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/imaging/python_imaging-1.1.7.recipe

@@ -6,16 +6,16 @@ HOMEPAGE="http://www.pythonware.com/products/pil/"
 COPYRIGHT="1997-2011 by Secret Labs AB
 	1995-2011 by Fredrik Lundh"
 LICENSE="MIT"
-REVISION="2"
-SOURCE_URI="http://effbot.org/downloads/Imaging-1.1.7.tar.gz"
+REVISION="3"
+SOURCE_URI="http://effbot.org/downloads/Imaging-$portVersion.tar.gz"
 CHECKSUM_SHA256="895bc7c2498c8e1f9b99938f1a40dc86b3f149741f105cf7c7bd2e0725405211"
-SOURCE_DIR="Imaging-1.1.7"
+SOURCE_DIR="Imaging-$portVersion"
 PATCHES="python_imaging-$portVersion.patchset"
 
-ARCHITECTURES="x86_gcc2"
+ARCHITECTURES="x86_gcc2 x86 x86_64"
 
 PROVIDES="
-	python_imaging$secondaryArchSuffix = $portVersion
+	python_imaging = $portVersion
 	cmd:pilconvert.py
 	cmd:pildriver.py
 	cmd:pilfile.py
@@ -23,8 +23,11 @@ PROVIDES="
 	cmd:pilprint.py
 	"
 REQUIRES="
+	haiku
 	lib:libjpeg
+	lib:libpython2.7
 	lib:libz
+	cmd:python2.7
 	"
 
 BUILD_REQUIRES="
@@ -32,17 +35,17 @@ BUILD_REQUIRES="
 	devel:libz
 	"
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel
+	haiku_devel
 	cmd:gcc
-	cmd:python
+	cmd:python2.7
 	"
 
 BUILD()
 {
-	python setup.py build_ext -i
+	python2.7 setup.py build_ext -i
 }
 
 INSTALL()
 {
-	python setup.py install --prefix=$prefix
+	python2.7 setup.py install --prefix=$prefix
 }