Move gnome-base/gvfs dependency to PDEPEND to break circular dependency, bug #269747.

Package-Manager: portage-2.2_rc33/cvs/Linux x86_64

4 files changed, 18 insertions, 11 deletions

diff --git a/gnome-base/libgnome/ChangeLog b/gnome-base/libgnome/ChangeLog
index a2ced199252d..c8eedcc6c1ec 100644
--- a/gnome-base/libgnome/ChangeLog
+++ b/gnome-base/libgnome/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for gnome-base/libgnome
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgnome/ChangeLog,v 1.175 2009/05/10 18:34:54 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgnome/ChangeLog,v 1.176 2009/06/17 22:33:42 eva Exp $
+
+  18 Jun 2009; Gilles Dartiguelongue <eva@gentoo.org>
+  libgnome-2.24.1.ebuild, libgnome-2.26.0.ebuild:
+  Move gnome-base/gvfs dependency to PDEPEND to break circular dependency,
+  bug #269747.
 
 *libgnome-2.26.0 (10 May 2009)
 
diff --git a/gnome-base/libgnome/Manifest b/gnome-base/libgnome/Manifest
index 60cc88090658..7b92f21b06d5 100644
--- a/gnome-base/libgnome/Manifest
+++ b/gnome-base/libgnome/Manifest
@@ -5,14 +5,14 @@ AUX libgnome-2.26.0-branding.patch 839 RMD160 044966b14e3735c4b95a865f9ff35eeb4a
 DIST gentoo-gdm-theme-r3.tar.bz2 411703 RMD160 9188c8f2661163be72595a6b4924fae0648e7df5 SHA1 246a7ce67ad9d826b1cca6d90b53369b88be72ac SHA256 c7cbe97757ff93f0ffd42f9d9fb702278a361e830940a03901cda9943f44ba68
 DIST libgnome-2.24.1.tar.bz2 1416606 RMD160 8dc93692e878bd22143fb7f0bfaf375acb70758a SHA1 f9d1d922569cb8f8a44834f5eadc42ac21d184e1 SHA256 16c05ef6b1bbb057ceea512300de35f2d704609d7a3cacfd5301bc1a138e015a
 DIST libgnome-2.26.0.tar.bz2 1414016 RMD160 0c98138b3e19c70ea331ffb84019c8bdd277337b SHA1 a78143105f61ec2c65cc852a9e3da7a7b56e51a0 SHA256 2ef0287ab19fd34a7d20bc8beef86bb22db13cfc414367cb48e6121b8163e318
-EBUILD libgnome-2.24.1.ebuild 880 RMD160 77fc44c6dc0aca99dc6dc6c577eb24bda45f7928 SHA1 cb99240029a521cbdea3bd70e9fea9f88b559a3d SHA256 f7268d402482271ba868d600d14b5686754f39a47b8a30d362cee7bae403353b
-EBUILD libgnome-2.26.0.ebuild 1450 RMD160 6018bf7db371caa50b721c512d346ceb39962d28 SHA1 8a0d52c2d5800ef50d566397ab37915177831735 SHA256 9addb9a6441201b05f7bfacce24354ec9fcf570c3f97b5e758d56f883e7311e0
-MISC ChangeLog 20531 RMD160 1310d9298bd4e5e6dec2c42eb7e9cfdca9b36828 SHA1 5d9fd338a5ea90b973a8c8312db6d1bfe27ac930 SHA256 3758fa68076552aa9c4b9bc67f9edcbcf19d99d4fb6cc0aa9742d1088ffd2fda
+EBUILD libgnome-2.24.1.ebuild 886 RMD160 ae58fd421f0b5e5f90248aecf1c35a18db0744d8 SHA1 286d74e79eb9dea6872bca8e1e2bbc396aaf98d7 SHA256 ae8a11141689afd565e5d440f3a654144fd960fd4d30ac4fad27817f074576ba
+EBUILD libgnome-2.26.0.ebuild 1460 RMD160 3417e5b6e51f5f0deebdd02a48739c24501d0f0c SHA1 d5c0518336af6f4446dfba713f2a507c30ff7d6c SHA256 713d3569ed8eb9fe18407c23013b4dae3e5ac3abb69de7d0420b3cc02f6ce081
+MISC ChangeLog 20726 RMD160 e51f37825130e78ce23d6b5d8623f3e8ab85d13e SHA1 a66b2861e4fea378ad8b42ca0d8d718ed2a663c2 SHA256 b3aec55feec2f73896b803db7325780cbf12833960de6bfb5810ec54a7bad300
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAkoHHlQACgkQ1fmVwcYIWAZLWACg4PB96Xk4UTLJojsYoaunE3jX
-dUcAoPAmY1ueIxznQ4j2AyzllmIJsLHA
-=1OlV
+iEYEARECAAYFAko5i24ACgkQ1fmVwcYIWAYCIACgtCcgmufBs6BvSCsie1eRgNzV
+wkQAn2+Bo8nIju9NmGlL787xaPlKKleZ
+=mrUK
 -----END PGP SIGNATURE-----
diff --git a/gnome-base/libgnome/libgnome-2.24.1.ebuild b/gnome-base/libgnome/libgnome-2.24.1.ebuild
index 10acbc115232..4ae5d7983350 100644
--- a/gnome-base/libgnome/libgnome-2.24.1.ebuild
+++ b/gnome-base/libgnome/libgnome-2.24.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgnome/libgnome-2.24.1.ebuild,v 1.11 2009/04/28 14:35:37 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgnome/libgnome-2.24.1.ebuild,v 1.12 2009/06/17 22:33:42 eva Exp $
 
 inherit gnome2
 
@@ -14,7 +14,6 @@ IUSE="doc esd"
 
 RDEPEND=">=gnome-base/gconf-2
 	>=dev-libs/glib-2.16
-	gnome-base/gvfs
 	>=gnome-base/gnome-vfs-2.5.3
 	>=gnome-base/libbonobo-2.13
 	>=dev-libs/popt-1.7
@@ -27,6 +26,8 @@ DEPEND="${RDEPEND}
 	>=dev-util/pkgconfig-0.17
 	doc? ( >=dev-util/gtk-doc-1 )"
 
+PDEPEND="gnome-base/gvfs"
+
 DOCS="AUTHORS ChangeLog NEWS README"
 
 pkg_setup() {
diff --git a/gnome-base/libgnome/libgnome-2.26.0.ebuild b/gnome-base/libgnome/libgnome-2.26.0.ebuild
index 26d7ca041160..5cc03b85a226 100644
--- a/gnome-base/libgnome/libgnome-2.26.0.ebuild
+++ b/gnome-base/libgnome/libgnome-2.26.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgnome/libgnome-2.26.0.ebuild,v 1.1 2009/05/10 18:34:54 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgnome/libgnome-2.26.0.ebuild,v 1.2 2009/06/17 22:33:42 eva Exp $
 
 EAPI="2"
 
@@ -19,7 +19,6 @@ SRC_URI="${SRC_URI}
 
 RDEPEND=">=gnome-base/gconf-2
 	>=dev-libs/glib-2.16
-	gnome-base/gvfs
 	>=gnome-base/gnome-vfs-2.5.3
 	>=gnome-base/libbonobo-2.13
 	>=dev-libs/popt-1.7
@@ -32,6 +31,8 @@ DEPEND="${RDEPEND}
 	>=dev-util/pkgconfig-0.17
 	doc? ( >=dev-util/gtk-doc-1 )"
 
+PDEPEND="gnome-base/gvfs"
+
 DOCS="AUTHORS ChangeLog NEWS README"
 
 pkg_setup() {