Fix dependencies (bug #323189).

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

diff --git a/dev-util/buildbot/ChangeLog b/dev-util/buildbot/ChangeLog
index 5a1994d0204610b1bc7a35cb773a4f7088b0af31..e4251df8480ea97af794e9356c87327f182e939c 100644 (file)
--- a/dev-util/buildbot/ChangeLog
+++ b/dev-util/buildbot/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-util/buildbot
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/buildbot/ChangeLog,v 1.58 2010/06/03 16:32:18 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/buildbot/ChangeLog,v 1.59 2010/06/08 21:41:32 arfrever Exp $
+
+  08 Jun 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  buildbot-0.8.0.ebuild:
+  Fix dependencies (bug #323189).
 
   03 Jun 2010; Pawel Hajdan jr <phajdan.jr@gentoo.org>
   buildbot-0.7.12.ebuild:

diff --git a/dev-util/buildbot/Manifest b/dev-util/buildbot/Manifest
index e7db488be1ea7af09f43c48949767d8b1d78688b..8ec0f50899c9cbb0528ef2226d047bb276fa3873 100644 (file)
--- a/dev-util/buildbot/Manifest
+++ b/dev-util/buildbot/Manifest
@@ -7,6 +7,6 @@ DIST buildbot-0.7.12.tar.gz 1296550 RMD160 b7c9ad263690708bbf1abadaa0b4bb78de4ab
 DIST buildbot-0.8.0.tar.gz 4467106 RMD160 8c15795b41f1ebd71f43ddce100d7d15055bbdad SHA1 0d1b315673e7c18f7c990fe252578b47645979dd SHA256 a85aea3cb911312a836c57c6c0dc24b170b612c429dfaffa7c66083352fd4f7a
 EBUILD buildbot-0.7.11_p3.ebuild 3108 RMD160 dc6bfdf2da4b7c8823914235ee9a803d8ac03374 SHA1 f523514733eaee33e61469ce1f74c88c7609dfdc SHA256 b364a7b0014fe3360bcd71297ec9120ce46b0e75b8fd9bdcb6b1b56907a2b484
 EBUILD buildbot-0.7.12.ebuild 3198 RMD160 07e0d96dba3aa4f67aed37cffa97976a72c6371e SHA1 2f97170aa38cb4889669c8807fcb40821eaa595d SHA256 1a60f6f375a1fc621fd42c755d5c97887fdfbcb6932983f5be3c3b1dbe06279b
-EBUILD buildbot-0.8.0.ebuild 3213 RMD160 a88d157d6d41fb96a219edd5e199cdd90a44d483 SHA1 a39e61b23edb8153d52e0e0aeea4521448ba9b42 SHA256 93d8af4a4a78a02a348494ef1842df97a8e2aabb599052d80dc18329ad373570
-MISC ChangeLog 8049 RMD160 1bb4da9eb0bd7e1013f9869c9f9d698748b03909 SHA1 9d8a4a1f846133785d9c6c50b86d27a0cd8a05a4 SHA256 476d128d6a97a92e28f792be83b4d02caabd7dddf1d1ccb63c907a45db23fba9
+EBUILD buildbot-0.8.0.ebuild 3340 RMD160 0624e2d9f9ba0710d9e3975ffd8e51b3078d6336 SHA1 ad90849011ca99d77c72c6f11ebcaeee49bdf29d SHA256 597cbdc6c28b5ebead9676542cd976408e5418842411827aaa9e45a192a1b570
+MISC ChangeLog 8180 RMD160 07893a7edb0c8823efb6b34918053d975930d9a6 SHA1 afe5031fdecdcee44090ea2d111a419c1a8667bf SHA256 06f2d707ba3062d9a2e48f85e0542d2789c9c9a67db82033acd5cfc7cf41381d
 MISC metadata.xml 1292 RMD160 87e781b71385afcd20ae84320394fecf27fee917 SHA1 66be097e7db1e17218cf906f4876bda684d779bf SHA256 24c59ac7a6f85e11cd776e636b8e9ebd95350acdd0a3329ad4d584d294b6523a

diff --git a/dev-util/buildbot/buildbot-0.8.0.ebuild b/dev-util/buildbot/buildbot-0.8.0.ebuild
index 4e5f57947825cf353169888f8c80ef72c7a15346..f4530e13337038552fed3b0e987da5204545c44b 100644 (file)
--- a/dev-util/buildbot/buildbot-0.8.0.ebuild
+++ b/dev-util/buildbot/buildbot-0.8.0.ebuild
@@ -1,10 +1,11 @@
 # 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.8.0.ebuild,v 1.1 2010/05/27 16:24:56 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/buildbot/buildbot-0.8.0.ebuild,v 1.2 2010/06/08 21:41:32 arfrever Exp $
 
 EAPI="3"
 PYTHON_DEPEND="2"
 SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="3.*"
 DISTUTILS_SRC_TEST="trial"
 DISTUTILS_DISABLE_TEST_DEPENDENCY="1"
 
@@ -22,18 +23,20 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 IUSE="doc irc mail manhole test"
 
-RDEPEND=">=dev-python/twisted-2.0.1
-       mail? ( dev-python/twisted-mail )
-       manhole? ( dev-python/twisted-conch )
-       irc? ( dev-python/twisted-words )
+# sqlite3 module of Python 2.5 is not supported.
+RDEPEND="dev-python/jinja
+       || ( dev-python/pysqlite:2 >=dev-lang/python-2.6[sqlite] )
+       >=dev-python/twisted-2.0.1
        dev-python/twisted-web
-       dev-python/twisted-mail"
+       dev-python/twisted-mail
+       irc? ( dev-python/twisted-words )
+       mail? ( dev-python/twisted-mail )
+       manhole? ( dev-python/twisted-conch )"
 DEPEND="${DEPEND}
+       doc? ( dev-python/epydoc )
        test? ( dev-python/twisted-mail
                        dev-python/twisted-web
-                       dev-python/twisted-words )
-       doc? ( dev-python/epydoc )"
-RESTRICT_PYTHON_ABIS="3.*"
+                       dev-python/twisted-words )"
 
 S="${WORKDIR}/${MY_P}"