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/watchdog/python_watchdog-0.8.3.recipe

@@ -1,52 +0,0 @@
-SUMMARY="Filesystem events monitoring"
-DESCRIPTION="Python API and shell utilities to monitor file system events."
-HOMEPAGE="https://pypi.python.org/pypi/watchdog"
-COPYRIGHT="2011 Yesudeep Mangalapilly
-	2012 Google, Inc."
-LICENSE="Apache v2"
-REVISION="1"
-SOURCE_URI="https://pypi.python.org/packages/source/w/watchdog/watchdog-$portVersion.tar.gz"
-CHECKSUM_SHA256="7e65882adb7746039b6f3876ee174952f8eaaa34491ba34333ddf1fe35de4162"
-SOURCE_DIR="watchdog-$portVersion"
-
-ARCHITECTURES="x86 x86_gcc2 x86_64"
-
-PROVIDES="
-	python_watchdog = $portVersion
-	cmd:watchmedo
-	"
-REQUIRES="
-	haiku
-	cmd:python2
-	argh
-	pathtools
-	pyyaml
-	"
-
-BUILD_REQUIRES="
-	haiku_devel
-	python_setuptools
-	"
-BUILD_PREREQUIRES="
-	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 \
-		--single-version-externally-managed \
-		--root=/ --prefix=$prefix
-}

dev-python/watchdog/watchdog-0.8.3.recipe

@@ -0,0 +1,77 @@
+SUMMARY="Filesystem events monitoring"
+DESCRIPTION="Python API and shell utilities to monitor file system events."
+HOMEPAGE="https://pypi.python.org/pypi/watchdog"
+COPYRIGHT="2011 Yesudeep Mangalapilly
+	2012 Google, Inc."
+LICENSE="Apache v2"
+REVISION="1"
+SOURCE_URI="https://pypi.python.org/packages/source/w/watchdog/watchdog-$portVersion.tar.gz"
+CHECKSUM_SHA256="7e65882adb7746039b6f3876ee174952f8eaaa34491ba34333ddf1fe35de4162"
+
+ARCHITECTURES="any"
+
+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\n\
+	argh_$pythonPackage\n\
+	pathtools_$pythonPackage\n\
+	pyyaml_$pythonPackage\n\
+	\""
+BUILD_REQUIRES="$BUILD_REQUIRES
+	setuptools_$pythonPackage"
+BUILD_PREREQUIRES="$BUILD_PREREQUIRES
+	cmd:python$pythonVersion"
+done
+
+PROVIDES_python="$PROVIDES_python
+	cmd:watchmedo = $portVersion
+	"
+PROVIDES_python3="$PROVIDES_python3
+	cmd:watchmedo3 = $portVersion
+	"
+INSTALL()
+{
+	for i in "${!PYTHON_PACKAGES[@]}"; do
+		pythonPackage=${PYTHON_PACKAGES[i]}
+		pythonVersion=${PYTHON_VERSIONS[$i]}
+
+		# GENERIC: all python_setuptools-based installs need this
+		python=python$pythonVersion
+		pythonVersion=$($python --version 2>&1 | sed 's/Python //' | head -c3)
+		installLocation=$prefix/lib/python$pythonVersion/vendor-packages/
+		export PYTHONPATH=$installLocation:$PYTHONPATH
+		mkdir -p $installLocation
+		rm -rf build
+		$python setup.py build install \
+			--root=/ --prefix=$prefix
+
+		if [ $pythonPackage != python ]; then
+			mv $binDir/watchmedo $binDir/watchmedo3
+		fi
+		packageEntries  $pythonPackage \
+			$prefix/lib/python* \
+			$binDir
+	done
+}