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.

app-editors/retext/patches/retext-7.0.0.patchset

@@ -0,0 +1,38 @@
+From 64086ebfcd26e89474df38e91430507d4ef0b03d Mon Sep 17 00:00:00 2001
+From: Jerome Duval <jerome.duval@gmail.com>
+Date: Sat, 28 Jan 2017 11:43:21 +0100
+Subject: find_library() doesn't work on Haiku.
+
+
+diff --git a/ReText/xsettings.py b/ReText/xsettings.py
+index a5647a0..0fbfa4d 100644
+--- a/ReText/xsettings.py
++++ b/ReText/xsettings.py
+@@ -53,15 +53,15 @@ class XSettingsParseError(XSettingsError):
+ 
+ def get_raw_xsettings(display=0):
+ 	# initialize the libraries
+-	xcb_library_name = ctypes.util.find_library('xcb')
+-	if xcb_library_name is None:
+-		raise XSettingsError('Xcb library not found')
+-	xcb = ctypes.CDLL(xcb_library_name)
+-
+-	c_library_name = ctypes.util.find_library('c')
+-	if c_library_name is None:
+-		raise XSettingsError('C library not found')
+-	c = ctypes.CDLL(c_library_name)
++	# xcb_library_name = ctypes.util.find_library('xcb')
++	# if xcb_library_name is None:
++	#	raise XSettingsError('Xcb library not found')
++	xcb = ctypes.CDLL('libxcb.so.1')
++
++	#c_library_name = ctypes.util.find_library('c')
++	#if c_library_name is None:
++	#	raise XSettingsError('C library not found')
++	c = ctypes.CDLL('libroot.so')
+ 
+ 	# set some args and return types
+ 	xcb.xcb_connect.argtypes = [ctypes.c_char_p, ctypes.POINTER(ctypes.c_int)]
+-- 
+2.10.2
+

app-editors/retext/retext-7.0.0.recipe

@@ -7,11 +7,10 @@ COPYRIGHT="2011–2016 Dmitry Shachnev
 LICENSE="GNU GPL v3"
 REVISION="1"
 SOURCE_URI="$HOMEPAGE/archive/$portVersion.tar.gz"
-CHECKSUM_SHA256="50c02d69ff6dca8863003e913a2acae7f3041e44ea96852e2dac303d435d1ca2"
-PATCHES="retext-$portVersion.tar.gz"
+CHECKSUM_SHA256="7df3fcdad1d1f9a046ae33591b54dd7a6894de64eb0370f2dabf4cd75eb66586"
+PATCHES="retext-$portVersion.patchset"
 
-ARCHITECTURES="!x86_gcc2 ?x86 x86_64"
-SECONDARY_ARCHITECTURES="?x86"
+ARCHITECTURES="any"
 
 PROVIDES="
 	retext$secondaryArchSuffix = $portVersion
@@ -19,15 +18,17 @@ PROVIDES="
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
-	python3_markups
-	python3_pyqt
+	cmd:python3
+	markdown_python3
+	markups_python3
+	pyqt_python3
 	lib:libxcb$secondaryArchSuffix
 	"
 
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
-	python3_pyqt >= 5
-	python3_setuptools
+	pyqt_python3 >= 5
+	setuptools_python3
 	"
 BUILD_PREREQUIRES="
 	cmd:python3