Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status
summaryrefslogtreecommitdiff
path: root/gnome-base
diff options
context:
space:
mode:
authorAlexandre Rostovtsev <tetromino@gentoo.org>2015-04-11 15:21:39 +0000
committerAlexandre Rostovtsev <tetromino@gentoo.org>2015-04-11 15:21:39 +0000
commite515fad51b8a7062e984e404b1a23aefb9dc6a73 (patch)
tree9a239896b199c10b4a1b63e7beab3194d0eb509e /gnome-base
parentDocument ruby22 status. (diff)
downloadhistorical-e515fad51b8a7062e984e404b1a23aefb9dc6a73.tar.gz
historical-e515fad51b8a7062e984e404b1a23aefb9dc6a73.tar.bz2
historical-e515fad51b8a7062e984e404b1a23aefb9dc6a73.zip
Break circular dependency between gnome-shell and gnome-control-center (bug #546134, thanks to Pacho).
Package-Manager: portage-2.2.18/cvs/Linux x86_64 Manifest-Sign-Key: 0x18E5B6F2D8D5EC8D
Diffstat (limited to 'gnome-base')
-rw-r--r--gnome-base/gnome-shell/ChangeLog7
-rw-r--r--gnome-base/gnome-shell/Manifest26
-rw-r--r--gnome-base/gnome-shell/gnome-shell-3.14.3.ebuild9
-rw-r--r--gnome-base/gnome-shell/gnome-shell-3.14.4.ebuild9
4 files changed, 35 insertions, 16 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/Manifest b/gnome-base/gnome-shell/Manifest
index 612522dc6cd0..0a0f4395825b 100644
--- a/gnome-base/gnome-shell/Manifest
+++ b/gnome-base/gnome-shell/Manifest
@@ -6,14 +6,26 @@ AUX gnome-shell-3.14.0-bluetooth-gold.patch 1217 SHA256 d29893b1cbffda738940eaa6
AUX gnome-shell-3.14.0-defaults.patch 1192 SHA256 f53946108a81e98a6dde79c395b49ad5f93838dbc4ccd93cb1c246e69ea944a9 SHA512 ca5bc1e7af5324fc18e44b14b5d43daf182c63b4e29b1626c6d3e4dd27bb750a8eb61c3791ff6a96677a570e690775eada52c834a8d3d54227b1f2ad25436992 WHIRLPOOL 9f50b68783f042db5def6dbdc1533dc1b41e32d172ed2778db44871a9e23c1b7ba8ac1802324fe1f9340f19d9752274306916764e8b3acb85283a32a2d9a7498
DIST gnome-shell-3.14.3.tar.xz 1592136 SHA256 fb44484efb94af4d90189127136a82b2cc1afed93e24834165ae550b58b539d6 SHA512 6a8bcd472ea01962e234668dc54e93de17b20121ece53916f6b1498b7a292cd4eb2d08c56b6903ea6dfd532293f513c09c6648a63d19c1775e23bc77e3087aaa WHIRLPOOL c6c7703822c7652d8a5832c3141c7a2632c3d3422791c8d63608df1b1e8a311e94ce2e88b6f6d6aad608b66cca1297a9906cec3bd01dc92a334d2e68563d077a
DIST gnome-shell-3.14.4.tar.xz 1597744 SHA256 43336da7edece72bf298f1749510abb8470b625585e551c8b45258981435fd80 SHA512 254536cc3362d968bc624d2e87a5dbfe0471a7dbfb9c43a13e8913a3c097adaa22010bca6fc3fab90106519902d1997b4fa4f9ec6f325667dc3222f06614dc52 WHIRLPOOL 25bb0a0bc5227742e55912082157692d9f71bcf90ff6a3ed7a0b731470cb0a4adba70ba703a302f678746d6cc7263b8ca2fec3b77dae6bcfdd15d694262792a0
-EBUILD gnome-shell-3.14.3.ebuild 7505 SHA256 afb8dafa29a9e0c8094c98035b628bc0d049f95d70f5f1155bfc3277e04cfc2b SHA512 ec9461029d15b65a58b7637a8c9463c8af8368466b3faddd7c6f8be353bbb898a9b24f76b520eb48981d4cc5baa7eb3b7994edc3eff4da5c0295a0ff5b03d007 WHIRLPOOL a689141d1b48278aca8fe84855fcf48a61048715fb5b8da85b1a57ffbc2a8b6ed6466b1e30bfd41838e5a5722ba159850829fb897c94a10d52db91fc546362db
-EBUILD gnome-shell-3.14.4.ebuild 7635 SHA256 f1004abe3d4a28136f42b42b24f2b5a4ef6cfdc64cd6ba754c394c29fddc9105 SHA512 2ecb6f74047b631caeda1b6c4439f0cbc9d4e04c1842a3953238c2c3d5ed05e0eb7cd34f306e451d99c50d52e13bd6974b6193f1edffbf167af3309f467ff7c5 WHIRLPOOL 128689ccd653a6a45403203abc99b0920e296f3e22729165c0085997b620035c9e6b3a126ec27a57c86c6cac13767874bd89669dd01ac6308d8657f28926f3e5
-MISC ChangeLog 19590 SHA256 0019df9a425107ab4a7a690194f0601e24464b967d26d54a7c89e4ec4378a8b3 SHA512 b6615942cde7b094b93405e01702f9d98dcfbf5b855f4ca784e08989d222f015270d5bdbd63cd254fb729c258313b53114d1c89b3a164b12be036068c73bbf33 WHIRLPOOL 6aa84f42f4300c9f6bac6fc9b938ea257ff0225bba1424df40efcaf560f1f800a5ba3d04b2d9ba2007498b5a981d931f9b5eca0033396912ed2224005fc1316b
+EBUILD gnome-shell-3.14.3.ebuild 7528 SHA256 abf70893bdc3a0d891a8ebed310035c2766267ca07775e800cb7baeba85956a2 SHA512 8d7fc36c992cd274091db3aa057f5336e4e0f86b1d5dc496634233d6e77544b6f9185166a70faf6de82282015b84ab825f1163def5386c7d5ba3889b331d5a47 WHIRLPOOL 8b60d635d44fc6d1dc3f78c47d10a1c1553a5a7a17076a501cb206ae11ac410fda79a3280507058df33ac0b1c49c06dfefa2013f9c0d6e66baa33a1eb443cf85
+EBUILD gnome-shell-3.14.4.ebuild 7658 SHA256 d5d36cce75fe3429fc8f02b3b8cff2d151e30828a9d613815bba188305bad275 SHA512 22dd13a88a88b61a325354115a4e6da188bb8c45ad4d5067750ad363ad2479ca5484e568ef4a945df5648773a04b15cacebfec4d8fa891be484cc262e1863272 WHIRLPOOL 0469cc4ab06161360a76ccf35f1ec305dd4e087e3cc13b49870c6f20107cff890550a44f0b249f85ce6872b50884f7543c0c486675a37d7a45f457bd85238f6f
+MISC ChangeLog 19817 SHA256 acd330bfa39fbbe0a8a1811c39cbe6f31e91a76075042f28b0b62b2a6dd2a5d0 SHA512 9be45779067d1df389db63a35ccb3624e4cfdfaef3f5c9a7e8daae4554a0fedc8d64a22ede6a6020815b84d43d1694db4e5e891da90e98b881e761ce958d9b9b WHIRLPOOL 7ece040e8eb2a3e9145de1aabb08cc6b6a794041250f9fb35587aaf0524d287f637090de9e37ecd9f41784f53f8187a938c4f27763b5870c057b8505f063115f
MISC metadata.xml 503 SHA256 3b98b49418c316196a011c8706d99612da0dccfc184a11c2b4e2af912190384e SHA512 0e4a7bcc41c9edcbf0882f24427ab29ab8631cb3fdeca8b68734a143987012a66b6383c97dff57c5afd33d93b5da913d0755e6a9607101987bf9413e58551235 WHIRLPOOL 3eec055b8a58e6af24a72a1a8f4a544766aec38fe2c237a26c63468f63e98a2d4c4bb77254bf1dd0498ecb070aefce65da1cbb3dd77cf26c34449d8fc1cc83df
-----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
-iEYEAREIAAYFAlUWdtMACgkQCaWpQKGI+9RIRwCfWF6suDf/J+xBa7c/8fFtfqrn
-zq4AnigWp7yZy8FASfP0ggf0ODOcfvg+
-=e87v
+iQJ8BAEBCABmBQJVKTv8XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ1RTNCRkUzRDRBNkI2MEEwQkYwQzMyOEEx
+OEU1QjZGMkQ4RDVFQzhEAAoJEBjltvLY1eyN0hkQAJy091jty9H1TQm0ojez+1uR
+6Rps82g22RV+7ShWzKBv69Ty98ZSgo1OKdJ+X4T8pEr7skXxwOQs54zGswfzwXsw
+jt6Y88D0rppeWmrfZWR/WxCUx25jUoZk6cVoB3un5emz/hwpOAUXK8EckXhboZMA
+o6dU0bbBlF0MTy4QStI91hhhyF6el0Uj3NU6CpxkXLWHenBL4LQWnC9KfksuvE0o
++7SPcc3vKpi2QDTGnhrUOCuZKLheMXw9CzORtbFUOqVaRONduhpkuUm6/7kC9mv1
+t6JGbS83NC7Ezfxgn3Z39KMCJYcs5sarVWizA3jDVA80bpQ9fsHHsnaSOeAjNIvI
+6odufaUN3qCkdspM1pakvGUNhRG5LovNhKJyzO6mOQCAZIePHPJrHwzndZcFpUNA
+mBFIWMjjheXYhtleX6QaO3USRJ6Swf95dWQXZQEZyx+3F//ld2Lir8akTAwnoD8t
+iPMk5MQtD+XSoIZaVjg5vVa8nmruydfaSJELb1fNyzu1qfuxwWgRtHce8rtgrmpV
+bzphkovbF7LzOsICgKEkju/mvI/VQyrH5HKV3bZ6qeUOJLbCxME7of25lks6c+vV
+/QSeT08YUL1bDNkXXnL8dkp1o6LU7ZJxgs1z0N/vQe4AOFB7Bf1BOiCuPtoTlmzG
+BPfAy5K2aBYddDGENmDz
+=AJxH
-----END PGP SIGNATURE-----
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