Remove =app-laptop/batterymon-1.2.0, bug 313427.

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

4 files changed, 10 insertions, 95 deletions

diff --git a/app-laptop/batterymon/ChangeLog b/app-laptop/batterymon/ChangeLog
index f4837c7f85e2..ff308f54a6a0 100644
--- a/app-laptop/batterymon/ChangeLog
+++ b/app-laptop/batterymon/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-laptop/batterymon
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-laptop/batterymon/ChangeLog,v 1.7 2010/04/13 14:45:40 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-laptop/batterymon/ChangeLog,v 1.8 2010/05/17 00:30:59 idl0r Exp $
+
+  17 May 2010; Christian Ruppert <idl0r@gentoo.org>
+  -batterymon-1.2.0.ebuild, -files/batterymon-1.2.0-import.patch:
+  Remove =app-laptop/batterymon-1.2.0, bug 313427.
 
 *batterymon-0.6.0 (13 Apr 2010)
 
diff --git a/app-laptop/batterymon/Manifest b/app-laptop/batterymon/Manifest
index 77594923ee96..36f2c077e6c8 100644
--- a/app-laptop/batterymon/Manifest
+++ b/app-laptop/batterymon/Manifest
@@ -1,17 +1,14 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX batterymon-1.2.0-import.patch 750 RMD160 50b024d530125b2426aac17ef11bf6ae2e83ac96 SHA1 fdc77c83bc32b68c5380eb16573137f7b0551e40 SHA256 a103c31e4d21611c1899ea5018f8cb5c1839f846b84c8080a7e4e4f0c4c0b161
 DIST batterymon-0.6.0.tar.gz 1969256 RMD160 36e7e58c06a08ef4d392f31be7e2ddc76abf68a6 SHA1 4c4800c1dfbc03afa74a8bfe771732b442a32231 SHA256 140fe41de660678562bf5bb999cc2b38f6b62c95accc995ae4ba5fb08134eda6
-DIST batterymon-1.2.0.tar.gz 1271283 RMD160 e8516b4936f1f40570a4dda63119e8fe444bb2d1 SHA1 77ac73dfb42d062a3c115695fabdd4809080a7d0 SHA256 aaae3dc19c064e51012157e9544fbf48682f74e9e516af9753e14e180d5fa4c9
 EBUILD batterymon-0.6.0.ebuild 898 RMD160 9cc9b5839daf2b447b2e5afbadb6c15bec180fb3 SHA1 e427236a386beea8222586c87eae5a0324677e76 SHA256 3a136f2a3fadae4d3734b9e0fb58346b165bd0bb888a847872ceb0db53b491af
-EBUILD batterymon-1.2.0.ebuild 1469 RMD160 c1060817f59af755c2c8e39774660f690274b579 SHA1 0b80be6557590c0af542df6ff84d2f51e89314a2 SHA256 4e033b724a2b22f5a304574d7a0986796902ba8b97fb5906b95fe7818c5dd460
-MISC ChangeLog 1258 RMD160 e44959c68d20b0e93858d47d2d3d9ef528c4f1be SHA1 969309611c5d89c7e15c57c5b70a55f16d46f27f SHA256 362d312c41899f3614f4fc904d7461f4e1ae5848466be6d9031c96763d3ccedf
+MISC ChangeLog 1428 RMD160 49ea05620b47047bb133a309e76422ce7b8301c2 SHA1 9ba24b58914106e89d06f6b9069a705c708c68ba SHA256 dc61daeadd536e03ad2a0b0f5c54efe338b29409d4adef13fc6983381e9be836
 MISC metadata.xml 252 RMD160 5de0f0ff08807b9079ad37d250794b51ba685996 SHA1 4faf8cdf0a2ce5d38873962787b5af6bb0332af1 SHA256 aceb801e773da9b3e91dec088d62367685e761e2ab2b4db70f00d3e921050fa2
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
+Version: GnuPG v2.0.15 (GNU/Linux)
 
-iEYEARECAAYFAkvEg58ACgkQixe2jn+ufTizogCfes9TPRFRVteFaV2/7vA+WRga
-WFYAn28YMrWdI7RJ/4pSjO0xQUO8IEiH
-=7QnQ
+iEYEARECAAYFAkvwjkwACgkQixe2jn+ufTiJwgCePVmRAH89qRtfkDXIJDYEvV3i
+5kIAniFdJyNvt2RrzWFWcn1g6I4gDEMm
+=GNE1
 -----END PGP SIGNATURE-----
diff --git a/app-laptop/batterymon/batterymon-1.2.0.ebuild b/app-laptop/batterymon/batterymon-1.2.0.ebuild
deleted file mode 100644
index 42ab922f1f4e..000000000000
--- a/app-laptop/batterymon/batterymon-1.2.0.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-laptop/batterymon/batterymon-1.2.0.ebuild,v 1.6 2010/04/05 19:26:33 phajdan.jr Exp $
-
-EAPI="2"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.*"
-
-inherit python eutils
-
-DESCRIPTION="Simple battery monitor ideal for openbox etc."
-HOMEPAGE="http://code.google.com/p/batterymon/"
-SRC_URI="http://batterymon.googlecode.com/files/${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="libnotify"
-
-DEPEND=""
-RDEPEND="${DEPEND}
-	dev-python/dbus-python
-	dev-libs/dbus-glib
-	dev-python/pygtk:2
-	sys-apps/hal
-	libnotify? ( dev-python/notify-python )"
-
-S="${WORKDIR}/${PN}"
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}-import.patch"
-}
-
-src_install() {
-	install_batterymon() {
-		newbin batterymon.py batterymon || die
-
-		insinto $(python_get_sitedir)/${PN}
-		doins {logger,preferences,settings}.py || die
-
-		# Create missing __init__.py
-		touch "${D}/$(python_get_sitedir)/${PN}/__init__.py"
-
-		# Upstream forgot an svn dir
-		rm -rf icons/.svn
-
-		insinto /usr/share/${PN}/
-		doins -r icons/ batterymon.rc || die
-	}
-	python_execute_function install_batterymon
-}
-
-pkg_postinst() {
-	python_mod_optimize ${PN}
-
-	einfo
-	einfo "Your own batterymon.rc will be loaded from ~/.config/${PN}/"
-	einfo "The default configuration can be found here: '${ROOT}usr/share/${PN}/${PN}.rc'"
-	einfo
-}
-
-pkg_postrm() {
-	python_mod_cleanup ${PN}
-}
diff --git a/app-laptop/batterymon/files/batterymon-1.2.0-import.patch b/app-laptop/batterymon/files/batterymon-1.2.0-import.patch
deleted file mode 100644
index e8bb79d3d252..000000000000
--- a/app-laptop/batterymon/files/batterymon-1.2.0-import.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-iff -up batterymon.orig/batterymon.py batterymon/batterymon.py
---- batterymon.orig/batterymon.py	2009-05-01 13:14:37.000000000 +0200
-+++ batterymon/batterymon.py	2009-12-12 11:16:23.307705992 +0100
-@@ -9,9 +9,14 @@ from optparse import OptionParser
- import os,sys
- 
- ## code modules
--from preferences import prefs
--from logger import logger_init
--from settings import config
-+try:
-+    from preferences import prefs
-+    from logger import logger_init
-+    from settings import config
-+except ImportError:
-+    from batterymon.preferences import prefs
-+    from batterymon.logger import logger_init
-+    from batterymon.settings import config
- 
- #{{{ Desktop notifications init
- try:
-Common subdirectories: batterymon.orig/icons and batterymon/icons