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/iniparse/iniparse-0.4.recipe

@@ -19,38 +19,36 @@ COPYRIGHT="2001-2008 Python Software Foundation
 	2004-2009 Paramjit Oberoi
 	2007 Tim Lauridsen"
 LICENSE="MIT"
-REVISION="1"
+REVISION="2"
 SOURCE_URI="https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/iniparse/iniparse-0.4.tar.gz"
 CHECKSUM_SHA256="abc1ee12d2cfb2506109072d6c21e40b6c75a3fe90a9c924327d80bc0d99c054"
-SOURCE_DIR="iniparse-0.4"
 PATCHES="iniparse-0.4.patchset"
 
-ARCHITECTURES="x86 ?x86_gcc2"
-SECONDARY_ARCHITECTURES="x86 ?x86_gcc2"
+ARCHITECTURES="any"
 
 PROVIDES="
-	iniparse$secondaryArchSuffix = $portVersion
+	iniparse = $portVersion
 	"
 REQUIRES="
-	haiku$secondaryArchSuffix
-	cmd:python$secondaryArchSuffix
+	haiku
+	cmd:python2
 	"
 
 BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel
+	haiku_devel
 	"
 BUILD_PREREQUIRES="
-	cmd:python$secondaryArchSuffix
+	cmd:python2
 	"
 
 BUILD()
 {
-	$portPackageLinksDir/cmd~python/bin/python setup.py build
+	$portPackageLinksDir/cmd~python2/bin/python2 setup.py build
 }
 
 INSTALL()
 {
-	$portPackageLinksDir/cmd~python/bin/python setup.py install \
+	$portPackageLinksDir/cmd~python2/bin/python2 setup.py install \
 		--prefix=$prefix \
 		--install-data=$docDir
 }