Add missing dependency between wacom and udev USE flags, bug #523316.

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

4 files changed, 15 insertions, 9 deletions

diff --git a/gnome-base/gnome-settings-daemon/ChangeLog b/gnome-base/gnome-settings-daemon/ChangeLog
index 4e8192eb59ff..bde0633cf0cf 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-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-settings-daemon/ChangeLog,v 1.150 2014/12/22 23:27:10 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-settings-daemon/ChangeLog,v 1.151 2014/12/27 01:51:40 eva Exp $
+
+  27 Dec 2014; Gilles Dartiguelongue <eva@gentoo.org>
+  gnome-settings-daemon-3.12.3.ebuild, gnome-settings-daemon-3.14.2.ebuild:
+  Add missing dependency between wacom and udev USE flags, bug #523316.
 
 *gnome-settings-daemon-3.14.2 (22 Dec 2014)
 
diff --git a/gnome-base/gnome-settings-daemon/Manifest b/gnome-base/gnome-settings-daemon/Manifest
index 42f015904297..d13ab9a48703 100644
--- a/gnome-base/gnome-settings-daemon/Manifest
+++ b/gnome-base/gnome-settings-daemon/Manifest
@@ -6,14 +6,14 @@ AUX gnome-settings-daemon-3.14.0-optional.patch 3621 SHA256 f32703d16e3a4a3165ee
 AUX gnome-settings-daemon-3.7.90-short-touchpad-timeout.patch 960 SHA256 d69495e4fca23d7faa7c9fefb0ec42d0d7d0769d3830f8cde08d5caea015138b SHA512 c431973f6d5b461a3d8bc1702522ac20d3c54252341e4ba5f712dd524a322e28d1a6a5f89920e9be9438217a6c418c5b254112be68f47d2ceb6b62790497e16f WHIRLPOOL dae508b8717d31bd6fa525d080c8f5d1e065b8d8c43102263760101cb48a7554e86887a5956efb3695023f412806fa67176f00d4de6ee614c630c56b3c46bfc6
 DIST gnome-settings-daemon-3.12.3.tar.xz 1632208 SHA256 4a92ad7090e76d621be181a48ede75a8da310e86e85d16cd82a9f5cf20297dbc SHA512 0e1f7a61c449ba0785f0d26cc681fe412c57b555aea4d4ac47f83c85147c4d1940c5a563b88e947728543822366703c7939bceaecc0b5f68817d87950a0de09d WHIRLPOOL bb9393e71d64f5b221082cff04b29c2b4eace0d0e56f547d1bafa4098d9dcfd9c953d73defaa8e3da1b060992c14717f06675a192e46dc7d262522331f8c0f2c
 DIST gnome-settings-daemon-3.14.2.tar.xz 1612184 SHA256 066bc8ed751c5f6b5a9590911a0fb2b51b0c3436ae1caccfa42e0791c34fedee SHA512 3cd125ed89d47b03439f473df861d41696f6281c9df84218f3fe29d86570fbcd13dd2bedb3f63b354e06043d7d8fda0d1304e03a6ca39b9bcbd369a908d88ba2 WHIRLPOOL 157195486a9ed8db18fe851ea8a567d2c53beeaf3cfc6d21f5e25a876f2e5b6847ccb6e848bae6accdd3861c96b16a0bfd5642f8e0fce3f8c3d4923599d49260
-EBUILD gnome-settings-daemon-3.12.3.ebuild 4315 SHA256 47e7db4f62a4d7668168bcae48ff347c949fc001d9f857dfd74620640984f6e8 SHA512 ca562cf5e11153cdb766c4cb140df24ea1298613b8894931527aa86c07a6c040b5741be632477e748f3dc8f237fba401944e86b385b92dd5c71cfa9e9b7a03d8 WHIRLPOOL 93a71c7cb8850f0225ebc15e47a46ac5ff824bff5eaf460ffe21dfabc341ebd0928ac6e5a6360bf11d51fc38dee732545eda9b5ab950755b725bea02cc7ab6ca
-EBUILD gnome-settings-daemon-3.14.2.ebuild 4482 SHA256 add81bf262cfd10207e936d2e8562a73148250ac6043147c52743fd186d53710 SHA512 cc7fc21181ae0b557ebdf2e21fd33fe0a1ab3aae76c118f4edb8ead3354a0362b9c72bbcc0670d17dba7791e251892ecb847d7f5a6dfaf8e94cc8693f3b7a057 WHIRLPOOL b65ace3920c7a820241adb5f6a61f56e8c92690ab1e1ce6311f7dd8c16988f6133c6ea60b4da526482b826c1bab58696158c971fd3231bdac1911b705acc497d
-MISC ChangeLog 31033 SHA256 fff79699e11287c5a6d55876f0ffcf9c2b20bcb466eaf5e170ef40a7aadc5cab SHA512 c798a26da5a87c159adcf4e3e07705b8e354dc6392277f3af0740a016f3b0833efcc832fc1b498be01b30a29c23e2a3fcf58e5ea0baaea090602c4f5fed5e40b WHIRLPOOL 06bd09d0bb00299af7e7934f211f67efc6ddd1d3277762fcad0246bff4ce999a3d59707a5c86c19a309f05e7e68dcca1047c5dbcd01dc6d137589918ba2cabd3
+EBUILD gnome-settings-daemon-3.12.3.ebuild 4344 SHA256 68172054e0801e20b3fda895a0dcc0cfd4d312ddb0c035d20b66e91e943d90d4 SHA512 5489633420b9f9f3c95a2fd723fc5a161c0af5dd5a0b64bef848ceb8c0d0c4a5143e6906102d965c7959038d60cb29841bb3e7e02e2b3147c668211fbe0e26d9 WHIRLPOOL 44d500f32e776fcfa92c4eaf68973629c564c15d1e8db6be0dc50851109d901bacc7da75f436842f55fc28df9bdc871d97ab20286780846386fe9a01c6699f5c
+EBUILD gnome-settings-daemon-3.14.2.ebuild 4513 SHA256 c2e49b548c3e43ec8fb098586770ddb7d342f059a98e069154f718be46182d52 SHA512 3f14089c2471bd9c2b8c0e774fe9bdeec709569c31a247c5dfafed5d5199d8cbca8c6bdb2a262604bb8bf4ae89b8d73d9e7a069cdcecbd112d05ef3609252c29 WHIRLPOOL fe58b9860b805f1bf3cfbbf59da9fb86e5dece5749570dfdb52b1944e616e91874e2ca0a61dd3a5d77cbf44243a46cdd1a13a32602cd2a1ac22f32962db3ec9e
+MISC ChangeLog 31236 SHA256 a804c1048691074fabd3b43830c4fdccb2299112b1689f8ee93058f98f6cdec2 SHA512 0c9845216d18188f34f9b25ddb4a6be6163886596fad4bf63fdb7272a4407f48bc1a3bdd0547ab4a63c3077b9d398e7b3726d6c536c6d3b19dad11489bab14fd WHIRLPOOL 18df62dc9ecfbcc9d73560539e2e8569e49b8ce5f2daea74b7095c0a0e096615f19a5d9b50b94e2bfa2382b0d2b86e5ac21f5c7a08ad1e6919f64e4c3c1169a3
 MISC metadata.xml 845 SHA256 87b6e8c514c79aea8bdb954ca9f74f04b3306999182fa8ac411ff4e16826c45e SHA512 4356b3dec82fed1c90398069d4648d728de7931e18920fc6c09e9a6ba7225331d21ae240ff93d6d2e447d4c6e7caf86b770107451b2b39c79c4e7b301798b5bf WHIRLPOOL a6cf1dc73278bd537c4e0687256109740ba924967b16be1cdb03315fc4ede64aacfe58af18fc85cafa6c5c074c2be705ca5050d373db368242d13fe7f80b0202
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlSYqM8ACgkQ1fmVwcYIWAZtiQCgqWTJCv/7hNFZ+B2dhr+oajBv
-720AoKKSLGAtjCkGCKZFNZA+67YqALLM
-=mnIo
+iEYEAREIAAYFAlSeEK0ACgkQ1fmVwcYIWAZTNgCfSWN6c+GWy3/MbblMkWjE8CvZ
+mN4AoL9qq32xgnKFgXDFw1mxSqVKWAmM
+=kGWb
 -----END PGP SIGNATURE-----
diff --git a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.12.3.ebuild b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.12.3.ebuild
index a8dc37bacb12..e044f056ac33 100644
--- a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.12.3.ebuild
+++ b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.12.3.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-settings-daemon/gnome-settings-daemon-3.12.3.ebuild,v 1.3 2014/12/19 13:37:30 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.12.3.ebuild,v 1.4 2014/12/27 01:51:40 eva Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
@@ -15,6 +15,7 @@ LICENSE="GPL-2+"
 SLOT="0"
 IUSE="+colord +cups debug +i18n input_devices_wacom -openrc-force packagekit policykit +short-touchpad-timeout smartcard +udev"
 REQUIRED_USE="
+	input_devices_wacom? ( udev )
 	packagekit? ( udev )
 	smartcard? ( udev )
 "
diff --git a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.14.2.ebuild b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.14.2.ebuild
index 45a52cc2557e..3ad09bebca9a 100644
--- a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.14.2.ebuild
+++ b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.14.2.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-settings-daemon/gnome-settings-daemon-3.14.2.ebuild,v 1.1 2014/12/22 23:27:10 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.14.2.ebuild,v 1.2 2014/12/27 01:51:40 eva Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
@@ -16,6 +16,7 @@ LICENSE="GPL-2+"
 SLOT="0"
 IUSE="+colord +cups debug input_devices_wacom -openrc-force networkmanager policykit +short-touchpad-timeout smartcard test +udev wayland"
 REQUIRED_USE="
+	input_devices_wacom? ( udev )
 	smartcard? ( udev )
 	test? ( ${PYTHON_REQUIRED_USE} )
 "