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/dateutil/dateutil-2.6.0.recipe

@@ -0,0 +1,63 @@
+SUMMARY="Extensions to the standard Python datetime module"
+DESCRIPTION="The dateutil module provides powerful extensions to the standard \
+datetime module, available in Python 2.3+."
+HOMEPAGE="http://github.com/dateutil/dateutil/"
+COPYRIGHT="2003-2010 Gustavo Niemeyer"
+LICENSE="BSD (3-clause)"
+REVISION="1"
+SOURCE_URI="http://github.com/dateutil/dateutil/archive/$portVersion.tar.gz"
+CHECKSUM_SHA256="3a027333eda28ad003f1a6c77cc0a46be06cb9e0790843dad6a1b619b102a181"
+
+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_dateutil
+	"
+
+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/dateutil/python_dateutil-2.5.2.recipe

@@ -1,51 +0,0 @@
-SUMMARY="Extensions to the standard Python datetime module"
-DESCRIPTION="The dateutil module provides powerful extensions to the standard \
-datetime module, available in Python 2.3+."
-HOMEPAGE="http://labix.org/python-dateutil"
-COPYRIGHT="2003-2010 Gustavo Niemeyer"
-#FIXME: check exact license
-#XXX: 2.0 is "simplified BSD" (which one ?)
-LICENSE="Python"
-REVISION="1"
-SOURCE_URI="http://github.com/dateutil/dateutil/archive/$portVersion.tar.gz"
-CHECKSUM_SHA256="757e927693126f474a3a97eef0215f87edb318c04e4f6ee9ab407c9994f91d27"
-SOURCE_DIR="dateutil-$portVersion"
-
-ARCHITECTURES="x86 x86_gcc2 x86_64"
-
-PROVIDES="
-	python_dateutil = $portVersion
-	"
-REQUIRES="
-	haiku
-	cmd:python2
-	#python_setuptools
-	"
-
-BUILD_REQUIRES="
-	haiku_devel
-	python_setuptools
-	"
-BUILD_PREREQUIRES="
-	cmd:python2
-	cmd:gcc
-	"
-
-BUILD()
-{
-	$portPackageLinksDir/cmd~python2/bin/python2 setup.py build
-}
-
-INSTALL()
-{
-	# GENERIC: all python_setuptools-based installs need this
-	export PATH="$portPackageLinksDir/cmd~python2/bin:$PATH"
-	pythonVersion=$(python2 --version 2>&1 | sed 's/Python //' | head -c3)
-	installLocation=$prefix/lib/python$pythonVersion/vendor-packages/
-	export PYTHONPATH=$installLocation:$PYTHONPATH
-	mkdir -p $installLocation
-
-	python2 setup.py install \
-		--single-version-externally-managed \
-		--root=/ --prefix=$prefix
-}