Version bump. Remove dev-python/python-distutils-extra dependency, fixes bug 315551...

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

diff --git a/app-laptop/batti/ChangeLog b/app-laptop/batti/ChangeLog
index eea89e6f7df24182483f266be5f29f0c0ae617ef..c40e3a60ac261d155e3c2166803da8e2f879783c 100644 (file)
--- a/app-laptop/batti/ChangeLog
+++ b/app-laptop/batti/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-laptop/batti
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-laptop/batti/ChangeLog,v 1.3 2010/04/13 19:32:09 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-laptop/batti/ChangeLog,v 1.4 2010/04/16 14:12:51 idl0r Exp $
+
+*batti-0.3.4 (16 Apr 2010)
+
+  16 Apr 2010; Christian Ruppert <idl0r@gentoo.org> -batti-0.3.1.ebuild,
+  +batti-0.3.4.ebuild:
+  Version bump. Remove dev-python/python-distutils-extra dependency, fixes
+  bug 315551. Add support for multiple python installations.
 
   13 Apr 2010; Christian Ruppert <idl0r@gentoo.org> batti-0.3.1.ebuild:
   Remove ewarn to tell the user he has to be in the messagebus group. Depend

diff --git a/app-laptop/batti/Manifest b/app-laptop/batti/Manifest
index e914bf43fb5fc331bae20c5f4cc7ad54e544febf..66c1dfb75cdc222796d3b8c4a6b52e4424621e03 100644 (file)
--- a/app-laptop/batti/Manifest
+++ b/app-laptop/batti/Manifest
@@ -1,14 +1,14 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-DIST batti-0.3.1.tar.gz 181659 RMD160 68f6997b5f7e50105d18aa36c29a0b17a4d3a547 SHA1 050f894ea933230bf30fb12300f329aaf049595d SHA256 a2a2ae0713954fcae05f873d2f4ead3aa7568b3f0b09a7bdb0ed4ba06f1d453e
-EBUILD batti-0.3.1.ebuild 972 RMD160 4b1d941737ff81fb23b85b81689b137de504947a SHA1 d1f526a5f2b2299895c07ae9af16b7bc35c5e471 SHA256 dff18fec25ab92bcfbeb14245d6669eb2b4e2e387edf462ce2ada4945464b9a7
-MISC ChangeLog 729 RMD160 4ddda68d0d6859eafca7f34b82ba55d12e1ae24f SHA1 2e7ce2c4bf7f5279d92ea003ef5947f1aa5050eb SHA256 6aaa4ea5e77e7c3ae16e87db118717ec4e8eb55b2d8d3a3c4f57cdd17d15ac21
+DIST batti-0.3.4.tar.gz 191151 RMD160 d499706b31b842c4a7a9126aa53e4b7a715025a7 SHA1 f693bf29cc41344a178430c88cf04dffd6d54f70 SHA256 2d890a8974fb3f3e138eb194e1904e38ede4476fe76d7406e0fb378d3863c660
+EBUILD batti-0.3.4.ebuild 1060 RMD160 c5e8ded96031a1a2c26d696a76a0122979e99d93 SHA1 1f1980d51ef5e8225505a3a5510fdd99d6454051 SHA256 bf473a8330a72e60c1d57318e2cf760df737694abf1054ea923a40d6b6813c58
+MISC ChangeLog 990 RMD160 79988c6a8b00d762ff5435e5dbe978aba4bf0117 SHA1 d9ba25d3e96ba201ef7781cb7f0dd80d0ba17f74 SHA256 a87ff319d0f57e9b8cad44551e78cb3ce645afb61e78e661d560affcdda77725
 MISC metadata.xml 266 RMD160 b4480e6518739202d8543a84b01b53940907f016 SHA1 3a5b0bff8b6ad1614a1e8fcbecddf54b800c80a2 SHA256 7aba9af99c2de45240978680e160a1bc959795d16c7eeeae6f2822ba59da9af2
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.14 (GNU/Linux)
 
-iEYEARECAAYFAkvExsUACgkQixe2jn+ufTiRYwCeJE/tql7p7P+G00hlhMpJPjn1
-3DYAnjTx9KJLG1vEon+joLse5y+kN+R3
-=DVEe
+iEYEARECAAYFAkvIcHAACgkQixe2jn+ufTj99QCfa1VfQRHmUaaailHnEeBJPyp+
+n90AoIT4V/Z8y5KY7Bgm2gB2fRpnIY/a
+=WoOD
 -----END PGP SIGNATURE-----

diff --git a/app-laptop/batti/batti-0.3.1.ebuild b/app-laptop/batti/batti-0.3.4.ebuild
similarity index 72%
rename from app-laptop/batti/batti-0.3.1.ebuild
rename to app-laptop/batti/batti-0.3.4.ebuild
index e22d616c4d56a136c1add7396e804a41ff4e915f..6649e3271a34dfd7ca5ab9777d34d2044993ed08 100644 (file)
--- a/app-laptop/batti/batti-0.3.1.ebuild
+++ b/app-laptop/batti/batti-0.3.4.ebuild
@@ -1,12 +1,14 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-laptop/batti/batti-0.3.1.ebuild,v 1.3 2010/04/13 19:32:09 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-laptop/batti/batti-0.3.4.ebuild,v 1.1 2010/04/16 14:12:51 idl0r Exp $
 
-EAPI=2
+EAPI=3
 
+PYTHON_SUPPORT_ABIS="1"
 PYTHON_DEPEND="2:2.6"
+RESTRICT_PYTHON_ABIS="3.*"
 
-inherit distutils gnome2-utils
+inherit python distutils gnome2-utils
 
 DESCRIPTION="A upower based battery monitor for the system tray, similar to batterymon"
 HOMEPAGE="http://code.google.com/p/batti-gtk/"
@@ -21,14 +23,18 @@ RDEPEND="dev-python/pygtk
        dev-python/dbus-python
        || ( sys-apps/devicekit-power sys-power/upower )
        libnotify? ( x11-libs/libnotify )"
-DEPEND="${RDEPEND}
-       dev-python/python-distutils-extra"
+DEPEND=""
 
 pkg_setup() {
        DOCS="AUTHORS"
        python_set_active_version 2
 }
 
+src_prepare() {
+       distutils_src_prepare
+       python_convert_shebangs 2 batti
+}
+
 pkg_preinst() {
        gnome2_icon_savelist
 }