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

(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 4868F14D)

3 files changed, 14 insertions, 10 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/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 )
 }