summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDirkjan Ochtman <djc@gentoo.org>2011-09-04 06:29:21 +0000
committerDirkjan Ochtman <djc@gentoo.org>2011-09-04 06:29:21 +0000
commit177359a0edae6548b007ee031281515152faeadb (patch)
tree04ccf9f1ad41a1eee450b2e04a32ba5e5b06bfb7 /dev-util/buildbot
parentTake some fixes from the python overlay. (diff)
downloadhistorical-177359a0edae6548b007ee031281515152faeadb.tar.gz
historical-177359a0edae6548b007ee031281515152faeadb.tar.bz2
historical-177359a0edae6548b007ee031281515152faeadb.zip
Take some fixes from the python overlay.
Package-Manager: portage-2.1.10.12/cvs/Linux x86_64
Diffstat (limited to 'dev-util/buildbot')
-rw-r--r--dev-util/buildbot/ChangeLog5
-rw-r--r--dev-util/buildbot/Manifest10
-rw-r--r--dev-util/buildbot/buildbot-0.8.4_p2.ebuild22
3 files changed, 23 insertions, 14 deletions
diff --git a/dev-util/buildbot/ChangeLog b/dev-util/buildbot/ChangeLog
index e74046ecd46a..79f382ada89e 100644
--- a/dev-util/buildbot/ChangeLog
+++ b/dev-util/buildbot/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for dev-util/buildbot
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/buildbot/ChangeLog,v 1.92 2011/09/03 19:34:00 djc Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/buildbot/ChangeLog,v 1.93 2011/09/04 06:29:21 djc Exp $
+
+ 04 Sep 2011; Dirkjan Ochtman <djc@gentoo.org> buildbot-0.8.4_p2.ebuild:
+ Take fixes suggested by Arfrever from the python overlay.
*buildbot-0.8.4_p2 (03 Sep 2011)
diff --git a/dev-util/buildbot/Manifest b/dev-util/buildbot/Manifest
index 25978340fbef..c59624c09038 100644
--- a/dev-util/buildbot/Manifest
+++ b/dev-util/buildbot/Manifest
@@ -6,13 +6,13 @@ AUX buildmaster.initd 961 RMD160 1ec2320628c6606acd0245d01c0e2517b7846c55 SHA1 b
DIST buildbot-0.8.3p1.tar.gz 4068355 RMD160 737e4863c371d3e9d30063564ae62e35eb70a856 SHA1 7b0c2d3a7c2acc66c3c95fc7a92acb2bc2627409 SHA256 0a49d35a75524a54dbbb875730fdf7abd8b96cae160af0457b4f5239b1fefa37
DIST buildbot-0.8.4p2.tar.gz 4555528 RMD160 063855eef00fc91094d022f7e09681566e7bf75e SHA1 475a077133f3df37ccddc9275989a03c75f14229 SHA256 1db52ef162f16965151be6f6641eb6ee03656041679182c8749e96f17393e8fe
EBUILD buildbot-0.8.3_p1.ebuild 3090 RMD160 083de527023edb7fc094d8fefe91b951ab4f88bf SHA1 a6ec2971d637d808db2036b0038fd5dca2015a9c SHA256 ccd6c3a61188a5313d54027a2c457265f8761337184207c7561c5491ee4693a7
-EBUILD buildbot-0.8.4_p2.ebuild 3095 RMD160 3661c3fbb6cb36fd926c5413349ae4d36f1dcad2 SHA1 7fcb8bb8f6995e8494d6e38c60443beb587455c1 SHA256 e3ca49d29a5483f2d7163efe29bd98b333705cc357c82e32854d233c95a03fac
-MISC ChangeLog 12198 RMD160 8e66f70cfbf0074be2c7edf4f0d5a35eeaf65b71 SHA1 407b8bec48214d933d8b39fd18680885596e5fc0 SHA256 f8887616ed4dec78c97b905bf4b4c6f9abbfd558fd9ef6a71891b36f8a725160
+EBUILD buildbot-0.8.4_p2.ebuild 3144 RMD160 86211d84e17b7e3e12595e37970a325e9a26f1f6 SHA1 6acf68702a0c766b8d370aae82de89212512e508 SHA256 fc730f597438b1933c08638fafa200f16010758edd0d479d62f6ce79cdd2fe6d
+MISC ChangeLog 12333 RMD160 b97c6e2e29a18134e934af012c849dbe25b9fc46 SHA1 60cf9c37db184650cf6b5a26678eaf31fc61ea46 SHA256 6ec438ac326e5fe3cbf471e470e66d220a3173c90147b4476799115f1fb84387
MISC metadata.xml 1292 RMD160 87e781b71385afcd20ae84320394fecf27fee917 SHA1 66be097e7db1e17218cf906f4876bda684d779bf SHA256 24c59ac7a6f85e11cd776e636b8e9ebd95350acdd0a3329ad4d584d294b6523a
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.17 (GNU/Linux)
-iEYEAREKAAYFAk5igTAACgkQxeMuLWsGW/tMXgCghUyp0ekf15akVmmbZ/ZJg4qF
-2JIAn09KfI5nZmELgDmPMDRi99yeYN8y
-=ugal
+iEYEAREKAAYFAk5jGtYACgkQxeMuLWsGW/t63gCfS+gPq7M2GRngpqWW/4AVwDzQ
+E34An02v3FFt/JwCUaocF06CICyhGCkS
+=ut8H
-----END PGP SIGNATURE-----
diff --git a/dev-util/buildbot/buildbot-0.8.4_p2.ebuild b/dev-util/buildbot/buildbot-0.8.4_p2.ebuild
index 9fc3d4db6a50..eecdf15f0617 100644
--- a/dev-util/buildbot/buildbot-0.8.4_p2.ebuild
+++ b/dev-util/buildbot/buildbot-0.8.4_p2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/buildbot/buildbot-0.8.4_p2.ebuild,v 1.1 2011/09/03 19:34:00 djc Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/buildbot/buildbot-0.8.4_p2.ebuild,v 1.2 2011/09/04 06:29:21 djc Exp $
EAPI="3"
PYTHON_DEPEND="2"
@@ -51,13 +51,19 @@ pkg_setup() {
enewuser buildbot
}
+src_prepare() {
+ distutils_src_prepare
+ # https://github.com/buildbot/buildbot/commit/a3abed70546b3742964994517bb27556e06f6e20
+ sed -e "s/sqlalchemy-migrate == 0.6/sqlalchemy-migrate ==0.6, ==0.7/" -i setup.py || die "sed failed"
+}
+
src_compile() {
distutils_src_compile
if use doc; then
einfo "Generation of documentation"
pushd docs > /dev/null
- emake buildbot.html buildbot.info || die "Generation of documentation failed"
+ emake buildbot.html buildbot.info
popd > /dev/null
fi
}
@@ -65,20 +71,20 @@ src_compile() {
src_install() {
distutils_src_install
- doman docs/buildbot.1 || die "doman failed"
+ doman docs/buildbot.1
if use doc; then
- dohtml -r docs/buildbot.html docs/images || die "dohtml failed"
- doinfo docs/buildbot.info || die "doinfo failed"
+ dohtml -r docs/buildbot.html docs/images
+ doinfo docs/buildbot.info
fi
if use examples; then
insinto /usr/share/doc/${PF}
- doins -r contrib docs/examples || die "doins failed"
+ doins -r contrib docs/examples
fi
- newconfd "${FILESDIR}/buildmaster.confd" buildmaster || die "newconfd failed"
- newinitd "${FILESDIR}/buildmaster.initd" buildmaster || die "newinitd failed"
+ newconfd "${FILESDIR}/buildmaster.confd" buildmaster
+ newinitd "${FILESDIR}/buildmaster.initd" buildmaster
}
pkg_postinst() {