From 7204e0f2841cd6f3f2aa27eb1db495755c06efc1 Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Mon, 27 Mar 2017 23:08:42 +0200
Subject: [PATCH] adjust recipes to use python 3.6, bump revisions.

---
 .../fonttools/python3_fonttools-3.0.recipe     | 13 +++++++------
 .../httplib2/python3_httplib2-0.9.2.recipe     | 11 ++++++-----
 dev-python/mako/python3_mako-1.0.3.recipe      | 11 ++++++-----
 dev-python/numpy/python3_numpy-1.11.2.recipe   | 18 ++++++++----------
 dev-python/pip/python3_pip-7.0.3.recipe        | 15 ++++++++-------
 dev-python/pyqt/pyqt-5.8.recipe                | 13 +++++++------
 .../requests/python3_requests-2.9.1.recipe     | 11 ++++++-----
 .../python3_setuptools-28.8.0.recipe           | 17 +++++++++--------
 dev-python/sip/sip-4.19.1.recipe               |  9 +++++----
 media-video/openshot/openshot-2.0.7.recipe     | 13 +++++++------
 10 files changed, 69 insertions(+), 62 deletions(-)

diff --git a/dev-python/fonttools/python3_fonttools-3.0.recipe b/dev-python/fonttools/python3_fonttools-3.0.recipe
index 2474a16fa..4d29d2793 100644
--- a/dev-python/fonttools/python3_fonttools-3.0.recipe
+++ b/dev-python/fonttools/python3_fonttools-3.0.recipe
@@ -5,11 +5,12 @@ Mac-specific formats."
 HOMEPAGE="https://github.com/behdad/fonttools"
 COPYRIGHT="1999-2004 Just van Rossum, Letterror, The Netherlands."
 LICENSE="FONTTOOLS"
-REVISION="1"
+REVISION="2"
 SOURCE_URI="https://github.com/behdad/fonttools/archive/$portVersion.tar.gz"
 SOURCE_FILENAME="fonttools-$portVersion.tar.gz"
 CHECKSUM_SHA256="3bc9141d608603faac3f800482feec78a550d0a94c29ff3850471dbe4ad9e941"
 SOURCE_DIR="fonttools-$portVersion"
+PYTHON_VERSION="3.6"
 
 ARCHITECTURES="x86 x86_gcc2 x86_64"
 
@@ -18,7 +19,7 @@ PROVIDES="
 	"
 REQUIRES="
 	haiku
-	cmd:python3
+	cmd:python$PYTHON_VERSION
 	"
 
 BUILD_REQUIRES="
@@ -26,19 +27,19 @@ BUILD_REQUIRES="
 	"
 BUILD_PREREQUIRES="
 	haiku_devel
-	cmd:python3
+	cmd:python$PYTHON_VERSION
 	cmd:gcc
 	"
 
 BUILD()
 {
-	$portPackageLinksDir/cmd~python3/bin/python3 setup.py build
+	$portPackageLinksDir/cmd~python$PYTHON_VERSION/bin/python3 setup.py build
 }
 
 INSTALL()
 {
 	# GENERIC: all python_setuptools-based installs need this
-	python=$portPackageLinksDir/cmd~python3/bin/python3
+	python=$portPackageLinksDir/cmd~python$PYTHON_VERSION/bin/python3
 	pythonVersion=$($python --version 2>&1 | sed 's/Python //' | head -c3)
 	installLocation=$prefix/lib/python$pythonVersion/vendor-packages/
 	export PYTHONPATH=$installLocation:$PYTHONPATH
@@ -48,5 +49,5 @@ INSTALL()
 		--prefix=$prefix
 		
 	# conflict with python_fonttools
-	rm -rf $binDir
+	rm -rf $binDir $prefix/share
 }
diff --git a/dev-python/httplib2/python3_httplib2-0.9.2.recipe b/dev-python/httplib2/python3_httplib2-0.9.2.recipe
index 8dee4b537..5e83764d9 100644
--- a/dev-python/httplib2/python3_httplib2-0.9.2.recipe
+++ b/dev-python/httplib2/python3_httplib2-0.9.2.recipe
@@ -4,10 +4,11 @@ libraries."
 HOMEPAGE="https://pypi.python.org/pypi/httplib2"
 COPYRIGHT="2006 Joe Gregorio"
 LICENSE="MIT"
-REVISION="1"
+REVISION="2"
 SOURCE_URI="https://pypi.python.org/packages/source/h/httplib2/httplib2-$portVersion.tar.gz"
 CHECKSUM_SHA256="c3aba1c9539711551f4d83e857b316b5134a1c4ddce98a875b7027be7dd6d988"
 SOURCE_DIR="httplib2-$portVersion"
+PYTHON_VERSION="3.6"
 
 ARCHITECTURES="x86 x86_gcc2 x86_64"
 
@@ -16,7 +17,7 @@ PROVIDES="
 	"
 REQUIRES="
 	haiku
-	cmd:python3
+	cmd:python$PYTHON_VERSION
 	"
 
 BUILD_REQUIRES="
@@ -24,19 +25,19 @@ BUILD_REQUIRES="
 	"
 BUILD_PREREQUIRES="
 	haiku_devel
-	cmd:python3
+	cmd:python$PYTHON_VERSION
 	cmd:gcc
 	"
 
 BUILD()
 {
-	$portPackageLinksDir/cmd~python3/bin/python3 setup.py build
+	$portPackageLinksDir/cmd~python$PYTHON_VERSION/bin/python3 setup.py build
 }
 
 INSTALL()
 {
 	# GENERIC: all python_setuptools-based installs need this
-	python=$portPackageLinksDir/cmd~python3/bin/python3
+	python=$portPackageLinksDir/cmd~python$PYTHON_VERSION/bin/python3
 	pythonVersion=$($python --version 2>&1 | sed 's/Python //' | head -c3)
 	installLocation=$prefix/lib/python$pythonVersion/vendor-packages/
 	export PYTHONPATH=$installLocation:$PYTHONPATH
diff --git a/dev-python/mako/python3_mako-1.0.3.recipe b/dev-python/mako/python3_mako-1.0.3.recipe
index b4f5722b4..1807eab8a 100644
--- a/dev-python/mako/python3_mako-1.0.3.recipe
+++ b/dev-python/mako/python3_mako-1.0.3.recipe
@@ -11,10 +11,11 @@ also maintaining close ties to Python calling and scoping semantics."
 HOMEPAGE="http://www.makotemplates.org"
 COPYRIGHT="2006-2015 the Mako authors and contributors"
 LICENSE="MIT"
-REVISION="1"
+REVISION="2"
 SOURCE_URI="https://pypi.python.org/packages/source/M/Mako/Mako-$portVersion.tar.gz"
 CHECKSUM_SHA256="7644bc0ee35965d2e146dde31827b8982ed70a58281085fac42869a09764d38c"
 SOURCE_DIR="Mako-$portVersion"
+PYTHON_VERSION="3.6"
 
 ARCHITECTURES="arm ppc x86 x86_gcc2 x86_64"
 
@@ -24,7 +25,7 @@ PROVIDES="
 	"
 REQUIRES="
 	haiku
-	cmd:python3
+	cmd:python$PYTHON_VERSION
 	"
 
 BUILD_REQUIRES="
@@ -32,19 +33,19 @@ BUILD_REQUIRES="
 	"
 BUILD_PREREQUIRES="
 	haiku_devel
-	cmd:python3
+	cmd:python$PYTHON_VERSION
 	cmd:gcc
 	"
 
 BUILD()
 {
-	$portPackageLinksDir/cmd~python3/bin/python3 setup.py build
+	$portPackageLinksDir/cmd~python$PYTHON_VERSION/bin/python3 setup.py build
 }
 
 INSTALL()
 {
 	# GENERIC: all python_setuptools-based installs need this
-	python=$portPackageLinksDir/cmd~python3/bin/python3
+	python=$portPackageLinksDir/cmd~python$PYTHON_VERSION/bin/python3
 	pythonVersion=$($python --version 2>&1 | sed 's/Python //' | head -c3)
 	installLocation=$prefix/lib/python$pythonVersion/vendor-packages/
 	export PYTHONPATH=$installLocation:$PYTHONPATH
diff --git a/dev-python/numpy/python3_numpy-1.11.2.recipe b/dev-python/numpy/python3_numpy-1.11.2.recipe
index 1a0aeb8ce..c0a57cbbd 100644
--- a/dev-python/numpy/python3_numpy-1.11.2.recipe
+++ b/dev-python/numpy/python3_numpy-1.11.2.recipe
@@ -9,10 +9,11 @@ general-purpose data-base applications."
 HOMEPAGE="http://numpy.scipy.org/"
 COPYRIGHT="2005-2016 NumPy Developers."
 LICENSE="BSD (3-clause)"
-REVISION="1"
+REVISION="2"
 SOURCE_URI="http://downloads.sourceforge.net/project/numpy/NumPy/$portVersion/numpy-$portVersion.tar.gz"
 CHECKSUM_SHA256="04db2fbd64e2e7c68e740b14402b25af51418fc43a59d9e54172b38b906b0f69"
 SOURCE_DIR="numpy-$portVersion"
+PYTHON_VERSION="3.6"
 
 ARCHITECTURES="!x86_gcc2 x86 x86_64"
 
@@ -22,7 +23,7 @@ PROVIDES="
 	"
 REQUIRES="
 	haiku
-	cmd:python3
+	cmd:python$PYTHON_VERSION
 	lib:libopenblas
 	"
 
@@ -32,32 +33,29 @@ BUILD_REQUIRES="
 	devel:libopenblas
 	"
 BUILD_PREREQUIRES="
-	cmd:python3
+	cmd:python$PYTHON_VERSION
 	cmd:git
 	cmd:gcc
 	cmd:gfortran
 	"
 
-PATCH()
+BUILD()
 {
 	# Check at every update in site.cfg.example!
-	echo "[openblas]" >> site.cfg
+	echo "[openblas]" > site.cfg
 	echo "libraries = openblas" >> site.cfg
 	echo "library_dirs = /system/`echo ${relativeDevelopLibDir}`" >> site.cfg
 	echo "include_dirs = /system/`echo ${relativeIncludeDir}`" >> site.cfg
 	echo "runtime_library_dirs = /system/`echo ${relativeLibDir}`" >> site.cfg
-}
 
-BUILD()
-{
 	rm -rf doc/sphinxext/.git
-	$portPackageLinksDir/cmd~python3/bin/python3 setup.py build $jobArgs
+	$portPackageLinksDir/cmd~python$PYTHON_VERSION/bin/python3 setup.py build $jobArgs
 }
 
 INSTALL()
 {
 	# GENERIC: all python_setuptools-based installs need this
-	python=$portPackageLinksDir/cmd~python3/bin/python3
+	python=$portPackageLinksDir/cmd~python$PYTHON_VERSION/bin/python3
 	pythonVersion=$($python --version 2>&1 | sed 's/Python //' | head -c3)
 	installLocation=$prefix/lib/python$pythonVersion/vendor-packages/
 	export PYTHONPATH=$installLocation:$PYTHONPATH
diff --git a/dev-python/pip/python3_pip-7.0.3.recipe b/dev-python/pip/python3_pip-7.0.3.recipe
index be42193fa..b2ecd7bbf 100644
--- a/dev-python/pip/python3_pip-7.0.3.recipe
+++ b/dev-python/pip/python3_pip-7.0.3.recipe
@@ -3,10 +3,11 @@ DESCRIPTION="Install Python packages, replacement for easy_install"
 HOMEPAGE="https://pypi.python.org/pypi/pip"
 COPYRIGHT="2006-2014 Python Packaging Authority"
 LICENSE="Python"
-REVISION="1"
+REVISION="2"
 SOURCE_URI="https://pypi.python.org/packages/source/p/pip/pip-$portVersion.tar.gz"
 CHECKSUM_SHA256="b4c598825a6f6dc2cac65968feb28e6be6c1f7f1408493c60a07eaa731a0affd"
 SOURCE_DIR="pip-$portVersion"
+PYTHON_VERSION="3.6"
 
 ARCHITECTURES="x86 x86_gcc2 x86_64"
 
@@ -14,11 +15,11 @@ PROVIDES="
 	python3_pip = $portVersion
 	cmd:pip
 	cmd:pip3
-	cmd:pip34
+	cmd:pip$PYTHON_VERSION
 	"
 REQUIRES="
 	haiku
-	cmd:python3
+	cmd:python$PYTHON_VERSION
 	python3_setuptools
 	"
 
@@ -27,23 +28,23 @@ BUILD_REQUIRES="
 	"
 BUILD_PREREQUIRES="
 	haiku_devel
-	cmd:python3
+	cmd:python$PYTHON_VERSION
 	cmd:sed
 	"
 
 BUILD()
 {
-	$portPackageLinksDir/cmd~python3/bin/python3 setup.py build
+	$portPackageLinksDir/cmd~python$PYTHON_VERSION/bin/python3 setup.py build
 }
 
 INSTALL()
 {
 	# GENERIC: all python_setuptools-based installs need this
-	pythonVersion=$(python3 --version 2>&1 | sed 's/Python //' | head -c3)
+	pythonVersion=$($portPackageLinksDir/cmd~python$PYTHON_VERSION/bin/python3 --version 2>&1 | sed 's/Python //' | head -c3)
 	installLocation=$prefix/lib/python$pythonVersion/vendor-packages/
 	export PYTHONPATH=$installLocation:$PYTHONPATH
 	mkdir -p $installLocation
 
-	$portPackageLinksDir/cmd~python3/bin/python3 setup.py install \
+	$portPackageLinksDir/cmd~python$PYTHON_VERSION/bin/python3 setup.py install \
 		--prefix=$prefix
 }
diff --git a/dev-python/pyqt/pyqt-5.8.recipe b/dev-python/pyqt/pyqt-5.8.recipe
index 5f4dbd483..dc98d1a3c 100644
--- a/dev-python/pyqt/pyqt-5.8.recipe
+++ b/dev-python/pyqt/pyqt-5.8.recipe
@@ -5,10 +5,11 @@ simplicity of Python."
 HOMEPAGE="http://www.riverbankcomputing.com/software/pyqt/"
 COPYRIGHT="2015-2017 Riverbank Computing Limited"
 LICENSE="GNU GPL v3"
-REVISION="1"
+REVISION="2"
 SOURCE_URI="https://downloads.sourceforge.net/project/pyqt/PyQt5/PyQt-$portVersion/PyQt5_gpl-$portVersion.tar.gz"
 CHECKSUM_SHA256="9edf2816105a4111a447452df2bef7ce47d7efb307c75c3e74c27b8d31d7f66e"
 SOURCE_DIR="PyQt5_gpl-$portVersion"
+PYTHON3_VERSION="3.6"
 
 ARCHITECTURES="!x86_gcc2 ?x86 x86_64"
 SECONDARY_ARCHITECTURES="?x86"
@@ -78,7 +79,7 @@ REQUIRES_python3="
 	haiku${secondaryArchSuffix}
 	pyqt$secondaryArchSuffix == $portVersion base
 	sip_python3 >= 4.19
-	cmd:python3
+	cmd:python$PYTHON3_VERSION
 	$REQUIRES
 	"
 REPLACES_python3="
@@ -124,7 +125,7 @@ BUILD_REQUIRES="
 	"
 BUILD_PREREQUIRES="
 	cmd:python2
-	cmd:python3
+	cmd:python$PYTHON3_VERSION
 	cmd:gcc${secondaryArchSuffix}
 	cmd:make
 	cmd:ld${secondaryArchSuffix}
@@ -158,12 +159,12 @@ BUILD()
 	mkdir -p ../build3; cd ../build3
 
 	# GENERIC: all python_setuptools-based installs need this
-	python=$portPackageLinksDir/cmd~python3/bin/python3
+	python=$portPackageLinksDir/cmd~python$PYTHON3_VERSION/bin/python3
 	pythonVersion=$($python --version 2>&1 | sed 's/Python //' | head -c3)
 	installLocation=$prefix/lib/python$pythonVersion/vendor-packages/
 	export PYTHONPATH=$installLocation:$OLDPYTHONPATH
 
-	$portPackageLinksDir/cmd~python3/bin/python3 ../configure.py \
+	$python ../configure.py \
 		--confirm-license \
 		--no-designer-plugin \
 		--no-qml-plugin \
@@ -202,7 +203,7 @@ INSTALL()
 
 	cd ../build3
 	# GENERIC: all python_setuptools-based installs need this
-	python=$portPackageLinksDir/cmd~python3/bin/python3
+	python=$portPackageLinksDir/cmd~python$PYTHON3_VERSION/bin/python3
 	pythonVersion=$($python --version 2>&1 | sed 's/Python //' | head -c3)
 	installLocation=$prefix/lib/python$pythonVersion/vendor-packages/
 	export PYTHONPATH=$installLocation:$OLDPYTHONPATH
diff --git a/dev-python/requests/python3_requests-2.9.1.recipe b/dev-python/requests/python3_requests-2.9.1.recipe
index 77a6ec034..3bd714c74 100644
--- a/dev-python/requests/python3_requests-2.9.1.recipe
+++ b/dev-python/requests/python3_requests-2.9.1.recipe
@@ -4,10 +4,11 @@ HOMEPAGE="http://python-requests.org/
 	http://pypi.python.org/pypi/requests"
 COPYRIGHT="2014 Kenneth Reitz"
 LICENSE="Apache v2"
-REVISION="1"
+REVISION="2"
 SOURCE_URI="https://pypi.python.org/packages/source/r/requests/requests-$portVersion.tar.gz"
 CHECKSUM_SHA256="c577815dd00f1394203fc44eb979724b098f88264a9ef898ee45b8e5e9cf587f"
 SOURCE_DIR="requests-$portVersion"
+PYTHON_VERSION="3.6"
 
 ARCHITECTURES="x86 x86_gcc2 x86_64"
 
@@ -16,7 +17,7 @@ PROVIDES="
 	"
 REQUIRES="
 	haiku
-	cmd:python3
+	cmd:python$PYTHON_VERSION
 	# actually has its own copy...
 	#ca_root_certificates
 	"
@@ -25,19 +26,19 @@ BUILD_REQUIRES="
 	haiku_devel
 	"
 BUILD_PREREQUIRES="
-	cmd:python3
+	cmd:python$PYTHON_VERSION
 	cmd:gcc
 	"
 
 BUILD()
 {
-	$portPackageLinksDir/cmd~python3/bin/python3 setup.py build
+	$portPackageLinksDir/cmd~python$PYTHON_VERSION/bin/python3 setup.py build
 }
 
 INSTALL()
 {
 	# GENERIC: all python_setuptools-based installs need this
-	python=$portPackageLinksDir/cmd~python3/bin/python3
+	python=$portPackageLinksDir/cmd~python$PYTHON_VERSION/bin/python3
 	pythonVersion=$($python --version 2>&1 | sed 's/Python //' | head -c3)
 	installLocation=$prefix/lib/python$pythonVersion/vendor-packages/
 	export PYTHONPATH=$installLocation:$PYTHONPATH
diff --git a/dev-python/setuptools/python3_setuptools-28.8.0.recipe b/dev-python/setuptools/python3_setuptools-28.8.0.recipe
index 971d8f105..9ade3c18d 100644
--- a/dev-python/setuptools/python3_setuptools-28.8.0.recipe
+++ b/dev-python/setuptools/python3_setuptools-28.8.0.recipe
@@ -6,46 +6,47 @@ Perl and PHP, respectively."
 HOMEPAGE="https://pypi.python.org/pypi/setuptools"
 COPYRIGHT="2006-2014 Python Packaging Authority"
 LICENSE="Python"
-REVISION="1"
+REVISION="2"
 SOURCE_URI="https://github.com/pypa/setuptools/archive/v$portVersion.tar.gz"
 SOURCE_FILENAME="setuptools-$portVersion.tar.gz"
 CHECKSUM_SHA256="d3b2c63a5cb6816ace0883bc3f6aca9e7890c61d80ac0d608a183f85825a7cc0"
 SOURCE_DIR="setuptools-$portVersion"
+PYTHON_VERSION="3.6"
 
 ARCHITECTURES="x86 x86_gcc2 x86_64"
 
 PROVIDES="
 	python3_setuptools = $portVersion
 	cmd:easy_install
-	cmd:easy_install_3.5
+	cmd:easy_install_$PYTHON_VERSION
 	"
 REQUIRES="
 	haiku
-	cmd:python3
+	cmd:python$PYTHON_VERSION
 	"
 
 BUILD_REQUIRES="
 	haiku_devel
 	"
 BUILD_PREREQUIRES="
-	cmd:python3
+	cmd:python$PYTHON_VERSION
 	cmd:sed
 	"
 
 BUILD()
 {
-	$portPackageLinksDir/cmd~python3/bin/python3 bootstrap.py
-	$portPackageLinksDir/cmd~python3/bin/python3 setup.py build
+	$portPackageLinksDir/cmd~python$PYTHON_VERSION/bin/python3 bootstrap.py
+	$portPackageLinksDir/cmd~python$PYTHON_VERSION/bin/python3 setup.py build
 }
 
 INSTALL()
 {
 	# GENERIC: all python_setuptools-based installs need this
-	pythonVersion=$(python3 --version 2>&1 | sed 's/Python //' | head -c3)
+	pythonVersion=$($portPackageLinksDir/cmd~python$PYTHON_VERSION/bin/python3 --version 2>&1 | sed 's/Python //' | head -c3)
 	installLocation=$prefix/lib/python$pythonVersion/vendor-packages/
 	export PYTHONPATH=$installLocation:$PYTHONPATH
 	mkdir -p $installLocation
 
-	$portPackageLinksDir/cmd~python3/bin/python3 setup.py install \
+	$portPackageLinksDir/cmd~python$PYTHON_VERSION/bin/python3 setup.py install \
 		--prefix=$prefix --skip-build
 }
diff --git a/dev-python/sip/sip-4.19.1.recipe b/dev-python/sip/sip-4.19.1.recipe
index 5738cf04a..b5d1b95dd 100644
--- a/dev-python/sip/sip-4.19.1.recipe
+++ b/dev-python/sip/sip-4.19.1.recipe
@@ -6,11 +6,12 @@ module provides support functions to the automatically generated code."
 HOMEPAGE="https://www.riverbankcomputing.com/software/sip/"
 COPYRIGHT="2015 Riverbank Computing Limited"
 LICENSE="GNU GPL v3"
-REVISION="1"
+REVISION="2"
 SOURCE_URI="http://sourceforge.net/projects/pyqt/files/sip/sip-$portVersion/sip-$portVersion.tar.gz"
 CHECKSUM_SHA256="501852b8325349031b769d1c03d6eab04f7b9b97f790ec79f3d3d04bf065d83e"
 SOURCE_DIR="sip-$portVersion"
 PATCHES="sip-$portVersion.patch"
+PYTHON3_VERSION="3.6"
 
 ARCHITECTURES="x86 x86_gcc2 x86_64"
 
@@ -37,7 +38,7 @@ PROVIDES_python3="
 	"
 REQUIRES_python3="
 	haiku
-	cmd:python3
+	cmd:python$PYTHON3_VERSION
 	"
 REPLACES_python3="
 	python3_sip
@@ -48,7 +49,7 @@ BUILD_REQUIRES="
 	"
 BUILD_PREREQUIRES="
 	cmd:python2
-	cmd:python3
+	cmd:python$PYTHON3_VERSION
 	cmd:gcc
 	cmd:make
 	"
@@ -76,7 +77,7 @@ BUILD()
 	mkdir -p ../build3 && cd ../build3
 
 	# GENERIC: all python_setuptools-based installs need this
-	python=$portPackageLinksDir/cmd~python3/bin/python3
+	python=$portPackageLinksDir/cmd~python$PYTHON3_VERSION/bin/python3
 	pythonVersion=$($python --version 2>&1 | sed 's/Python //' | head -c3)
 	installLocation=$prefix/lib/python$pythonVersion/vendor-packages/
 	export PYTHONPATH=$installLocation:$OLDPYTHONPATH
diff --git a/media-video/openshot/openshot-2.0.7.recipe b/media-video/openshot/openshot-2.0.7.recipe
index a5c887dfe..d64b6a8e2 100644
--- a/media-video/openshot/openshot-2.0.7.recipe
+++ b/media-video/openshot/openshot-2.0.7.recipe
@@ -6,11 +6,12 @@ you create the film you always dreamed of. Easily add sub-titles, transitions,\
 HOMEPAGE="http://www.openshot.org"
 COPYRIGHT="2008-2016 OpenShot Studios, LLC"
 LICENSE="GNU GPL v3"
-REVISION="2"
+REVISION="3"
 SOURCE_URI="https://github.com/OpenShot/openshot-qt/archive/v$portVersion.tar.gz"
 SOURCE_FILENAME="openshot-$portVersion.tar.gz"
 CHECKSUM_SHA256="4c231493f6ce52a64929c3253961f7769c90652cb5a3e4979158e5e032afe433"
 SOURCE_DIR="openshot-qt-$portVersion"
+PYTHON_VERSION="3.6"
 
 ARCHITECTURES="!x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="!x86_gcc2 ?x86"
@@ -23,19 +24,19 @@ REQUIRES="
 	haiku$secondaryArchSuffix
 	lib:libopenshot$secondaryArchSuffix
 	python3_httplib2
-	python3_pyqt >= 5
+	pyqt_python3 >= 5
 	python3_setuptools
-	cmd:python3
+	cmd:python$PYTHON_VERSION
 	"
 
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	devel:libopenshot$secondaryArchSuffix
-	python3_pyqt >= 5
+	pyqt_python3 >= 5
 	python3_setuptools
 	"
 BUILD_PREREQUIRES="
-	cmd:python3
+	cmd:python$PYTHON_VERSION
 	"
 
 BUILD()
@@ -46,7 +47,7 @@ BUILD()
 INSTALL()
 {
 	# GENERIC: all python_setuptools-based installs need this
-	python=$portPackageLinksDir/cmd~python3/bin/python3
+	python=$portPackageLinksDir/cmd~python$PYTHON_VERSION/bin/python3
 	pythonVersion=$($python --version 2>&1 | sed 's/Python //' | head -c3)
 	installLocation=$prefix/lib/python$pythonVersion/vendor-packages/
 	export PYTHONPATH=$installLocation:$PYTHONPATH