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/beautifulsoup/beautifulsoup-4.4.1.recipe

@@ -1,57 +0,0 @@
-SUMMARY="Python library for iterating, searching, and modifying an HTML/XML parse tree"
-DESCRIPTION="
-	Beautiful Soup is a Python HTML/XML parser designed for quick
-	turnaround projects like screen-scraping.
-	Two features make it powerful:
-	it won't choke if you give it bad markup and it provides
-	a few simple methods and Pythonic idioms for navigating and
-	searching a parse tree: a toolkit for dissecting a document and
-	extracting what you need"
-HOMEPAGE="https://bugs.launchpad.net/beautifulsoup/
-	https://pypi.python.org/pypi/beautifulsoup4
-	http://www.crummy.com/software/BeautifulSoup/bs4/"
-COPYRIGHT="2004-2015 Leonard Richardson
-	2006-2013 James Graham and other contributors"
-LICENSE="MIT"
-REVISION="1"
-SOURCE_URI="https://pypi.python.org/packages/source/b/beautifulsoup4/beautifulsoup4-4.4.1.tar.gz"
-CHECKSUM_SHA256="87d4013d0625d4789a4f56b8d79a04d5ce6db1152bb65f1d39744f7709a366b4"
-SOURCE_DIR="beautifulsoup4-$portVersion"
-
-ARCHITECTURES="?x86 x86_gcc2 !x86_64"
-
-PROVIDES="
-	beautifulsoup = $portVersion
-	"
-REQUIRES="
-	haiku
-	cmd:python
-	#python_setuptools
-	"
-
-BUILD_REQUIRES="
-	haiku_devel
-	python_setuptools
-	"
-BUILD_PREREQUIRES="
-	cmd:python
-	"
-
-BUILD()
-{
-	$portPackageLinksDir/cmd~python/bin/python setup.py build
-}
-
-INSTALL()
-{
-	# GENERIC: all python_setuptools-based installs need this
-	export PATH="$portPackageLinksDir/cmd~python/bin:$PATH"
-	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/beautifulsoup/beautifulsoup-4.5.3.recipe

@@ -0,0 +1,69 @@
+SUMMARY="Python library for iterating, searching, and modifying an HTML/XML parse tree"
+DESCRIPTION="
+	Beautiful Soup is a Python HTML/XML parser designed for quick
+	turnaround projects like screen-scraping.
+	Two features make it powerful:
+	it won't choke if you give it bad markup and it provides
+	a few simple methods and Pythonic idioms for navigating and
+	searching a parse tree: a toolkit for dissecting a document and
+	extracting what you need"
+HOMEPAGE="https://bugs.launchpad.net/beautifulsoup/
+	https://pypi.python.org/pypi/beautifulsoup4
+	http://www.crummy.com/software/BeautifulSoup/bs4/"
+COPYRIGHT="2004-2015 Leonard Richardson
+	2006-2013 James Graham and other contributors"
+LICENSE="MIT"
+REVISION="1"
+SOURCE_URI="https://pypi.python.org/packages/9b/a5/c6fa2d08e6c671103f9508816588e0fb9cec40444e8e72993f3d4c325936/beautifulsoup4-$portVersion.tar.gz"
+CHECKSUM_SHA256="b21ca09366fa596043578fd4188b052b46634d22059e68dd0077d9ee77e08a3e"
+SOURCE_DIR="beautifulsoup4-$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
+
+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
+}