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/markups/markups-2.0.0.recipe

@@ -0,0 +1,70 @@
+SUMMARY="A wrapper around various text markups"
+DESCRIPTION="Markups provides a wrapper around various text markup languages.
+Available by default are Markdown, reStructuredText and Textile, but you can \
+easily add your own markups.
+"
+HOMEPAGE="http://python-requests.org/
+	http://pypi.python.org/pypi/markups"
+COPYRIGHT="2012-2015 Dmitry Shachnev"
+LICENSE="BSD (3-clause)"
+REVISION="1"
+SOURCE_URI="https://pypi.python.org/packages/0b/98/3a20a868437c17db37cec47cc82fbd1030aa55765faf06207ab832e85152/Markups-$portVersion.tar.gz"
+CHECKSUM_SHA256="5639ddd76d74e0a5335e5b66ff2f1b3f9a9f0ab6eeff76a1003f59ed0ec2b721"
+SOURCE_DIR="Markups-$portVersion"
+
+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_markups
+	"
+REPLACES_python3="
+	python3_markups
+	"
+
+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/markups/python3_markups-2.0.0.recipe

@@ -1,50 +0,0 @@
-SUMMARY="A wrapper around various text markups"
-DESCRIPTION="Markups provides a wrapper around various text markup languages.
-Available by default are Markdown, reStructuredText and Textile, but you can \
-easily add your own markups.
-"
-HOMEPAGE="http://python-requests.org/
-	http://pypi.python.org/pypi/markups"
-COPYRIGHT="2012-2015 Dmitry Shachnev"
-LICENSE="BSD (3-clause)"
-REVISION="1"
-SOURCE_URI="https://pypi.python.org/packages/0b/98/3a20a868437c17db37cec47cc82fbd1030aa55765faf06207ab832e85152/Markups-$portVersion.tar.gz"
-CHECKSUM_SHA256="5639ddd76d74e0a5335e5b66ff2f1b3f9a9f0ab6eeff76a1003f59ed0ec2b721"
-SOURCE_DIR="Markups-$portVersion"
-
-ARCHITECTURES="x86 x86_gcc2 x86_64"
-
-PROVIDES="
-	python3_markups = $portVersion
-	"
-REQUIRES="
-	haiku
-	cmd:python3
-	"
-
-BUILD_REQUIRES="
-	haiku_devel
-	python3_setuptools
-	"
-BUILD_PREREQUIRES="
-	cmd:python3
-	"
-
-BUILD()
-{
-	$portPackageLinksDir/cmd~python3/bin/python3 setup.py build
-}
-
-INSTALL()
-{
-	# GENERIC: all python_setuptools-based installs need this
-	python=$portPackageLinksDir/cmd~python3/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 \
-		--single-version-externally-managed \
-		--root=/ --prefix=$prefix
-}

dev-python/markups/python_markups-2.0.0.recipe

@@ -1,49 +0,0 @@
-SUMMARY="A wrapper around various text markups"
-DESCRIPTION="Markups provides a wrapper around various text markup languages.
-Available by default are Markdown, reStructuredText and Textile, but you can \
-easily add your own markups.
-"
-HOMEPAGE="http://python-requests.org/
-	http://pypi.python.org/pypi/markups"
-COPYRIGHT="2012-2015 Dmitry Shachnev"
-LICENSE="BSD (3-clause)"
-REVISION="1"
-SOURCE_URI="https://pypi.python.org/packages/0b/98/3a20a868437c17db37cec47cc82fbd1030aa55765faf06207ab832e85152/Markups-$portVersion.tar.gz"
-CHECKSUM_SHA256="5639ddd76d74e0a5335e5b66ff2f1b3f9a9f0ab6eeff76a1003f59ed0ec2b721"
-SOURCE_DIR="Markups-$portVersion"
-
-ARCHITECTURES="x86 x86_gcc2 x86_64"
-
-PROVIDES="
-	python_markups = $portVersion
-	"
-REQUIRES="
-	haiku
-	cmd:python2
-	"
-
-BUILD_REQUIRES="
-	haiku_devel
-	python_setuptools
-	"
-BUILD_PREREQUIRES="
-	cmd:python2
-	"
-
-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 \
-		--root=/ --prefix=$prefix
-}