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/pyyaml/pyyaml-3.11.recipe

@@ -1,66 +0,0 @@
-SUMMARY="YAML parser and emitter for Python"
-DESCRIPTION="
-YAML is a data serialization format designed for human readability \
-and interaction with scripting languages. \
-PyYAML is a YAML parser and emitter for Python.
-
-PyYAML features a complete YAML 1.1 parser, Unicode support, \
-pickle support, capable extension API, and sensible error messages. \
-PyYAML supports standard YAML tags and \
-provides Python-specific tags that allow to represent an arbitrary Python object.
-
-PyYAML is applicable for a broad range of tasks from \
-complex configuration files to object serialization and persistance.
-"
-HOMEPAGE="
-	http://pyyaml.org/
-	http://pypi.python.org/pypi/PyYAML
-	"
-SOURCE_URI="https://pypi.python.org/packages/source/P/PyYAML/PyYAML-3.11.tar.gz"
-CHECKSUM_SHA256="c36c938a872e5ff494938b33b14aaa156cb439ec67548fcab3535bb78b0846e8"
-LICENSE="MIT"
-COPYRIGHT="2006 Kirill Simonov"
-REVISION="1"
-
-ARCHITECTURES="x86 x86_gcc2 x86_64"
-
-SOURCE_DIR="PyYAML-$portVersion"
-
-PROVIDES="
-	pyyaml = $portVersion
-	"
-
-REQUIRES="
-	haiku
-	cmd:python
-	"
-
-#TODO: eventually depend on http://pyyaml.org/wiki/LibYAML
-BUILD_REQUIRES="
-	haiku_devel
-	cmd:sed
-	python_setuptools
-	"
-
-BUILD_PREREQUIRES="
-	cmd:python
-	cmd:gcc
-	"
-
-BUILD()
-{
-	$portPackageLinksDir/cmd~python/bin/python setup.py build
-}
-
-INSTALL()
-{
-	# GENERIC: all python_setuptools-based installs need this
-	python=$portPackageLinksDir/cmd~python/bin/python
-	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/pyyaml/pyyaml-3.12.recipe

@@ -0,0 +1,74 @@
+SUMMARY="YAML parser and emitter for Python"
+DESCRIPTION="
+YAML is a data serialization format designed for human readability \
+and interaction with scripting languages. \
+PyYAML is a YAML parser and emitter for Python.
+
+PyYAML features a complete YAML 1.1 parser, Unicode support, \
+pickle support, capable extension API, and sensible error messages. \
+PyYAML supports standard YAML tags and \
+provides Python-specific tags that allow to represent an arbitrary Python object.
+
+PyYAML is applicable for a broad range of tasks from \
+complex configuration files to object serialization and persistance.
+"
+HOMEPAGE="http://pyyaml.org/"
+COPYRIGHT="2006 Kirill Simonov"
+LICENSE="MIT"
+REVISION="1"
+SOURCE_URI="http://pyyaml.org/download/pyyaml/PyYAML-$portVersion.tar.gz"
+CHECKSUM_SHA256="592766c6303207a20efc445587778322d7f73b161bd994f227adaa341ba212ab"
+SOURCE_DIR="PyYAML-$portVersion"
+
+ARCHITECTURES="x86_gcc2 x86 x86_64"
+
+PROVIDES="
+	$portName = $portVersion
+	"
+REQUIRES="
+	haiku
+	"
+
+BUILD_REQUIRES="
+	haiku_devel
+	"
+BUILD_PREREQUIRES="
+	cmd:gcc
+	"
+
+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
+
+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
+}