Fix dependencies.

Package-Manager: portage-HEAD/cvs/Linux x86_64

diff --git a/dev-util/buildbot/Manifest b/dev-util/buildbot/Manifest
index 09501feb99120e42fe542e8acc56aa0a6958eda8..198f47e6843456e257f70c725bc8f5c873d33439 100644 (file)
--- a/dev-util/buildbot/Manifest
+++ b/dev-util/buildbot/Manifest
@@ -5,6 +5,6 @@ AUX buildslave.confd 215 RMD160 ffe7545a43c10a9f3e9798f23ba6a32ab47c137b SHA1 8c
 DIST buildbot-0.7.11p3.tar.gz 1019706 RMD160 5fc1d9e1c32127109f58ea727cae2e6266b16fb9 SHA1 3c0fc8bbdb2db92450d7294da11fc40979e94e63 SHA256 5bc20a29e761c3eb191c8d7b36ef10929f7c371c50dfeeec426ce3589c8ce740
 DIST buildbot-0.7.12.tar.gz 1296550 RMD160 b7c9ad263690708bbf1abadaa0b4bb78de4abd50 SHA1 76e2278cd8cb56dba99086fdcc0400f8fea5079f SHA256 56c38c77a679f380782635ed763744ecaa2c75f8741153b561b7a2cf0577e1be
 EBUILD buildbot-0.7.11_p3.ebuild 3108 RMD160 dc6bfdf2da4b7c8823914235ee9a803d8ac03374 SHA1 f523514733eaee33e61469ce1f74c88c7609dfdc SHA256 b364a7b0014fe3360bcd71297ec9120ce46b0e75b8fd9bdcb6b1b56907a2b484
-EBUILD buildbot-0.7.12.ebuild 3073 RMD160 01660800401100cd2e47faf10c33860dc7eb724d SHA1 6157638659a6a0413faa39c968d22a27357fe618 SHA256 271150013e5e0cd2bd899d9ee92d16fbe7aa662741d3cb7305e6cba45b556cc6
+EBUILD buildbot-0.7.12.ebuild 3198 RMD160 30edd57d6b2bd7973be50d0eb53fd343fc5c9aa4 SHA1 ce3438dfa8aa2ebbcc22043f96cb0c3b6e122cc7 SHA256 e05f076ff814239b394bf624ce0deed6a220021ef37cf8e2ffee6a9caa4d8277
 MISC ChangeLog 7677 RMD160 5513aba9b2f1d46e408479878a8a6248041e2018 SHA1 8352538f95598eedfa0bdb1fcdf4421a9e9404c2 SHA256 89034f81596fcaf3605865a2f7add1e5c2a832cbd5d3000048b8fb797aeeb78a
 MISC metadata.xml 1292 RMD160 87e781b71385afcd20ae84320394fecf27fee917 SHA1 66be097e7db1e17218cf906f4876bda684d779bf SHA256 24c59ac7a6f85e11cd776e636b8e9ebd95350acdd0a3329ad4d584d294b6523a

diff --git a/dev-util/buildbot/buildbot-0.7.12.ebuild b/dev-util/buildbot/buildbot-0.7.12.ebuild
index f9876893f29cda998de119f95cd5d3a6ad3505ca..a8e3ed29486406f72d85c3e539f31021ee2d10ae 100644 (file)
--- a/dev-util/buildbot/buildbot-0.7.12.ebuild
+++ b/dev-util/buildbot/buildbot-0.7.12.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/buildbot/buildbot-0.7.12.ebuild,v 1.2 2010/02/20 18:48:48 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/buildbot/buildbot-0.7.12.ebuild,v 1.3 2010/05/02 19:47:01 arfrever Exp $
 
-EAPI="2"
+EAPI="3"
 PYTHON_DEPEND="2"
 SUPPORT_PYTHON_ABIS="1"
 DISTUTILS_SRC_TEST="trial"
@@ -22,18 +22,17 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 IUSE="doc irc mail manhole test"
 
-CDEPEND=">=dev-python/twisted-2.0.1"
-RDEPEND="${CDEPEND}
+RDEPEND=">=dev-python/twisted-2.0.1
        mail? ( dev-python/twisted-mail )
        manhole? ( dev-python/twisted-conch )
        irc? ( dev-python/twisted-words )
        dev-python/twisted-web
        dev-python/twisted-mail"
-DEPEND="${CDEPEND}
+DEPEND="${DEPEND}
        test? ( dev-python/twisted-mail
                        dev-python/twisted-web
                        dev-python/twisted-words )
-       doc? ( =dev-python/epydoc-2* )"
+       doc? ( dev-python/epydoc )"
 RESTRICT_PYTHON_ABIS="3.*"
 
 S="${WORKDIR}/${MY_P}"
@@ -64,21 +63,23 @@ src_install() {
        doins -r contrib
        doins -r docs/examples
 
-       use doc && doins -r docs/reference
+       if use doc; then
+               doins -r docs/reference || die "doins failed"
+       fi
 
-       newconfd "${FILESDIR}/buildslave.confd" buildslave
-       newinitd "${FILESDIR}/buildbot.initd-r1" buildslave
-       newconfd "${FILESDIR}/buildmaster.confd" buildmaster
-       newinitd "${FILESDIR}/buildbot.initd-r1" buildmaster
+       newconfd "${FILESDIR}/buildslave.confd" buildslave || die "newconfd failed"
+       newinitd "${FILESDIR}/buildbot.initd-r1" buildslave || die "newinitd failed"
+       newconfd "${FILESDIR}/buildmaster.confd" buildmaster || die "newconfd failed"
+       newinitd "${FILESDIR}/buildbot.initd-r1" buildmaster || die "newinitd failed"
 
        # Make it print the right names when you start/stop the script.
-       sed -i -e 's/@buildbot@/buildslave/' \
-               "${D}/etc/init.d/buildslave" || die "buildslave sed failed"
-       sed -i -e 's/@buildbot@/buildmaster/' \
-               "${D}/etc/init.d/buildmaster" || die "buildmaster sed failed"
+       sed -e "s/@buildbot@/buildslave/" -i "${ED}etc/init.d/buildslave" || die "sed buildslave failed"
+       sed -e "s/@buildbot@/buildmaster/" -i "${ED}etc/init.d/buildmaster" || die "sed buildmaster failed"
 }
 
 pkg_postinst() {
+       distutils_pkg_postinst
+
        elog 'The "buildbot" user and the "buildmaster" and "buildslave" init'
        elog "scripts were added to support starting buildbot through gentoo's"
        elog "init system.  To use this set up your build master or build slave"