Use patch from ArchLinux to support upower-0.99 (x11-misc/cbatticon is another alternative to this package that has dead upstream since 2011)

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

4 files changed, 97 insertions, 12 deletions

diff --git a/app-laptop/batti/ChangeLog b/app-laptop/batti/ChangeLog
index 1257dff11c51..8e2ef51a4389 100644
--- a/app-laptop/batti/ChangeLog
+++ b/app-laptop/batti/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-laptop/batti
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-laptop/batti/ChangeLog,v 1.18 2013/02/09 18:57:10 idl0r Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-laptop/batti/ChangeLog,v 1.19 2014/05/31 18:06:22 pacho Exp $
+
+*batti-0.3.8-r2 (31 May 2014)
+
+  31 May 2014; Pacho Ramos <pacho@gentoo.org> +batti-0.3.8-r2.ebuild,
+  +files/batti-0.3.8-upower-0.99.patch:
+  Use patch from ArchLinux to support upower-0.99 (x11-misc/cbatticon is another
+  alternative to this package that has dead upstream since 2011)
 
   09 Feb 2013; Christian Ruppert <idl0r@gentoo.org> batti-0.3.8-r1.ebuild:
   Fix Icon dependency
@@ -76,4 +83,3 @@
 
   12 Apr 2010; Samuli Suominen <ssuominen@gentoo.org> +batti-0.3.1.ebuild:
   Initial commit wrt #314797 by Arthur Spitzer.
-
diff --git a/app-laptop/batti/Manifest b/app-laptop/batti/Manifest
index 2ad37bb7ae18..4232d8c78705 100644
--- a/app-laptop/batti/Manifest
+++ b/app-laptop/batti/Manifest
@@ -1,18 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX batti-0.3.8-upower-0.99.patch 1248 SHA256 38309062cb0111df2c96c49e0b468a120fd3d145c3960b669f71cc020fbc2e5f SHA512 172036b2d5f63c37d26a9542e9348b469c2df4e1380fa3ff4c13883e3a295963c569230b32a36eba14f70e37f87dfc2fcfe03e98406a335749f2d0234c5d30be WHIRLPOOL 2950fcf9b7ef984c0d1fbeed3ed8cd2db9f0d19af8bf2f2399eda0d791f48fb0d23763856cb4c38631ca7fea28b5e11701889d4bde015630ba5010897f7e933e
 DIST batti-0.3.8.tar.gz 59783 SHA256 a63f99bc63dad743abef18ac666e11247011cf9136a11286b131467d9f484d1c SHA512 39e0085a13847359eb555eff80c3f3b166775558fba3c76ecb4315786e2ce4307d21dcac5fab38da4ee3cc2035356906eb1354ced56a1f007735029e0484a4de WHIRLPOOL 93f9dcc1b7a42968859eb79db593e0be694b6a31a14152e589cd1866172185a296b67b4e2131923d369ee21b3f36f80f42d8b7eb4aa91edad5d6ef96a5d2038c
 EBUILD batti-0.3.8-r1.ebuild 933 SHA256 755a64814813375c6d70f7921163907b41bcc6d21a43479be2f1b03a8f951182 SHA512 3868afba7dc9b6806ba26a2bf4f1635289537deb44481daa7fdb672dd2886e9f39d6a8e7158f2084c5e09f211a5f9220b62cfef6cd1edf2c15369a8b71d3f913 WHIRLPOOL 407dd2ad4eb3204eb61408b5a7bd09466b0e0a73181c4c27e336920a0825586397982d05d0a8a7d501f721e9584d2ae5079212a98c34357021553006645a8e20
-MISC ChangeLog 2917 SHA256 677bb9bf4b945a75e6eeea4c774c55efa6cb6a54aad5c5848c2dfa082b748ddc SHA512 e2ccc434b62d45aba146ce7580ae4506d14e56ed48b5c16b2d9c1555875aae67b2dbdec5185413eb81634820504b0b30de8e85cc75b7912ff7d0a96cdd569d25 WHIRLPOOL 29e02745b5f5a64a36c58980eb014fa542723fae3552c5fd5b799b5f20ab304df29eb0077d6d7da2148736b20c45aac7fec91f128036afd360432769fcb73e14
+EBUILD batti-0.3.8-r2.ebuild 1082 SHA256 3f89f81bd31882773d0cd06c23dd59ce451cef0dd23c7fccd3a51292cccdcebd SHA512 c61842bd719b3336aac1b11a64346869ee8906dd96bcbf89fce10891c04e264ee236cf0f2c8fe2537eef4cfd54ca49860d5c2fa817878fda9bcd0cbc3a6407bf WHIRLPOOL d2ea86a3816c01563662d385313cdced3cdef7b84ac493321d38fe2da1aed76009c90bf5a93ef2956e999e6741dd534161e24bb955935df3e331f2d161dbe93d
+MISC ChangeLog 3204 SHA256 0f769503362a144c29d40f2d97461425de2a012df74058cc776b737d7ae54e38 SHA512 1f5b83e420bf1db81cf437d5c1fe4fc40d0b26a06669a00f3274ebb069ba839c27650ed7290397f3c44c63b4b2ef74cb0d5aa679ab55872fcf50b6e6422c3941 WHIRLPOOL 0662c10911991d56581a167f27c97e7937b1ba549b0e39d9eff7b5bdd99042b39e059aa8e886705445cdea3a010ae3ffbfc3831542d8a7e6e21577ab774ccb8a
 MISC metadata.xml 309 SHA256 1ee29fbc146953a29834db4265544619e8c7823e7ee6fd01d3e402bf7557b036 SHA512 a82213a6365cb67325ed9f91f518829b6944331a74cf5e684e054a332d8f656fa353b36d9310c8bd5cace137ab1c38dc8d0a689fc3706ad28deda3ec07980d95 WHIRLPOOL 160dd68f4567fd0d5c3d65c367cb03c0de18347bcb8a7040caf22a1977bcbef4ef6eb10736ebca8f36e0d8a0163b15ec5486fb31bec6367cf1945cbeb70acbfa
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCAAGBQJRFpwHAAoJEMOx0zmdw4Z1cu8IAIIh5AEqkZAOjxDmDBE7nTrC
-3i4HukFNcUKahSmr07YtEXP1vw4or7cFRYxJhquCcuSd0sQVimHMp3Y1Em8smviJ
-DY7yqeXr1EfQXTMSJe1pKaR2EG7GQX6jdIYWE3EiA0FwHJMaQ6/+JwFaeeqgdJs3
-zz12PrSsbUVkzFUMVCsbo3wako1fN2BdnfjqJptQCA26oUSXqnFAa0iHwkFE93TG
-/rsh0hYuWGd3+pNm+Eg6KDQYPKCItJNCVLPz0kfnVwGe0t7LOAqeiE7X9BCVDy3O
-ztFj57Z5NVqcJpnu8OT3TyzHPXQvWhYC7h3UVGd/cdWlW5tPti+xxDkzG1I7YXE=
-=ooOo
+iEYEAREIAAYFAlOKGh8ACgkQCaWpQKGI+9S1/gCdFiEVTskwyq2nOESy2VXoGfQB
+JYUAnRyDBqrS7WH45yMFMla1eC6LwCMV
+=VgPh
 -----END PGP SIGNATURE-----
diff --git a/app-laptop/batti/batti-0.3.8-r2.ebuild b/app-laptop/batti/batti-0.3.8-r2.ebuild
new file mode 100644
index 000000000000..ffb4ee81bf1e
--- /dev/null
+++ b/app-laptop/batti/batti-0.3.8-r2.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-laptop/batti/batti-0.3.8-r2.ebuild,v 1.1 2014/05/31 18:06:22 pacho Exp $
+
+EAPI=5
+
+SUPPORT_PYTHON_ABIS="1"
+PYTHON_DEPEND="2"
+RESTRICT_PYTHON_ABIS="3.*"
+
+inherit python distutils gnome2-utils eutils
+
+DESCRIPTION="A upower based battery monitor for the system tray, similar to batterymon"
+HOMEPAGE="http://code.google.com/p/batti-gtk/"
+SRC_URI="http://batti-gtk.googlecode.com/files/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="libnotify"
+
+RDEPEND="dev-python/pygtk
+	dev-python/dbus-python
+	|| ( sys-power/upower:= sys-power/upower-pm-utils )
+	x11-themes/gnome-icon-theme
+	libnotify? ( x11-libs/libnotify )"
+DEPEND=""
+
+DOCS="AUTHORS"
+
+src_prepare() {
+	has_version ">=sys-power/upower-0.99" && epatch "${FILESDIR}/${P}-upower-0.99.patch"
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	distutils_pkg_postinst
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	distutils_pkg_postrm
+}
diff --git a/app-laptop/batti/files/batti-0.3.8-upower-0.99.patch b/app-laptop/batti/files/batti-0.3.8-upower-0.99.patch
new file mode 100644
index 000000000000..6f313a594c94
--- /dev/null
+++ b/app-laptop/batti/files/batti-0.3.8-upower-0.99.patch
@@ -0,0 +1,34 @@
+diff -Naur batti-0.3.8.orig/src/PowerBackend.py batti-0.3.8/src/PowerBackend.py
+--- batti-0.3.8.orig/src/PowerBackend.py	2014-04-15 19:30:34.123260000 +0200
++++ batti-0.3.8/src/PowerBackend.py	2014-04-15 19:32:11.859168509 +0200
+@@ -180,17 +180,6 @@
+         
+         properties = dbus.Interface(iface, 'org.freedesktop.DBus.Properties')
+ 
+-        if properties.Get(self.dbus_interface, 'CanSuspend'):
+-            self.__can_suspend = True
+-        else:
+-            self.__can_suspend = False
+-        
+-        if properties.Get(self.dbus_interface, 'CanHibernate'):
+-            self.__can_hibernate = True
+-        else:
+-            self.__can_hibernate = False
+-    
+-    
+     def __get_interface(self):
+         dkit_obj = self.__bus.get_object(self.dbus_service, self.dbus_object)
+         return dbus.Interface(dkit_obj, self.dbus_interface)
+@@ -201,12 +190,6 @@
+             self.__mc_action(widget, event, data)
+             
+          
+-    def can_suspend(self):   
+-        return self.__can_suspend and self.__get_interface().SuspendAllowed()
+-
+-    def can_hibernate(self):
+-        return self.__can_hibernate and self.__get_interface().HibernateAllowed()
+-
+     def suspend(self):
+         self.__get_interface().Suspend()
+