Break circular dependency between gnome-shell and gnome-control-center (bug #546134, thanks to Pacho).

(Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key 0x18E5B6F2D8D5EC8D)

3 files changed, 16 insertions, 9 deletions

diff --git a/gnome-base/gnome-shell/ChangeLog b/gnome-base/gnome-shell/ChangeLog
index baf3a3f34f67..c55d5e6a26fe 100644
--- a/gnome-base/gnome-shell/ChangeLog
+++ b/gnome-base/gnome-shell/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for gnome-base/gnome-shell
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-shell/ChangeLog,v 1.90 2015/03/28 09:39:30 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-shell/ChangeLog,v 1.91 2015/04/11 15:21:21 tetromino Exp $
+
+  11 Apr 2015; Alexandre Rostovtsev <tetromino@gentoo.org>
+  gnome-shell-3.14.3.ebuild, gnome-shell-3.14.4.ebuild:
+  Break circular dependency between gnome-shell and gnome-control-center (bug
+  #546134, thanks to Pacho).
 
 *gnome-shell-3.14.4 (28 Mar 2015)
 
diff --git a/gnome-base/gnome-shell/gnome-shell-3.14.3.ebuild b/gnome-base/gnome-shell/gnome-shell-3.14.3.ebuild
index 2cc57cd48c7c..f10316292c8e 100644
--- a/gnome-base/gnome-shell/gnome-shell-3.14.3.ebuild
+++ b/gnome-base/gnome-shell/gnome-shell-3.14.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-shell/gnome-shell-3.14.3.ebuild,v 1.5 2015/03/15 13:23:17 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-shell/gnome-shell-3.14.3.ebuild,v 1.6 2015/04/11 15:21:21 tetromino Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
@@ -89,7 +89,6 @@ RDEPEND="${COMMON_DEPEND}
 
 	>=gnome-base/gnome-session-2.91.91
 	>=gnome-base/gnome-settings-daemon-3.8.3
-	>=gnome-base/gnome-control-center-3.8.3[bluetooth(+)?]
 
 	!openrc-force? ( >=sys-apps/systemd-31 )
 
@@ -103,8 +102,10 @@ RDEPEND="${COMMON_DEPEND}
 		net-misc/mobile-broadband-provider-info
 		sys-libs/timezone-data )
 "
-# avoid circular dependency
-PDEPEND=">=gnome-base/gdm-3.5[introspection]
+# avoid circular dependency, see bug #546134
+PDEPEND="
+	>=gnome-base/gdm-3.5[introspection]
+	>=gnome-base/gnome-control-center-3.8.3[bluetooth(+)?]
 "
 DEPEND="${COMMON_DEPEND}
 	dev-libs/libxslt
diff --git a/gnome-base/gnome-shell/gnome-shell-3.14.4.ebuild b/gnome-base/gnome-shell/gnome-shell-3.14.4.ebuild
index 12f0fdd1c5bd..b57506138fbc 100644
--- a/gnome-base/gnome-shell/gnome-shell-3.14.4.ebuild
+++ b/gnome-base/gnome-shell/gnome-shell-3.14.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-shell/gnome-shell-3.14.4.ebuild,v 1.1 2015/03/28 09:33:14 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-shell/gnome-shell-3.14.4.ebuild,v 1.2 2015/04/11 15:21:21 tetromino Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
@@ -89,7 +89,6 @@ RDEPEND="${COMMON_DEPEND}
 
 	>=gnome-base/gnome-session-2.91.91
 	>=gnome-base/gnome-settings-daemon-3.8.3
-	>=gnome-base/gnome-control-center-3.8.3[bluetooth(+)?]
 
 	!openrc-force? ( >=sys-apps/systemd-31 )
 
@@ -103,8 +102,10 @@ RDEPEND="${COMMON_DEPEND}
 		net-misc/mobile-broadband-provider-info
 		sys-libs/timezone-data )
 "
-# avoid circular dependency
-PDEPEND=">=gnome-base/gdm-3.5[introspection]
+# avoid circular dependency, see bug #546134
+PDEPEND="
+	>=gnome-base/gdm-3.5[introspection]
+	>=gnome-base/gnome-control-center-3.8.3[bluetooth(+)?]
 "
 DEPEND="${COMMON_DEPEND}
 	dev-libs/libxslt