smartcard support is disabled for 3.8.x, bug #491592 by Martin Wegner

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0xA188FBD4

3 files changed, 18 insertions, 11 deletions

diff --git a/gnome-base/gnome-settings-daemon/ChangeLog b/gnome-base/gnome-settings-daemon/ChangeLog
index 8d57c376c5a1..6ea0955e8ea2 100644
--- a/gnome-base/gnome-settings-daemon/ChangeLog
+++ b/gnome-base/gnome-settings-daemon/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for gnome-base/gnome-settings-daemon
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-settings-daemon/ChangeLog,v 1.127 2013/11/13 19:30:31 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-settings-daemon/ChangeLog,v 1.128 2013/11/18 20:30:28 pacho Exp $
+
+  18 Nov 2013; Pacho Ramos <pacho@gentoo.org>
+  gnome-settings-daemon-3.8.6.1.ebuild:
+  smartcard support is disabled for 3.8.x, bug #491592 by Martin Wegner
 
   13 Nov 2013; Pacho Ramos <pacho@gentoo.org>
   -files/gnome-settings-daemon-3.0.2-short-touchpad-timeout.patch,
diff --git a/gnome-base/gnome-settings-daemon/Manifest b/gnome-base/gnome-settings-daemon/Manifest
index ec348870df9e..5b1bf70e5dbd 100644
--- a/gnome-base/gnome-settings-daemon/Manifest
+++ b/gnome-base/gnome-settings-daemon/Manifest
@@ -15,13 +15,13 @@ DIST gnome-settings-daemon-3.8.3.tar.xz 1576376 SHA256 00e7f46c9a6fb8b148255adfc
 DIST gnome-settings-daemon-3.8.6.1.tar.xz 1579684 SHA256 24ced08254208e31f2819f4695e8c5e0699ac54f3cf70e05f43347703f5877e6 SHA512 fd49091623bf5a2865fda99a0e9920a948ce930212a587746dcb8e98336a9362d17c39f0c60ab399e1ff78381422875b236c1ce41f29a0ae6a6dac31bd23e4a7 WHIRLPOOL 1a241e3d927f4b3469342b3c6f2ff1543eeec462c527fb3f73fc31c6fc91b5c34da7b7983a9735e745a1f245785b08b24827aaed53b90b9439f0643e12ea430f
 EBUILD gnome-settings-daemon-2.32.1-r2.ebuild 3939 SHA256 f8ef87e63f2424cb2d9fced9bafa82fcd62079846c1e9562e27049eaa682d76d SHA512 946bcc938bd19a49cb060a034a0da4e26040c228f8987a6981a8c507ce63fe6b4aa889ecd0c12e5dc3b0fb3e2a106955bde4fbb0a9820ca2c325cf0793f1267b WHIRLPOOL 16062f23d482227a871eff39698659be325aa787606d1bdadcfff3444cb2730d42eb5d9d42a14eff7277da66b893518dd0956bdf2891b9deab0118548f0012b9
 EBUILD gnome-settings-daemon-3.8.3.ebuild 3247 SHA256 8796177232ce6a941bda954dd40d805eb3f7b22d3366287c95f4380f4a9a6897 SHA512 d992f5cc24d18d03d0248594217c2f3059b1ddbc60ff2a3a8b6e3ade01d05ef235cfc109c59ab10a89f05ce44f12584f29acffc9df76a6ac0e4824644c193491 WHIRLPOOL 6c0740c6beb1157a8ed9c54b57861c27322787180a9b23d719d95ca5008eab1a3c2d680d311ab88373b38a3b396269f43bf7e05e05e89f45d0e2a829346e1325
-EBUILD gnome-settings-daemon-3.8.6.1.ebuild 4096 SHA256 47bcbc05ed5c86639f29b833ad1618cf279b48b5a4eab1ae6b82e112a9b70f6c SHA512 44bbeef3003dff743c88ede8da13b1ca2c4914f071530b084745cbb9fbbaed42db2ae3397fd787c2857b81035cbf27f7ea8c0a6f94abeec59f9f9ed62507e1de WHIRLPOOL 4b185d29004fd705af6ceec6c0df258706335b3ab8a4ebc2553e01d208537783072826f05f337fda6fed9b86cc933569141b689937153dbdef2bf708619e8cca
-MISC ChangeLog 26861 SHA256 0c8903a11f12271efa6244c4a963feb0191e02b7d6aa2524eb6d12049d8041d4 SHA512 8c5fed69a96782e3dfc443baecf1f031ae16849dab411c91ecdcd68ce5c659fd9e293f758197bfe690f9c116e24b52b45bf3c5f1da98d5770df7cb08dd99bd9f WHIRLPOOL a605352e61ad2c217c0136941f6b440f4a9be909327cbc372f76a6aa7848c0ad0a0319f5a576051c08d3896d91eaea99301308fe555673148a09c5e6ccc413c0
+EBUILD gnome-settings-daemon-3.8.6.1.ebuild 4188 SHA256 a878d2c79e4dd6fc567594ef3b528d3ceb307d0b18b8bc94fc8eb30fefbd4e4a SHA512 b00b94a6c5e95fd9a51986a326658fd55a1ebd9bfab62e3b57edbf091f47142077943b68a75b7faa39429e8481c27954280c9ad71368d1fbfb9bfb3d13ada74b WHIRLPOOL 69fc29f669b5108669ce1978fddcdd48c9f4114aaf980bf4a1e0520ca62f95d07191772ded1a675a3bb3b92adcc8e868a2580c0b462f61c621237cdf86ea8b11
+MISC ChangeLog 27020 SHA256 588b7f519797442d305eb36b481d9dfa0ff7cb0b7fb3361fdb10e32852970d5d SHA512 fbad8c28a7e2bdf82139f0ba29e4db3891ac1dbd0a677257a1601266b55e1c0c4958afc335d2760520e49f417b1be86a83c48f234dee8f93521cb87c6e2d12aa WHIRLPOOL 4b7094eb7ed04357a0e6fa4e3a1a6702706fe589fc315f17f1e81ef521ddf93ce35566165ec930a6b3420ffd4ccc81232894721ea311c0181972b469fdb5d83e
 MISC metadata.xml 845 SHA256 87b6e8c514c79aea8bdb954ca9f74f04b3306999182fa8ac411ff4e16826c45e SHA512 4356b3dec82fed1c90398069d4648d728de7931e18920fc6c09e9a6ba7225331d21ae240ff93d6d2e447d4c6e7caf86b770107451b2b39c79c4e7b301798b5bf WHIRLPOOL a6cf1dc73278bd537c4e0687256109740ba924967b16be1cdb03315fc4ede64aacfe58af18fc85cafa6c5c074c2be705ca5050d373db368242d13fe7f80b0202
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlKD01gACgkQCaWpQKGI+9RLtwCfSZqwl4TwQ5cmP1i13tFDBVcn
-S2cAnjEEM9BGGkLmL8uktcOQsuJFfSfS
-=oV5Z
+iEYEAREIAAYFAlKKeOUACgkQCaWpQKGI+9RMXACbBFiE3mLMLYzgWkonqj2S8FG0
+RpkAn2O0Ds3OneYMrxCSMoZk1IrcosWD
+=9P+8
 -----END PGP SIGNATURE-----
diff --git a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.8.6.1.ebuild b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.8.6.1.ebuild
index c722f1099204..68728d9b25e7 100644
--- a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.8.6.1.ebuild
+++ b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.8.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-base/gnome-settings-daemon/gnome-settings-daemon-3.8.6.1.ebuild,v 1.2 2013/11/13 19:30:31 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.8.6.1.ebuild,v 1.3 2013/11/18 20:30:28 pacho Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
@@ -15,11 +15,12 @@ LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
 
-IUSE="+colord +cups debug +i18n input_devices_wacom -openrc-force packagekit policykit +short-touchpad-timeout smartcard +udev"
+# smartcard support is disabled for 3.8.x, bug #491592
+IUSE="+colord +cups debug +i18n input_devices_wacom -openrc-force packagekit policykit +short-touchpad-timeout +udev" #smartcard
 REQUIRED_USE="
 	packagekit? ( udev )
-	smartcard? ( udev )
 "
+#	smartcard? ( udev )
 
 # require colord-0.1.27 dependency for connection type support
 COMMON_DEPEND="
@@ -52,9 +53,10 @@ COMMON_DEPEND="
 		>=dev-libs/libwacom-0.7
 		x11-drivers/xf86-input-wacom )
 	packagekit? ( >=app-admin/packagekit-base-0.7.4 )
-	smartcard? ( >=dev-libs/nss-3.11.2 )
 	udev? ( virtual/udev[gudev] )
 "
+#	smartcard? ( >=dev-libs/nss-3.11.2 )
+
 # Themes needed by g-s-d, gnome-shell, gtk+:3 apps to work properly
 # <gnome-color-manager-3.1.1 has file collisions with g-s-d-3.1.x
 # <gnome-power-manager-3.1.3 has file collisions with g-s-d-3.1.x
@@ -109,9 +111,10 @@ src_configure() {
 		$(use_enable debug more-warnings) \
 		$(use_enable i18n ibus) \
 		$(use_enable packagekit) \
-		$(use_enable smartcard smartcard-support) \
+		--disable-smartcard-support \
 		$(use_enable udev gudev) \
 		$(use_enable input_devices_wacom wacom)
+#		$(use_enable smartcard smartcard-support) \
 }
 
 src_test() {