From 3c9f3e6d923a6fd81198488d16292d8e9e7ff063 Mon Sep 17 00:00:00 2001
From: fbrosson <fbrosson@users.noreply.github.com>
Date: Fri, 2 Nov 2018 00:31:43 +0000
Subject: [PATCH] dev-python/pbr: add a python subpackage, fix missing
 dependency.

cmd:pbr was in the base package but it would only work if the
python3 subpackage was also installed. Adding a dependency on it
works but it is much better to move the cmd:pbr script to the
python3 subpackage.
---
 dev-python/pbr/pbr-4.2.0.recipe | 75 ++++++++++++++++++++++-----------
 1 file changed, 51 insertions(+), 24 deletions(-)

diff --git a/dev-python/pbr/pbr-4.2.0.recipe b/dev-python/pbr/pbr-4.2.0.recipe
index c269437d0..d1ae6641b 100644
--- a/dev-python/pbr/pbr-4.2.0.recipe
+++ b/dev-python/pbr/pbr-4.2.0.recipe
@@ -16,7 +16,6 @@ ARCHITECTURES="any"
 
 PROVIDES="
 	$portName = $portVersion
-	cmd:pbr
 	"
 REQUIRES="
 	haiku
@@ -24,25 +23,48 @@ REQUIRES="
 
 BUILD_REQUIRES="
 	haiku_devel
+	setuptools_python
+	setuptools_python3
+	"
+BUILD_PREREQUIRES="
+	cmd:python
+	cmd:python3
 	"
 
-PYTHON_PACKAGES=(python3)
-PYTHON_VERSIONS=(3.6)
+PYTHON_PACKAGES=(python python3)
+PYTHON_VERSIONS=(2.7 3.6)
 for i in "${!PYTHON_PACKAGES[@]}"; do
-pythonPackage=${PYTHON_PACKAGES[i]}
-pythonVersion=${PYTHON_VERSIONS[$i]}
-eval "PROVIDES_${pythonPackage}=\"\
-	${portName}_$pythonPackage = $portVersion\
-	\"; \
-REQUIRES_$pythonPackage=\"\
-	haiku\n\
-	cmd:python$pythonVersion\
-	\""
-BUILD_REQUIRES="$BUILD_REQUIRES
-	setuptools_$pythonPackage"
-BUILD_PREREQUIRES="$BUILD_PREREQUIRES
-	cmd:python$pythonVersion"
+	pythonPackage=${PYTHON_PACKAGES[i]}
+	pythonVersion=${PYTHON_VERSIONS[$i]}
+	eval "PROVIDES_$pythonPackage=\"
+		${portName}_$pythonPackage = $portVersion
+		\""
+	eval "REQUIRES_$pythonPackage=\"
+		haiku
+		cmd:python$pythonVersion
+		\""
 done
+PROVIDES_python+="
+	cmd:pbr2
+	"
+PROVIDES_python3+="
+	cmd:pbr
+	"
+
+BUILD()
+{
+	for i in "${!PYTHON_PACKAGES[@]}"; do
+		pythonPackage=${PYTHON_PACKAGES[i]}
+		pythonVersion=${PYTHON_VERSIONS[$i]}
+
+		rm -rf "$sourceDir"-$pythonPackage
+		cp -a "$sourceDir" "$sourceDir"-$pythonPackage
+		cd "$sourceDir"-$pythonPackage
+
+		python=python$pythonVersion
+		$python setup.py build
+	done
+}
 
 INSTALL()
 {
@@ -50,16 +72,21 @@ INSTALL()
 		pythonPackage=${PYTHON_PACKAGES[i]}
 		pythonVersion=${PYTHON_VERSIONS[$i]}
 
+		cd "$sourceDir"-$pythonPackage
+
 		python=python$pythonVersion
 		installLocation=$prefix/lib/$python/vendor-packages/
-		export PYTHONPATH=$installLocation:$PYTHONPATH
-		mkdir -p $installLocation
-		rm -rf build
-		$python setup.py build install \
-			--root=/ --prefix=$prefix
+		export PYTHONPATH=$installLocation
+		mkdir -p "$installLocation"
+		$python setup.py install \
+			--root=/ --prefix="$prefix"
 
-		packageEntries  $pythonPackage \
-			$prefix/lib/python*
+		if [ "$pythonPackage" = python ]; then
+			mv "$binDir"/pbr "$binDir"/pbr2
+		fi
+
+		packageEntries $pythonPackage \
+			"$binDir" \
+			"$prefix"/lib/$python
 	done
 }
-