Rename USE=wacom to INPUT_DEVICES=wacom to match the rest of the tree.

Package-Manager: portage-2.2.0_alpha158/cvs/Linux x86_64
Manifest-Sign-Key: 0xCF0ADD61

5 files changed, 43 insertions, 28 deletions

diff --git a/gnome-base/gnome-control-center/ChangeLog b/gnome-base/gnome-control-center/ChangeLog
index d99ca83f2ff8..d5e3b58f9ee2 100644
--- a/gnome-base/gnome-control-center/ChangeLog
+++ b/gnome-base/gnome-control-center/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for gnome-base/gnome-control-center
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-control-center/ChangeLog,v 1.117 2013/01/06 09:35:01 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-control-center/ChangeLog,v 1.118 2013/01/22 07:38:02 tetromino Exp $
+
+  22 Jan 2013; Alexandre Rostovtsev <tetromino@gentoo.org>
+  gnome-control-center-3.4.2-r1.ebuild, gnome-control-center-3.6.3-r1.ebuild,
+  metadata.xml:
+  Rename USE=wacom to INPUT_DEVICES=wacom to match the rest of the tree.
 
   06 Jan 2013; Agostino Sarubbo <ago@gentoo.org>
   gnome-control-center-3.6.3-r1.ebuild:
diff --git a/gnome-base/gnome-control-center/Manifest b/gnome-base/gnome-control-center/Manifest
index b789905afe97..00e1bee7a327 100644
--- a/gnome-base/gnome-control-center/Manifest
+++ b/gnome-base/gnome-control-center/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX gnome-control-center-2.32.1-duplicated-background.patch 3053 SHA256 8223542f9db11769e8ab73f88f434598bb9f740e42993bcc7cb6035eaadc986d SHA512 753b142ba24075276117a475453a4f2f083720fb13398d250c3a18f9047b4a429bb7a178076111f0c5b846c4cdca62824ad380a2db3d2a561c51f14a6df83b93 WHIRLPOOL 36027ef7289a94f2a477f1d2ea5d338c3205611b7d1684d8b36f2a088c3c5e9d58b1fc3a388305b50f1452f8e833e67d564bf67ef2537b0b38c5abaa8b7167bd
 AUX gnome-control-center-2.32.1-erase-background.patch 1899 SHA256 95bc536d5b08191222acd63af0d2f626ef6ec3a54f7823a471e0b329f40de3f8 SHA512 6f5c9aa935d74648b90fdaa8a3cf992e88f05d8f4bf02349760dd355313aa18ee3eefcadecdff585d67a6ba9b4df0851ddfc7bccf3c8e2780c749444707cd838 WHIRLPOOL 7d4b063a3e27a9c11a20c8e62fdc25a000c42fc4d22a1ec206b291571ccd9f9f11c4a3810700c043cbd5c758de70e713e55729c4de52aef8eee0451193cdd229
 AUX gnome-control-center-2.32.1-mime-handler.patch 55290 SHA256 49c034e437493f1639e97b31e0a38b1921536abfe31d8b3c7917d0b8495994cd SHA512 990849500fd5317ec6fbf58e03db3754c5e9111757d28d83bd4f7655068efb25fbe793f9d5171f227070dfde7b688163eab8c011edacb5435b4a788e8349aee6 WHIRLPOOL 8683316623e0059cec6278b7f0b0a23ea46dff73ca4ad2bc9ffe14b139072bfb4ea2589a76b74ccfb14170cff9cd756f1772ae356cdaa6779aee930907553130
@@ -15,7 +18,18 @@ DIST gnome-control-center-2.32.1.tar.bz2 2280217 SHA256 7c568b57358e5c08f4d8dd76
 DIST gnome-control-center-3.4.2.tar.xz 4267688 SHA256 efc72bf8af07b439f5f0e9135d1b2c5237e649e6a0f1ff3cf32bdd710421042a SHA512 78927f56f1e1af4043f0d96bae174513916e752aa3e987b545e78213f34527a25ba69ce61da43dcd21ed51aa9d1ee713cabed507853f20bb6c0b0bea82f272e6 WHIRLPOOL fa4eb7659963d416594b4f983d304f84d7a0673b0b990d2975f559d25eea6048a602369a18a88736be857df3f9c3a91af31a5b3346171bb8ec62d4f92f3327e7
 DIST gnome-control-center-3.6.3.tar.xz 4877812 SHA256 2ae23972bc64f62b4facd12dd5adce212bda02491eb6e56bbf195332157d21fb SHA512 77cd68349dc7f58714fbd121a34ec73a5c3e67c7a42a08c20a8dfdcfc9cefdec47af0f09130b7e3f0407cb7a786234b2619fdb76462c3bdb2bbc548294bfd444 WHIRLPOOL bf4ba1b6c9cb17f6b5f22003ee89af051ad152dd5671ffe01ba5cc0339d51659a8af7c629755726d305caf75c1fe4629b268fc269862751bc24317d323395697
 EBUILD gnome-control-center-2.32.1-r1.ebuild 2686 SHA256 575724aa369631c48fef3810bc831abc687fe38e30df4f25e7af600fc998e270 SHA512 2b792066b1c09eb4433a87222732c9dc4e3df593699454da57e9d4f3939f0c593429c8b2b3e712d2508700fc03b8e8e1066efa65348bc2016dee0d21c4089a92 WHIRLPOOL 8b7f2d6b9a66581efb5b31b8573d67acbce8d450ca303eab36641ef429e8fa6e88aa299c525cd223155ad67299926c56a0dfd432b8414672284424642117d92a
-EBUILD gnome-control-center-3.4.2-r1.ebuild 4301 SHA256 66c338e130244f748c747478d61a64e4c217e02a1b3d7a53a0af72ef0ec11db3 SHA512 dce2b3ddeea09497abf8554aedc833fd085a7bde90c75892ab90250cc77c277ca4fd389efbd5192e7efbceba6125d76476cec83596f9c05847c6fe93abdb02d4 WHIRLPOOL 76c40649fabe605e37dc72e6493e8b92f30d35d322ea20f42abbaeb22127ba6ea2071712646856cb436f64922debf5f3a3e85bb96dc15044dc6d771096cea168
-EBUILD gnome-control-center-3.6.3-r1.ebuild 4552 SHA256 4eca699e2eec2a5250b06f17a8ae1c29af50b4bfb15e7f0b9e5c287906a9decb SHA512 2a829bcc07f7f97306df5ca54d8a9f7cb8ee500288b2a64537ef4197596f6e01fecd15600a18377f11af32e104b43c3568d5e6c3f6c4c26912c2a259383796de WHIRLPOOL 3a8d85ebb5febc37ba85ced88940f98f61bd3080517ae3df013183653a7b2fe9f3d1239ca771f02c02f41d66779d03b748a48653e97ab8825e070d5e2fee5d9e
-MISC ChangeLog 60355 SHA256 5b5b6aca256463c276760f85affda8b36bde10c05552afd2000ee65605c4f547 SHA512 88089180f6c2dc3ea0fb20ee4d3a1125751757c1af77d89cba03e17e2ef61e4271380a89ab0c884ec47d1e18c4899e67bbc25e8377725cffa7a4c15d5344a2c9 WHIRLPOOL 117d9f19709676453f69a0c04f536d91b0cc600a88a5815117112ea30e5ec2e684010bc9833167f126cdeb11e90ac84de9cee3fb5c5a6221ecfdc90e885e7504
-MISC metadata.xml 966 SHA256 1edac6d3822964755722abbf73f95631c92407af3a0edd9feed92df0f68efb6a SHA512 4d4eff3285927b02562e776ed62450cfa37d46f99a812cd2b2dc038381fab14ed0042f81aada1bed3e1f3ecfb124d0e2ada21d21beea439f8182890188981c71 WHIRLPOOL c6ba9a6ab08ea68df45bedcb23bd067072bd261518398e07939ca8cabcb8524a7834d5d89c380746f795006a5472a31cc1fb0eebd858931447c9db415971d5d0
+EBUILD gnome-control-center-3.4.2-r1.ebuild 4356 SHA256 35267a33fb3d9469ae46dfac59e12bdb4c2632cc886c505e9c4df8089c099b8a SHA512 a378c23db86b84422c702769eef81fde6d4ed1ee0efe332f0291d5753eeef986e5fe2a1eca2dbf8833297693449b1ea6930a6d812b95246154a926d3071dab90 WHIRLPOOL 32e7c8e293e80db42e98c9003ba7199e491cc5c6f1c16b0d04b3e388436608e7dbe55e597dda988638526796d7be3da16db2a1bd0ce2db6aad42ff147cd258dd
+EBUILD gnome-control-center-3.6.3-r1.ebuild 4560 SHA256 c6e6476d4705cfb91d1d0309bbb3068da45ae14fec4fd86ec12b3d7a783daccd SHA512 f7a9cb798feeba82280791dedb0b2cb66526aa8e95ab80e073531fa8722c0a4a83bf6b45dfd84b57b0fc5386b0dcf00dec241a43fa311f825c3336ad455d92ca WHIRLPOOL 9cc38d89256cc5ed24af6d89e35be359dab0fa7ed5df4c70457584597dd5e3aec9d24f6449408f7a538400cd73dc6c732614707e1cc36f42568f56e7fa269e65
+MISC ChangeLog 60588 SHA256 3c5f558070eff9538d47a96cb14acdd3ab25b1dd683c0019f03c69f6672da78e SHA512 09d82b3e7ecf71b3725eb0bd4e6fc580fcc033cde52bbebf301d590777342ab2a48892b88e37f6a5089cc7bc2ef854e5e44c19abdb114e4a6ba49111b6189b32 WHIRLPOOL 6a041ab1bcad893c3fcef12c9c0a9145917f9439b892dad13065623eb1680d140cc13ffa0641e174c9e92964f313774324392242a3b1cd6802e267d3ea0479e0
+MISC metadata.xml 882 SHA256 8667fbb2c5438e34d06dd3411f9842dc5e5cfd84d722a0c360c5f85d7eef3ad5 SHA512 6d25c190d2eab2d12656b410337fbe0e6864389a7a661cb841d84717ea7407a411e5c3ba2228732faab8aefb04ae3c5dcec19865026e41452ea94aa4cd58cd0b WHIRLPOOL 2ebfa4af067f4e5dac17b265117b3ffb620744ff1524978fea78fae7dcbd5d7354ceeb5c1f0c27c7c29212a46861122d860e1d99fa88d06c473819a12b2a2b9b
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQEcBAEBCAAGBQJQ/kHcAAoJEJ0WA1zPCt1hLsIIALp/6od63pCpeCiJ3T63z9AZ
+1MmuqcJPIcW4lo1s8AIgdxDcCsVnuhMVlf91kVsExr5RBDOkcLxJ6LLH47S7kdzr
+2JymBINnm8Uzm1uq/HPBb+q2zxR+eAFS5mQZ4oGTkRrmXgwXzifDhlMI+OHVypbU
+4lyM1OhczP7i0v0rKU/woRDcaJNVMJwMfzufzTmvhe8d66uOMuM/TiretyLxRKWb
+7gRJvXR1N+x5sPzxNwnHFYQV1QOQESiP0OI4jfSF+eP+e6dVgN9Xuvaan/jOswGi
+2rOybvloS6F8pkEkXyj4khPHItJgm8sUWB0Ejp7B7D4Fa9bNVqpvisY5MeMhxgE=
+=g6fn
+-----END PGP SIGNATURE-----
diff --git a/gnome-base/gnome-control-center/gnome-control-center-3.4.2-r1.ebuild b/gnome-base/gnome-control-center/gnome-control-center-3.4.2-r1.ebuild
index d75bba548191..580654ecab93 100644
--- a/gnome-base/gnome-control-center/gnome-control-center-3.4.2-r1.ebuild
+++ b/gnome-base/gnome-control-center/gnome-control-center-3.4.2-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-control-center/gnome-control-center-3.4.2-r1.ebuild,v 1.4 2012/12/27 07:52:16 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-control-center/gnome-control-center-3.4.2-r1.ebuild,v 1.5 2013/01/22 07:38:02 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="yes"
@@ -13,7 +13,7 @@ HOMEPAGE="http://www.gnome.org/"
 
 LICENSE="GPL-2"
 SLOT="2"
-IUSE="+bluetooth +cheese +colord +cups +gnome-online-accounts +networkmanager +socialweb systemd wacom"
+IUSE="+bluetooth +cheese +colord +cups +gnome-online-accounts input_devices_wacom +networkmanager +socialweb systemd"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
 
 # XXX: gnome-desktop-2.91.5 is needed for upstream commit c67f7efb
@@ -57,16 +57,19 @@ COMMON_DEPEND="
 	colord? ( >=x11-misc/colord-0.1.8 )
 	cups? ( >=net-print/cups-1.4[dbus] )
 	gnome-online-accounts? ( net-libs/gnome-online-accounts )
+	input_devices_wacom? (
+		>=dev-libs/libwacom-0.3
+		x11-libs/libXi )
 	networkmanager? (
 		>=gnome-extra/nm-applet-0.9.1.90
 		>=net-misc/networkmanager-0.8.997 )
 	socialweb? ( net-libs/libsocialweb )
 	systemd? ( >=sys-apps/systemd-31 )
-	wacom? ( >=dev-libs/libwacom-0.3
-		x11-libs/libXi )"
+"
 # <gnome-color-manager-3.1.2 has file collisions with g-c-c-3.1.x
 RDEPEND="${COMMON_DEPEND}
 	app-admin/apg
+	gnome-base/gnome-settings-daemon[input_devices_wacom?]
 	sys-apps/accountsservice
 	x11-themes/gnome-icon-theme-symbolic
 	colord? ( >=gnome-extra/gnome-color-manager-3 )
@@ -76,7 +79,6 @@ RDEPEND="${COMMON_DEPEND}
 	!systemd? (
 		app-admin/openrc-settingsd
 		sys-auth/consolekit )
-	wacom? ( gnome-base/gnome-settings-daemon[wacom] )
 
 	!<gnome-base/gdm-2.91.94
 	!<gnome-extra/gnome-color-manager-3.1.2
@@ -111,10 +113,10 @@ pkg_setup() {
 		$(use_with cheese)
 		$(use_enable colord color)
 		$(use_enable cups)
+		$(use_enable input_devices_wacom wacom)
 		$(use_enable gnome-online-accounts goa)
 		$(use_with socialweb libsocialweb)
-		$(use_enable systemd)
-		$(use_enable wacom)"
+		$(use_enable systemd)"
 	DOCS="AUTHORS ChangeLog NEWS README TODO"
 }
 
diff --git a/gnome-base/gnome-control-center/gnome-control-center-3.6.3-r1.ebuild b/gnome-base/gnome-control-center/gnome-control-center-3.6.3-r1.ebuild
index 230149bfcead..986488096784 100644
--- a/gnome-base/gnome-control-center/gnome-control-center-3.6.3-r1.ebuild
+++ b/gnome-base/gnome-control-center/gnome-control-center-3.6.3-r1.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-control-center/gnome-control-center-3.6.3-r1.ebuild,v 1.6 2013/01/06 09:35:01 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-control-center/gnome-control-center-3.6.3-r1.ebuild,v 1.7 2013/01/22 07:38:02 tetromino Exp $
 
 EAPI="5"
 GCONF_DEBUG="yes"
@@ -13,12 +13,8 @@ HOMEPAGE="http://www.gnome.org/"
 
 LICENSE="GPL-2+"
 SLOT="2"
-IUSE="+bluetooth +colord +cups +gnome-online-accounts +i18n kerberos +networkmanager +socialweb systemd v4l wacom"
-if [[ ${PV} = 9999 ]]; then
-	KEYWORDS=""
-else
-	KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
-fi
+IUSE="+bluetooth +colord +cups +gnome-online-accounts +i18n input_devices_wacom kerberos +networkmanager +socialweb systemd v4l"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
 
 # XXX: NetworkManager-0.9 support is automagic, make hard-dep once it's released
 #
@@ -56,6 +52,9 @@ COMMON_DEPEND="
 	cups? ( >=net-print/cups-1.4[dbus] )
 	gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.5.90 )
 	i18n? ( >=app-i18n/ibus-1.4.99 )
+	input_devices_wacom? (
+		>=dev-libs/libwacom-0.6
+		>=x11-libs/libXi-1.2 )
 	kerberos? ( virtual/krb5 )
 	networkmanager? (
 		>=gnome-extra/nm-applet-0.9.1.90
@@ -66,12 +65,10 @@ COMMON_DEPEND="
 		media-libs/gstreamer:1.0
 		media-libs/clutter-gtk:1.0
 		>=media-video/cheese-3.5.91 )
-	wacom? (
-		>=dev-libs/libwacom-0.6
-		>=x11-libs/libXi-1.2 )
 "
 # <gnome-color-manager-3.1.2 has file collisions with g-c-c-3.1.x
 RDEPEND="${COMMON_DEPEND}
+	gnome-base/gnome-settings-daemon[input_devices_wacom?]
 	sys-apps/accountsservice
 	x11-themes/gnome-icon-theme-symbolic
 	colord? ( >=gnome-extra/gnome-color-manager-3 )
@@ -81,7 +78,6 @@ RDEPEND="${COMMON_DEPEND}
 	!systemd? (
 		app-admin/openrc-settingsd
 		sys-auth/consolekit )
-	wacom? ( gnome-base/gnome-settings-daemon[wacom] )
 
 	!<gnome-base/gdm-2.91.94
 	!<gnome-extra/gnome-color-manager-3.1.2
@@ -139,10 +135,10 @@ src_configure() {
 		$(use_enable cups)
 		$(use_enable gnome-online-accounts goa)
 		$(use_enable i18n ibus)
+		$(use_enable input_devices_wacom wacom)
 		$(use_with socialweb libsocialweb)
 		$(use_enable systemd)
-		$(use_with v4l cheese)
-		$(use_enable wacom)"
+		$(use_with v4l cheese)"
 	# XXX: $(use_with kerberos) # for 3.7.x
 	if ! use kerberos; then
 		G2CONF+=" KRB5_CONFIG=$(type -P true)"
diff --git a/gnome-base/gnome-control-center/metadata.xml b/gnome-base/gnome-control-center/metadata.xml
index a159443211af..1b54cdb3ad96 100644
--- a/gnome-base/gnome-control-center/metadata.xml
+++ b/gnome-base/gnome-control-center/metadata.xml
@@ -15,7 +15,5 @@
 			Flickr using <pkg>net-libs/libsocialweb</pkg></flag>
 		<flag name="systemd">Use <pkg>sys-apps/systemd</pkg> instead of
 			<pkg>sys-auth/consolekit</pkg> for session tracking</flag>
-		<flag name="wacom">Enable support for Wacom tablets and drawing
-			devices</flag>
 	</use>
 </pkgmetadata>