ssuominen 14/06/04 09:04:18 Modified: uevt-2.3-r1.ebuild ChangeLog Log: Support >=dev-lang/vala-0.24.0 wrt #509512 by Alexandre Rostovtsev. Prefer sys-power/upower-pm-utils over sys-power/upower because that's the only way to get Hibernate and Suspend support in this version of UEvt. However, don't force it because the power management features are optional. (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 4868F14D)
Revision Changes Path 1.8 sys-apps/uevt/uevt-2.3-r1.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/uevt/uevt-2.3-r1.ebuild?rev=1.8&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/uevt/uevt-2.3-r1.ebuild?rev=1.8&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/uevt/uevt-2.3-r1.ebuild?r1=1.7&r2=1.8 Index: uevt-2.3-r1.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/sys-apps/uevt/uevt-2.3-r1.ebuild,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- uevt-2.3-r1.ebuild 26 May 2014 19:54:34 -0000 1.7 +++ uevt-2.3-r1.ebuild 4 Jun 2014 09:04:18 -0000 1.8 @@ -1,10 +1,9 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/uevt/uevt-2.3-r1.ebuild,v 1.7 2014/05/26 19:54:34 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/uevt/uevt-2.3-r1.ebuild,v 1.8 2014/06/04 09:04:18 ssuominen Exp $ EAPI=5 VALA_MIN_API_VERSION="0.16" -VALA_MAX_API_VERSION="0.22" inherit eutils vala DESCRIPTION="UPower/UDisks Event, a lightweight desktop-independent power and disk manager" @@ -16,15 +15,13 @@ KEYWORDS="amd64 x86" IUSE="" -#TODO FIXME: Does this release work with >=sys-power/upower-0.99 API? -#If not, adjust dependencies to: -#|| ( <sys-power/upower-0.99 sys-power/upower-pm-utils ) ) COMMON_DEPEND=">=dev-libs/glib-2.28 x11-libs/gtk+:2 >=x11-libs/libnotify-0.7" +# Prefer sys-power/upower-pm-utils because there is no Hibernate/Suspend otherwise RDEPEND="${COMMON_DEPEND} - >=sys-fs/udisks-1.0.4-r5:0 - || ( >=sys-power/upower-0.9.21 sys-power/upower-pm-utils )" + >=sys-fs/udisks-1.0.5:0 + || ( sys-power/upower-pm-utils >=sys-power/upower-0.9.23 )" DEPEND="${COMMON_DEPEND} $(vala_depend) dev-util/intltool @@ -39,7 +36,9 @@ src_prepare() { # http://git.sleipnir.fr/uevt/commit/?id=69d2f45e234190fbfb37745ea05ab88547a3de96 - epatch "${FILESDIR}"/${P}-support_for_more_than_one_CPU.patch + epatch \ + "${FILESDIR}"/${P}-support_for_more_than_one_CPU.patch \ + "${FILESDIR}"/${P}-vala-0.24.patch # See http://bugs.gentoo.org/ wrt #428438 echo src/configurator.c >> po/POTFILES.skip @@ -47,3 +46,8 @@ vala_src_prepare } + +pkg_postinst() { + has_version '>=sys-power/upower-0.99.0' && \ + ewarn "This version of UEvt doesn't support Hibernate/Suspend with UPower >= 0.99.0" +} 1.17 sys-apps/uevt/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/uevt/ChangeLog?rev=1.17&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/uevt/ChangeLog?rev=1.17&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/uevt/ChangeLog?r1=1.16&r2=1.17 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/sys-apps/uevt/ChangeLog,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- ChangeLog 26 May 2014 19:54:34 -0000 1.16 +++ ChangeLog 4 Jun 2014 09:04:18 -0000 1.17 @@ -1,6 +1,13 @@ # ChangeLog for sys-apps/uevt # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/uevt/ChangeLog,v 1.16 2014/05/26 19:54:34 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/uevt/ChangeLog,v 1.17 2014/06/04 09:04:18 ssuominen Exp $ + + 04 Jun 2014; Samuli Suominen <[email protected]> + +files/uevt-2.3-vala-0.24.patch, uevt-2.3-r1.ebuild: + Support >=dev-lang/vala-0.24.0 wrt #509512 by Alexandre Rostovtsev. Prefer + sys-power/upower-pm-utils over sys-power/upower because that's the only way to + get Hibernate and Suspend support in this version of UEvt. However, don't + force it because the power management features are optional. 26 May 2014; Samuli Suominen <[email protected]> uevt-2.3-r1.ebuild: Fix dependencies to allow sys-power/upower-pm-utils.
