Fix gdm ↔ gnome-shell circular dependency, pointed out by odium

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0xCF0ADD61

5 files changed, 29 insertions, 14 deletions

diff --git a/gnome-base/gnome-shell/ChangeLog b/gnome-base/gnome-shell/ChangeLog
index e9536c0dde0f..7c94665fa41d 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-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-shell/ChangeLog,v 1.77 2014/05/04 12:10:18 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-shell/ChangeLog,v 1.78 2014/05/08 01:11:26 tetromino Exp $
+
+  08 May 2014; Alexandre Rostovtsev <tetromino@gentoo.org>
+  gnome-shell-3.10.4-r1.ebuild, gnome-shell-3.10.4-r2.ebuild,
+  gnome-shell-3.12.1.ebuild:
+  Fix gdm ↔ gnome-shell circular dependency, pointed out by odium
 
   04 May 2014; Pacho Ramos <pacho@gentoo.org> gnome-shell-3.10.4-r2.ebuild:
   x86 stable, bug 508862
diff --git a/gnome-base/gnome-shell/Manifest b/gnome-base/gnome-shell/Manifest
index c3b89d0dadc8..8fdcde1d0f4b 100644
--- a/gnome-base/gnome-shell/Manifest
+++ b/gnome-base/gnome-shell/Manifest
@@ -14,15 +14,19 @@ AUX gnome-shell-3.12-bluetooth-flag.patch 1894 SHA256 1da61704c51128de9b17fcca02
 AUX gnome-shell-defaults.patch 1266 SHA256 eeea87bd5f02b3da83435c69d44a57e85d0ad58a62f72a350b55e0efac0f2584 SHA512 36c08779466884e1dce41460e56d0b9c82ca07bf2fee491d48604ae6f511dccfcf2bb3fdb1a7213aa47f08d0ec37da798465480ce12444dd22711bb4daec642c WHIRLPOOL 04669a7b93b7440e55d6ce71f43b9a90df531e6a72093c3ac61f775213a66a6e856538b5836a5962169d54746591dc246e12e3d532b2cc6af022092c82b9efe6
 DIST gnome-shell-3.10.4.tar.xz 1521256 SHA256 e082f6847eedbbc474ffe4bcb3dfe51054eb0e4c5ddab440d39afed78526b726 SHA512 bb69942bb1ab97e896ed69b48360c99a1a870074b0bfe16dc546fcb3d23a970b95b7f3bd3f9bac85a73a0fc0c5d7c8b8c08054d28abb5aa80b7b79c918532167 WHIRLPOOL aa2678a9b19e2c92823b0d555d1b88869112796c3876433a3886086a22a25b4cb4c77908d7e82c76430fbfba535af0f2b9791b79be5c7aa3f57575c8c3372d4f
 DIST gnome-shell-3.12.1.tar.xz 1541420 SHA256 d5a475f390d992de03ccf8ffeafec90595da700594eba9fc0688cbb1652b5516 SHA512 a6c811def3933107eb9e69614bb484ef7cf308ee32a7447560d38e0d2115fddd8ba9fb839c683222c5c7a9691db9afded0ddc0725f498a0adb79670b544cb3bf WHIRLPOOL cbe84c2ae7d9d78e2151ad01a34ddeddbcbcc6209434d2cb6590bd931fb56a8a52c9b480b3ef4421832076fcbec25f42658d9568a3147538a860594670a1dade
-EBUILD gnome-shell-3.10.4-r1.ebuild 7729 SHA256 63a167d0c220708afc812982f556b35b8ff8185ea6cc6b1e0e99b9dbb4d581a1 SHA512 8f7e39b7bbf7cb9c2683d494834a18fdcd7ff5d7a9e0efb687665ff22109ee56b61791b68e01277a1ff0a1c2cb00dd17fd69d08072325c537bcc4bc04df892f1 WHIRLPOOL dc48b7bc5f4f19230caeb63ade36df917894406d57ddb0bcd4ece04da80022c1f773a2a27fbdff9e1cc74c86032eabca5d41f94e4c9c16fa914679739586dfcf
-EBUILD gnome-shell-3.10.4-r2.ebuild 8301 SHA256 96c0f0c9cdcbbb21c339eb2148ad9b0f28cca678f69316c0d80a685b3b89c034 SHA512 27764ebef48ac9ac923b725cacf6566a21885b780036ad72922bded13fe3ff99dd0a77ff9277a063143ad8b5750b9946f1b92021bda01fbce6192ea9809ee54c WHIRLPOOL 1797f8f0d10286bda48c83414f22a15e3f759367eba5ef672df89ca76cffb2ede58342b46beab2e981d3aab9765c4828768122e436b26298ef9182adaf21b86f
-EBUILD gnome-shell-3.12.1.ebuild 7510 SHA256 99ba5838069d56199c778878db68151366dfc25538510b5151485ba40b090b99 SHA512 521d86dd66a60b0e659726e701850ef579ccceb768e961a6eb94a7a6d87f4469c73261bde19395fc3f817a31c4b73aef82a349815cf5a0b9211499a230d85a08 WHIRLPOOL 1cf17cee8a841fb956902cd211abed5eb6439ae76767799cba6487d7a5bba45efcda1993317ffea9150c83785799f7d0dababc6692c42fd0d12a5445241c9856
-MISC ChangeLog 17036 SHA256 b14727b7b67afaae54dee010390707c6e60e7d0a8ab9e34573a9f9d338c661ef SHA512 2a85a4dfe0033cf729466152501736923de56751b0b569d31b97badb3b9047caa18095c5870bee81299bf372cba286b58ed8ad1e6da127a9fd2492895518bc07 WHIRLPOOL cbc176ff389f20da57383815db7c751c05322770c44c85cb9bd15ed2565ef5224c7647d53d1da2be2614e3b87fa68a7ff100cdd2b0bd196d4b776bc60a2bcdc1
+EBUILD gnome-shell-3.10.4-r1.ebuild 7767 SHA256 67d49e78da6bb540a0500bcc77f7d4d680a4669aa187168fee78bb205fcfe738 SHA512 01d8a8407bac85e714120d8f126a9945281b4facedd02359422f62824538bb38977f0165c7cad6caa4d5099f714babb52e811d8c6cdadcc634917da9e13e8adf WHIRLPOOL 52c9868b0c7eb192990453222ce9ad9eeeb1244ea2c973fdfeb52795efc247ce115ce214a0f8bbcf1b5be27cae3baadaed5501b221dac137cb12920b3d1c7550
+EBUILD gnome-shell-3.10.4-r2.ebuild 8343 SHA256 e64afcd8cdaddafe076fbf0db2eca1388897463764f6118f8b7425ea0be7cea8 SHA512 dcbe3d876dca8a4bdd951bffe1f7bf42120c944f81a280c08f624c5688058ffbc4b3a944f45b487281776e13caccf2945c03ff12bbf03851aa89058d8eac51ec WHIRLPOOL 9271ba9a6fbda0de202a632d122797ffd567b1ee0f8f76d2a0f47c6babcd42235cf15693ca1476ba11be44a19d033d617c56adfb22fe9c7913573f653eca65f9
+EBUILD gnome-shell-3.12.1.ebuild 7548 SHA256 18b033e15fd4b60992ef8e2137889f1e3ed22236ad9f7d79948ba1d19bb2c8d7 SHA512 9b066c1dcd3b7d5d1d844328ebe928c8c686e5fe6bb3e6c7a46d037a22925a19907b818ff87e7664ca2d68c82b2b35d5717a1eccd9c6bbf10645dc64334ba438 WHIRLPOOL 95741f6f28695ceedac960eeeb029ba935928845502acd78b9becdbab545f7b1cb6a38adce0e68f9b103cce27e94993b4f79e84eefde20b1f55513e2d1d3f062
+MISC ChangeLog 17259 SHA256 7f372f3289dbe41fa98981305af4c7a11163d6845671036e0dd0ef97581c3e8a SHA512 929a99e5b0507c451ae2dc6a6a919a07cf6ae0d6290b7ff696bf01dd3271cf1d989213935ba601dba258014a8bc2b61468b025b1d55142cb0521d844818a05a5 WHIRLPOOL 7ed6aaa2ce01da56ee740c5ef91c16e16c3d514aa193ad8a7867ae79812c167e9d3923620ed14631633dfc4c768d76b87c48727eef7d3293e1cab36395080416
 MISC metadata.xml 503 SHA256 3b98b49418c316196a011c8706d99612da0dccfc184a11c2b4e2af912190384e SHA512 0e4a7bcc41c9edcbf0882f24427ab29ab8631cb3fdeca8b68734a143987012a66b6383c97dff57c5afd33d93b5da913d0755e6a9607101987bf9413e58551235 WHIRLPOOL 3eec055b8a58e6af24a72a1a8f4a544766aec38fe2c237a26c63468f63e98a2d4c4bb77254bf1dd0498ecb070aefce65da1cbb3dd77cf26c34449d8fc1cc83df
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlNmLisACgkQCaWpQKGI+9RdMQCffkFaXQG84WjKO5tmBsRQOgQO
-cnAAn2reZiDR9DFaZ2XiTc/nZq484Yyz
-=dNOJ
+iQEcBAEBCAAGBQJTatmLAAoJEJ0WA1zPCt1hKfAH/jKFRMWqtncj/lJVpeHrfk1A
+TIFOdvX4QExgF00JrP/6L+ckVHUpo06xrD2JoVHH4tr92MtDCSQjO6sR4XpmOeZI
+Ep4n+64JMascmvZxr9PLIyl8BjZqrMKnB8zlmb1o5Qd8F4BoenQWiMZEeRgZrXjK
+ZX5I3aFY+ULYLTBFxP8O3QLnrA3QscRvVomqOCH7Rsesq8QOfrRkqIJM2bWFmBRm
+b6N0pu3CqNbP/jP8EBsD83dhZPekY1qfiO4WYfqK+sFUz4ZkQMqy1OWwAgaN1Uq2
+kk6ztXkuqtangv8grXvj6hazW+CRl2uXmxcbXnljydvQy0bPu/YMyUNs+9HgWys=
+=Vy38
 -----END PGP SIGNATURE-----
diff --git a/gnome-base/gnome-shell/gnome-shell-3.10.4-r1.ebuild b/gnome-base/gnome-shell/gnome-shell-3.10.4-r1.ebuild
index 3c3ebb131b77..a4c79c888895 100644
--- a/gnome-base/gnome-shell/gnome-shell-3.10.4-r1.ebuild
+++ b/gnome-base/gnome-shell/gnome-shell-3.10.4-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 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.10.4-r1.ebuild,v 1.5 2014/05/01 02:31:19 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-shell/gnome-shell-3.10.4-r1.ebuild,v 1.6 2014/05/08 01:11:26 tetromino Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
@@ -84,7 +84,6 @@ RDEPEND="${COMMON_DEPEND}
 	>=sys-auth/polkit-0.101[introspection]
 
 	>=app-accessibility/caribou-0.4.8
-	>=gnome-base/gdm-3.5[introspection]
 	media-libs/cogl[introspection]
 	>=sys-apps/accountsservice-0.6.14[introspection]
 	sys-power/upower[introspection]
@@ -105,6 +104,9 @@ RDEPEND="${COMMON_DEPEND}
 		net-misc/mobile-broadband-provider-info
 		sys-libs/timezone-data )
 "
+# avoid circular dependency
+PDEPEND=">=gnome-base/gdm-3.5[introspection]
+"
 DEPEND="${COMMON_DEPEND}
 	dev-libs/libxslt
 	>=dev-util/gtk-doc-am-1.17
diff --git a/gnome-base/gnome-shell/gnome-shell-3.10.4-r2.ebuild b/gnome-base/gnome-shell/gnome-shell-3.10.4-r2.ebuild
index 7b782bba55c2..f3d642141dab 100644
--- a/gnome-base/gnome-shell/gnome-shell-3.10.4-r2.ebuild
+++ b/gnome-base/gnome-shell/gnome-shell-3.10.4-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 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.10.4-r2.ebuild,v 1.5 2014/05/04 12:10:18 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-shell/gnome-shell-3.10.4-r2.ebuild,v 1.6 2014/05/08 01:11:26 tetromino Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
@@ -84,7 +84,6 @@ RDEPEND="${COMMON_DEPEND}
 	>=sys-auth/polkit-0.101[introspection]
 
 	>=app-accessibility/caribou-0.4.8
-	>=gnome-base/gdm-3.5[introspection]
 	media-libs/cogl[introspection]
 	>=sys-apps/accountsservice-0.6.14[introspection]
 	sys-power/upower[introspection]
@@ -105,6 +104,9 @@ RDEPEND="${COMMON_DEPEND}
 		net-misc/mobile-broadband-provider-info
 		sys-libs/timezone-data )
 "
+# avoid circular dependency
+PDEPEND=">=gnome-base/gdm-3.5[introspection]
+"
 DEPEND="${COMMON_DEPEND}
 	dev-libs/libxslt
 	>=dev-util/gtk-doc-am-1.17
diff --git a/gnome-base/gnome-shell/gnome-shell-3.12.1.ebuild b/gnome-base/gnome-shell/gnome-shell-3.12.1.ebuild
index 2f1fd40a3d9e..40d151a7255a 100644
--- a/gnome-base/gnome-shell/gnome-shell-3.12.1.ebuild
+++ b/gnome-base/gnome-shell/gnome-shell-3.12.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 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.12.1.ebuild,v 1.2 2014/05/01 02:31:19 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-shell/gnome-shell-3.12.1.ebuild,v 1.3 2014/05/08 01:11:26 tetromino Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
@@ -84,7 +84,6 @@ RDEPEND="${COMMON_DEPEND}
 	>=sys-auth/polkit-0.101[introspection]
 
 	>=app-accessibility/caribou-0.4.8
-	>=gnome-base/gdm-3.5[introspection]
 	media-libs/cogl[introspection]
 	>=sys-apps/accountsservice-0.6.14[introspection]
 	sys-power/upower[introspection]
@@ -105,6 +104,9 @@ RDEPEND="${COMMON_DEPEND}
 		net-misc/mobile-broadband-provider-info
 		sys-libs/timezone-data )
 "
+# avoid circular dependency
+PDEPEND=">=gnome-base/gdm-3.5[introspection]
+"
 DEPEND="${COMMON_DEPEND}
 	dev-libs/libxslt
 	>=dev-util/gtk-doc-am-1.17