Fix handling of UPower dependencies to be exact.

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

6 files changed, 44 insertions, 28 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/Manifest b/app-leechcraft/lc-liznoo/Manifest
index 552735ea0793..758d2b387252 100644
--- a/app-leechcraft/lc-liznoo/Manifest
+++ b/app-leechcraft/lc-liznoo/Manifest
@@ -3,19 +3,19 @@ Hash: SHA256
 
 DIST leechcraft-0.6.60.tar.xz 5089252 SHA256 669c2325235c3c49dfc9a30d38c1ad08c0a6abf1ebbf2c8d33eca27e976e1b6d SHA512 0bac75f96bfc43c692e8b61ba5e9b6b82d535a78bd310966c36579666feb8b87217a9d74cfe792fa32b57b9b04e158239acbf2422014735d2316cbda2d8b39ec WHIRLPOOL f3056faab0006830afbcf5f3448094e530c908d432cebec731f305f34347e514db55416a911674c28445a3cd4e542136fd053ee5e444b3cf93e086dc9e88428c
 DIST leechcraft-0.6.65.tar.xz 5067580 SHA256 b821fb8716b3ba04862bbb358a738609ead84cd9c86b569fe31c712b48c2a7fd SHA512 94e3cfa42bea572cb2feeaf4c7153c8d7e08e0597d447db5033b72222cea67370e8948d0dd0e2b89585583a88b4ee3df7b32d72dcd624d383e79b9472ceffe30 WHIRLPOOL bc589f46c89351328e25e6e32febdcba8ead639a8d1daf18df7352372d66fb8f8e7e5bbef02d49b6a00a7f5ffa15d66699b79cc73f64ea1bf8b59949fcd81b8a
-EBUILD lc-liznoo-0.6.60.ebuild 769 SHA256 ea2c977e2414ccde24de4d6f3f2c6731979f70808e15eaecec3fccb4abd236c8 SHA512 8c96333dfbd6a1e4bf189c5b64bfe79fa01cfc94cc0e72e54ffce3d7fb6d95b75a7c50927ba5ab591e8f8b34adaebc8c959044d75615b3a3b4365a66b874c64d WHIRLPOOL 8a30437e4897e9e202b29615fece7e1e626cf1315f2c34fae8d7d35c485528eb6b17217d16594f49aa11dd4e706932e539df805d8c225eabee05bf4631f8c37a
-EBUILD lc-liznoo-0.6.65.ebuild 771 SHA256 c279743c71b35e7c3d16077af9e47dda1dc943310386158715e440356ca46e11 SHA512 ea0241424d4da099f1f03fa4bbc4d09d8efe5b7b498186e4bc0db15d52224ca74d32b558f4feaff3003236587e56c0c0b85ce4a7f0a980092ade6db08e6a4924 WHIRLPOOL f928f824e00c422ff5269c110b5071334e199663dc0298a9549f02995e329dfb91e5be74e89456f3f7602f06430eb2e587a93361624d3bb105af3f1e906ad8d7
-EBUILD lc-liznoo-9999.ebuild 758 SHA256 540e2166997e3f0177f28bcd951c0e4d8223cf8156d2491593b4640a29063795 SHA512 b5cd8295b4be54f6ec87b15d7c22cfce2a97dc2aa1ec088c1459a4eea958817df80a254a66108c026fbc2758fe09834d89cf6bfe8f1f7abbd22fe9bb5e2d2f82 WHIRLPOOL 0a9ed3dba192bd36159c79353203946bf442cd3bbcab7fa02d193c2c51ea1847c2c79ac0771491f859fa6d84af64d57e8ab081a6493014192d74ddd1dd961247
-MISC ChangeLog 5385 SHA256 733792ee84bdc4402851deb62e0feed655155365f89850e9b09606737695078f SHA512 74b50ee4b85e1696effb05b509f74483016155ae8f74f1bd00296156da87701f29c7110b4e59259003aeec2200d63f7a0424cc7e291a64cd650ab0a4d16dcdd1 WHIRLPOOL 7ad9d3661ac0e8153a371f36bb67ead35fc3fd144cea54fbada9cf84063c8068dd149ffe4cb68f29d6460f917ded12884658b1261d3db38d65119dccaccfefe4
-MISC metadata.xml 164 SHA256 d3d50c47cc72568dcc457fe11ddfc6849ba6572bc2d581aad1deac910ee1d488 SHA512 ce478accd06c9c530d86b3ca8abaf3680428a7ab07ed8bb5b78e60c7e3240c3be349993f73e2ef904642efec5cd9c8abb7196675b46723103290ef9ab5d1cc10 WHIRLPOOL 4c2d59059bc69ff27c720b093f582968e2778d23875e0f7d3edba0ec6634e1b50e7403974c4a32638eeaae4d7baf45ca163e5e80f5bd692590b7d075882d51f0
+EBUILD lc-liznoo-0.6.60.ebuild 1038 SHA256 4157b75d6ef7ca91a497eda431af7975b1e53938768bb61ba00b170fc2c09b03 SHA512 177b21eef04b60cfdf4daa08293ae38b877921eb430e9ab4bd48b0c07b0662c996d7ce9a7df82698c656c44daa8fa74799004129ccd696a90fd81c3b9e65a73e WHIRLPOOL 6233074976462bdeea7a538e70bd0081f67822c062e90e038fb404641650203bf6a6d6698e9b8f59896c3f7c39c143f4487f312afe17e6a90d70f8f868d4c638
+EBUILD lc-liznoo-0.6.65.ebuild 1040 SHA256 51ec9d9d4e50350c4d8ba6c8097056754e8bd40e883bbee64d09d4cabb4738c9 SHA512 a868c1a3d1ffe8eb4b68414762181cb5b0d0b719a6e85f7e98ed86f6d96318c5b42ab576e4f7afaf08aea6bdc32788be0191958d19e0cb6c0c6910db5da3a581 WHIRLPOOL 61a9cd82ac164278a8846f231165205c762cb63c557c10453b51fbbf4081ab8b8de0e80150654d9ca4df20d1bd418e9127faa35caf28b2c5166605f262397d52
+EBUILD lc-liznoo-9999.ebuild 1027 SHA256 4290a8d7a6cce677f789a10af01bc4cfe0288b090f4bedb911b9797a8e0c2d8d SHA512 7419b02ca6b3256802bca9531e7c26ba4b0d22858aee9fefaec0d13e5c2b104b2017802b1ba5866f32be8390d2b96847ce63668f2656ff134fd049abb740a7fc WHIRLPOOL ad6b67bd9f1e4683770b8855bf29099e64e1846cd96899ae1feb7f9fb9e6f8ebe3f9f0f0db440d0c949b3f447d18dd4fc5491742a17d365678f2ada5aa0e0a61
+MISC ChangeLog 5580 SHA256 b0766fa4d69df11a3bb7170b195ddca2aa937218c8d713a3172076cc177c87b6 SHA512 3e44367cac7dfe7fa42a3d1b965c4c02d6296091944cdb9bd2a19c66b68735d45bb6d7c94950ccffd854366b3126499534f742b26ef59c8bd4325596073b6cf3 WHIRLPOOL 4c28d1e2c4e22dc8b44b15dc71a5e2e2e9cc2eba5b5bd8f92686c0cd0f1a1e3a0fe3df0c4e559a3794a2e5bbeb067ba51374eaffec235f766a20eed3a00fa2e7
+MISC metadata.xml 280 SHA256 c6f1ae784a8c2a601ee863c1930cbd2e289250aebf972543f7c6d84a88716e9b SHA512 ba7ee34f52c27f3d4ee6da2b57fa98907c1ffd4fc5f9d1ae294fb7eb8d0caf47f6f243b0f2fecfd4d2476736f660db06edb0d066e0274abfb299ac4288f632e1 WHIRLPOOL 903e6e1f31a5954d69646864df2e962f694ba1a5e25346e0eb4284f943d33c3d18dae505b2089cdc2dea0ee30439729344dde8702f909c90b86b0050440964a6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQEcBAEBCAAGBQJT1T4iAAoJEEdUh39IaPFNU0MH/AquoRPCRbtSDI8uHWuFDWm3
-PR2WUXedc9gpnPqRx+xQ9wQJ+olfXaKsLM/y/sNFmKmPZhpkX2/TEWVrcYckeaCV
-aaRohl+VSTxQfkO8R9iOze5Ht91hohe4Mf3WMJ0Rfn83gcFi/Z4fSJomBA9/FX+L
-4vU6K5cs97Gz2+VnCEx7LW78ONqH2YSgVj+jjAx/sIW2q/1N48GepH+gEPYbCiFP
-hRditEpYUaKqrPoHdzMkBG3EMH6vUZOwn31LfG9ervIT1hFwWtPKv2FfLK3QU/HU
-uqEqhPYHSQlFdGVdjNVWr6ud3H3VtbnBEmWLHrZpR6KPSPx60yw5YpcVwecVGrk=
-=UUhp
+iQEcBAEBCAAGBQJT1ngcAAoJEEdUh39IaPFNXXYIAJUbxUT8aaWHOTHvsJlEbZz3
+qT6bfqRcDpdZeS2yAKM9amhPFwjdj42IoA/Z095o1i/JNoVkiA5vZuyKeMfZGhy5
+8KTQHEZoLkGKQ64MAUGLBPYEdkHOSgcyKKK7JkJpmeVjjkwkKYAouf5m0htSD4OA
+GYyX0VOYEX2TNLEnH2jGecCXMNruWeXpuC25w1YLwiBVt+EW63rP3kBU6+AAlJ7V
+AE5Xp5cRny/W8xIue7o+QjuyeYt2qbgvMrsUd9vhrxNvj8GlLR39s7koqcnrv/pa
+h7WuLFkSqrMGZnKLFtC4WrdJw8v0TcUtQaqtVR5tmTU5MYJQaDjt45L2Hj65dd0=
+=RNP0
 -----END PGP SIGNATURE-----
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>