Restrict -r0 to old UPower and add -r1 for compability with UPower >= 0.99

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

5 files changed, 125 insertions, 12 deletions

diff --git a/xfce-extra/xfce4-weather-plugin/ChangeLog b/xfce-extra/xfce4-weather-plugin/ChangeLog
index b4ffa00c2a8d..c46ecfc4a997 100644
--- a/xfce-extra/xfce4-weather-plugin/ChangeLog
+++ b/xfce-extra/xfce4-weather-plugin/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for xfce-extra/xfce4-weather-plugin
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-weather-plugin/ChangeLog,v 1.34 2014/05/26 19:49:28 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-weather-plugin/ChangeLog,v 1.35 2014/05/31 19:02:31 ssuominen Exp $
+
+*xfce4-weather-plugin-0.8.3-r1 (31 May 2014)
+
+  31 May 2014; Samuli Suominen <ssuominen@gentoo.org>
+  +files/xfce4-weather-plugin-0.8.3-upower-0.99.patch,
+  +xfce4-weather-plugin-0.8.3-r1.ebuild, xfce4-weather-plugin-0.8.3.ebuild:
+  Restrict -r0 to old UPower and add -r1 for compability with UPower >= 0.99
 
   26 May 2014; Samuli Suominen <ssuominen@gentoo.org>
   xfce4-weather-plugin-0.8.3.ebuild:
diff --git a/xfce-extra/xfce4-weather-plugin/Manifest b/xfce-extra/xfce4-weather-plugin/Manifest
index db8b51d8d0a6..f50e31bfb1d0 100644
--- a/xfce-extra/xfce4-weather-plugin/Manifest
+++ b/xfce-extra/xfce4-weather-plugin/Manifest
@@ -1,18 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX xfce4-weather-plugin-0.8.3-upower-0.99.patch 1879 SHA256 8f505b78a8fc1d1621380362474274022ea3ee17331a42407082228dde76d0c2 SHA512 e4ae8cd5a72d124ca7027686d0fd11fcecb549bc6684d15b9f68e13e88d65b8e6874335a9c65b8ddb388f921b3f1ce63f11eb27b6deada840dd9d7625b35279b WHIRLPOOL f11d6c99520c070a5ba3a9c96765e10c96249792afb969c9a804cac889d86b74f4fc5b0a00528699af85aa7425b27b8125e59b08a6000e4d7002907a63ade620
 DIST xfce4-weather-plugin-0.8.3.tar.bz2 2786473 SHA256 40a6a22be7653b15a47174a430da89040f178695b48e5e01e77990050f715ce4 SHA512 24b1f191e12fcd56a9149d2f0dd3d4449a31586503a28f96352b4dd25f795e3ebcb975997d580478840311c98e30d313458403814ca21d049f35865a5e75b687 WHIRLPOOL b857a236c39e9986ad6962cdc670fabb560ac32d1339d3c276fb8b512387a281c163cf66613a57c3858c98978acfdb8dd5c23ff97aec3dd70d8f6e57c954292a
-EBUILD xfce4-weather-plugin-0.8.3.ebuild 1104 SHA256 2e28c294bc0257e7ac62b9e7fb61b13c063b9ae7b0e4192916b2df2a893935ac SHA512 ce651f1bc375fe181b7dc6ea554d88953c1610f2c9b877febdeffb370d6bf35629cde1ea1845e2ab428c82514b4e35ada99a2b8804ecc0709a44882c4442543b WHIRLPOOL 0ab0a0241f3231785146661f4e6b63a9b106bd8eb7de863fafd010801ad2d3edb7678172e43cc118e047fcfdad23f74f40be09063894d020a0881d2226776c9d
-MISC ChangeLog 3458 SHA256 efb58d4b3472a1416646ef06fb51c3176a7677aef3affdca3e2e1fb2b9eaeddb SHA512 564b55a7428dd430405a52ebbf2b2cf1e4d37d5f55cfdea9a257d3a3f00fdc43ae5f839584fcd673cc9fc21e65a39f94d6e5214ef0fefff8fd31771df1cd3536 WHIRLPOOL e8fdb92a30389a2538835377225394aa1c6686a9918eae53b6852d8c07fd96f763b1b9a6e3360b9b50b60ab406e2aeda3d366d4ab75270d35344877b730cf626
+EBUILD xfce4-weather-plugin-0.8.3-r1.ebuild 1160 SHA256 d018e601a765a9c5d91e1f4bca60943fe3d7ee50bbe8aa227e6657c3704cfb16 SHA512 ef3640f3636936dcfa050e429d96793cfc91ab9b413a594a50d29118de5beda1da0dbb271feb36d88ac5b4ffb42c195a8ec16e92bb46c10271adba7f3c2db1d3 WHIRLPOOL e5e9e59b489cbb4646c83ba160002eca509922c814f1c8def7137a7fe2433e6be6d3b0d59af0aca43333c1ab3376edb3d924717e908e3fd8be97df96496b94f1
+EBUILD xfce4-weather-plugin-0.8.3.ebuild 1101 SHA256 8f8a11c17ddf66eb4b57d93254e69264a4f4e389aa3961a75717264e2f619260 SHA512 0bfa6d0197d05980ba2260bb167b7aa9568cdaee68e3a0e7904b0ca47cecfc6b3f9fdec3b3d076a6c29f8f544956c49a0ab3406f20edfb93de48505f483c9c02 WHIRLPOOL 8c9d0ea9f126db4e3229786b15cd0dd156d0754c1a361293be4a89dfd4bdcd0661d0409055f7b9f63a14b054716f643fbddeb7c49c3c55898d56dd56a1bc5165
+MISC ChangeLog 3767 SHA256 fe09547a75a99728f6888e13a83f0a1b4b5c71c7efded5c3c39abe4e9aee0bd9 SHA512 a023582a9faabb747585920cf18d7525e8237edeb220acf730812c2b960e55113001caa849d3a2c73ee0566ad0a957a1db4304febf7121041af2321fc3836102 WHIRLPOOL d39ba12cd78c5d50679dc7bc5a223a9daf9621d45fdd6d7a69f15b3a553967130ab35a8df5824fd601b0f9ff4266f91c0e3717c2bbf0ccd4cfa1c93ea6a2d527
 MISC metadata.xml 159 SHA256 900ea49b6703fce452e205b85226bf1f994725963e5840da501182e7487d0e63 SHA512 000eb10e453390fb27843585adf354d725e77d881553d97a1a242bf06578a402ee4a924d9d8205a3fa687a59e2402bc9f3e1c227e448e05026354c196cf0a4f3 WHIRLPOOL 6f01aa01b8124d752be8e6c550ffdfc9093d45b206771c924ce25ce3f0daf006a669721d1385ff1bc803df342322d1c264f2905d3ccc44686c937deae8308ec3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCAAGBQJTg5plAAoJEEdUh39IaPFNSlkH/3slgLjcvSjUxaXcifHAmzdX
-KkIGMDhT2MLthLkkPmg2l05gR6EQgoDhTSeXO8NUXKgqc48agKho7bFo5uCxbclC
-hv28eMwoe1i1QFC1deYdTiGPSvO+HqI+JP9kM1VJGMN+NlIX5BWTeUrvKX2oDOXc
-z8VvRFQXirmlUKOQlTbc2M1I9E055Xodn4NRXmDXMTPuMsxD8z5Uu4JPePNsBcDb
-f2elDihTkE2ObkuyjZO8dER/bbHAzlDUzl+vEbjiE3XWHSGGLPUfligYtwQlLaG5
-XCAOt8Q9TC8xNrA5HcrL0uDSdlNFnjQo/GBoD/2JFhrws60yA51vsWHc7hhshgU=
-=Tgwt
+iQEcBAEBCAAGBQJTiibMAAoJEEdUh39IaPFNF1QIAIrrQsCZHDtq8m6RdvSa7vAk
+DZTqoCadyTNMsYwJFPl8V7dWsgnvETwlNo4aJVPAP/qlBQcULGuGFgUGIKvsVN4b
+tzJvTFfajAO+lvNv4Na7gEk9AX1jPPDVQ6nLTmyOEqOb0sReI9Naee7tHVYzTHU+
+2MdU1xKG9UOL/pm1vSfMRQZ6nN7ELTY1IyW78WtaDJKTL/9YJ9n/Ht9uwKQq8PYe
+2dokNJNBpCP6J9o0loG1R7K7UgFgOia5Wxo9Y7AGINqtfmjej/bQX8a147929v4n
+WiaBgu88rSNXFeOka9uqIQnaN0a1qqBKPaazRh/wEDsI116bdXQVNPxlH3vI0rs=
+=5VNG
 -----END PGP SIGNATURE-----
diff --git a/xfce-extra/xfce4-weather-plugin/files/xfce4-weather-plugin-0.8.3-upower-0.99.patch b/xfce-extra/xfce4-weather-plugin/files/xfce4-weather-plugin-0.8.3-upower-0.99.patch
new file mode 100644
index 000000000000..0e3d6e8cc4bb
--- /dev/null
+++ b/xfce-extra/xfce4-weather-plugin/files/xfce4-weather-plugin-0.8.3-upower-0.99.patch
@@ -0,0 +1,64 @@
+http://bug-attachment.xfce.org/attachment.cgi?id=5500
+
+From 79887843c58ef21233a0de571474ac656f977d7c Mon Sep 17 00:00:00 2001
+From: Eric Koegel <eric.koegel@gmail.com>
+Date: Fri, 30 May 2014 19:01:08 +0300
+Subject: [PATCH] Update for Upower 0.99
+
+Upower changed a singal handler.
+---
+ panel-plugin/weather.c | 22 +++++++++++++++++-----
+ 1 file changed, 17 insertions(+), 5 deletions(-)
+
+diff --git a/panel-plugin/weather.c b/panel-plugin/weather.c
+index efa8559..30eddb3 100644
+--- a/panel-plugin/weather.c
++++ b/panel-plugin/weather.c
+@@ -1553,8 +1553,14 @@ proxy_auth(SoupSession *session,
+ 
+ #ifdef HAVE_UPOWER_GLIB
+ static void
++#if UP_CHECK_VERSION(0, 99, 0)
+ upower_changed_cb(UpClient *client,
++                  GParamSpec *pspec,
+                   plugin_data *data)
++#else /* UP_CHECK_VERSION < 0.99 */
++upower_changed_cb(UpClient *client,
++                  plugin_data *data)
++#endif /* UP_CHECK_VERSION */
+ {
+     gboolean on_battery;
+ 
+@@ -1576,7 +1582,7 @@ upower_changed_cb(UpClient *client,
+         schedule_next_wakeup(data);
+     }
+ }
+-#endif
++#endif /* HAVE_UPOWER_GLIB */
+ 
+ 
+ static void
+@@ -2171,10 +2177,16 @@ weather_construct(XfcePanelPlugin *plugin)
+                      G_CALLBACK(xfceweather_show_about), data);
+ 
+ #ifdef HAVE_UPOWER_GLIB
+-    if (data->upower)
+-        g_signal_connect(data->upower, "changed",
+-                         G_CALLBACK(upower_changed_cb), data);
+-#endif
++    if (data->upower) {
++#if UP_CHECK_VERSION(0, 99, 0)
++        g_signal_connect (data->upower, "notify",
++                          G_CALLBACK(upower_changed_cb), data);
++#else /* UP_CHECK_VERSION < 0.99 */
++        g_signal_connect (data->upower, "changed",
++                          G_CALLBACK(upower_changed_cb), data);
++#endif /* UP_CHECK_VERSION */
++    }
++#endif /* HAVE_UPOWER_GLIB */
+ 
+     weather_dump(weather_dump_plugindata, data);
+ }
+-- 
+1.9.3
+
diff --git a/xfce-extra/xfce4-weather-plugin/xfce4-weather-plugin-0.8.3-r1.ebuild b/xfce-extra/xfce4-weather-plugin/xfce4-weather-plugin-0.8.3-r1.ebuild
new file mode 100644
index 000000000000..08b85bc5d19f
--- /dev/null
+++ b/xfce-extra/xfce4-weather-plugin/xfce4-weather-plugin-0.8.3-r1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-weather-plugin/xfce4-weather-plugin-0.8.3-r1.ebuild,v 1.1 2014/05/31 19:02:31 ssuominen Exp $
+
+EAPI=5
+inherit xfconf
+
+DESCRIPTION="A weather plug-in for the Xfce desktop environment"
+HOMEPAGE="http://goodies.xfce.org/projects/panel-plugins/xfce4-weather-plugin"
+SRC_URI="mirror://xfce/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+IUSE="debug udev"
+
+RDEPEND=">=dev-libs/glib-2.20
+	dev-libs/libxml2
+	>=net-libs/libsoup-2.26
+	>=x11-libs/gtk+-2.14:2
+	>=xfce-base/libxfce4ui-4.10
+	>=xfce-base/libxfce4util-4.10
+	>=xfce-base/xfce4-panel-4.10
+	udev? ( || ( >=sys-power/upower-0.9.23 sys-power/upower-pm-utils ) )"
+DEPEND="${RDEPEND}
+	dev-util/intltool
+	virtual/pkgconfig"
+
+pkg_setup() {
+	PATCHES=( "${FILESDIR}"/${P}-upower-0.99.patch )
+
+	# For GEONAMES_USERNAME, read README file and ask ssuominen@!
+	XFCONF=(
+		$(use_enable udev upower)
+		$(xfconf_use_debug)
+		GEONAMES_USERNAME=Gentoo
+		)
+
+	DOCS=( AUTHORS ChangeLog NEWS README TODO )
+}
diff --git a/xfce-extra/xfce4-weather-plugin/xfce4-weather-plugin-0.8.3.ebuild b/xfce-extra/xfce4-weather-plugin/xfce4-weather-plugin-0.8.3.ebuild
index cf1d44a921fb..0b29a84b5764 100644
--- a/xfce-extra/xfce4-weather-plugin/xfce4-weather-plugin-0.8.3.ebuild
+++ b/xfce-extra/xfce4-weather-plugin/xfce4-weather-plugin-0.8.3.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/xfce-extra/xfce4-weather-plugin/xfce4-weather-plugin-0.8.3.ebuild,v 1.4 2014/05/26 19:49:28 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-weather-plugin/xfce4-weather-plugin-0.8.3.ebuild,v 1.5 2014/05/31 19:02:31 ssuominen Exp $
 
 EAPI=5
 inherit xfconf
@@ -21,7 +21,7 @@ RDEPEND=">=dev-libs/glib-2.20
 	>=xfce-base/libxfce4ui-4.10
 	>=xfce-base/libxfce4util-4.10
 	>=xfce-base/xfce4-panel-4.10
-	udev? ( || ( >=sys-power/upower-0.9.19 sys-power/upower-pm-utils ) )"
+	udev? ( || ( <sys-power/upower-0.99 sys-power/upower-pm-utils ) )"
 DEPEND="${RDEPEND}
 	dev-util/intltool
 	virtual/pkgconfig"