Use global USE flag "upower" for use of UPower

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

6 files changed, 30 insertions, 33 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/Manifest b/app-misc/tracker/Manifest
index 3782de1e5c98..a26b9a325128 100644
--- a/app-misc/tracker/Manifest
+++ b/app-misc/tracker/Manifest
@@ -5,25 +5,19 @@ AUX tracker-1.0.1-libmediaart-disabled.patch 1163 SHA256 dcc360064454177a6eb9bee
 DIST tracker-0.16.4.tar.xz 5745592 SHA256 9c2f50839c2b8b352ab9a022597ef985c1900e6286c0c3bcb7a64da39dbb3580 SHA512 82cc63f5a89e70e5d7d3c306005c9119b7f52a244cc453b789f19f56ec4858fd4c02421e07ab392dc1198b3352e99022986dfff043f9b4757e59723c038ffda0 WHIRLPOOL 07ec3cb39f619b930fba194c8cb5843786d9b0afa0d759498f72b35305ad06e1b9aba53fee64dad73186d74b7207c80ffa892adc9b5b350a108d882eaead9d9a
 DIST tracker-1.0.1.tar.xz 6060276 SHA256 76e7918e62526a8209f9c9226f82abe592a6332826ac7c12e6e405063181e889 SHA512 b41908756e10a1019901ad9313d795958eff40b7025d72e1c6670810b14f2968e05fa7f35451a53c354ba70d938aeb49e1ee9ab81d88531d1dfd75037b5e38eb WHIRLPOOL 08b46212e7ba5be97044bed416d5966ed5e1ec3ebe134827253fd20b3463f37f13449b82d8e705cb02dd5d29fd8d059911562c159e8ae5012454063f7265b826
 DIST tracker-1.0.2.tar.xz 6046600 SHA256 73491517006a58802630ff28243fc6fe07a24fe8bea563670da0ad28595468c4 SHA512 65a0324948ff6287c122a0de6356372cae366d1c8f0161f551a88c2e442c42066787333192acf6bc173dcdcc709ce9f58e5f88f660c1b5c9409363c680c50f8f WHIRLPOOL 7aa00e80094b441a774ff5cca7b0ceb1dbad69062124b371120d6fc049784b9f6e3b87f040bf02d4e4cacddd80184939b754a0b1d24c4f55242cd23eba2dde65
-EBUILD tracker-0.16.4.ebuild 9149 SHA256 aba92687db939cc8a58b60947a95a77f22102812df3b4b5983b73e86f1a60c18 SHA512 6f0085c15b11e2a350b8fa6043b1749e40f90cc5d80d847d3fdab03ed3d5eba98c169e87ed8808ea0ba4dcecb3064d4fb9412cb88dcbeb92b82d336a21be1a4c WHIRLPOOL b655fc10333c5954d0da3873a07be925972327ee06e144c79e645db0882dbbf3703eb4e22a2dc617f7f58d73808d8c15bc817d7f01b4022d64b35720594aba17
-EBUILD tracker-1.0.1.ebuild 8027 SHA256 22ab8e412f605c0725489410c5eb68df129290dd8bdf6c4059df62cae6c7a718 SHA512 3cd3c150ab33f1cf8385bb4f5ea79a9195f0a239eb6942131d70730feb015bb6063cc1c0da0c82327cf392a2101f2e27ef98e91483e660d81d9d1bffb2b60763 WHIRLPOOL a15ba7d7c1b2e4e4c6119155d6cc21810178b089c9389732260852a7d1c3b59d73bf1b6fa3d3480fe04a44e19e97bbe3c3b1aaeebb81c0279b4d3cbec8c362b3
-EBUILD tracker-1.0.2.ebuild 7906 SHA256 2367edfce5054894ca5763e7a1f9b269cf98f5f52a41f2bc98ee4d2992111e06 SHA512 5de48a99b1422f15e808c9b7bbf2c6532cdb2d70853ca860044f81886e55c828cf4e4ddf3abd906669b7331862f60120f2c58cf479304cec6ee7f5bcee1a7fd4 WHIRLPOOL 3c4a947b05fef0d15e06ad5b406b269b7cb6c64c6a8f6080079918b9aed0db143f1bbda1fe47eaae0f3ed55662138379ea97029c1fe10e655f3698514d8b764d
-MISC ChangeLog 31971 SHA256 5f52a1c4ce10adb6817b4e87187fba6812c522951ade4f53ce3dd9e2e4ed1885 SHA512 7905fccc9a274ee7eb2377ad1e034e88d2e0caae44ad09f4ed740f7ee0fc6f3062c4d9268e6894473f286280d1c9499c27933b50b27e921c2c158eb7b2c9fbab WHIRLPOOL dd4848c94ce9065d2245fa6091ba21082c0eed8acc0d39f4b1f88fb4fa02a78b9e20654c46ab54f4a9ac9fa56f2733c1fcaab9cd02307e9e5999218055152c61
-MISC metadata.xml 1484 SHA256 5d395e74b62ec9b377456b66221e5ecb1b3afb8097db358cfe9029c5018cb1dc SHA512 c188ca86938c56518d0fa01fedacd1aee189364358dbbda2cc8b70d2efd9549c2e4b3b92f3f177733a5061e31ae78048a25c30e90c0e6d065879688c53f94e63 WHIRLPOOL 232fff635a2fb3437f915301aa57a096189b4bc6658038d63c626e2b8cf8814b24bfd7b4ff96d9e9f4ac24ee562b16127ea7ec195b7923bc6799fc0002cb210d
+EBUILD tracker-0.16.4.ebuild 9153 SHA256 b58f4507c6b90156637208b52936aecac219be22ee9a16c46564aee41bae007c SHA512 27b2035af049c0884138c117bf4c7780989e8fdb604beeb12baf2ecf8a45b9b2d9b90838da83c1155385dff6e9e6cdd13d465b46aa101876225f40862ab0910e WHIRLPOOL 418345ce6bfa69bb7b5385569ae4fb3c79ffe859d55d4836ee8f5be299ea5f437048865c3b24f71e962c1856e383c63b6cc39988c0c1fb2b42b4ce8008968c62
+EBUILD tracker-1.0.1.ebuild 8031 SHA256 61fdf5b136691be07659da203722aaba6e19d80d5b4112e53e89c8cfd80863ca SHA512 44e331264b4922bd409bcc38d6db9af62e53bcdc2aa26e41ad812facd616720a319262f012983f182226944a3cb2bdabfa28e17f54299775ae8989f9e7f8ae8b WHIRLPOOL 579d82e1d5713a815146f170d5b3432d0470959218e902ddb3752494493e2ee6c3a400ab3be3cc2f91fe4c33a0009ca78c2222b36756d08fff0e9a53d4dc13fe
+EBUILD tracker-1.0.2.ebuild 7912 SHA256 2aeb6572fbba80802d37b60b2560e439b356d02dbe1fb0dbc29fcf72ac509456 SHA512 79c1a1acebbcac017f4a0141a08a984f7b326660a83b6c4b5cab701cd6d8197ec9bea4b4cb4dc57e3796d1268c2ebd0ff4bd6afd1111beaf707777bc07655524 WHIRLPOOL bd8ec93eee93b4b101749aeaedbca6bd053d4cadf80c0edc3e4a7690630e64bd17ea35f54ad1423d54dd274506deb4f56a963826b661da395a0bf2939d88d77c
+MISC ChangeLog 32164 SHA256 76808c417be1bc324fe7a52a6220f1acb202c2882310f0db7bea3fa69d41b05d SHA512 a3f5577a48aa3dba612535b68529650a4342e98a2a8d4c7a72d4415f16896c5b873027ad752c0e8592397a84f5d5e12bd04188c17123017cd4e829d33a0bb3dc WHIRLPOOL 3f75bd8bdaf9f437fdea1acf49c53e66761cb39abec1fea1fd509e3f6f53548d4786114106848d02a4c170e218982e6cd81c7859f1b09257b01a4f80b1fef6da
+MISC metadata.xml 1419 SHA256 f032429f060b6b1b366bd11e9409cd5a59e4d49344fbbeacd21090be4de9a540 SHA512 55b66baafe655925636880e9b3dbf062c3582cbc02894896add75ea4ea436808c5fe7b463a8378c1c35e6de3e40414633b301680ce733e22b52cfb0981d289f3 WHIRLPOOL a652509fbf6e3749aa509aa8ad89142ebf45b7f5e09a9cdf7e5c88aa18b51237e1e56ac47f5d4b83ef3c9efa5838635a1dc4592c97b2ecc520a9351f95f2c673
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJTz9EYAAoJELp701BxlEWfPCMP/3jnripOmJPbshm1/KXh0ShY
-TE2MhJ0FXIpbQ9z9Ov7dd9YrZq8FL2OAbfuf0d5JWhUpZ8+95fDplKdYybc/gM8e
-E8BL6Scq0M5AF8hskGvhfB42AyeAsgoKNbay82udEomYXfLZxzomhYuGRObXW0Du
-TD5263rDOMAGonmY4+F8hVsw3O2JUZ2JNULvODoyi4HT34DkY1ztrn+OemzQYNWB
-UJrh9ALO+SyzoyegfmCROpaqR4nK8FphNdG4pC9dsDV5NHQCSo1sC6pv/mBhrqds
-UxvEOiVCACl6ROYrcGeex+Eyyt1scTNlJjVmvJ8FgUT/tG0SWdA+FG+bDCHHxX7s
-KGsq5fP/h5JPiOtqpUj/zRY2mQNP749g+vWb0zRzcPY7+njxkSEvcJZSRcnYim24
-Z25Y60gQYQwCmYfAzSP3zf1CRkhwBiMixNp7GXHcnxeM860Ty8TSNaKRIk+MVrNK
-PBTUGfaW+E4lRviW8/tg93jMUcKugmRg/OxM8zoK0RPbS3CtVBXmiIXINenEdrjZ
-JP/SvzQ+d+mt3oreGz3qza6q9TBsp3iHJS4azs6N6cS9CmN3Pk3twXu6DHxrdKUd
-iQSh0iJLutpHwNRmbBRfrZjWocqN9DaI3C77JEHAxtyVg5doNkhsEKQfDTOU3f9A
-fK0yqi7707/L3oMT89ch
-=A+Ge
+iQEcBAEBCAAGBQJT0PWCAAoJEEdUh39IaPFNCLEH/jR6mgqtopCVADcRK+smloe1
+8D/RLiRDhiqYWRP+YhdVdlGFE19/7qvwZTEOlNsO/dBQl9oqhMvf6VvoLbALQAe2
+5UXBACIP3UUUA0SAJUMdKNClkjnhQSQN340mdbYETV9VkSRIpRvED80NuOelAqTv
+c1rtiOKGbZkcMl0MP0qrdLNuvH4A5H7kFU1vok0FmxVnozvtVtlsuvbn9fprIpOe
+cQGeHybRcaYNADUJoPvig3lRNLE9ylP0Qk7gA5Peb33EFSoc36u9f/aJDtDDVuMx
+uXeOqWe3NDGh982K3e/hfc0iXpXxwtdWwJefDh6LeR3dy3EMvl89ZJ3UKoskqPE=
+=Pi5z
 -----END PGP SIGNATURE-----
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) \