ssuominen 14/07/28 16:19:56 Modified: lc-liznoo-0.6.60.ebuild lc-liznoo-9999.ebuild metadata.xml lc-liznoo-0.6.65.ebuild ChangeLog Log: Fix handling of UPower dependencies to be exact. (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 4868F14D)
Revision Changes Path 1.6 app-leechcraft/lc-liznoo/lc-liznoo-0.6.60.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-leechcraft/lc-liznoo/lc-liznoo-0.6.60.ebuild?rev=1.6&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-leechcraft/lc-liznoo/lc-liznoo-0.6.60.ebuild?rev=1.6&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-leechcraft/lc-liznoo/lc-liznoo-0.6.60.ebuild?r1=1.5&r2=1.6 Index: lc-liznoo-0.6.60.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/app-leechcraft/lc-liznoo/lc-liznoo-0.6.60.ebuild,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- lc-liznoo-0.6.60.ebuild 27 Jul 2014 18:00:13 -0000 1.5 +++ lc-liznoo-0.6.60.ebuild 28 Jul 2014 16:19:56 -0000 1.6 @@ -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 @@ 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 } 1.5 app-leechcraft/lc-liznoo/lc-liznoo-9999.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-leechcraft/lc-liznoo/lc-liznoo-9999.ebuild?rev=1.5&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-leechcraft/lc-liznoo/lc-liznoo-9999.ebuild?rev=1.5&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-leechcraft/lc-liznoo/lc-liznoo-9999.ebuild?r1=1.4&r2=1.5 Index: lc-liznoo-9999.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/app-leechcraft/lc-liznoo/lc-liznoo-9999.ebuild,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- lc-liznoo-9999.ebuild 27 Jul 2014 18:00:13 -0000 1.4 +++ lc-liznoo-9999.ebuild 28 Jul 2014 16:19:56 -0000 1.5 @@ -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 @@ 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 } 1.2 app-leechcraft/lc-liznoo/metadata.xml file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-leechcraft/lc-liznoo/metadata.xml?rev=1.2&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-leechcraft/lc-liznoo/metadata.xml?rev=1.2&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-leechcraft/lc-liznoo/metadata.xml?r1=1.1&r2=1.2 Index: metadata.xml =================================================================== RCS file: /var/cvsroot/gentoo-x86/app-leechcraft/lc-liznoo/metadata.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- metadata.xml 8 Mar 2013 22:01:46 -0000 1.1 +++ metadata.xml 28 Jul 2014 16:19:56 -0000 1.2 @@ -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> 1.4 app-leechcraft/lc-liznoo/lc-liznoo-0.6.65.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-leechcraft/lc-liznoo/lc-liznoo-0.6.65.ebuild?rev=1.4&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-leechcraft/lc-liznoo/lc-liznoo-0.6.65.ebuild?rev=1.4&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-leechcraft/lc-liznoo/lc-liznoo-0.6.65.ebuild?r1=1.3&r2=1.4 Index: lc-liznoo-0.6.65.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/app-leechcraft/lc-liznoo/lc-liznoo-0.6.65.ebuild,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- lc-liznoo-0.6.65.ebuild 27 Jul 2014 18:00:13 -0000 1.3 +++ lc-liznoo-0.6.65.ebuild 28 Jul 2014 16:19:56 -0000 1.4 @@ -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 @@ 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 } 1.16 app-leechcraft/lc-liznoo/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-leechcraft/lc-liznoo/ChangeLog?rev=1.16&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-leechcraft/lc-liznoo/ChangeLog?rev=1.16&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-leechcraft/lc-liznoo/ChangeLog?r1=1.15&r2=1.16 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/app-leechcraft/lc-liznoo/ChangeLog,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- ChangeLog 27 Jul 2014 18:00:13 -0000 1.15 +++ ChangeLog 28 Jul 2014 16:19:56 -0000 1.16 @@ -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 <ssuomi...@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 <ssuomi...@gentoo.org> lc-liznoo-0.6.60.ebuild, lc-liznoo-0.6.65.ebuild, lc-liznoo-9999.ebuild: