Version bump, adds upower support

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0xC74525F2

4 files changed, 48 insertions, 50 deletions

diff --git a/x11-plugins/wmbattery/ChangeLog b/x11-plugins/wmbattery/ChangeLog
index 9b548f5ef7c4..98631a0c53a5 100644
--- a/x11-plugins/wmbattery/ChangeLog
+++ b/x11-plugins/wmbattery/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-plugins/wmbattery
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmbattery/ChangeLog,v 1.23 2012/09/25 14:08:40 voyageur Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmbattery/ChangeLog,v 1.24 2014/02/11 09:42:47 voyageur Exp $
+
+*wmbattery-2.42 (11 Feb 2014)
+
+  11 Feb 2014; Bernard Cafarelli <voyageur@gentoo.org>
+  -wmbattery-2.19-r1.ebuild, +wmbattery-2.42.ebuild:
+  Version bump, adds upower support
 
 *wmbattery-2.41 (25 Sep 2012)
 
diff --git a/x11-plugins/wmbattery/Manifest b/x11-plugins/wmbattery/Manifest
index 82884b1f1235..da914e1ca655 100644
--- a/x11-plugins/wmbattery/Manifest
+++ b/x11-plugins/wmbattery/Manifest
@@ -1,18 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST wmbattery_2.19.tar.gz 66379 SHA256 d30b2f55e3e073fc6dd343e8ff9232a2b44b6547d2b7ec9545934c0360b652ae
 DIST wmbattery_2.40.tar.gz 37070 SHA256 1e94be618e0b103054ac897d7fcca7972dfc11ec65abda5dec3f0439a30a85a5
 DIST wmbattery_2.41.tar.gz 37971 SHA256 1dd3ec541d55558e14161d2d6219c6242b50fb00faf2a23e2c3d9fcad2237e18 SHA512 123b965d3e35c5f4b4d77a1a57b82e9d2e8cf021386e00716adb52776ec6094bc3f62652ef70b3c667adf75c7633be91884422809c0669c2f714ed667c557114 WHIRLPOOL 20b9b50b65b0555683353c4e8e9e0c4a8425715d55b95836386d2193d79a4c5582e8bfed1dc6b8a4440c0cb41a4659df4804d12d59ff3392c0660c97cc8f7282
-EBUILD wmbattery-2.19-r1.ebuild 918 SHA256 f85b659127de2ccab92b20d54ed34afa0c3837f950b2647bf40a9a097c043fb1 SHA512 8f5f5bc6f82f92c75a82d5d99c1dc73ad03489aae9b0172af1dcbe4d4cf1f9877678c61815ce5c9a7d78bbf3ed188b2c9716ab4156eceb719442d2cbd3f82495 WHIRLPOOL d425f54dd6ae96f9ca3ede5274b9f6d75730c02bf901080047fe12050c80a0538be73271dcb1ddb39a176cd25a599467b7a953009ae0609cf8f2efbf8de08af0
+DIST wmbattery_2.42.tar.gz 38881 SHA256 6e57d163443e2d31951d2238eeaadbbe71dbcc0a92c44e7e1f27598eb2c87b75 SHA512 f59b721bd6c59da7730bdee5a092036713c9e3fa4ed8b58d331a9ba67a2fc9e08095c98d77356bb9a95833284fc53f1ff38cb1c818ddbbbc23c756d2cbbd2b8f WHIRLPOOL 2137a80d92939e2307883a598188e282dbb9e279ba335d326754f8fbe5934caeca1dca0d95803f95926364d5b238d6f2486b8ce502b372582be88507e0451be0
 EBUILD wmbattery-2.40.ebuild 796 SHA256 d54907e6170e96b1cb91b4b41e027df37e62332b00c12d8f0f0c43049c09937f SHA512 fce1637c676b505ae6ba590c42ab355b73d2e95901422d57eda26dd83a9b3d707f3c9fb381974ba48a859594f00925f71df18b5276f241cf3f868c53983c1b7a WHIRLPOOL 0049c2bd4993304fcb5125f421683d651d0fdec546b39e4ee7deef2228c8daf2ea129ac97cbce6b7456788244f30ef6333ec646760a053d68d9023513421eb57
 EBUILD wmbattery-2.41.ebuild 796 SHA256 c88449b508beac768b4385a7a99fb388a90ee55d74bd25acbb28c466853a926e SHA512 5732b979f3976c95e38ac318b6f8ca4932ae4d4f36042706a386e2750cc8b1690dbe20491c95a9fbf1f47348998dab31c5dbb16dc9e66a639e272c70869f364a WHIRLPOOL 0016d6f48a42c260d6fb2b56b66cd1ad8eaa09e1c749b740cd4f6610c416ca79333585fde9a45069060c7aa8c7fe67bf6f4b24cd4c42667fa8068b5f7701a492
-MISC ChangeLog 3428 SHA256 07950617d1d154676c5525125bafda330cfcec2ae4611b5a3897bad819901007 SHA512 f29e1411b664d66daede612caada657790ec5105941fedd9f63c673a8d76a9e22741b72df14224b945768c22070c6d0b7abf3e644184b08f99bacdeb43209a21 WHIRLPOOL ef522f62625c3dbbdf12505d6a4a9ad2cf0330b838a1325fa8959767d10a6f0cd1e5f676cb9f4a366e125e91925734faa7260856080af50d6aa9fb14f065408a
+EBUILD wmbattery-2.42.ebuild 747 SHA256 7b77f48bf29a478f75ca99074896bf44e65d131227730ee3bc7d49de4ecb18c8 SHA512 9f2893e052f207216eb462f46cdd350316790d99be79f7230471b759d920356cb91c8cb6af9ef2d8bed0785425ed38b437b3a52a1b401dc0867a55fb27453441 WHIRLPOOL fabf7c7696530a171984ffc474e0172805c49601214ed09c61a3a15859a0ed12300c20e87df7340ce61c01d170158a75f95d5b3ab71bcad183a33b96b392b8df
+MISC ChangeLog 3604 SHA256 acad9bff839d595f44fa76ef4bf11ac259e80d6b7e4dd8fe80238ef6e1156a7e SHA512 90badb66da9a685ac82dec5fe0018e0a436b155ecda4e99d9621585775c56f5645c5ecf34712d39d2916b8e4d6e3e911cd580ef4e327dfdb00578c78c8a9f866 WHIRLPOOL 1e0ffacfb56eeef6cebee2ca88cb31bd52a47d1a2c66b1c3691bee3593f7e7b2f2fbbc0f1ec46cd4757e39f985b9eac3f80b5f47b160eb04bde3489066104028
 MISC metadata.xml 510 SHA256 99c27a1b6d7bd330dcc1ed00a2c50f6c11c7a010d5719f9cfcee71e44d8c1608 SHA512 39bf83a9a0b0b5d13fba9a71e1849bb2e5913d7524c9f2ff13edb9cf9b1cfa4ea3651cd0cd21fb4e333b61d6f70e78685b2908dd6ef63b874ca1ad4c52545f85 WHIRLPOOL e2896c9ebf2a6f04e925149075824bfa4d5574cb5b967244ecdd97ab964308bdd3969d5e412d867b94382e65fcb9eb17cdffecc3c19f70765a40554fa137def2
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iF4EAREIAAYFAlBhuwEACgkQFYEBGcdFJfJJbwD/b1x5aIos+anFuii4hLLCdDwc
-UZKyijtcp3EE1M/lgboA/0TTy46DbUILhqipRq7usDGtT2jFg+93Yc4qhvk1/msb
-=Zg0D
+iF4EAREIAAYFAlL58KUACgkQFYEBGcdFJfLCTgD+MQ9UqYRCcwZDstChVcjNmIif
+TUav2A+OW+vgT/dSnGMBAJhX/7PB+AP3GebN2r2Ge6Ug+QRLer5TfaXWT2m8l0/n
+=9FRK
 -----END PGP SIGNATURE-----
diff --git a/x11-plugins/wmbattery/wmbattery-2.19-r1.ebuild b/x11-plugins/wmbattery/wmbattery-2.19-r1.ebuild
deleted file mode 100644
index e12bfb0e5baf..000000000000
--- a/x11-plugins/wmbattery/wmbattery-2.19-r1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2012 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.8 2012/07/08 15:24:35 jer Exp $
-
-inherit eutils
-
-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://joeyh.name/code/wmbattery/"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 amd64 -sparc ~ppc"
-
-RDEPEND="sys-apps/apmd
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXt
-	x11-libs/libXpm"
-DEPEND="${RDEPEND}
-	x11-proto/xextproto"
-
-src_compile() {
-	econf || die "Configuration failed"
-	emake icondir="/usr/share/pixmaps/wmbattery" || die "Compilation failed"
-}
-
-src_install () {
-	dobin wmbattery
-	dodoc README TODO
-
-	mv wmbattery.1x wmbattery.1
-	doman wmbattery.1
-
-	insinto /usr/share/pixmaps/wmbattery
-	doins *.xpm
-}
diff --git a/x11-plugins/wmbattery/wmbattery-2.42.ebuild b/x11-plugins/wmbattery/wmbattery-2.42.ebuild
new file mode 100644
index 000000000000..9983d5ab6859
--- /dev/null
+++ b/x11-plugins/wmbattery/wmbattery-2.42.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmbattery/wmbattery-2.42.ebuild,v 1.1 2014/02/11 09:42:47 voyageur Exp $
+
+EAPI=5
+inherit autotools
+
+DESCRIPTION="A dockable app to report APM, ACPI, or SPIC battery status"
+HOMEPAGE="http://joeyh.name/code/wmbattery/"
+SRC_URI="mirror://debian/pool/main/w/${PN}/${PN}_${PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc -sparc ~x86"
+IUSE=""
+
+DEPEND="sys-apps/apmd
+	sys-power/upower
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXpm"
+
+S=${WORKDIR}/${PN}
+
+DOCS=( README TODO )
+
+src_prepare() {
+	sed -i \
+		-e '/^icondir/s:icons:pixmaps:' \
+		autoconf/makeinfo.in || die
+
+	eautoconf
+}