Rename USE=upower to USE=-systemd in light of upower-0.99 API changes and upstream comments (bug #509508, thanks to Mark R. Pariente and Pacho Ramos).

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

6 files changed, 37 insertions, 29 deletions

diff --git a/net-im/telepathy-mission-control/ChangeLog b/net-im/telepathy-mission-control/ChangeLog
index cf9ad3c1448b..3508e5375f77 100644
--- a/net-im/telepathy-mission-control/ChangeLog
+++ b/net-im/telepathy-mission-control/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-im/telepathy-mission-control
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/telepathy-mission-control/ChangeLog,v 1.98 2014/05/05 13:50:58 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/telepathy-mission-control/ChangeLog,v 1.99 2014/05/05 14:12:34 tetromino Exp $
+
+  05 May 2014; Alexandre Rostovtsev <tetromino@gentoo.org>
+  telepathy-mission-control-5.14.0-r1.ebuild,
+  telepathy-mission-control-5.14.1.ebuild,
+  telepathy-mission-control-5.16.1.ebuild, metadata.xml:
+  Rename USE=upower to USE=-systemd in light of upower-0.99 API changes and
+  upstream comments (bug #509508, thanks to Mark R. Pariente and Pacho Ramos).
 
   05 May 2014; Alexandre Rostovtsev <tetromino@gentoo.org>
   telepathy-mission-control-5.14.0-r1.ebuild,
diff --git a/net-im/telepathy-mission-control/Manifest b/net-im/telepathy-mission-control/Manifest
index bb07df63e10f..6c999ca04b46 100644
--- a/net-im/telepathy-mission-control/Manifest
+++ b/net-im/telepathy-mission-control/Manifest
@@ -4,19 +4,19 @@ Hash: SHA256
 DIST telepathy-mission-control-5.14.0.tar.gz 1026233 SHA256 58e0047f5292836c2c35e1603a908b3ac20a5c0b183869514c63de339fd48a30 SHA512 a083b97050b3da3eb8063b021539c2c229e715489fbd3d48404f601208a329c338b6b5a7eea688c59c09b8f5b98b05b99a9c2c275195a8bd877d2b2e63fa6fda WHIRLPOOL ad5f5e19b417133b62b4810d010e1ce4e2a32d8ff21fbf86ec8e35cff0eb6b440b8ccf2aa33a6460beb6eda935751198649bc133a4a531de43137fc6377b67be
 DIST telepathy-mission-control-5.14.1.tar.gz 1026891 SHA256 4b16c0199c3ca11953a5e7e6420093346d968be1287b376ebe2b81ac8b5f1fcb SHA512 58341a0c06ca1478e995dbd3a4532418d7b1a576d33468db1117d027e8f989df0661138efe4d910d93d2ddfcb32d65b1574329fdfb595fb110cc65470870f1ea WHIRLPOOL dd2c4a7495880c791180cda3368822586aa09e6fef7ab9a7f8ec7ae701a96ae1ddd09e2c2cc8ec65e0b23a0758b9045b7b07e107a2aeba84eb531490544e79d1
 DIST telepathy-mission-control-5.16.1.tar.gz 1064040 SHA256 14ceb7d53535b43d44b8271ad11319d1d0fe6d193d154636b9e62b42799b9723 SHA512 0b751aa23915961352b0c6194ed84c6aec624d9cf6e75dd7f7baf9348416ab951bd0b75c258f8a1723d1fbaa013134aebcad9806d639195e029e1c71152c2ea9 WHIRLPOOL 3d1c48dd0945ece350fd9f1d3716c0054d5a74dabcf82008049d1c4fa97af8a6396685b3455542430e714ecb71d5cdb53ba26208bed6f2fbd3c226836db5e1ec
-EBUILD telepathy-mission-control-5.14.0-r1.ebuild 1612 SHA256 40601c9827174bdbdc362165296325192b83ceb81b3c13b17c60386418fb70a7 SHA512 39095dfed3e6c029e38c403725d6b4257f89c1ef17d137bbc293daff374a303382fdee3ddea747c08e84736f6eb96039f6974ede97fa9337733b7eb205883d06 WHIRLPOOL 59cb90e91b9700ad66105011e75646d02702832a535822bc7b037dbacec9154f4e25154340ea60ef94d26ff494e6ada147c0f77e8bda97c8241471190b034183
-EBUILD telepathy-mission-control-5.14.1.ebuild 1716 SHA256 0fa486800aa2afe7f3d305f3599375c7ec6091d6cd9e5eaa94c4ea8448089b47 SHA512 82cf327a7eb2ed4d03b14b73b3413d2c351feab0c85903d9c96d796b1151eb271a6792fd37c5dbd56081247681bea4faba34270a23480ab1274c1f5889c2d62b WHIRLPOOL 301fd4e6f2789d2a19553245adea1ce39ecf1425463b4fa71e3603745ddc28ffe2c2273770c5d4f452133195e87b458f3014e24f1aac514ff86c06ce7af15420
-EBUILD telepathy-mission-control-5.16.1.ebuild 1489 SHA256 38fabcc0b6cfc8272cd303ce7271e7fd1a367d0d3333324cddb1a5eb5a113c82 SHA512 3fcafbebd4187b88c12798877e4c82e0a8504bc882e80a0a4298bb639c3e923b6259b374fc0aca8aabb6b2b75cbb83251844893bafc8a025d428837d2c57fadf WHIRLPOOL b326e3ba8b93bc57cf9164327f41ecdb017bd4beb8e080abf328a891234f9e82669b64e26e228292df4ff5dd4b5650f8dd93f9b8133846caf923fc41e6bbd0bc
-MISC ChangeLog 16761 SHA256 7e095203dc4277a3d2234a09adb7c711e925a4bcc38ab016f019f0291c720217 SHA512 d5bc8d325fb3c720c9f1ec86e854e40e7ca027a82525d1f52b2eb2c28a1f935c91c1d1f75efac9dd1ba3cd4d35b292adefbdbe6ba48bab57f346d9ecd1341e18 WHIRLPOOL a40f667dafc140d171f9e6dfb5b1b291057bf1bf0a20cf1a74468f335725b256797eaafa00124330a8f974b52f06e1ba1e9bb46201f6db6de571c32492c4edb4
-MISC metadata.xml 630 SHA256 20c5628b562bad9042c59e46eeac55ec934a3b6b146b0ac5c1e1d1692c98c92d SHA512 3fc0cd8f2d9d8114ab6e69f7490600b04ec663717fd9dcdde0069f826c63bb66e672ffd8a185c1bbc0b8cc1b7ebe44da086e6be2ee6ab3e633d6faeb3a43e3ae WHIRLPOOL 6376c0f6a570dca9bc814bcabbd2621ae927a104fa6bbe09bb52126451cf3080adca15bfb7f41db3fce034d1c0f066405b88b7ec31eb928f26c64ef541c5b504
+EBUILD telepathy-mission-control-5.14.0-r1.ebuild 1643 SHA256 c40cfdbdbfc5290573e186bb9ae1e05f22574a3b1d59a644ab349bac790b3f73 SHA512 a3c5086548a65fb6035673fb3cec574eb62057d3ca500afc126da3fe6628cfb14d520bb286ecb676670ada801be8a450ea6142a34e3c210d77efe9c280cf0675 WHIRLPOOL fe26ddd59fb4c6aa77835a0cf1405908d86b24b73c278ed1300f27ebf74852a908afa86cc99b473207fdca310a5e23a194b99d1a3d6b6ffb6f0c1cad1527abe8
+EBUILD telepathy-mission-control-5.14.1.ebuild 1748 SHA256 80d8dfa5926179dfbbd860c5f294fa6f6a0bda86fcac5fade6ee918693ff3e17 SHA512 e52f9b543a7a94d894c879b24b8ce677a9474e468a94fdc753cdce0ee977505acbf72b3dbbf1730c642110cb9c42fa711935e511ffc570900aae44403b55dd60 WHIRLPOOL 5597b5bc0b0198d6afd3978d8e8d66c1e6ed486d04b561c355568ebd47d78961a7559d9ae6aa3d814cfc18c57c5c9144256b7146cf12a4eb171769e6e4841467
+EBUILD telepathy-mission-control-5.16.1.ebuild 1526 SHA256 62f04491ac4c3a0dd3b6592216ce44bb1694153ee2e78d789d22a904455f102e SHA512 151f05f03107db66f64c4b50c5439772ac9d13e7b40cba0c139b9dae49942c3583e15ac39ab4c934635e0d7e3ae39cf594cb22dc18fdf917b93368ce001f52f3 WHIRLPOOL 083f44352849eec07d0cba46352d773d58591a3c973f131f4d85efa71704fe48a293e93c19659e3da91bf16262c8eabf3c53ff6b72785dbd4e47fa5eba664c2e
+MISC ChangeLog 17122 SHA256 c104265880882643f6dad4eda736f678ed89fcf668afbef673166bfc1abce900 SHA512 dc05cb0a64730eaab2cd18b9f037a3e35059c23c2ca56fb6db56c7e00c34cb2af1fe90220cf7b150cff1ba5058935b8bc92ca8418ba38d919c2b5ccfd66c3ea9 WHIRLPOOL 9310f46ae038a2a7de013115c76210b054b026fb043aa7f122bff072f58ced36b73b38b9f9ae5c9365a49ee9f136e3afaeb805e220e20ba25d16c07404715353
+MISC metadata.xml 673 SHA256 530c93e05168536a7facdc22f67c32736e4ce8d1b9a5b00dd6d94443b59e75f7 SHA512 11d652c78203033a64542a88a575d8cda9105e086349079c2306d7fd07613c1c28edfe54a368b6eb1f8b201ab3f0d76461b02006afa2a429e3bff4dc8bc4bd04 WHIRLPOOL 1ce7e915205b0ca7ad37d02cefddaa133484a79dc7f89cd08c58ebb13ac2a57176389c91f7b8350e41d6e065024221affaf851b0881b56ab92b02db5a46a5b48
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCAAGBQJTZ5cOAAoJEJ0WA1zPCt1htXgIALHiCLjmWdjCdZAvpV7zt1oC
-mUVmWzn0oUQFt46ZqFtALxordjiaUrCJL95j23QIURzbkolyZMRCuXy25OCrHJH5
-5mDt05Btm9FztHnnjnhnMpxHCefydXwE+sUgeoHNNrW4arNvXFtuKT3m2VkPigXY
-tutaPrjnYxY+EH7rpDa1A0iIxIU8XMhv6wFGxoXBsH6Rss/HClM+spVHAOIcUKqg
-wJGcztCppFNGY8pEs5Vs8PIjk7dElzV3c2GgQrkty76ofg70g/Xi6KiUfuUd3IUc
-MFuJd5WpLLSRbq402wLWX9crojsZDBAR2uBGMYyakVWM5Lyut2fIODQ46wwkCQY=
-=Qh2I
+iQEcBAEBCAAGBQJTZ5weAAoJEJ0WA1zPCt1hEVMH/07wWpphzjiNDhPVlI3T2bpz
+8V11fSNyoC9MnWmXWiRXQtMqMSCJt/5pd7aJurq1nreKSVBlj53YjwRNA9XU0fFS
+xCcCFj76y+evjKJZMuzPAjhpmNO1yuEZ23RCt1785Y87Mw59e11CwLFy2dNuVkaN
+t3Grps8TEowwzsh2faLpLCkMBSJXdtDcQhDZXyaMFPifBEWGYRfMpkB14vy41QWb
+a0A8sY8GsDQXAqbXxpyFoHC+I2NY8ZiilAIYyHX55KRH2LMWWJMBCC0yQAtO67Hb
+kpCkr0Ebcy54i+YloAGn+luSo5T0oL+aknRg9OGfhqGcV9RtBpEMP+VFMVJ0GuQ=
+=J/Jj
 -----END PGP SIGNATURE-----
diff --git a/net-im/telepathy-mission-control/metadata.xml b/net-im/telepathy-mission-control/metadata.xml
index 56cad563466b..925502c40b61 100644
--- a/net-im/telepathy-mission-control/metadata.xml
+++ b/net-im/telepathy-mission-control/metadata.xml
@@ -9,6 +9,7 @@ managers, to provide a simple way to manipulate a bunch of connection managers
 at once, and to remove the need to have in each program the account
 definitions and credentials.</longdescription>
 <use>
-	<flag name="upower">Use <pkg>sys-power/upower</pkg> to detect suspend and resume</flag>
+	<flag name="systemd">Rely on systemd's logind (instead of using
+		<pkg>sys-power/upower</pkg>) to detect suspend and resume</flag>
 </use>
 </pkgmetadata>
diff --git a/net-im/telepathy-mission-control/telepathy-mission-control-5.14.0-r1.ebuild b/net-im/telepathy-mission-control/telepathy-mission-control-5.14.0-r1.ebuild
index 28aa7a380a6b..edc0bacfb5e3 100644
--- a/net-im/telepathy-mission-control/telepathy-mission-control-5.14.0-r1.ebuild
+++ b/net-im/telepathy-mission-control/telepathy-mission-control-5.14.0-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/net-im/telepathy-mission-control/telepathy-mission-control-5.14.0-r1.ebuild,v 1.11 2014/05/05 13:50:58 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/telepathy-mission-control/telepathy-mission-control-5.14.0-r1.ebuild,v 1.12 2014/05/05 14:12:34 tetromino Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
@@ -13,10 +13,10 @@ DESCRIPTION="An account manager and channel dispatcher for the Telepathy framewo
 HOMEPAGE="http://telepathy.freedesktop.org/wiki/Mission%20Control"
 SRC_URI="http://telepathy.freedesktop.org/releases/${PN}/${P}.tar.gz"
 
-LICENSE="LGPL-2.1"
+LICENSE="LGPL-2.1+"
 SLOT="0"
 KEYWORDS="alpha amd64 ~arm ia64 ppc ~ppc64 sparc x86 ~amd64-linux ~arm-linux ~x86-linux"
-IUSE="connman debug gnome-keyring networkmanager +upower" # test
+IUSE="connman debug gnome-keyring networkmanager systemd" # test
 REQUIRED_USE="?? ( connman networkmanager )"
 
 RDEPEND="
@@ -27,7 +27,7 @@ RDEPEND="
 	connman? ( net-misc/connman )
 	gnome-keyring? ( gnome-base/libgnome-keyring )
 	networkmanager? ( >=net-misc/networkmanager-0.7 )
-	upower? (
+	!systemd? (
 		>=sys-power/upower-0.9.11
 		<sys-power/upower-0.99 )
 "
@@ -49,5 +49,5 @@ src_configure() {
 		$(use_enable gnome-keyring) \
 		$(use_with connman connectivity connman) \
 		$(use_with networkmanager connectivity nm) \
-		$(use_enable upower)
+		$(usex systemd --disable-upower --enable-upower)
 }
diff --git a/net-im/telepathy-mission-control/telepathy-mission-control-5.14.1.ebuild b/net-im/telepathy-mission-control/telepathy-mission-control-5.14.1.ebuild
index 60ca099be7cc..e1fae3440387 100644
--- a/net-im/telepathy-mission-control/telepathy-mission-control-5.14.1.ebuild
+++ b/net-im/telepathy-mission-control/telepathy-mission-control-5.14.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/net-im/telepathy-mission-control/telepathy-mission-control-5.14.1.ebuild,v 1.9 2014/05/05 13:50:58 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/telepathy-mission-control/telepathy-mission-control-5.14.1.ebuild,v 1.10 2014/05/05 14:12:34 tetromino Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
@@ -14,10 +14,10 @@ DESCRIPTION="An account manager and channel dispatcher for the Telepathy framewo
 HOMEPAGE="http://cgit.freedesktop.org/telepathy/telepathy-mission-control/"
 SRC_URI="http://telepathy.freedesktop.org/releases/${PN}/${P}.tar.gz"
 
-LICENSE="LGPL-2.1"
+LICENSE="LGPL-2.1+"
 SLOT="0"
 KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~arm-linux ~x86-linux"
-IUSE="connman debug gnome-keyring networkmanager +upower" # test
+IUSE="connman debug gnome-keyring networkmanager systemd" # test
 REQUIRED_USE="?? ( connman networkmanager )"
 
 RDEPEND="
@@ -28,7 +28,7 @@ RDEPEND="
 	connman? ( net-misc/connman )
 	gnome-keyring? ( gnome-base/libgnome-keyring )
 	networkmanager? ( >=net-misc/networkmanager-0.7 )
-	upower? (
+	!systemd? (
 		>=sys-power/upower-0.9.11
 		<sys-power/upower-0.99 )
 "
@@ -52,5 +52,5 @@ src_configure() {
 		$(use_enable gnome-keyring) \
 		$(use_with connman connectivity connman) \
 		$(use_with networkmanager connectivity nm) \
-		$(use_enable upower)
+		$(usex systemd --disable-upower --enable-upower)
 }
diff --git a/net-im/telepathy-mission-control/telepathy-mission-control-5.16.1.ebuild b/net-im/telepathy-mission-control/telepathy-mission-control-5.16.1.ebuild
index 4013336706b0..e1319bc36b44 100644
--- a/net-im/telepathy-mission-control/telepathy-mission-control-5.16.1.ebuild
+++ b/net-im/telepathy-mission-control/telepathy-mission-control-5.16.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/net-im/telepathy-mission-control/telepathy-mission-control-5.16.1.ebuild,v 1.1 2014/04/27 17:44:35 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/telepathy-mission-control/telepathy-mission-control-5.16.1.ebuild,v 1.2 2014/05/05 14:12:34 tetromino Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
@@ -14,10 +14,10 @@ DESCRIPTION="An account manager and channel dispatcher for the Telepathy framewo
 HOMEPAGE="http://cgit.freedesktop.org/telepathy/telepathy-mission-control/"
 SRC_URI="http://telepathy.freedesktop.org/releases/${PN}/${P}.tar.gz"
 
-LICENSE="LGPL-2.1"
+LICENSE="LGPL-2.1+"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux"
-IUSE="debug networkmanager +upower" # test
+IUSE="debug networkmanager systemd" # test
 
 RDEPEND="
 	>=dev-libs/dbus-glib-0.82
@@ -25,7 +25,7 @@ RDEPEND="
 	>=sys-apps/dbus-0.95
 	>=net-libs/telepathy-glib-0.20
 	networkmanager? ( >=net-misc/networkmanager-0.7 )
-	upower? (
+	!systemd? (
 		>=sys-power/upower-0.9.11
 		<sys-power/upower-0.99 )
 "
@@ -47,5 +47,5 @@ src_configure() {
 		 --disable-static \
 		$(use_enable debug) \
 		$(use_with networkmanager connectivity nm) \
-		$(use_enable upower)
+		$(usex systemd --disable-upower --enable-upower)
 }