7 files changed, 10 insertions, 63 deletions
diff --git a/x11-plugins/wmbattery/ChangeLog b/x11-plugins/wmbattery/ChangeLog
index f9244e9b4c97..8c7fab2f7ee4 100644
--- a/x11-plugins/wmbattery/ChangeLog
+++ b/x11-plugins/wmbattery/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-plugins/wmbattery
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmbattery/ChangeLog,v 1.10 2004/07/16 23:09:32 s4t4n Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmbattery/ChangeLog,v 1.11 2004/07/31 22:48:59 s4t4n Exp $
+
+  01 Aug 2004; Michele Noberasco <s4t4n@gentoo.org> wmbattery-2.19-r1.ebuild:
+  Stable for x86.
+  wmbattery-2.19.ebuild, wmbattery-1.2.1-r1.ebuild:
+  Remove older ebuilds.
 
 *wmbattery-2.19-r1 (17 Jul 2004)
 
diff --git a/x11-plugins/wmbattery/Manifest b/x11-plugins/wmbattery/Manifest
index e83574818943..b8138274fe17 100644
--- a/x11-plugins/wmbattery/Manifest
+++ b/x11-plugins/wmbattery/Manifest
@@ -1,10 +1,6 @@
-MD5 5b1321f0b49ca5f301ebff8cd3caa1ab wmbattery-1.2.1-r1.ebuild 672
-MD5 da2c1c1f326eee5131c451347420026b wmbattery-2.19-r1.ebuild 824
-MD5 7bffbb7869537562ce1d5fa7d7d9b227 wmbattery-2.19.ebuild 649
-MD5 2c0991688b26cf92c24f7d92015cda21 ChangeLog 1863
+MD5 f84a5b473864e43524d0247982bdd0f7 wmbattery-2.19-r1.ebuild 823
+MD5 a506acda18b2eacaa6b68271369145a2 ChangeLog 2036
 MD5 96467fd518228a7950cea6d046f812dc metadata.xml 510
 MD5 f7eadefdeeb46db6d5ff6ce3c62431fe wmbattery-1.2.1-r2.ebuild 844
-MD5 57a327b2ebb8a0d31940eef06579b9bf files/digest-wmbattery-1.2.1-r1 60
 MD5 57a327b2ebb8a0d31940eef06579b9bf files/digest-wmbattery-1.2.1-r2 60
-MD5 4a7cd817e096ff1bf23412612b22fa34 files/digest-wmbattery-2.19 65
 MD5 4a7cd817e096ff1bf23412612b22fa34 files/digest-wmbattery-2.19-r1 65
diff --git a/x11-plugins/wmbattery/files/digest-wmbattery-1.2.1-r1 b/x11-plugins/wmbattery/files/digest-wmbattery-1.2.1-r1
deleted file mode 100644
index 64e9d36c97bc..000000000000
--- a/x11-plugins/wmbattery/files/digest-wmbattery-1.2.1-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 8b85808deec55fb79c5285b02f827ce6 wmbattery.tar.gz 43487
diff --git a/x11-plugins/wmbattery/files/digest-wmbattery-2.19 b/x11-plugins/wmbattery/files/digest-wmbattery-2.19
deleted file mode 100644
index 7aac78e80617..000000000000
--- a/x11-plugins/wmbattery/files/digest-wmbattery-2.19
+++ /dev/null
@@ -1 +0,0 @@
-MD5 13c84a71d47ab3f54a1c89d7ff3d9464 wmbattery_2.19.tar.gz 66379
diff --git a/x11-plugins/wmbattery/wmbattery-1.2.1-r1.ebuild b/x11-plugins/wmbattery/wmbattery-1.2.1-r1.ebuild
deleted file mode 100644
index 0c4e629ec9c2..000000000000
--- a/x11-plugins/wmbattery/wmbattery-1.2.1-r1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmbattery/wmbattery-1.2.1-r1.ebuild,v 1.9 2004/06/24 23:05:13 agriffis Exp $
-
-IUSE=""
-S=${WORKDIR}/wmbattery
-DESCRIPTION="A dockable app to report APM battery stats."
-SRC_URI="http://kitenet.net/programs/code/wmbattery/wmbattery.tar.gz"
-HOMEPAGE="http://kitenet.net/programs/wmbattery"
-
-DEPEND="virtual/x11"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 sparc amd64"
-
-src_install () {
-	dobin wmbattery
-	doman wmbattery.1x
-	dodoc README COPYING TODO
-
-	#install the icons.
-	insinto /usr/share/pixmaps/wmbattery
-	doins *.xpm
-}
diff --git a/x11-plugins/wmbattery/wmbattery-2.19-r1.ebuild b/x11-plugins/wmbattery/wmbattery-2.19-r1.ebuild
index c4f218e4ead3..aa5cc30ecf55 100644
--- a/x11-plugins/wmbattery/wmbattery-2.19-r1.ebuild
+++ b/x11-plugins/wmbattery/wmbattery-2.19-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmbattery/wmbattery-2.19-r1.ebuild,v 1.1 2004/07/16 23:09:32 s4t4n Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmbattery/wmbattery-2.19-r1.ebuild,v 1.2 2004/07/31 22:48:59 s4t4n Exp $
 
 inherit eutils
 
@@ -14,7 +14,7 @@ HOMEPAGE="http://kitenet.net/programs/wmbattery"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 amd64"
+KEYWORDS="x86 amd64"
 
 DEPEND="virtual/x11
 	sys-apps/apmd"
diff --git a/x11-plugins/wmbattery/wmbattery-2.19.ebuild b/x11-plugins/wmbattery/wmbattery-2.19.ebuild
deleted file mode 100644
index 54f3daabcd5c..000000000000
--- a/x11-plugins/wmbattery/wmbattery-2.19.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmbattery/wmbattery-2.19.ebuild,v 1.5 2004/06/24 23:05:13 agriffis Exp $
-
-IUSE=""
-
-S=${WORKDIR}/${PN}
-
-DESCRIPTION="A dockable app to report APM battery stats."
-SRC_URI="http://kitenet.net/programs/wmbattery/${P/-/_}.tar.gz"
-HOMEPAGE="http://kitenet.net/programs/wmbattery"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~x86 amd64"
-
-DEPEND="virtual/x11
-	sys-apps/apmd"
-
-src_install () {
-	dobin wmbattery
-	doman wmbattery.1x
-	dodoc README COPYING TODO
-
-	insinto /usr/share/pixmaps/wmbattery
-	doins *.xpm
-}