dev-python: merge most python2 and python3 recipes.

* adjust recipes depending on these, ie python_dateutil=>dateutil_python.
* switch architectures to any for relevant python recipes.
* bump versions for retext, argh, beautifulsoup, cssselect, dateutil,
docutils, fonttools, html2text, httplib2, lxml, mechanize, mock, paramiko,
pillow, pip, pygments, requests, twisted, urllib3, zope_interface.

dev-python/pip/pip-9.0.0.recipe

@@ -0,0 +1,75 @@
+SUMMARY="The PyPA recommended tool for installing Python packages"
+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"
+SOURCE_URI="https://pypi.io/packages/source/p/pip/pip-$portVersion.tar.gz"
+CHECKSUM_SHA256="f62fb70e7e000e46fce12aaeca752e5281a5446977fe5a75ab4189a43b3f8793"
+
+ARCHITECTURES="any"
+
+PROVIDES="
+	$portName = $portVersion
+	"
+REQUIRES="
+	haiku
+	"
+
+BUILD_REQUIRES="
+	haiku_devel
+	"
+
+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\n\
+	cmd:pip$pythonVersion\n\
+	cmd:pip${pythonVersion:0:1}\n\
+	\"; \
+REQUIRES_$pythonPackage=\"\
+	haiku\n\
+	cmd:python$pythonVersion\n\
+	setuptools_$pythonPackage\n\
+	\""
+BUILD_REQUIRES="$BUILD_REQUIRES
+	setuptools_$pythonPackage"
+BUILD_PREREQUIRES="$BUILD_PREREQUIRES
+	cmd:python$pythonVersion"
+done
+
+PROVIDES_python="$PROVIDES_python
+	cmd:pip
+	"
+REPLACES_python="
+	python_pip
+	"
+REPLACES_python3="
+	python3_pip
+	"
+
+INSTALL()
+{
+	for i in "${!PYTHON_PACKAGES[@]}"; do
+		pythonPackage=${PYTHON_PACKAGES[i]}
+		pythonVersion=${PYTHON_VERSIONS[$i]}
+
+		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
+
+		if [ $pythonPackage != python ]; then
+			rm $binDir/pip
+		fi
+		packageEntries  $pythonPackage \
+			$prefix/lib/python* \
+			$binDir
+	done
+}

dev-python/pip/python3_pip-7.0.3.recipe

@@ -1,50 +0,0 @@
-SUMMARY="The PyPA recommended tool for installing Python packages"
-DESCRIPTION="Install Python packages, replacement for easy_install"
-HOMEPAGE="https://pypi.python.org/pypi/pip"
-COPYRIGHT="2006-2014 Python Packaging Authority"
-LICENSE="Python"
-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"
-
-PROVIDES="
-	python3_pip = $portVersion
-	cmd:pip
-	cmd:pip3
-	cmd:pip$PYTHON_VERSION
-	"
-REQUIRES="
-	haiku
-	cmd:python$PYTHON_VERSION
-	python3_setuptools
-	"
-
-BUILD_REQUIRES="
-	python3_setuptools
-	"
-BUILD_PREREQUIRES="
-	haiku_devel
-	cmd:python$PYTHON_VERSION
-	cmd:sed
-	"
-
-BUILD()
-{
-	$portPackageLinksDir/cmd~python$PYTHON_VERSION/bin/python3 setup.py build
-}
-
-INSTALL()
-{
-	# GENERIC: all python_setuptools-based installs need this
-	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~python$PYTHON_VERSION/bin/python3 setup.py install \
-		--prefix=$prefix
-}