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.

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

4 files changed, 43 insertions, 18 deletions

diff --git a/sys-apps/uevt/ChangeLog b/sys-apps/uevt/ChangeLog
index ace3b8e3aa52..261f7ebd1766 100644
--- a/sys-apps/uevt/ChangeLog
+++ b/sys-apps/uevt/ChangeLog
@@ -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 <ssuominen@gentoo.org>
+  +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 <ssuominen@gentoo.org> uevt-2.3-r1.ebuild:
   Fix dependencies to allow sys-power/upower-pm-utils.
diff --git a/sys-apps/uevt/Manifest b/sys-apps/uevt/Manifest
index da57f8c2d727..a46ecd43d32a 100644
--- a/sys-apps/uevt/Manifest
+++ b/sys-apps/uevt/Manifest
@@ -2,18 +2,19 @@
 Hash: SHA256
 
 AUX uevt-2.3-support_for_more_than_one_CPU.patch 7891 SHA256 ede620171c0704d8d09702ba50391e218aefddc93ad6bddc666030b3ff99d49d SHA512 fd4203fe0b7291f34761763ab6e422be940c9db168c82d2718bd1f226245257edddca2214cb50667de6df90d3f7aebc1ac57ae21b17728f95f3d900cba88fb75 WHIRLPOOL aa540267db6b12c057c641f107651edc0fdc6a770017797bd91b52d143dd189e5f4ea78ee5f4156af712a5f1fa358616f041759dd35816a35b0b81213754033b
+AUX uevt-2.3-vala-0.24.patch 380 SHA256 1d33d9fb548b8721be286038efffef634837132bcc75d52248e25d3c07edd617 SHA512 6b13e41d510493cc80553096c06bf332b02c32bb6b82d30ab7da018f845bdfad1f653b41a468b88f542f85396d0c86125e2e9377cff04f9de6e10e4fafcf0156 WHIRLPOOL 70f3cf334d115004ba22d2729e9a01c88740dc88d53eff14f2cc1d97471cacba6f7c7fe400748370c34a129b1af3376e05eba105d75737111bafd6a8a0257e69
 DIST uevt-2.3.tar.bz2 787807 SHA256 504daa8c1ff1475ad545a86432d3bd98af4f7ee8570c6aa2b54bedf80d57f0dc SHA512 69baeae514cc34b95f1c908000509d37ce0dff58fbdeffb911f13f1800c4f0fb8de1f9e6f0622836c04f2614bae3a17402d3448236e8ff6b3eadde038a34c1a8 WHIRLPOOL 93bf4a1c9854569c7287ab59a7c668453ebbcb093423acd375f9c089234ab9950e336cb736ad94266aa61b0e598e671fabddfb93973cbdb94e7e29a6a30c789b
-EBUILD uevt-2.3-r1.ebuild 1447 SHA256 cc47556e2a1f3053e4069bda8951a491bf1e985490c3b03ac0257d51bf779528 SHA512 6afdb1989371274f550319ad8cc67342a01b4897b2fa05b317d7e80bed15b8738ab5d9cd90642bef759bc5b7fe0338e519977dfd63b17b87b26c7cd5e47801cc WHIRLPOOL 7275f7081034b2dba69221809b585b2e0c3df87e5f8d943d8f61ff2dd3f2cd85802a242a3004f4297175aaefe0df58e010eeff3210d0483ada8de78031cb18cf
-MISC ChangeLog 2296 SHA256 067fe0cdf3482474737ea5e552c5172c6cf090a05df4b2a3b224402aa0213026 SHA512 628729753456011ad118c2432f6bf4144bf7cc09fd56c5b650d77056d648441ebc40fc7054550bec8a144ffedcc252080b8de9c4c26f68eec20d0832a31826c8 WHIRLPOOL 40e9489e5867704cf10f3f965ddbd107ae6c8326470764534b12df5d9ebffa83af006cc335490d982251f410c3b500961bba7b19d2ba23c96997b2e8ba475319
+EBUILD uevt-2.3-r1.ebuild 1533 SHA256 ce0c7fb2c12a63c6559aaa75aec0dae4aed3a3d8cfaf8a7b5a0c10a4b87595d9 SHA512 dbf10972f326928244d5ccdf0dd8ba0f506230d82b264e937e4182e355e9a91e990adcff3e17c18532fcc5013dcaec7cc327706f58dd711a49d3ce083c95bd68 WHIRLPOOL 3fad7523a06854cf0277fd6e45fe9e48cdab7d02543ea9e4fe3c5f7a58217bdf370dda8af6fbadf48849149bbab2744bdbfd929ef6138158877a7e13d3425320
+MISC ChangeLog 2703 SHA256 81bf7899f5f0221352eda0aefc5661525607e47466558a5e0a558845c558ad19 SHA512 f93aae477a34596b5cee315d05732c9de9935d1f39d20b3093a96d8552e94d80a76a9d0e555ad7484306ca2f5269fd1a513cc08618698a0be07c08ceb8ecf265 WHIRLPOOL f576fbc2314abc7ef44a59d8aff7b1e404ea47490e25d4417b9f3567817be311c8b31ae2f4beea18917c78673784e4ad11e1fd9aa2f49d9fa10e707aa96957dc
 MISC metadata.xml 165 SHA256 d7da9ed29b7afb87ac00580d48a49d248f89c92269e9a7791782dc72f4490aec SHA512 243d1391ff105563c9bf0f75b1eab39434cfb69e084e81cebf6e4eb3aa391cd7e36210b2c3808895bf876dd761eb72330144af2a81e467453c60b37ccdf0e63c WHIRLPOOL f63c52b91f14d86972c7de46b5a50b2d47822a1347d627e05845027ff75299dc79a135988141e1dec933925c4e0213287ef6933ed76ed2fd3fcdff3757c1766b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCAAGBQJTg5uYAAoJEEdUh39IaPFN/SsIAJD0ElHskvfSlrX1Q+M28dfI
-zMiabfP9bpIpk5Cmy3HXAgBIW9FCxoMhUy1tWIcEfV/X7S0hMpsU+fXOxYYdJQh3
-/OH3zTRZQmVzSRMAnu686+eLVUCqSJnmcyn7L4gY7+F5uBjpGQgzZfsgdSOO9cs6
-GGBMT81jx44UBonOBupUarXrlyFya4PNqwgffRXvHPukj4r/bxsNn4tnTF+q5N2y
-QJI2UyivRP/C9b0z2DBlnnhoMSEC08kGofhtMBYUlrBEbS6L1DMyqiSUGkTU8q3l
-aGojc8thOImLG8RUiPdwfdVjyQggkQRwgH0l+A9fTIQtQiJor6CorDK0n31LWPc=
-=8hcM
+iQEcBAEBCAAGBQJTjuCFAAoJEEdUh39IaPFNPS0H/3t/tS8vimaEtpid1xU4B/lV
+CECmR+IUjDx3Rbo6bgqwb/Rx5H54lHq73cc8gGKQiBKVbrgfGCs8b1W0i0ILA9uB
+hxTEvjKpyXQIwTPV7hQsix54Z+HVGhqRwvyHlBJo9+MxKRZ/B6VBrHoWndBgGLmQ
+rYnPM8tNaEhtk7QAmQ38RErrFnc5RGBGsckYZ9OC1UECmCYOz+w0BaaI2Oqf3+Zo
+3rjDtetD9UwDUSKHYtZDQnMGqdchifyJMaTtfBv/ULWePpaJn1z/u1jzD6ywpZuO
+e+F0NbGLTu6bwHlya6ijTOY9IUi0OeE0AOE7EzsoKQPzeNIrzjiQxjml5eusXxg=
+=NJZ7
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/uevt/files/uevt-2.3-vala-0.24.patch b/sys-apps/uevt/files/uevt-2.3-vala-0.24.patch
new file mode 100644
index 000000000000..9cb0917b180f
--- /dev/null
+++ b/sys-apps/uevt/files/uevt-2.3-vala-0.24.patch
@@ -0,0 +1,13 @@
+http://bugs.gentoo.org/509512
+
+--- src/uevt-notify.vala
++++ src/uevt-notify.vala
+@@ -51,7 +51,7 @@
+         if(notify != true)
+             return;
+ 
+-        Notification notif = new Notification(head, Markup.escape_text(body), icon);
++        Notify.Notification notif = new Notify.Notification(head, Markup.escape_text(body), icon);
+ 
+         try {
+             notif.show();
diff --git a/sys-apps/uevt/uevt-2.3-r1.ebuild b/sys-apps/uevt/uevt-2.3-r1.ebuild
index baf8e62f7475..f3b5e34be104 100644
--- a/sys-apps/uevt/uevt-2.3-r1.ebuild
+++ b/sys-apps/uevt/uevt-2.3-r1.ebuild
@@ -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 @@ SLOT="0"
 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 @@ pkg_setup() {
 
 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 @@ src_prepare() {
 
 	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"
+}