Add it back as I just got another mail from him telling it wasn't really breaking it ;)

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

4 files changed, 95 insertions, 5 deletions

diff --git a/app-laptop/batti/ChangeLog b/app-laptop/batti/ChangeLog
index 1bd876682cd6..6db79f446cc0 100644
--- a/app-laptop/batti/ChangeLog
+++ b/app-laptop/batti/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-laptop/batti
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-laptop/batti/ChangeLog,v 1.20 2014/05/31 18:19:54 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-laptop/batti/ChangeLog,v 1.21 2014/05/31 18:22:41 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:
+  Add it back as I just got another mail from him telling it wasn't really
+  breaking it ;)
 
   31 May 2014; Pacho Ramos <pacho@gentoo.org> -batti-0.3.8-r2.ebuild,
   -files/batti-0.3.8-upower-0.99.patch, batti-0.3.8-r1.ebuild:
diff --git a/app-laptop/batti/Manifest b/app-laptop/batti/Manifest
index 79f80e89ea4b..ccb2abdbaa8c 100644
--- a/app-laptop/batti/Manifest
+++ b/app-laptop/batti/Manifest
@@ -1,14 +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 972 SHA256 227c20a8d2d4b599f420521a33324a24bb328b50c85c656abef63687eaa8fe45 SHA512 5e14e68c60b2dcaa3490abab53e04f46fa29f51f98dc32aa11a67d6ebc18ed55545dc0b36f68770577a616ba79bc1496fb25fc3b3c4e32469fdd53955cc74fda WHIRLPOOL 4156cd9dddc865d2bb342ec5219f8817622e3c81509d0e2e5cbb1c74942dd6f1d4d2399f28adad275035d30ea7b42b30e834a696ab7846988d6fec08415d3663
-MISC ChangeLog 3447 SHA256 48f99fd53e588133a8560597e79eb00edd5830c3c3e005104c1a422f9ff01490 SHA512 ef9a9715a4b4b4c45cc30cb9c83e7704d8aefafb53d90ea99b17d26c68680ab6a6308cfae24a0b662b6373b0bebf6cb43e1db8042143a5ab9e5a104b58e8242b WHIRLPOOL e80cc9007fd4e9c29479ec85197556f4b445ce9ac45e6bb0cc8d2f5ae55bb4200c16391fc461ae9a7e146941e4ee4ca5d06430875cbe0d553e6b277f0260a867
+EBUILD batti-0.3.8-r2.ebuild 1082 SHA256 e4839b2897f6182a51472887d9cd563b29cb19092c38b0e8ce8d670490550140 SHA512 59845f8d0e3b0987896c844dfb22325cf38cdfbb1674be0582611eb59f9d057bd242a0aec393e7d47216b4c2549fef57bfd73d163989c982407db2affbeaa042 WHIRLPOOL 6f2600e76c3c2fb0e7a22ee3a6e26d46956c6e9ea447e606382d5a14961583c9af6e59990b7d07344acef7b2061e0b304626e7b4cb72d6aea25134c4fc87a26a
+MISC ChangeLog 3681 SHA256 dab76c610e4adf0a41e854ada3794c28d2393e9720768ee5edd4646c2cd09bf2 SHA512 839380824a63666fffe3ae92b1c7dde2b9f6184a29624396ec1a886875d11619d8946dcf3e9eede58b7e677e0e307ecc9f1c8fae1df314bf51ddcd0f1bf03bbc WHIRLPOOL 59e4f787e93dfed6211f8f69f14efe4714290d9255f6550d11e7907d410f8e98fdeb60ab5423beb0462c8e40b409291c11ecd8f12e2fd748a87039f6d4521bf6
 MISC metadata.xml 309 SHA256 1ee29fbc146953a29834db4265544619e8c7823e7ee6fd01d3e402bf7557b036 SHA512 a82213a6365cb67325ed9f91f518829b6944331a74cf5e684e054a332d8f656fa353b36d9310c8bd5cace137ab1c38dc8d0a689fc3706ad28deda3ec07980d95 WHIRLPOOL 160dd68f4567fd0d5c3d65c367cb03c0de18347bcb8a7040caf22a1977bcbef4ef6eb10736ebca8f36e0d8a0163b15ec5486fb31bec6367cf1945cbeb70acbfa
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlOKHUwACgkQCaWpQKGI+9R6MACfb+03KxzUkLGTNQXabtsSXBee
-WRUAn2rcVU70gxOICfHjWA8fqyrVEXK/
-=BXXT
+iEYEAREIAAYFAlOKHfIACgkQCaWpQKGI+9RW/QCaA9Aq7qTpOQ5xy+kaW/ys07YY
+WwsAnRCu4TnGaQ0Dw4nUQwXUNoNKCrD0
+=HN6E
 -----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..f263d6b971be
--- /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.3 2014/05/31 18:22:41 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()
+