Fix handling of UPower dependencies to be exact.

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

5 files changed, 32 insertions, 16 deletions

diff --git a/app-leechcraft/lc-liznoo/ChangeLog b/app-leechcraft/lc-liznoo/ChangeLog
index ea47651bde10..25ba49ace00f 100644
--- a/app-leechcraft/lc-liznoo/ChangeLog
+++ b/app-leechcraft/lc-liznoo/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-leechcraft/lc-liznoo
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-leechcraft/lc-liznoo/ChangeLog,v 1.15 2014/07/27 18:00:13 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-leechcraft/lc-liznoo/ChangeLog,v 1.16 2014/07/28 16:19:56 ssuominen Exp $
+
+  28 Jul 2014; Samuli Suominen <ssuominen@gentoo.org> lc-liznoo-0.6.60.ebuild,
+  lc-liznoo-0.6.65.ebuild, lc-liznoo-9999.ebuild, metadata.xml:
+  Fix handling of UPower dependencies to be exact.
 
   27 Jul 2014; Samuli Suominen <ssuominen@gentoo.org> lc-liznoo-0.6.60.ebuild,
   lc-liznoo-0.6.65.ebuild, lc-liznoo-9999.ebuild:
diff --git a/app-leechcraft/lc-liznoo/lc-liznoo-0.6.60.ebuild b/app-leechcraft/lc-liznoo/lc-liznoo-0.6.60.ebuild
index 10f402a4bf0c..75916f6ee5c8 100644
--- a/app-leechcraft/lc-liznoo/lc-liznoo-0.6.60.ebuild
+++ b/app-leechcraft/lc-liznoo/lc-liznoo-0.6.60.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-leechcraft/lc-liznoo/lc-liznoo-0.6.60.ebuild,v 1.5 2014/07/27 18:00:13 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-leechcraft/lc-liznoo/lc-liznoo-0.6.60.ebuild,v 1.6 2014/07/28 16:19:56 ssuominen Exp $
 
 EAPI="4"
 
@@ -10,18 +10,21 @@ DESCRIPTION="UPower-based power manager for LeechCraft"
 
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE="debug"
+IUSE="debug systemd"
 
 DEPEND="~app-leechcraft/lc-core-${PV}
 	x11-libs/qwt:6
 	dev-qt/qtdbus:4
 	virtual/leechcraft-trayarea"
 RDEPEND="${DEPEND}
-	|| ( >=sys-power/upower-0.9.23 sys-power/upower-pm-utils )"
+	!systemd? ( || ( >=sys-power/upower-0.99 sys-power/upower-pm-utils ) )
+	systemd? ( || ( >=sys-power/upower-0.9.23 sys-power/upower-pm-utils ) )"
 
 pkg_postinst() {
 	if has_version '>=sys-power/upower-0.99'; then
-		ewarn "If you need hibernate and suspend support, you need to downgrade"
-		ewarn "sys-power/upower to 0.9.23 or switch to sys-power/upower-pm-utils"
+		ewarn "The new sys-power/upower version you have installed doesn't have hibernate"
+		ewarn "and suspend. If you need hibernate and suspend in ${PN}, and you use"
+		ewarn "systemd, you should downgrade sys-power/upower to 0.9.23 series. All others"
+		ewarn "should switch to sys-power/upower-pm-utils, also to 0.9.23 series."
 	fi
 }
diff --git a/app-leechcraft/lc-liznoo/lc-liznoo-0.6.65.ebuild b/app-leechcraft/lc-liznoo/lc-liznoo-0.6.65.ebuild
index c0cc8625a100..3547379f3cc5 100644
--- a/app-leechcraft/lc-liznoo/lc-liznoo-0.6.65.ebuild
+++ b/app-leechcraft/lc-liznoo/lc-liznoo-0.6.65.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-leechcraft/lc-liznoo/lc-liznoo-0.6.65.ebuild,v 1.3 2014/07/27 18:00:13 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-leechcraft/lc-liznoo/lc-liznoo-0.6.65.ebuild,v 1.4 2014/07/28 16:19:56 ssuominen Exp $
 
 EAPI="4"
 
@@ -10,18 +10,21 @@ DESCRIPTION="UPower-based power manager for LeechCraft"
 
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="debug"
+IUSE="debug systemd"
 
 DEPEND="~app-leechcraft/lc-core-${PV}
 	x11-libs/qwt:6
 	dev-qt/qtdbus:4
 	virtual/leechcraft-trayarea"
 RDEPEND="${DEPEND}
-	|| ( >=sys-power/upower-0.9.23 sys-power/upower-pm-utils )"
+	!systemd? ( || ( >=sys-power/upower-0.99 sys-power/upower-pm-utils ) )
+	systemd? ( || ( >=sys-power/upower-0.9.23 sys-power/upower-pm-utils ) )"
 
 pkg_postinst() {
 	if has_version '>=sys-power/upower-0.99'; then
-		ewarn "If you need hibernate and suspend support, you need to downgrade"
-		ewarn "sys-power/upower to 0.9.23 or switch to sys-power/upower-pm-utils"
+		ewarn "The new sys-power/upower version you have installed doesn't have hibernate"
+		ewarn "and suspend. If you need hibernate and suspend in ${PN}, and you use"
+		ewarn "systemd, you should downgrade sys-power/upower to 0.9.23 series. All others"
+		ewarn "should switch to sys-power/upower-pm-utils, also to 0.9.23 series."
 	fi
 }
diff --git a/app-leechcraft/lc-liznoo/lc-liznoo-9999.ebuild b/app-leechcraft/lc-liznoo/lc-liznoo-9999.ebuild
index 83f3be45c813..7974c904d6db 100644
--- a/app-leechcraft/lc-liznoo/lc-liznoo-9999.ebuild
+++ b/app-leechcraft/lc-liznoo/lc-liznoo-9999.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-leechcraft/lc-liznoo/lc-liznoo-9999.ebuild,v 1.4 2014/07/27 18:00:13 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-leechcraft/lc-liznoo/lc-liznoo-9999.ebuild,v 1.5 2014/07/28 16:19:56 ssuominen Exp $
 
 EAPI="4"
 
@@ -10,18 +10,21 @@ DESCRIPTION="UPower-based power manager for LeechCraft"
 
 SLOT="0"
 KEYWORDS=""
-IUSE="debug"
+IUSE="debug systemd"
 
 DEPEND="~app-leechcraft/lc-core-${PV}
 	x11-libs/qwt:6
 	dev-qt/qtdbus:4
 	virtual/leechcraft-trayarea"
 RDEPEND="${DEPEND}
-	|| ( >=sys-power/upower-0.9.23 sys-power/upower-pm-utils )"
+	!systemd? ( || ( >=sys-power/upower-0.99 sys-power/upower-pm-utils ) )
+	systemd? ( || ( >=sys-power/upower-0.9.23 sys-power/upower-pm-utils ) )"
 
 pkg_postinst() {
 	if has_version '>=sys-power/upower-0.99'; then
-		ewarn "If you need hibernate and suspend support, you need to downgrade"
-		ewarn "sys-power/upower to 0.9.23 or switch to sys-power/upower-pm-utils"
+		ewarn "The new sys-power/upower version you have installed doesn't have hibernate"
+		ewarn "and suspend. If you need hibernate and suspend in ${PN}, and you use"
+		ewarn "systemd, you should downgrade sys-power/upower to 0.9.23 series. All others"
+		ewarn "should switch to sys-power/upower-pm-utils, also to 0.9.23 series."
 	fi
 }
diff --git a/app-leechcraft/lc-liznoo/metadata.xml b/app-leechcraft/lc-liznoo/metadata.xml
index 2c857dda08d3..27926b7a815c 100644
--- a/app-leechcraft/lc-liznoo/metadata.xml
+++ b/app-leechcraft/lc-liznoo/metadata.xml
@@ -2,4 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>leechcraft</herd>
+	<use>
+		<flag name="systemd">Pull in correct UPower dependencies for systemd and non-systemd users.</flag>
+	</use>
 </pkgmetadata>