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).

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

5 files changed, 25 insertions, 17 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/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)
 }