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/fonttools/fonttools-3.10.0.recipe

@@ -0,0 +1,98 @@
+SUMMARY="A library for manipulating fonts"
+DESCRIPTION="FontTools is a library for manipulating fonts, written in Python.\
+ It supports TrueType, OpenType, AFM and to an extent Type 1 and some \
+Mac-specific formats."
+HOMEPAGE="https://github.com/behdad/fonttools"
+COPYRIGHT="1999-2004 Just van Rossum, Letterror, The Netherlands."
+LICENSE="FONTTOOLS"
+REVISION="1"
+SOURCE_URI="https://github.com/fonttools/fonttools/archive/$portVersion.tar.gz"
+SOURCE_FILENAME="fonttools-$portVersion.tar.gz"
+CHECKSUM_SHA256="91fbab7277017587d9c6bfaf6770cbf1b38983d02308eb3f948b7915e43ef6bb"
+
+ARCHITECTURES="any"
+
+PROVIDES="
+	$portName = $portVersion
+	cmd:fonttools
+	cmd:pyftinspect
+	cmd:pyftmerge
+	cmd:pyftsubset
+	cmd:ttx
+	"
+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
+
+PROVIDES_python="$PROVIDES_python
+	cmd:fonttools
+	cmd:pyftinspect
+	cmd:pyftmerge
+	cmd:pyftsubset
+	cmd:ttx
+	"
+REPLACES_python="
+	python_fonttools
+	"
+PROVIDES_python3="$PROVIDES_python3
+	cmd:fonttools3
+	cmd:pyftinspect3
+	cmd:pyftmerge3
+	cmd:pyftsubset3
+	cmd:ttx3
+	"
+REPLACES_python3="
+	python3_fonttools
+	"
+
+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
+			for f in $binDir/*; do
+				mv $f ${f}3
+			done
+		fi
+
+		packageEntries  $pythonPackage \
+			$prefix/lib/python* \
+			$binDir
+	done
+
+	mkdir -p $(dirname $manDir)
+	mv $prefix/share/man $manDir
+	rmdir $prefix/share
+}

dev-python/fonttools/python3_fonttools-3.0.recipe

@@ -1,53 +0,0 @@
-SUMMARY="A library for manipulating fonts"
-DESCRIPTION="FontTools is a library for manipulating fonts, written in Python.\
- It supports TrueType, OpenType, AFM and to an extent Type 1 and some \
-Mac-specific formats."
-HOMEPAGE="https://github.com/behdad/fonttools"
-COPYRIGHT="1999-2004 Just van Rossum, Letterror, The Netherlands."
-LICENSE="FONTTOOLS"
-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"
-
-PROVIDES="
-	python3_fonttools = $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
-		
-	# conflict with python_fonttools
-	rm -rf $binDir $prefix/share
-}

dev-python/fonttools/python_fonttools-3.0.recipe

@@ -1,55 +0,0 @@
-SUMMARY="A library for manipulating fonts"
-DESCRIPTION="FontTools is a library for manipulating fonts, written in Python.\
- It supports TrueType, OpenType, AFM and to an extent Type 1 and some \
-Mac-specific formats."
-HOMEPAGE="https://github.com/behdad/fonttools"
-COPYRIGHT="1999-2004 Just van Rossum, Letterror, The Netherlands."
-LICENSE="FONTTOOLS"
-REVISION="1"
-SOURCE_URI="https://github.com/behdad/fonttools/archive/$portVersion.tar.gz"
-SOURCE_FILENAME="fonttools-$portVersion.tar.gz"
-CHECKSUM_SHA256="3bc9141d608603faac3f800482feec78a550d0a94c29ff3850471dbe4ad9e941"
-SOURCE_DIR="fonttools-$portVersion"
-
-ARCHITECTURES="x86 x86_gcc2 x86_64"
-
-PROVIDES="
-	python_fonttools = $portVersion
-	cmd:pyftmerge
-	cmd:pyftsubset
-	cmd:ttx
-	"
-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
-		
-	# we don't have pygtk
-	rm $binDir/pyftinspect
-}