Use global USE flag "upower" for use of UPower

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

5 files changed, 18 insertions, 15 deletions

diff --git a/app-misc/tracker/ChangeLog b/app-misc/tracker/ChangeLog
index 1ecd1ac5c480..bcee39e71cd9 100644
--- a/app-misc/tracker/ChangeLog
+++ b/app-misc/tracker/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-misc/tracker
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/tracker/ChangeLog,v 1.173 2014/07/23 15:13:27 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/tracker/ChangeLog,v 1.174 2014/07/24 12:01:06 ssuominen Exp $
+
+  24 Jul 2014; Samuli Suominen <ssuominen@gentoo.org> metadata.xml,
+  tracker-0.16.4.ebuild, tracker-1.0.1.ebuild, tracker-1.0.2.ebuild:
+  Use global USE flag "upower" for use of UPower
 
   23 Jul 2014; Agostino Sarubbo <ago@gentoo.org> tracker-1.0.2.ebuild:
   Stable for x86, wrt bug #512012
diff --git a/app-misc/tracker/metadata.xml b/app-misc/tracker/metadata.xml
index 1d3ff932c65b..4c0298ae6d70 100644
--- a/app-misc/tracker/metadata.xml
+++ b/app-misc/tracker/metadata.xml
@@ -13,7 +13,6 @@
   for ODT.</flag>
   <flag name="iptc">Enable extraction of IPTC data from pictures</flag>
   <flag name="iso">Enable extraction of metadata from ISO disk images</flag>
-  <flag name="laptop">Make tracker power management aware</flag>
   <flag name="libsecret">Enable libsecret support to store login
   credentials</flag>
   <flag name="miner-fs">Enable tracker-miner-fs (required for filesystem indexing)</flag>
diff --git a/app-misc/tracker/tracker-0.16.4.ebuild b/app-misc/tracker/tracker-0.16.4.ebuild
index 3953a9b1ada0..e297f06e64a6 100644
--- a/app-misc/tracker/tracker-0.16.4.ebuild
+++ b/app-misc/tracker/tracker-0.16.4.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/app-misc/tracker/tracker-0.16.4.ebuild,v 1.4 2014/06/01 07:55:46 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/tracker/tracker-0.16.4.ebuild,v 1.5 2014/07/24 12:01:06 ssuominen Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
@@ -15,7 +15,7 @@ HOMEPAGE="http://projects.gnome.org/tracker/"
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="0/16"
-IUSE="cue eds elibc_glibc exif firefox-bookmarks flac gif gsf gstreamer gtk iptc +iso +jpeg laptop libsecret +miner-fs mp3 nautilus networkmanager pdf playlist rss test thunderbird +tiff upnp-av +vorbis xine +xml xmp xps" # qt4 strigi
+IUSE="cue eds elibc_glibc exif firefox-bookmarks flac gif gsf gstreamer gtk iptc +iso +jpeg upower libsecret +miner-fs mp3 nautilus networkmanager pdf playlist rss test thunderbird +tiff upnp-av +vorbis xine +xml xmp xps" # qt4 strigi
 KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
 
 REQUIRED_USE="
@@ -64,7 +64,7 @@ RDEPEND="
 	iptc? ( media-libs/libiptcdata )
 	iso? ( >=sys-libs/libosinfo-0.0.2:= )
 	jpeg? ( virtual/jpeg:0 )
-	laptop? ( || ( <sys-power/upower-0.99 sys-power/upower-pm-utils ) )
+	upower? ( || ( <sys-power/upower-0.99 sys-power/upower-pm-utils ) )
 	libsecret? ( >=app-crypt/libsecret-0.5 )
 	mp3? (
 		>=media-libs/taglib-1.6
@@ -218,7 +218,7 @@ src_configure() {
 		$(use_enable iptc libiptcdata) \
 		$(use_enable iso libosinfo) \
 		$(use_enable jpeg libjpeg) \
-		$(use_enable laptop upower) \
+		$(use_enable upower upower) \
 		$(use_enable libsecret) \
 		$(use_enable miner-fs) \
 		$(use_enable mp3 taglib) \
diff --git a/app-misc/tracker/tracker-1.0.1.ebuild b/app-misc/tracker/tracker-1.0.1.ebuild
index 13a5f3502d84..627249bb0171 100644
--- a/app-misc/tracker/tracker-1.0.1.ebuild
+++ b/app-misc/tracker/tracker-1.0.1.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/app-misc/tracker/tracker-1.0.1.ebuild,v 1.3 2014/06/25 12:15:03 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/tracker/tracker-1.0.1.ebuild,v 1.4 2014/07/24 12:01:06 ssuominen Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
@@ -16,7 +16,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Tracker"
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="0/100"
 IUSE="cue eds elibc_glibc exif ffmpeg firefox-bookmarks flac gif gsf
-gstreamer gtk iptc +iso +jpeg laptop +miner-fs mp3 nautilus networkmanager
+gstreamer gtk iptc +iso +jpeg upower +miner-fs mp3 nautilus networkmanager
 pdf playlist rss test thunderbird +tiff upnp-av +vorbis +xml xmp xps"
 
 KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
@@ -69,7 +69,7 @@ RDEPEND="
 	iptc? ( media-libs/libiptcdata )
 	iso? ( >=sys-libs/libosinfo-0.2.9:= )
 	jpeg? ( virtual/jpeg:0 )
-	laptop? ( || ( >=sys-power/upower-0.9 sys-power/upower-pm-utils ) )
+	upower? ( || ( >=sys-power/upower-0.9 sys-power/upower-pm-utils ) )
 	mp3? ( >=media-libs/taglib-1.6 )
 	networkmanager? ( >=net-misc/networkmanager-0.8 )
 	pdf? (
@@ -200,7 +200,7 @@ src_configure() {
 		$(use_enable iptc libiptcdata) \
 		$(use_enable iso libosinfo) \
 		$(use_enable jpeg libjpeg) \
-		$(use_enable laptop upower) \
+		$(use_enable upower upower) \
 		$(use_enable miner-fs) \
 		$(use_enable mp3 taglib) \
 		$(use_enable mp3) \
diff --git a/app-misc/tracker/tracker-1.0.2.ebuild b/app-misc/tracker/tracker-1.0.2.ebuild
index f772944cb026..1de53e6c7a68 100644
--- a/app-misc/tracker/tracker-1.0.2.ebuild
+++ b/app-misc/tracker/tracker-1.0.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/app-misc/tracker/tracker-1.0.2.ebuild,v 1.3 2014/07/23 15:13:27 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/tracker/tracker-1.0.2.ebuild,v 1.4 2014/07/24 12:01:06 ssuominen Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
@@ -16,8 +16,8 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Tracker"
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="0/100"
 IUSE="cue eds elibc_glibc exif ffmpeg firefox-bookmarks flac gif gsf
-gstreamer gtk iptc +iso +jpeg laptop +miner-fs mp3 nautilus networkmanager
-pdf playlist rss test thunderbird +tiff upnp-av +vorbis +xml xmp xps"
+gstreamer gtk iptc +iso +jpeg +miner-fs mp3 nautilus networkmanager
+pdf playlist rss test thunderbird +tiff upnp-av upower +vorbis +xml xmp xps"
 
 KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
 
@@ -69,7 +69,7 @@ RDEPEND="
 	iptc? ( media-libs/libiptcdata )
 	iso? ( >=sys-libs/libosinfo-0.2.9:= )
 	jpeg? ( virtual/jpeg:0 )
-	laptop? ( || ( >=sys-power/upower-0.9 sys-power/upower-pm-utils ) )
+	upower? ( || ( >=sys-power/upower-0.9 sys-power/upower-pm-utils ) )
 	mp3? ( >=media-libs/taglib-1.6 )
 	networkmanager? ( >=net-misc/networkmanager-0.8 )
 	pdf? (
@@ -197,7 +197,7 @@ src_configure() {
 		$(use_enable iptc libiptcdata) \
 		$(use_enable iso libosinfo) \
 		$(use_enable jpeg libjpeg) \
-		$(use_enable laptop upower) \
+		$(use_enable upower upower) \
 		$(use_enable miner-fs) \
 		$(use_enable mp3 taglib) \
 		$(use_enable mp3) \