main/py-sphinx: fix py3 subpackage and conflicts in /usr/bin

1 files changed, 29 insertions, 7 deletions

diff --git a/main/py-sphinx/APKBUILD b/main/py-sphinx/APKBUILD
index 704db72e71..f785d6fc61 100644
--- a/main/py-sphinx/APKBUILD
+++ b/main/py-sphinx/APKBUILD
@@ -8,21 +8,37 @@ pkgdesc="Python Documentation Generator"
 url="http://sphinx.pocoo.org/"
 arch="noarch"
 license="BSD"
-_pydepends="make py-docutils py-jinja2 py-pygments py-six py-sphinx_rtd_theme
+_pydepends="py-docutils py-jinja2 py-pygments py-six py-sphinx_rtd_theme
 	py-alabaster<0.8 py-babel py-snowballstemmer py-imagesize"
+depends="py3-${pkgname#py-}"
 makedepends="python2-dev python3-dev py-setuptools"
 subpackages="py2-${pkgname#py-}:_py2 py3-${pkgname#py-}:_py3"
 source="$_pkgname-$pkgver.tar.gz::https://github.com/sphinx-doc/sphinx/archive/$pkgver.tar.gz"
 builddir="$srcdir/$_pkgname-$pkgver"
 
+prepare() {
+	default_prepare || return 1
+
+	# Soure files are modified during build with 2to3 tool, so we cannot
+	# build it for both Python versions in the same location.
+	local python; for python in python2 python3; do
+		cp -r "$builddir" "$builddir-$python" || return 1
+	done
+}
+
 build() {
-	cd "$builddir"
-	python2 setup.py build || return 1
-	python3 setup.py build || return 1
+	local python; for python in python2 python3; do
+		cd "$builddir"-$python
+		$python setup.py build || return 1
+	done
 }
 
 package() {
-	mkdir -p "$pkgdir"
+	mkdir -p "$pkgdir"/usr/bin
+
+	local name; for name in apidoc autogen build quickstart; do
+		ln -s sphinx-$name "$pkgdir"/usr/bin/sphinx-$name-3 || return 1
+	done
 }
 
 _py2() {
@@ -38,12 +54,18 @@ _py3() {
 
 _py() {
 	local python="$1"
+	local pyver="${1:6:1}"
 	pkgdesc="$pkgdesc (for $python)"
 	depends="$depends $python"
 	install_if="$pkgname=$pkgver-r$pkgrel $python"
 
-	cd "$builddir"
-	$python setup.py install --prefix=/usr --root="$subpkgdir"
+	cd "$builddir"-$python
+	$python setup.py install --prefix=/usr --root="$subpkgdir" || return 1
+
+	# Add version suffix to executable files.
+	local path; for path in "$subpkgdir"/usr/bin/*; do
+		mv "$path" "$path-$pyver" || return 1
+	done
 }
 
 md5sums="0d3471b1cf421b68d0e41aedbfa48428  sphinx-1.4.8.tar.gz"