Gentoo Archives: gentoo-commits

From: "Arfrever Frehtes Taifersar Arahesis (arfrever)" <arfrever@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in dev-util/buildbot: buildbot-0.7.12.ebuild
Date: Sun, 02 May 2010 19:47:14
Message-Id: 20100502194701.70DD32C267@corvid.gentoo.org
1 arfrever 10/05/02 19:47:01
2
3 Modified: buildbot-0.7.12.ebuild
4 Log:
5 Fix dependencies.
6 (Portage version: HEAD/cvs/Linux x86_64)
7
8 Revision Changes Path
9 1.3 dev-util/buildbot/buildbot-0.7.12.ebuild
10
11 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/buildbot/buildbot-0.7.12.ebuild?rev=1.3&view=markup
12 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/buildbot/buildbot-0.7.12.ebuild?rev=1.3&content-type=text/plain
13 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/buildbot/buildbot-0.7.12.ebuild?r1=1.2&r2=1.3
14
15 Index: buildbot-0.7.12.ebuild
16 ===================================================================
17 RCS file: /var/cvsroot/gentoo-x86/dev-util/buildbot/buildbot-0.7.12.ebuild,v
18 retrieving revision 1.2
19 retrieving revision 1.3
20 diff -u -r1.2 -r1.3
21 --- buildbot-0.7.12.ebuild 20 Feb 2010 18:48:48 -0000 1.2
22 +++ buildbot-0.7.12.ebuild 2 May 2010 19:47:01 -0000 1.3
23 @@ -1,8 +1,8 @@
24 # Copyright 1999-2010 Gentoo Foundation
25 # Distributed under the terms of the GNU General Public License v2
26 -# $Header: /var/cvsroot/gentoo-x86/dev-util/buildbot/buildbot-0.7.12.ebuild,v 1.2 2010/02/20 18:48:48 arfrever Exp $
27 +# $Header: /var/cvsroot/gentoo-x86/dev-util/buildbot/buildbot-0.7.12.ebuild,v 1.3 2010/05/02 19:47:01 arfrever Exp $
28
29 -EAPI="2"
30 +EAPI="3"
31 PYTHON_DEPEND="2"
32 SUPPORT_PYTHON_ABIS="1"
33 DISTUTILS_SRC_TEST="trial"
34 @@ -22,18 +22,17 @@
35 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
36 IUSE="doc irc mail manhole test"
37
38 -CDEPEND=">=dev-python/twisted-2.0.1"
39 -RDEPEND="${CDEPEND}
40 +RDEPEND=">=dev-python/twisted-2.0.1
41 mail? ( dev-python/twisted-mail )
42 manhole? ( dev-python/twisted-conch )
43 irc? ( dev-python/twisted-words )
44 dev-python/twisted-web
45 dev-python/twisted-mail"
46 -DEPEND="${CDEPEND}
47 +DEPEND="${DEPEND}
48 test? ( dev-python/twisted-mail
49 dev-python/twisted-web
50 dev-python/twisted-words )
51 - doc? ( =dev-python/epydoc-2* )"
52 + doc? ( dev-python/epydoc )"
53 RESTRICT_PYTHON_ABIS="3.*"
54
55 S="${WORKDIR}/${MY_P}"
56 @@ -64,21 +63,23 @@
57 doins -r contrib
58 doins -r docs/examples
59
60 - use doc && doins -r docs/reference
61 + if use doc; then
62 + doins -r docs/reference || die "doins failed"
63 + fi
64
65 - newconfd "${FILESDIR}/buildslave.confd" buildslave
66 - newinitd "${FILESDIR}/buildbot.initd-r1" buildslave
67 - newconfd "${FILESDIR}/buildmaster.confd" buildmaster
68 - newinitd "${FILESDIR}/buildbot.initd-r1" buildmaster
69 + newconfd "${FILESDIR}/buildslave.confd" buildslave || die "newconfd failed"
70 + newinitd "${FILESDIR}/buildbot.initd-r1" buildslave || die "newinitd failed"
71 + newconfd "${FILESDIR}/buildmaster.confd" buildmaster || die "newconfd failed"
72 + newinitd "${FILESDIR}/buildbot.initd-r1" buildmaster || die "newinitd failed"
73
74 # Make it print the right names when you start/stop the script.
75 - sed -i -e 's/@buildbot@/buildslave/' \
76 - "${D}/etc/init.d/buildslave" || die "buildslave sed failed"
77 - sed -i -e 's/@buildbot@/buildmaster/' \
78 - "${D}/etc/init.d/buildmaster" || die "buildmaster sed failed"
79 + sed -e "s/@buildbot@/buildslave/" -i "${ED}etc/init.d/buildslave" || die "sed buildslave failed"
80 + sed -e "s/@buildbot@/buildmaster/" -i "${ED}etc/init.d/buildmaster" || die "sed buildmaster failed"
81 }
82
83 pkg_postinst() {
84 + distutils_pkg_postinst
85 +
86 elog 'The "buildbot" user and the "buildmaster" and "buildslave" init'
87 elog "scripts were added to support starting buildbot through gentoo's"
88 elog "init system. To use this set up your build master or build slave"