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/httplib2/httplib2-0.10.3.recipe

@@ -0,0 +1,66 @@
+SUMMARY="A comprehensive HTTP library for the Python platform"
+DESCRIPTION="httplib2 supports many features left out of other HTTP \
+libraries."
+HOMEPAGE="https://github.com/httplib2/httplib2/"
+COPYRIGHT="2006 Joe Gregorio"
+LICENSE="MIT"
+REVISION="1"
+SOURCE_URI="$HOMEPAGE/archive/v$portVersion.tar.gz"
+CHECKSUM_SHA256="d1bee28a68cc665c451c83d315e3afdbeb5391f08971dcc91e060d5ba16986f1"
+
+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\
+	\"; \
+REQUIRES_$pythonPackage=\"\
+	haiku\n\
+	cmd:python$pythonVersion\
+	\""
+BUILD_REQUIRES="$BUILD_REQUIRES
+	setuptools_$pythonPackage"
+BUILD_PREREQUIRES="$BUILD_PREREQUIRES
+	cmd:python$pythonVersion"
+done
+
+REPLACES_python="
+	python_httplib2
+	"
+REPLACES_python3="
+	python3_httplib2
+	"
+
+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
+
+		packageEntries  $pythonPackage \
+			$prefix/lib/python*
+	done
+}

dev-python/httplib2/python3_httplib2-0.9.2.recipe

@@ -1,48 +0,0 @@
-SUMMARY="A comprehensive HTTP library for the Python platform"
-DESCRIPTION="httplib2 supports many features left out of other HTTP \
-libraries."
-HOMEPAGE="https://pypi.python.org/pypi/httplib2"
-COPYRIGHT="2006 Joe Gregorio"
-LICENSE="MIT"
-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"
-
-PROVIDES="
-	python3_httplib2 = $portVersion
-	"
-REQUIRES="
-	haiku
-	cmd:python$PYTHON_VERSION
-	"
-
-BUILD_REQUIRES="
-	python3_setuptools
-	"
-BUILD_PREREQUIRES="
-	haiku_devel
-	cmd:python$PYTHON_VERSION
-	cmd:gcc
-	"
-
-BUILD()
-{
-	$portPackageLinksDir/cmd~python$PYTHON_VERSION/bin/python3 setup.py build
-}
-
-INSTALL()
-{
-	# GENERIC: all python_setuptools-based installs need this
-	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
-	mkdir -p $installLocation
-
-	$python setup.py install \
-		--prefix=$prefix
-}

dev-python/httplib2/python_httplib2-0.9.2.recipe

@@ -1,47 +0,0 @@
-SUMMARY="A comprehensive HTTP library for the Python platform"
-DESCRIPTION="httplib2 supports many features left out of other HTTP \
-libraries."
-HOMEPAGE="https://pypi.python.org/pypi/httplib2"
-COPYRIGHT="2006 Joe Gregorio"
-LICENSE="MIT"
-REVISION="1"
-SOURCE_URI="https://pypi.python.org/packages/source/h/httplib2/httplib2-$portVersion.tar.gz"
-CHECKSUM_SHA256="c3aba1c9539711551f4d83e857b316b5134a1c4ddce98a875b7027be7dd6d988"
-SOURCE_DIR="httplib2-$portVersion"
-
-ARCHITECTURES="x86 x86_gcc2 x86_64"
-
-PROVIDES="
-	python_httplib2 = $portVersion
-	"
-REQUIRES="
-	haiku
-	cmd:python2
-	"
-
-BUILD_REQUIRES="
-	python_setuptools
-	"
-BUILD_PREREQUIRES="
-	haiku_devel
-	cmd:python2
-	cmd:gcc
-	"
-
-BUILD()
-{
-	$portPackageLinksDir/cmd~python2/bin/python2 setup.py build
-}
-
-INSTALL()
-{
-	# GENERIC: all python_setuptools-based installs need this
-	python=$portPackageLinksDir/cmd~python2/bin/python2
-	pythonVersion=$($python --version 2>&1 | sed 's/Python //' | head -c3)
-	installLocation=$prefix/lib/python$pythonVersion/vendor-packages/
-	export PYTHONPATH=$installLocation:$PYTHONPATH
-	mkdir -p $installLocation
-
-	$python setup.py install \
-		--prefix=$prefix
-}