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-util/buildbot_slave/buildbot_slave-0.8.12.recipe

@@ -38,7 +38,7 @@ PROVIDES="
 REQUIRES="
 	haiku
 	cmd:python2
-	python_twisted
+	twisted_python
 	"
 
 BUILD_REQUIRES="

dev-util/buildbot_slave/buildbot_slave-0.9.5.recipe

@@ -0,0 +1,60 @@
+SUMMARY="Python-based continuous integration testing framework"
+DESCRIPTION="Buildbot is a continuous integration system designed to automate \
+the build/test cycle. By automatically rebuilding and testing the tree each \
+time something has changed, build problems are pinpointed quickly, before \
+other developers are inconvenienced by the failure.
+The main features are:
+
+- Buildbot is easy to set up, but very extensible and customizable.  It \
+supports arbitrary build processes, and is not limited to common build \
+processes for particular languages (e.g., autotools or ant)
+- Buildbot supports building and testing on a variety of platforms. \
+Developers, who do not have the facilities to test their changes everywhere \
+before committing, will know shortly afterwards whether they have broken the \
+build or not.
+- Buildbot has minimal requirements for slaves: using virtualenv, only a \
+Python installation is required.
+- Slaves can be run behind a NAT firewall and communicate with the master.
+- Buildbot has a variety of status-reporting tools to get information about \
+builds in front of developers in a timely manner.
+
+This package contains the slave implementation, i.e. the part that is \
+executing builds and/or tests."
+HOMEPAGE="http://www.buildbot.net"
+COPYRIGHT="2005-2013 Bryan Warner and the Buildbot team members"
+LICENSE="GNU GPL v2"
+REVISION="1"
+SOURCE_URI="https://pypi.python.org/packages/a4/bc/ea8d3115fca39cfd7492f0d3da1dffde659fc11072f07152247c8d903df6/buildbot-worker-$portVersion.tar.gz"
+CHECKSUM_SHA256="be89dbbd64ac4d10c8b43ea0fd8378803170247493c8ae023a4e8732aa9287aa"
+SOURCE_DIR="buildbot-worker-$portVersion"
+PATCHES="buildbot_slave-$portVersion.patchset"
+
+ARCHITECTURES="any"
+
+PROVIDES="
+	buildbot_slave = $portVersion
+	cmd:buildslave = $portVersion
+	"
+REQUIRES="
+	haiku
+	cmd:python2
+	twisted_python
+	"
+
+BUILD_REQUIRES="
+	haiku_devel
+	"
+BUILD_PREREQUIRES="
+	cmd:python2
+	"
+
+BUILD()
+{
+	$portPackageLinksDir/cmd~python2/bin/python2 setup.py build
+}
+
+INSTALL()
+{
+	$portPackageLinksDir/cmd~python2/bin/python2 setup.py install \
+		--prefix=$prefix
+}

dev-util/buildbot_slave/patches/buildbot_slave-0.9.5.patchset

@@ -0,0 +1,22 @@
+From 98719cec51efeaa02526088d328f8cf24b641ac4 Mon Sep 17 00:00:00 2001
+From: Jessica Hamilton <jessica.l.hamilton@gmail.com>
+Date: Fri, 20 Jun 2014 04:58:54 +0000
+Subject: logwatcher.py: fix path to tail on Haiku
+
+
+diff --git a/buildbot_worker/scripts/logwatcher.py b/buildbot_worker/scripts/logwatcher.py
+index d750358..7df3061 100644
+--- a/buildbot_worker/scripts/logwatcher.py
++++ b/buildbot_worker/scripts/logwatcher.py
+@@ -73,7 +73,7 @@ class LogWatcher(LineOnlyReceiver):
+         if platform.system().lower() == 'sunos' and os.path.exists('/usr/xpg4/bin/tail'):
+             tailBin = "/usr/xpg4/bin/tail"
+         else:
+-            tailBin = "/usr/bin/tail"
++            tailBin = "/bin/tail"
+         self.p = reactor.spawnProcess(self.pp, tailBin,
+                                       ("tail", "-f", "-n", "0", self.logfile),
+                                       env=os.environ,
+-- 
+2.11.0
+

dev-util/gyp/gyp-git.recipe

@@ -4,7 +4,7 @@ DESCRIPTION="GYP is created by Google to generate native IDE project files \
 HOMEPAGE="https://gyp.gsrc.io/"
 COPYRIGHT="2012 Google Inc."
 LICENSE="BSD (2-clause)"
-REVISION="2"
+REVISION="3"
 # Note that the hash which FreeBSD keeps for this version is not the same as
 # the commit ID in the official gyp repository. This revision in the FreeBSD
 # mirror is equivalent to commit 02b145a1 in the official repository, which
@@ -24,12 +24,12 @@ PROVIDES="
 REQUIRES="
 	haiku
 	cmd:python
-	python_setuptools
+	setuptools_python
 	"
 
 BUILD_REQUIRES="
 	haiku_devel
-	python_setuptools
+	setuptools_python
 	"
 BUILD_PREREQUIRES="
 	cmd:python

dev-util/meson/meson-0.39.1.recipe

@@ -28,7 +28,7 @@ REQUIRES="
 
 BUILD_REQUIRES="
 	haiku_devel
-	python3_setuptools
+	setuptools_python3
 	"
 BUILD_PREREQUIRES="
 	cmd:python$PYTHON_VERSION