Raise libgnomekbd dependency to avoid gtk+2/3 being used in the same application, bug #470926.

Package-Manager: portage-2.2.1/cvs/Linux x86_64
Manifest-Sign-Key: 0xC6085806

3 files changed, 14 insertions, 9 deletions

diff --git a/gnome-extra/gnome-screensaver/ChangeLog b/gnome-extra/gnome-screensaver/ChangeLog
index 6238d574733c..01e467b6a252 100644
--- a/gnome-extra/gnome-screensaver/ChangeLog
+++ b/gnome-extra/gnome-screensaver/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for gnome-extra/gnome-screensaver
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-screensaver/ChangeLog,v 1.163 2013/03/29 22:36:50 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-screensaver/ChangeLog,v 1.164 2013/09/08 16:19:31 eva Exp $
+
+  08 Sep 2013; Gilles Dartiguelongue <eva@gentoo.org>
+  gnome-screensaver-3.6.1.ebuild:
+  Raise libgnomekbd dependency to avoid gtk+2/3 being used in the same
+  application, bug #470926.
 
   29 Mar 2013; Gilles Dartiguelongue <eva@gentoo.org>
   -gnome-screensaver-3.4.4.ebuild:
diff --git a/gnome-extra/gnome-screensaver/Manifest b/gnome-extra/gnome-screensaver/Manifest
index 1f973f3120e9..76622cf16de5 100644
--- a/gnome-extra/gnome-screensaver/Manifest
+++ b/gnome-extra/gnome-screensaver/Manifest
@@ -14,13 +14,13 @@ DIST gentoo-logo.svg 13764 SHA256 ad81a212991cd24faaddbc260c806c805fd7a67f65b246
 DIST gnome-screensaver-2.30.2.tar.bz2 4814653 SHA256 dd52ef278b23ec5abe5974548c2d576eeaeb5294c85e9f2efd6231ecc9ca09fa SHA512 b86197459e5a1a5979bb60f8a979cf9440f7fc75bf22074d54bcd93f1579e8db2865456759d2aa875c1a2267604006e12a47cfa8fceae018be9a29b5bb7c0f07 WHIRLPOOL 95c48be40e7e07513d5b97064da49e54337aadd968cbd68485610524b43dfc466b18028446e213da8e4ecf1a9bc408a4f63f1716aaebda836e72b07b0d6015be
 DIST gnome-screensaver-3.6.1.tar.xz 568340 SHA256 f39b78d4f7fed748c7f0a31d694112fb907c6d3c4e63db22eb858df07e962cd0 SHA512 daa140c9608859c9291966931deedad50c94dd861916601022cd508f367cdac5db68ea1abb750bbef575d19b8690617900fee9859b880b1466267fd1cbee150f WHIRLPOOL 58d8296eef62cdafd8d6fa55bdf8fc52e8a776ebf5cd0b8a796aaff3ebccd70a34fe9ab8bacff5ba54cd3e6f1ef6e48d0b2c0bc3481bb94df6e74bdb1bc7b084
 EBUILD gnome-screensaver-2.30.2-r1.ebuild 4378 SHA256 9ebb5c672893b09890f0e47133bc3089d4019b82137d2ae69c5e48efefd40337 SHA512 74fea1a38382ce07f87dd024ef0a266a0f809dd1072212c959681e49912ca93c78ba9875a3bb549c3f23dc51716d0e17e64b0b3e0d18afb0db50c00a0f1aaff1 WHIRLPOOL b9f6190251331b33c2a18ed89a76abe141067e1d00f8ba0fa7e5e2609b775c0d72fd637330fd6186ff81a1c19db74997a3bd8d4ba204db70b284c009a73feccb
-EBUILD gnome-screensaver-3.6.1.ebuild 1995 SHA256 1d8447740b6b4b170877f7c55f0eb4a6ad39697df522e9b3359a38671feb1d84 SHA512 cb6bc3ff430224f093156152620610db09a65d2f06a94907b0b1d02c1f5b063b8a9682941f51b1ca45a6b4809b75341d217ab84664e01d4f40d24014d1b53e52 WHIRLPOOL 9ffbde33038d5047a8025d07ff4b32cbcb832bd12e72992bbd263ccaad7117e59ac2a4a5dc1f2d5e46acb5b59d915724d67749fd08d00ff6e397384604d1b3e5
-MISC ChangeLog 27710 SHA256 7367aceff881f5af04e89d941902a038004ce2ba8bbad4dbf2f64902924a8ab3 SHA512 71ef6a2487098141966b1254b5ff3a1159b681b1a6e4c01cbcf9ce17e845e7a824b9b0ef218651b4b79528cc5f8c2b946967daea8262731eb66ec859b2e5b03a WHIRLPOOL e9fa7de9062e9169e48d9b421b68a478b43852500a36019c0e112f1c64732e9cdd320e13e4c515729b88f7fcd7cd7b722e02450b60b3d93e821f1edd39f34c25
+EBUILD gnome-screensaver-3.6.1.ebuild 1995 SHA256 30fb8dd510e469cbdfa4dc43d11f8274d1b4295758fa32d48a90338ee28f4b76 SHA512 f9443e668e70f5ed9b261175689cb3c0fbfd0662e7e86df48fd4525077a1c051e98af236df7b3cc2f6b507d5385465d363d2a527c73986acff4d9d58f0a67472 WHIRLPOOL 7183ea637847da8435f33293e05d0eb07fe2d39482a31547c4a5bf3d7a14afe4af3527868bf3e1aaa0ce89044451e0f645b28c625121aff771ef0a0c7f7ea4e0
+MISC ChangeLog 27898 SHA256 5a2092a6324ffee1d0f7748b9fbd924bf74be65c83e7fda1bbd2935281416059 SHA512 968d53b9c392b4480477719cbe3e878eba6624a2e2ff8452bd8ab96d079b6721bbb70eeb8b76dd5914ae730085140d4e98a779cbd2931e7d6429197d69709d6b WHIRLPOOL 1d495a23cb957b4884cc2de9e6e91b71f1dd14ebf84520ed1565e497b9f4d8f28db09fc8af37e90bc36d76f5a5e57414e8b92f5b3c3528cba18702012c8a94a8
 MISC metadata.xml 461 SHA256 1f9263f2c172b8e33b62054a80f8809f3ce31fd9f648a4d326315b98f14dcc5b SHA512 db7da29c2c6910d0af3bc093a1ed71bc326964ab01ceae654e0647e2da4011c9a566b68c3898e9871bd3db26fc6814d70c45f180f24be987169bec5bf7a80b33 WHIRLPOOL ca57dba5a807a8decd21c3c39233a82cabb4d97df1476c790ab02f1ea32b6ae406b639dd732e9cb3e0ab6825f09e471d661c02f0950140c7f4e2f8e1b18d0ddc
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.21 (GNU/Linux)
 
-iEYEAREIAAYFAlFWF4MACgkQ1fmVwcYIWAZmqgCgkBMCFMBCNRK79CBv953EpQU8
-QKMAn1edeYQ1VylwwzAAFaV1/42DiXKT
-=SOo7
+iEYEAREIAAYFAlIso5QACgkQ1fmVwcYIWAbpOACeK0s/dHkTsTGdaBeoZwF7jU4W
+C+IAn20nMagWqFkYiUC1qxMrymbA5i0L
+=oAaW
 -----END PGP SIGNATURE-----
diff --git a/gnome-extra/gnome-screensaver/gnome-screensaver-3.6.1.ebuild b/gnome-extra/gnome-screensaver/gnome-screensaver-3.6.1.ebuild
index 031a7609bf7c..9a7893eb3080 100644
--- a/gnome-extra/gnome-screensaver/gnome-screensaver-3.6.1.ebuild
+++ b/gnome-extra/gnome-screensaver/gnome-screensaver-3.6.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-screensaver/gnome-screensaver-3.6.1.ebuild,v 1.3 2013/02/02 22:38:49 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-screensaver/gnome-screensaver-3.6.1.ebuild,v 1.4 2013/09/08 16:19:31 eva Exp $
 
 EAPI="5"
 GCONF_DEBUG="yes"
@@ -20,7 +20,7 @@ RDEPEND="
 	>=x11-libs/gtk+-2.99.3:3
 	>=gnome-base/gnome-desktop-3.1.91:3=
 	>=gnome-base/gsettings-desktop-schemas-0.1.7
-	>=gnome-base/libgnomekbd-0.1
+	>=gnome-base/libgnomekbd-3.6
 	>=dev-libs/dbus-glib-0.71
 
 	sys-apps/dbus