Rename USE="udev" to USE="upower" wrt #516380

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0x4868F14D

7 files changed, 43 insertions, 35 deletions

diff --git a/xfce-base/xfce4-session/ChangeLog b/xfce-base/xfce4-session/ChangeLog
index 156ff47c6646..3e88d366c5a8 100644
--- a/xfce-base/xfce4-session/ChangeLog
+++ b/xfce-base/xfce4-session/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for xfce-base/xfce4-session
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-session/ChangeLog,v 1.224 2014/07/18 20:28:02 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-session/ChangeLog,v 1.225 2014/07/24 10:54:57 ssuominen Exp $
+
+  24 Jul 2014; Samuli Suominen <ssuominen@gentoo.org>
+  xfce4-session-4.10.1-r2.ebuild, xfce4-session-4.11.0-r2.ebuild:
+  Rename USE="udev" to USE="upower" wrt #516380
 
   18 Jul 2014; Samuli Suominen <ssuominen@gentoo.org>
   xfce4-session-4.10.1-r2.ebuild:
diff --git a/xfce-base/xfce4-session/Manifest b/xfce-base/xfce4-session/Manifest
index bb6bcdde6caa..bec1d4cd5476 100644
--- a/xfce-base/xfce4-session/Manifest
+++ b/xfce-base/xfce4-session/Manifest
@@ -6,18 +6,18 @@ AUX xfce4-session-4.10.1-systemd.patch 12922 SHA256 0e90469248180390ce7736a5621a
 AUX xfce4-session-4.11.0-upower-0.99.0.patch 13446 SHA256 9cd7f57c00868fe1ac6847e737be4a0a3cf95ae4444e910c9072719e153d211b SHA512 479ff89bab77b521eadaa2bd1d7cfb5494df922bff7dc665e589e1faba0b8cc9a308762774315c471e834a3f732ab9d60df59137f58cbeefd063c9b751f503bd WHIRLPOOL a5d994b6cacadcefd7bf6f8ced2e9a19eaba4574cefba58e9b7d10a3af1bb37382d84691b2fcf0f93c659ab4e70d12dea9fa91e58bc85476be73ba4ce754e911
 DIST xfce4-session-4.10.1.tar.bz2 1273015 SHA256 0154fabdc398798c3445374ccc52a2f5bcb2d867fc94bc54114395b24f9cfc83 SHA512 4c6931c350957107fc13f244748287141d524a0e954f48935b5dac2c46a8125af702e1164af98414644f9ea51f5a952db6c57a96fe2a51cab21b616381aac015 WHIRLPOOL fb6193b4d769fb0cd5461a925538bbfa9224b31209d3d16b8bef2f81cbf29aa4cf1c56373335b27326cc2a9f8905a11eec975ee7bc2068168b39e06cd08e64fa
 DIST xfce4-session-4.11.0.tar.bz2 1213569 SHA256 c68905b5124382e30e90f7e4f080fd7e24d58a065991eba9cfcb99e5d59a7c8e SHA512 cbb574117acdefb4781ecb16f7e4681c4c31e624eea2976c88199d3bba883c9a1f114d8b88eebfdd1f5e2c298a672ebf6171ee2b0a117dc54cb675ebd38db90e WHIRLPOOL fa14aa5e321339903460df8471b59b018d34c8453f639f8726e6961d88383aded6319448704d08f74be53ca08c03625dc76857ee328b19cfbaeffadce160d1fe
-EBUILD xfce4-session-4.10.1-r2.ebuild 1882 SHA256 d649f2c47e8c736e3dab1b3c26942880d7014d048836b04ff7eaf95f48e33b6d SHA512 45161f27c8b4328331408c988bb38b295c01a2d7df43b69f0df1a3c2407797eed151e10400427f7b81b3871771bc81b197f1e2cfb17c4927ce827d6fc3a2a1d9 WHIRLPOOL 3211a269ba79678c320335b80d77863eff24281f9222933659d875f94ab27e7ad4fd4d4ce465c6ba852152f8363119adc1b7667fd6b533544a10da77d4253ba7
-EBUILD xfce4-session-4.11.0-r2.ebuild 1950 SHA256 38ebca7facd5c0678a31f905070c89991f6b3808ce2b927a22cbf7b0eac5cfa7 SHA512 aa86392cbd8441f9c89e0016469acb3d6b6879d924898452e72c5cc98d0bd88ac6f58c60dddfe4093cd0d4ef44005a70122d6039159ac9e1db6bc70b12225b6e WHIRLPOOL 5f80d043daa753a2b38f3d819ce258d8006318c4e78423e5762c3118c94a7b8d89ae918d960b7edef4945baff0fd1865888d0052319db717ea9a00bac0d9d756
-MISC ChangeLog 30923 SHA256 2a1289f8a955230874e046d45888252c633e49323a6a8ce7db603669b71d8500 SHA512 d70a56880ccd29b949cf02df9b63c1822e6348c79ca77b527094e87c573193ced2ddccf80f6fccfe668dfb93c6ab1deb8c8711e1e6fcf04738b5750ed04a50e3 WHIRLPOOL 89f3747ffcfdb50bff10aa876a5509b047bfced0f722a66b9a824f31464ec0a655306e859cde2f23422bf7f640ad4431089c5834756d59f5405f7deccc12c8cc
+EBUILD xfce4-session-4.10.1-r2.ebuild 1886 SHA256 975aa9c83c1d575585078eecec495152120ba1513b136bfb9ebcec6098a7734e SHA512 5e2066db09aa21c7c181907a64b1c668d596723c85fc7b2d53d684fcee0ca9ced5817b67598e933ad2f384f6268ced62dbe75996276b1a515fce7872744ce28f WHIRLPOOL 1e6fbfedfd18c831609d7090f4a24a852b2af82fba2af45d2f84fa523566c7c12bb40b2de28c5b7375aa41a33648d8214394770a7f6bc5b92f1b627b30f62931
+EBUILD xfce4-session-4.11.0-r2.ebuild 1960 SHA256 b25f706fa386e92627f49a5206f43ed811f1a8400a7ca588571b2c320e1e16c0 SHA512 6183c83bddbdd490396a76d56f554259319e63d033e7eed27916edd82d5412b13ae9802efbfef6e0c5db6b9c9b2c4eadab16ba90d3189f552df36978213b60ab WHIRLPOOL c39dfbdd876590f2c77f5425950921265ba7022417199420f4a1f01440e7809d882bcc547536d6d9498ccf1f0f2859611eebf3e41c0941638ca257d390ea72d9
+MISC ChangeLog 31092 SHA256 b6fb42eec857a988813fb3045755376f55378e70cefb3b6ae1cfc392b4d94d14 SHA512 b40a214dd33c3c919aef631ab345bb1c0692c6d9c2e989a8ad9bfff8d1d42d975407753d98591bf9890cef3f80dbe8de0a736d2bad0f933e47f617da80e04882 WHIRLPOOL 26914c47ae233f62e522013b35abfa67c51a3827bb4f3ce41c13b4a657e3009198fb6613ba6b43c20614b6eeac8af2a6fc44e822943ae4b9a99abc8b36a1fd81
 MISC metadata.xml 159 SHA256 900ea49b6703fce452e205b85226bf1f994725963e5840da501182e7487d0e63 SHA512 000eb10e453390fb27843585adf354d725e77d881553d97a1a242bf06578a402ee4a924d9d8205a3fa687a59e2402bc9f3e1c227e448e05026354c196cf0a4f3 WHIRLPOOL 6f01aa01b8124d752be8e6c550ffdfc9093d45b206771c924ce25ce3f0daf006a669721d1385ff1bc803df342322d1c264f2905d3ccc44686c937deae8308ec3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQEcBAEBCAAGBQJTyYNIAAoJEEdUh39IaPFNPfkH/iAvTqaC5t1EEUFTdV3/hXhJ
-dOtBSyW21JZEf18+BOl5jiMqpauxsIXBX6cnzz4nFnBh+8v8vo85JMfzf/aBFcJJ
-qpATzLH+bjiq9ho1G9geSgS8AWfJ7J8G0eZPrpnYNNSM8EALI5JJfe2Nrsb4lMGW
-u4QO1B5kMMJi6LWutD/piVJxy2l1cw6iHqZVn9c+5hy5J7rZDHibZMkvX2NFDDPY
-c50hyLuXaY+tSeZL9yyIuzYjIZL7p+oNsbVKjNMF8P32nRcfkDIDD2Hc9yL8QWL6
-q1M+TsqIQUI5nSanJgxkNo9a7IwLjIuUAPh9B/TS+H+RnwaH3fvIuhtp1M+0d8M=
-=nNdJ
+iQEcBAEBCAAGBQJT0OYCAAoJEEdUh39IaPFN4xoH/itO95l0oHg7IEGfuSm0qXti
+UAWS9R+cToHq/X882vgR8uZM6NEQOBMm+DTw+RoGEdGAgjTV/MbKMR74su28jIem
+lH/WzoHE+hsNHNcuSFB09JBdShXj+ydr03e5ntJLNX4mfJeNJyZdi8BwkxyobH/2
+NPaT/D8abLXjAvACmjRglwLsxt8e46eVNWzjFMlYxJFNp3heMwizY32mOdgTwDcD
+6xNhUBqQQwYfENa6fpFwMDsxy1WsEYMOsHUKQ6v/c0j6xffMy3DjdU/+OdZroNiT
+Noou0sox8eDv1lWjgkw/u3U6FoohEOxakJG+/S7kVIj84AVszD8GQNBoJa26d8s=
+=Mp7p
 -----END PGP SIGNATURE-----
diff --git a/xfce-base/xfce4-session/xfce4-session-4.10.1-r2.ebuild b/xfce-base/xfce4-session/xfce4-session-4.10.1-r2.ebuild
index 660987f75038..8a3fcb32fd13 100644
--- a/xfce-base/xfce4-session/xfce4-session-4.10.1-r2.ebuild
+++ b/xfce-base/xfce4-session/xfce4-session-4.10.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/xfce-base/xfce4-session/xfce4-session-4.10.1-r2.ebuild,v 1.10 2014/07/18 20:28:02 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-session/xfce4-session-4.10.1-r2.ebuild,v 1.11 2014/07/24 10:54:57 ssuominen Exp $
 
 EAPI=5
 EAUTORECONF=1
@@ -13,7 +13,7 @@ SRC_URI="mirror://xfce/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="debug nls systemd udev +xscreensaver"
+IUSE="debug nls systemd upower +xscreensaver"
 
 COMMON_DEPEND=">=dev-libs/dbus-glib-0.100
 	x11-apps/iceauth
@@ -28,7 +28,7 @@ COMMON_DEPEND=">=dev-libs/dbus-glib-0.100
 RDEPEND="${COMMON_DEPEND}
 	x11-apps/xrdb
 	nls? ( x11-misc/xdg-user-dirs )
-	udev? (
+	upower? (
 		systemd? ( || ( >=sys-power/upower-0.9.23 sys-power/upower-pm-utils ) )
 		!systemd? ( sys-power/upower-pm-utils )
 		)
diff --git a/xfce-base/xfce4-session/xfce4-session-4.11.0-r2.ebuild b/xfce-base/xfce4-session/xfce4-session-4.11.0-r2.ebuild
index 9bd8a452f76f..70b550f12cce 100644
--- a/xfce-base/xfce4-session/xfce4-session-4.11.0-r2.ebuild
+++ b/xfce-base/xfce4-session/xfce4-session-4.11.0-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/xfce-base/xfce4-session/xfce4-session-4.11.0-r2.ebuild,v 1.2 2014/07/09 06:56:14 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-session/xfce4-session-4.11.0-r2.ebuild,v 1.3 2014/07/24 10:54:57 ssuominen Exp $
 
 EAPI=5
 EAUTORECONF=1
@@ -13,7 +13,7 @@ SRC_URI="mirror://xfce/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="debug nls systemd udev +xscreensaver"
+IUSE="debug nls systemd upower +xscreensaver"
 
 COMMON_DEPEND=">=dev-libs/dbus-glib-0.100
 	x11-apps/iceauth
@@ -24,12 +24,12 @@ COMMON_DEPEND=">=dev-libs/dbus-glib-0.100
 	>=xfce-base/libxfce4ui-4.11
 	>=xfce-base/xfconf-4.10
 	!xfce-base/xfce-utils
-	udev? ( || ( >=sys-power/upower-0.9.23 sys-power/upower-pm-utils ) )
+	upower? ( || ( >=sys-power/upower-0.9.23 sys-power/upower-pm-utils ) )
 	systemd? ( >=sys-auth/polkit-0.100 )"
 RDEPEND="${COMMON_DEPEND}
 	x11-apps/xrdb
 	nls? ( x11-misc/xdg-user-dirs )
-	!systemd? ( udev? ( sys-power/pm-utils ) )
+	!systemd? ( upower? ( sys-power/pm-utils ) )
 	xscreensaver? ( || (
 		>=x11-misc/xscreensaver-5.26
 		gnome-extra/gnome-screensaver
@@ -45,7 +45,7 @@ DEPEND="${COMMON_DEPEND}
 pkg_setup() {
 	PATCHES=( "${FILESDIR}"/${PN}-4.10.1-alock_support_to_xflock4.patch )
 
-	use udev && PATCHES+=( "${FILESDIR}"/${P}-upower-0.99.0.patch )
+	use upower && PATCHES+=( "${FILESDIR}"/${P}-upower-0.99.0.patch )
 
 	XFCONF=(
 		--docdir="${EPREFIX}"/usr/share/doc/${PF}
@@ -54,7 +54,7 @@ pkg_setup() {
 		$(xfconf_use_debug)
 		)
 
-	use udev && XFCONF+=( --enable-upower )
+	use upower && XFCONF+=( --enable-upower )
 
 	DOCS=( AUTHORS BUGS ChangeLog NEWS README TODO )
 }
diff --git a/xfce-base/xfce4-settings/ChangeLog b/xfce-base/xfce4-settings/ChangeLog
index 4dc9fadbea48..793026577311 100644
--- a/xfce-base/xfce4-settings/ChangeLog
+++ b/xfce-base/xfce4-settings/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for xfce-base/xfce4-settings
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-settings/ChangeLog,v 1.122 2014/06/20 06:30:51 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-settings/ChangeLog,v 1.123 2014/07/24 10:53:39 ssuominen Exp $
+
+  24 Jul 2014; Samuli Suominen <ssuominen@gentoo.org>
+  xfce4-settings-4.11.2-r1.ebuild:
+  Rename USE="udev" to USE="upower" wrt #516380
 
   20 Jun 2014; Samuli Suominen <ssuominen@gentoo.org>
   -xfce4-settings-4.11.2.ebuild:
diff --git a/xfce-base/xfce4-settings/Manifest b/xfce-base/xfce4-settings/Manifest
index 4b972a897a93..d4268839334a 100644
--- a/xfce-base/xfce4-settings/Manifest
+++ b/xfce-base/xfce4-settings/Manifest
@@ -5,17 +5,17 @@ AUX xfce4-settings-4.11.2-upower-0.99.patch 2630 SHA256 021876788c5076799dd1f9cf
 DIST xfce4-settings-4.10.1.tar.bz2 777735 SHA256 118a6959ea50e3a533d7aa18ec5a878a47a30608b3ce9ce59a93c3888f4e13d5 SHA512 cf2d3255a0c862b0d016a8653fd1ba94c86b9da36b894dd7ad733d6758b9e023807aa93b1e43deeb0f6a34c6db23507f6fe32b6b7a98fa3e0d3bc7577da429f7 WHIRLPOOL 82f6e28e5d6519fc37c2265efc759054d7208fe38374acb07b40f281f7b802e47e5230a78066e7dac0727453ed14017abc8b0c6afd069eed1f164c607ff1f2ad
 DIST xfce4-settings-4.11.2.tar.bz2 869865 SHA256 2745fc11fe6e856344a6a7c1ae9c12e1f0f21cc6d56c5a46bd16987a7e10081f SHA512 677633cc6c965b85092662a3d2e38f1775d6af8d6b91a3e650eee394f96364216b9614a3a0af24b7848857108b0d42b3cecfc2770e9759e0803b3a32e05db362 WHIRLPOOL cdfd5a2ba217afda5a091f9350f01cc2295ef955c8dcd0bdb25fb1f819a8767a0ed0e44227eb95566dc3f1e575237efa0c4fbc291e248842a23b0a9a65781bb1
 EBUILD xfce4-settings-4.10.1.ebuild 1419 SHA256 efe4385a1b5cdbd574454280736f274005b2be13dc89d814043274e027bbb14e SHA512 a9a22e04566405d987199fbf8855854e6022dbc60698d8ab3a72966b681fdf70b4e0df562719b2ea2d9e6cb71ff9ba013d269734bf0af1e61cbc3542b1d62083 WHIRLPOOL e5acf5ac8f8587ea4d34023bbda1afc7123305d4c9f0ff8f188cfa181269ed571c93053bc267af8c761f4bf29d544920e626e26bc0bc0a59416855f7ad51cc44
-EBUILD xfce4-settings-4.11.2-r1.ebuild 1595 SHA256 10309ad3325e5ec5c260626598e7d76359b551bd7e9adfbfce6e9323995e70ad SHA512 d24a73f84d7eda906e440d79fae187994b0d0f3f69a47d1ec243fd9df150f8b1d84194cf93960eaf0f43a804f87659a1b5df0a69cb41bee92068c0e04af762c6 WHIRLPOOL c813248f35a2ecf5966dc5c9d242deb3add422c0d6e70eed95774882ca7b8e5d2493d0f184d88235cd321f8c3f98031adfbb9cee40b019e71b2f5e4351bc9b0b
-MISC ChangeLog 16018 SHA256 d0c637d6926d82176d6918eb26592b4545843e15e3c8109a4a3dbb818ebc051e SHA512 48069de65220f1954557fa802dea674e64475c08bf645cdd5b16fcb20630c459acb1be74a6ac8c2de89dfca16e3aadab27c3d93e38995ec600f0cf3df51fe86d WHIRLPOOL 1ed2bd9960fb57758b6124f7b80410adc297f2e8d5d1b8b004e47d3796aa34adbc6c80eec6c352f764edb532610db81aca9ca84c1e50eb61a7104784ec6e2fe5
+EBUILD xfce4-settings-4.11.2-r1.ebuild 1601 SHA256 f5f89ee20281bdf250bbb3978e91d92dca483c0e83463b2657a51cfdf7a4c116 SHA512 2cc175821614eca6893782f19a6e6e1796bc81ed6fdabacee46b97da38860f63bae5989d4a40267dd5ea489a234fd90da11edca9e601b0458c5fd4f470c2efa7 WHIRLPOOL 0ecb4a4450c1bc03f075d791f668e49f3fd818d8fb3387ff1fee3bd1a0601ddf387275f37a72a08b50c7c1c00dc61e0b1680a244b4c53734c29282d594797b13
+MISC ChangeLog 16156 SHA256 732d56d5ab1423b109edd04a7e8de5f13ea22ba5ca97ab54c9a8478a18b801bd SHA512 4998c824759a80dfbaf337b5461e769aaa88a3a8995472183a441723bf3ca2958d8e5c0a194c79d6cda66a6248ab87e577cf0676dd319572f0fcdc68b7d1c7bb WHIRLPOOL 712b7a3dbb0ee5fc3d86341f14f6a5400a8cbbd3c13bfc48e7cd34c528a85cd457f567c94be44f68447c9f0f52cea5101c76ea00890f7cf898fb8f15b2cb5903
 MISC metadata.xml 391 SHA256 e12aab743d09d93de0374287e05add71330871ddafb70f9af31707241e1e2815 SHA512 61b5f4e2794713eda461738e970a8609eb357618bb260e4aa7c651a5e85680e128ad1aa2600af8cc100ebcfc493028bb8aedc09b860145b4b61fdc7dd1b5ce59 WHIRLPOOL a482a5c406cfd50f608dbaa9c4a58c60d0d0e8ab1ce07e82d9ef51c99145289e6a9b8cb1b8b419077683b08df5be6086236a069fff6527643c4be08126f7e79f
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2
 
-iQEcBAEBCAAGBQJTo9RNAAoJEEdUh39IaPFNiu0H/R/7QKtNYur/0NHPB/lUnMMP
-c70uSIW5M0r9PTnoy3WXMQA1vhEVzTr3Gbs9CZorXxkQSXWiFg4pQXU3eyzo0sVr
-oPIza0O/vsjmlIPOusfWSw2DmF3+BJgZATQitVWNn0bPNvJSIh3+7fjAUz46Skqj
-HFm0DW/RVmya1zgpnRf6bPdXfoAVnLfOt5FfPN8kxffexzeWCy4tZhBfI31PweRB
-jQnemVw+GLFe5WP4CbIS8MBxNWP2hCV8IfBm4+mGr+8xjxfSyIXh7Xkwfne4b5UZ
-Ay2OjHmy6nBP8RVtotixG+NdCVGFLR5zcs0YiGczAL7Wu0A2k8u15MjuX2ovpvM=
-=ueQk
+iQEcBAEBCAAGBQJT0OWzAAoJEEdUh39IaPFNJRUH/2ALjCPn/Cx2dPIEVKERGpeG
+asSWYSy3bsPa5YMDSM0wWN0JbLTssjwqJRgTdFxvxFbqgf6pk+EalFfnIL0ScgbR
+SzQxMsF99teuG5r1POaCnBs+ZKusKdYzX/wgxqf7oW/3K7nh2kVslN7GzV+v2sVs
+TKi5T4BOYqnES7mDVyfL1zPJkxNH6TK5A8uYRA7NlRMgmnq+hopCeO3NDoCdJTbN
+IVIBiXYrFT4AArUIMRFTTlGqfFsCwPxTood/3WmmdVu7lhpoaUHNYDoQMJJ5zVIq
+o2Yt7oufF9jetGziBbb8Zj5iFyvKAcDCSXAgf0qIMBu7wYKdWKyQqX89N5T4u1I=
+=BeYK
 -----END PGP SIGNATURE-----
diff --git a/xfce-base/xfce4-settings/xfce4-settings-4.11.2-r1.ebuild b/xfce-base/xfce4-settings/xfce4-settings-4.11.2-r1.ebuild
index c7030aaabc18..4a982cd4d102 100644
--- a/xfce-base/xfce4-settings/xfce4-settings-4.11.2-r1.ebuild
+++ b/xfce-base/xfce4-settings/xfce4-settings-4.11.2-r1.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/xfce-base/xfce4-settings/xfce4-settings-4.11.2-r1.ebuild,v 1.1 2014/05/31 19:13:04 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-settings/xfce4-settings-4.11.2-r1.ebuild,v 1.2 2014/07/24 10:53:39 ssuominen Exp $
 
 EAPI=5
 inherit xfconf
@@ -12,7 +12,7 @@ SRC_URI="mirror://xfce/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux"
-IUSE="debug libcanberra libnotify udev +xklavier"
+IUSE="debug libcanberra libnotify upower +xklavier"
 
 RDEPEND=">=dev-libs/dbus-glib-0.100
 	>=dev-libs/glib-2.24
@@ -29,7 +29,7 @@ RDEPEND=">=dev-libs/dbus-glib-0.100
 	>=xfce-base/xfconf-4.10
 	libcanberra? ( >=media-libs/libcanberra-0.25[sound] )
 	libnotify? ( >=x11-libs/libnotify-0.7 )
-	udev? ( || ( >=sys-power/upower-0.9.23 sys-power/upower-pm-utils ) )
+	upower? ( || ( >=sys-power/upower-0.9.23 sys-power/upower-pm-utils ) )
 	xklavier? ( >=x11-libs/libxklavier-5 )"
 DEPEND="${RDEPEND}
 	dev-util/intltool
@@ -42,7 +42,7 @@ pkg_setup() {
 	PATCHES=( "${FILESDIR}"/${P}-upower-0.99.patch )
 
 	XFCONF=(
-		$(use_enable udev upower-glib)
+		$(use_enable upower upower-glib)
 		$(use_enable libnotify)
 		$(use_enable xklavier libxklavier)
 		$(use_enable libcanberra sound-settings)