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/paramiko/paramiko-1.18.2.recipe

@@ -0,0 +1,66 @@
+SUMMARY="Pure python SSH implementation"
+DESCRIPTION="Paramiko is a module for python 2.2 (or higher) that implements \
+the SSH2 protocol for secure (encrypted and authenticated) connections to \
+remote machines."
+HOMEPAGE="http://www.lag.net/paramiko/"
+COPYRIGHT="2003-2009  Robey Pointer"
+LICENSE="GNU LGPL v2.1"
+REVISION="1"
+SOURCE_URI="https://github.com/paramiko/paramiko/archive/$portVersion.tar.gz"
+CHECKSUM_SHA256="79bf1702ec9e0b556cbfb3e68c19091f66d98b787c6deede82c48281a6e87f36"
+
+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\
+	pycrypto_$pythonPackage\n\
+	cmd:python$pythonVersion\
+	\""
+BUILD_REQUIRES="$BUILD_REQUIRES
+	setuptools_$pythonPackage
+	pycrypto_$pythonPackage"
+BUILD_PREREQUIRES="$BUILD_PREREQUIRES
+	cmd:python$pythonVersion"
+done
+
+REPLACES_python="
+	python_paramiko
+	"
+
+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/paramiko/python_paramiko-1.16.0.recipe

@@ -1,45 +0,0 @@
-SUMMARY="Pure python SSH implementation"
-DESCRIPTION="Paramiko is a module for python 2.2 (or higher) that implements \
-the SSH2 protocol for secure (encrypted and authenticated) connections to \
-remote machines."
-HOMEPAGE="http://www.lag.net/paramiko/"
-COPYRIGHT="2003-2009  Robey Pointer"
-LICENSE="GNU LGPL v2.1"
-REVISION="1"
-SOURCE_URI="https://pypi.python.org/packages/source/p/paramiko/paramiko-1.16.0.tar.gz"
-STATUS_HAIKU="stable"
-CHECKSUM_SHA256="3297ebd3cd072f573772f7c7426939a443c62c458d54bb632ff30fd6ecf96892"
-
-ARCHITECTURES="arm ppc x86 x86_gcc2 x86_64"
-
-SOURCE_DIR="paramiko-${portVersion}"
-
-PROVIDES="
-	python_paramiko = $portVersion
-	"
-REQUIRES="
-	haiku
-	cmd:python
-	pycrypto
-	"
-
-BUILD_REQUIRES="
-	haiku_devel
-	"
-
-BUILD_PREREQUIRES="
-	cmd:python
-	cmd:sed
-	"
-
-
-BUILD()
-{
-	python setup.py build
-}
-
-
-INSTALL()
-{
-	python setup.py install --prefix=$prefix
-}