From ccf00891a7cf60fba080733ae5421be7b30015c1 Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Thu, 14 Apr 2016 21:18:04 +0000 Subject: [PATCH] buildbot_slave: bump version. --- ....8.recipe => buildbot_slave-0.8.12.recipe} | 14 ++++++------ .../patches/buildbot_slave-0.8.12.patchset | 22 +++++++++++++++++++ .../patches/buildbot_slave-0.8.8.patchset | 22 ------------------- 3 files changed, 29 insertions(+), 29 deletions(-) rename dev-util/buildbot_slave/{buildbot_slave-0.8.8.recipe => buildbot_slave-0.8.12.recipe} (84%) create mode 100644 dev-util/buildbot_slave/patches/buildbot_slave-0.8.12.patchset delete mode 100644 dev-util/buildbot_slave/patches/buildbot_slave-0.8.8.patchset diff --git a/dev-util/buildbot_slave/buildbot_slave-0.8.8.recipe b/dev-util/buildbot_slave/buildbot_slave-0.8.12.recipe similarity index 84% rename from dev-util/buildbot_slave/buildbot_slave-0.8.8.recipe rename to dev-util/buildbot_slave/buildbot_slave-0.8.12.recipe index 1a3535fc2..2837a2eb4 100644 --- a/dev-util/buildbot_slave/buildbot_slave-0.8.8.recipe +++ b/dev-util/buildbot_slave/buildbot_slave-0.8.12.recipe @@ -23,11 +23,11 @@ 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="4" -SOURCE_URI="https://buildbot.googlecode.com/files/buildbot-slave-0.8.8.tar.gz" +REVISION="1" +SOURCE_URI="https://pypi.python.org/packages/source/b/buildbot-slave/buildbot-slave-$portVersion.tar.gz" CHECKSUM_SHA256="8b7532d4d34527aea41e353d1bc3c35291ec335d3224c27800d2cc0cfc9837cc" SOURCE_DIR="buildbot-slave-$portVersion" -PATCHES="buildbot_slave-0.8.8.patchset" +PATCHES="buildbot_slave-$portVersion.patchset" ARCHITECTURES="x86 x86_gcc2 x86_64" @@ -37,7 +37,7 @@ PROVIDES=" " REQUIRES=" haiku - cmd:python + cmd:python2 python_twisted " @@ -45,16 +45,16 @@ BUILD_REQUIRES=" haiku_devel " BUILD_PREREQUIRES=" - cmd:python + 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 } diff --git a/dev-util/buildbot_slave/patches/buildbot_slave-0.8.12.patchset b/dev-util/buildbot_slave/patches/buildbot_slave-0.8.12.patchset new file mode 100644 index 000000000..a4469f085 --- /dev/null +++ b/dev-util/buildbot_slave/patches/buildbot_slave-0.8.12.patchset @@ -0,0 +1,22 @@ +From 0e18912e5fbd96708f618b15bb3fa755a025aa88 Mon Sep 17 00:00:00 2001 +From: Jessica Hamilton +Date: Fri, 20 Jun 2014 04:58:54 +0000 +Subject: logwatcher.py: fix path to tail on Haiku + + +diff --git a/buildslave/scripts/logwatcher.py b/buildslave/scripts/logwatcher.py +index 32bec78..6bfd046 100644 +--- a/buildslave/scripts/logwatcher.py ++++ b/buildslave/scripts/logwatcher.py +@@ -81,7 +81,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.2.2 + diff --git a/dev-util/buildbot_slave/patches/buildbot_slave-0.8.8.patchset b/dev-util/buildbot_slave/patches/buildbot_slave-0.8.8.patchset deleted file mode 100644 index d6ca1924f..000000000 --- a/dev-util/buildbot_slave/patches/buildbot_slave-0.8.8.patchset +++ /dev/null @@ -1,22 +0,0 @@ -From 339c07d8cef40e19d98a915ecc06929c097865fc Mon Sep 17 00:00:00 2001 -From: Jessica Hamilton -Date: Fri, 20 Jun 2014 04:58:54 +0000 -Subject: logwatcher.py: fix path to tail on Haiku - - -diff --git a/buildslave/scripts/logwatcher.py b/buildslave/scripts/logwatcher.py -index ff3e119..fb20aba 100644 ---- a/buildslave/scripts/logwatcher.py -+++ b/buildslave/scripts/logwatcher.py -@@ -62,7 +62,7 @@ class LogWatcher(LineOnlyReceiver): - # been seen within 10 seconds, and with ReconfigError if the error - # line was seen. If the logfile could not be opened, it errbacks with - # an IOError. -- self.p = reactor.spawnProcess(self.pp, "/usr/bin/tail", -+ self.p = reactor.spawnProcess(self.pp, "/bin/tail", - ("tail", "-f", "-n", "0", self.logfile), - env=os.environ, - ) --- -1.8.3.4 -