Revision bump, fixed up gnome-keyring dependency by adding it in the pam USE flag check; fixes bug #504350, reported by Thibaud "thican" CANALE.

Package-Manager: portage-HEAD/cvs/Linux x86_64
Manifest-Sign-Key: 0x6D34E57D

3 files changed, 19 insertions, 14 deletions

diff --git a/mate-extra/mate-screensaver/ChangeLog b/mate-extra/mate-screensaver/ChangeLog
index 316ac1a1cbef..e09c31271af8 100644
--- a/mate-extra/mate-screensaver/ChangeLog
+++ b/mate-extra/mate-screensaver/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for mate-extra/mate-screensaver
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mate-extra/mate-screensaver/ChangeLog,v 1.4 2014/03/13 17:12:56 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/mate-extra/mate-screensaver/ChangeLog,v 1.5 2014/03/13 17:15:33 tomwij Exp $
+
+*mate-screensaver-1.6.1-r2 (13 Mar 2014)
+
+  13 Mar 2014; Tom Wijsman <TomWij@gentoo.org>
+  +mate-screensaver-1.6.1-r2.ebuild, -mate-screensaver-1.6.1-r1.ebuild:
+  Revision bump, fixed up gnome-keyring dependency by adding it in the pam USE
+  flag check; fixes bug #504350, reported by Thibaud "thican" CANALE.
 
 *mate-screensaver-1.6.1-r1 (13 Mar 2014)
 
diff --git a/mate-extra/mate-screensaver/Manifest b/mate-extra/mate-screensaver/Manifest
index 67ba2be8c094..ab1e76ab5254 100644
--- a/mate-extra/mate-screensaver/Manifest
+++ b/mate-extra/mate-screensaver/Manifest
@@ -5,17 +5,17 @@ AUX mate-screensaver-1.2.0-fix-popsquares-includes.patch 309 SHA256 f21d10a9a3ff
 AUX mate-screensaver-1.2.0-fix-with-libgl.patch 381 SHA256 f4860df79ec7ebcc46da120095f726031ba39b806bc2107817095193ea27f008 SHA512 ce5675738d3a53ad864a4a8fdaa39ac50037c0ba23e598838b7a0bdd4104e97e2ee23dd0bcb7830c6fdf878680596a9668cac6f4ca1cdee43117c3f31ea4ac8c WHIRLPOOL 5a355a4f05a837795043a585a516a00cc3a3c73e098f0fdee7a2d0c54f4774da86d3875402d8ddf506cce7ed06681fe2f2d3e0981a35d86664b49554e9020ea5
 AUX xss-conversion.txt 1026 SHA256 f1bcc5e85d45e53e6170d0cdf25dd3d10020aeef545cf2fdea5e3b4b30ec86c8 SHA512 149d28bf7ff9dffe75f0a59408d91eff6537ec27a9457bf2419efe78e9b39a11796b341176e6ba4b1a183cc3ead080abe0ba85f51a3d57b0ff54dae8a3ec312a WHIRLPOOL 95492336413595cd91fbf31dc44f616500714ec11ddedcbdf98e9c18b0d0897d83b3f5ef82fe410cdd45409060a2560a873b67141576ed3a196bc33f87734ee3
 DIST mate-screensaver-1.6.1.tar.xz 4974032 SHA256 b04801e68d013c899cdfefceed25e28040c21197a2da40cd650be52ac643843c SHA512 cebb8aef6d68429a0f0033449e3d412e58055f1c3c88903dd609b21408fed5e393d93ee043a4243c3952b7387e10a2e6f86b1a255136604ccc91951a5b62b486 WHIRLPOOL 82dca4fbd87f5e13fb13006bba4c3974f8f7354c4a9c27468cb2359097b97d2255c3dbed8d96beb6b8f88e665d293beabce841493bc57b618d4f7c5e8235b8d2
-EBUILD mate-screensaver-1.6.1-r1.ebuild 4092 SHA256 895185716c26d65ea21a31a632db24ca5b553f99e289ce8fd064a8495cf3d0bc SHA512 33bf7f64c9cc5085b1687b0ea3bd7a0293cf92c9db281a2fac61549ee4caec3b8f17c23014b6600b10bd7bb3a9da6c0b73fb392bbb2bc2231bccf8c359e20af4 WHIRLPOOL 36537a005ebfc6768dc296c946bca32bb0c612f716109590a74ef29ac1bc1ecba864a62f084e928a53cb8c48087b5c9cfb6e82c5713ce72eec8cdfa55a4da523
-MISC ChangeLog 1263 SHA256 529ae33d9afe0a1491cb5785e899f93eb0c80823da2b939393e4eed28560d1ca SHA512 38ccabb703239f32340416d38dada7c19563ee3f2b4c7a4ef558db2c4ab798ecebfee246f8c8d36200505de3224826b439dc54b49af45095050aeacd33c066a2 WHIRLPOOL 44abd569036874c8755464352f604c57ee87657275029db954b8150f9ade13f3eff2efa40f0ddd6479975686d09007b08ecdccf9d61cf3e5186002beee701855
+EBUILD mate-screensaver-1.6.1-r2.ebuild 4075 SHA256 40ac8f38c0db57ac97f14e16184970ace71ceed91aa76516487e31ad230a0d78 SHA512 120323b28ad51f01a7ed935397085b880bf3cd3b4542e987f76cad0ab933527abc17200aa2ee938b851a3acec44d8e2b8f8c1b143f3b2b9f329f83e54c409ca1 WHIRLPOOL 066c4a22af8d581e00417bd83d7fd58ac455ebc98e774f82ca8fe8d221f824141b0525dafdd691ef68e8f86e750ee922f004cfa917223a8541eb9fc5f4857d80
+MISC ChangeLog 1574 SHA256 3b4f088a640b4a63363819f25f3a78d8f96b31be6f1b553ccafe1c97943e5efc SHA512 64769e67412665ee397a71805af1ff45243d209e0b49abf424e9340058ab3de95613fe1c0541dd0e06ff79c64970a321143b32d9cf4da5bcf7f632a09dfcae4a WHIRLPOOL c1a4e3efe4922674a99fc245d1e1714b4f41721ee0ed4161663aceadbbf60ec106e03c543a602b9d20b00270f333c5ffeae43e9fe70d7efbdcd235b2ed29d877
 MISC metadata.xml 333 SHA256 65924dc5eb9352b23b5cbd440061640d0651dc0300fc43085b33d3606e710b87 SHA512 e4ca39f2167d40427df01498ba04b05ee9c109c6c9f02cf192a637179fc3c3a642b2862488613d18a5942a9660b56c293fe4c0d582fb64267064b90dcd7bea7d WHIRLPOOL 9b85f9a29c79be7448cde034436d23bf00068bd545905a310f777902ce5346e765a90937c584b004a2addafdb440f354629ff6ce757270f847d9575430fcd063
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCAAGBQJTIecdAAoJEJWyH81tNOV9mYgIAKlLmEjBuel+hWePoiRWCuLn
-wfvoaJpHNsCRxTzwTj+DSP5KB9A9ADZJ5WmbpZgmIOuIExePOFsFvFbqDV+D8nwN
-j/Db4GOjiNtHW+MfLTCIbapr+0mfhusFU9MALGhUtlOv6ng5uXeB+8C7dmWenHFd
-E696KF1WfMQmG2IHb1S+B5MeHi/jQIPQIelPzvJ8r3YrjILoFhxa01KJUzGl2K9t
-aalIss5ZC6zUaFYbtMZU8T6NG737GC/17qg/Q2f795b6z1CaHKz/a5TXytxYOfRP
-gI1spqYYyek2x+C8n40JAlwHkhE6xMlZtCKHicm41mThyScTOZKrVrf5LiwLcJ4=
-=1N51
+iQEbBAEBCAAGBQJTIee4AAoJEJWyH81tNOV9pb4H+IyF3Q6TBpZ/IfBiLCdqGZcI
+DseA0dx7pNrL24KhKm+xq1po84Znd7xsiQ9QtOGxrR3PhNkgxNscl+xaJoO/cbG6
+5gthfBcnCBdGcYkxXtj5VYEDOwuB87yy2GujBNQ4sJjGwj9E5qLfgXzPsSFwnqvR
+JkK8j3wp+3JXbdIts8JTfDQxFTmUbDVZPjjwnJDDRAbGt+U1SQByF1eiiFb8F0NV
+ssRHzeZXRCBrcgCikfB9ffVWXJaTXu9KexaesJ36JCoc5Auyt+KU+ZRSvobPvQ+u
+8Y9Nw9gtrJoGGUWIcRlz1lpIY5UbSB2pVlcS3Z3l20joldkCtLMFjf3LiYl0dw==
+=kSGE
 -----END PGP SIGNATURE-----
diff --git a/mate-extra/mate-screensaver/mate-screensaver-1.6.1-r1.ebuild b/mate-extra/mate-screensaver/mate-screensaver-1.6.1-r2.ebuild
index f9d6b19fb79f..86a30e21842c 100644
--- a/mate-extra/mate-screensaver/mate-screensaver-1.6.1-r1.ebuild
+++ b/mate-extra/mate-screensaver/mate-screensaver-1.6.1-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/mate-extra/mate-screensaver/mate-screensaver-1.6.1-r1.ebuild,v 1.1 2014/03/13 17:12:56 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/mate-extra/mate-screensaver/mate-screensaver-1.6.1-r2.ebuild,v 1.1 2014/03/13 17:15:33 tomwij Exp $
 
 EAPI="5"
 
@@ -23,12 +23,10 @@ IUSE="X consolekit kernel_linux libnotify opengl pam systemd"
 RDEPEND="
 	>=dev-libs/dbus-glib-0.71:0
 	>=dev-libs/glib-2.15:2
-	gnome-base/gnome-keyring:0
 	>=mate-base/libmatekbd-1.6:0
 	>=mate-base/mate-desktop-1.6:0
 	>=mate-base/mate-menus-1.6:0
 	>=sys-apps/dbus-0.30:0
-	sys-libs/pam:0
 	>=x11-libs/gdk-pixbuf-2.14:2
 	>=x11-libs/gtk+-2.11.5:2
 	>=x11-libs/libX11-1:0
@@ -43,7 +41,7 @@ RDEPEND="
 	virtual/libintl:0
 	libnotify? ( >=x11-libs/libnotify-0.7:0 )
 	opengl? ( virtual/opengl:0 )
-	pam? ( virtual/pam:0 )
+	pam? ( gnome-base/gnome-keyring:0 virtual/pam:0 )
 	!pam? ( kernel_linux? ( sys-apps/shadow:0 ) )
 	!!<gnome-extra/gnome-screensaver-3:0"