Fix circular dependency (bug #327465).

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

diff --git a/dev-python/apptools/ChangeLog b/dev-python/apptools/ChangeLog
index 4451a4e9cea133b32ae38172a7ead6ae87ee39dd..bedf3406af339a14cac52310a0f7e26b35ab7b68 100644 (file)
--- a/dev-python/apptools/ChangeLog
+++ b/dev-python/apptools/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-python/apptools
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/apptools/ChangeLog,v 1.8 2010/07/07 16:56:27 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/apptools/ChangeLog,v 1.9 2010/07/09 16:25:22 arfrever Exp $
+
+  09 Jul 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  apptools-3.3.2.ebuild:
+  Fix circular dependency (bug #327465).
 
   07 Jul 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
   apptools-3.3.2.ebuild:

diff --git a/dev-python/apptools/Manifest b/dev-python/apptools/Manifest
index bd297e7c1eceb6a220dc53a7bdcef305ee554240..e80d83ffaa7db5fc9db64257ac8039d04d410d73 100644 (file)
--- a/dev-python/apptools/Manifest
+++ b/dev-python/apptools/Manifest
@@ -1,4 +1,4 @@
 DIST AppTools-3.3.2.tar.gz 1102637 RMD160 0aa00552c9444a3cbcaed1fd1d9b82cb49ab5af5 SHA1 ebe4764748f1513c2082f65b1d24215c3bf65541 SHA256 4a1779482a04e8617a1d9f5ff2b2b292151a8ce516f0f606193a59e07bacfc97
-EBUILD apptools-3.3.2.ebuild 2018 RMD160 a63a5c5185902d7a09fd0cdd58ff135ce30de2b2 SHA1 3afc6164d971ecb082ac6e4beb068dc3e6162332 SHA256 541b28baa2160bc0f5a2f4956a55769d6d1f515f4d284a6f00c0bb70fa6bf41f
-MISC ChangeLog 1291 RMD160 1046d986f89fbbd0d7fccbb1939ec09c843f7670 SHA1 9d64c8ef5877d750558db6f50d00816346188926 SHA256 3e6f80c36d1defc3fee44e6398f6aa73c8ac83cfba83dc5e73c2e83930e81dc3
+EBUILD apptools-3.3.2.ebuild 2182 RMD160 619e6b7f47394460b22cbdfc82e1161fa2c581be SHA1 f18fe36be03a9bbd3e7e6f6d596244e2755e6963 SHA256 0eeea38235285baaed7f5f14c370ea9598379bd5f317d3cd5d32e5857f891761
+MISC ChangeLog 1431 RMD160 699787eece6ba17dcc68992336cd5c3250a62ca7 SHA1 48e12e4915df4be62dab7023c7af9f88ca6ba918 SHA256 ec39086caeb27f0c6e18d1030bcc530d2c733a5a600822d99747bcaf23a271a0
 MISC metadata.xml 442 RMD160 e713a3f44b1d40c6ac50c2c44860414c05ab4958 SHA1 7993b0178867ebfa46375180c6532ea79452033f SHA256 6d105831cb50bcaf0a9413a60d3b36c11df9f8fec7fe83d091ee1bc8aab5168c

diff --git a/dev-python/apptools/apptools-3.3.2.ebuild b/dev-python/apptools/apptools-3.3.2.ebuild
index 0ea0ac8c4f0d04d3487c440334071eba2371988d..a1de99d14745e15b8132376f032371b42d420e60 100644 (file)
--- a/dev-python/apptools/apptools-3.3.2.ebuild
+++ b/dev-python/apptools/apptools-3.3.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/apptools/apptools-3.3.2.ebuild,v 1.3 2010/07/07 16:56:27 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/apptools/apptools-3.3.2.ebuild,v 1.4 2010/07/09 16:25:22 arfrever Exp $
 
 EAPI="3"
 PYTHON_DEPEND="2"
@@ -24,7 +24,6 @@ IUSE="doc examples test"
 
 RDEPEND="dev-python/configobj
        >=dev-python/enthoughtbase-3.0.5
-       >=dev-python/envisagecore-3.1.2
        dev-python/numpy
        >=dev-python/traitsgui-3.4.0"
 DEPEND="dev-python/setuptools
@@ -36,6 +35,9 @@ DEPEND="dev-python/setuptools
                media-fonts/font-misc-misc
                x11-apps/xhost
        )"
+# dev-python/envisagecore depends on dev-python/apptools, so dev-python/envisagecore
+# cannot be specified in DEPEND/RDEPEND due to circular dependencies.
+PDEPEND=">=dev-python/envisagecore-3.1.2"
 
 S="${WORKDIR}/${MY_P}"