Version bump with new homepage, update makefile patch

Package-Manager: portage-2.2.14_rc1/cvs/Linux x86_64
Manifest-Sign-Key: 0xC74525F2

4 files changed, 128 insertions, 13 deletions

diff --git a/x11-plugins/wmacpi/ChangeLog b/x11-plugins/wmacpi/ChangeLog
index 6bb759a5c402..1eb10c9a1e13 100644
--- a/x11-plugins/wmacpi/ChangeLog
+++ b/x11-plugins/wmacpi/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-plugins/wmacpi
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmacpi/ChangeLog,v 1.24 2008/06/28 06:36:16 maekke Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmacpi/ChangeLog,v 1.25 2014/10/10 13:15:37 voyageur Exp $
+
+*wmacpi-2.2 (10 Oct 2014)
+
+  10 Oct 2014; Bernard Cafarelli <voyageur@gentoo.org> +wmacpi-2.2.ebuild,
+  +files/wmacpi-2.2-makefile.patch:
+  Version bump with new homepage, update makefile patch
 
   28 Jun 2008; Markus Meier <maekke@gentoo.org> wmacpi-2.2_rc1.ebuild:
   x86 stable, bug #229545
diff --git a/x11-plugins/wmacpi/Manifest b/x11-plugins/wmacpi/Manifest
index 17f982aa4dc0..525c13595049 100644
--- a/x11-plugins/wmacpi/Manifest
+++ b/x11-plugins/wmacpi/Manifest
@@ -1,11 +1,24 @@
-AUX 1.34-acpi.patch 469 RMD160 141ecb9352b0d220a2bb63a8e7b1ce445d48189f SHA1 ba2c76b3e4e7b6eb25c99608d51954a10c302254 SHA256 f8dae526b35333963628509e8016f4370b657f7a889e1da06668f62114b99e3d
-AUX 1.34-apm.patch 466 RMD160 26abcf04c3a4dff7f915a3f043076544497cb5c6 SHA1 85e91e91da075be673df900841c1349e05f73a27 SHA256 2b20fe75daeefa302f8ca3c5deead8ab062517e999469e08a47f6d0d1774e4f7
-AUX 2.1rc1-nodeps.patch 544 RMD160 edac8566db2746ea18d7227c3cf570f7f9e97b5c SHA1 3df208b8cd842ee6e7f968c44b00badae480ed20 SHA256 311f854223fcd3d5002214988b9330a908a2b863a6d479756a1452edf6b3816a
-AUX 2.1rc1-windowed.patch 918 RMD160 5558156d816efb4e850edbdc8f7d30368373493e SHA1 324f81c150160f49e84d88ed7dc83ca01cd87269 SHA256 11885f4a5d976fb05a8c6eeedabafe3a5e26a5388f1704c453369ba9024fac49
-AUX wmacpi-2.2_rc1-makefile.patch 1859 RMD160 19d319a0479796dd38b42148f3d5886892691d51 SHA1 c9b08c3f3d51f9eff3d233f7d6bcef234b12fbc4 SHA256 884196cbfddbb047891ae22d9e3bbbb93ffb014a6485da4924c1769d1c14785a
-DIST wmacpi-1.34.tar.gz 15509 RMD160 d7eda8146d0f14143fa744a29b95507bf9fb2d49 SHA1 d280e0f7148eac574fa6ec6defaef0d2e49f131e SHA256 65f7a1da06fd3489ed97391d1c9b77b570bc30c14b1f846007028353d0fa51e2
-DIST wmacpi-2.2rc1.tar.bz2 30233 RMD160 57e58d768631fb10da8ddfaccab366b510847b71 SHA1 c4efc7ee09503eca8399ad446d06a80b61f6b9fe SHA256 25fc405e6e653caf9cfd90104b184cb4ed73114e710e229ed012ec155083a11f
-EBUILD wmacpi-1.34.ebuild 1002 RMD160 5e8915730d4392ecb75cf7a1e9b0422f1022c927 SHA1 3991aeee5bf2d723c6a48ea8d3a0b9e1ec7c8be5 SHA256 ccdd9d6eea9cbe17fe2ca35a86a6907733b198cac9128a56291089a5c9b6a718
-EBUILD wmacpi-2.2_rc1.ebuild 1146 RMD160 c127e971dbd3bdcc2bb7cbdfe196dc76492dc571 SHA1 e9e398e2568685af692cf40a8947cbd3c1e78043 SHA256 7d46d64773e9a7fdfcd724e3bc7089756c16c2e8873a80f02a8f1e61e1045869
-MISC ChangeLog 3151 RMD160 91dbd70e7de145af42acba0347b5ca5b8412f053 SHA1 f3f08e1c577d34780c7344c89dc246ed38e5c15e SHA256 6bd3b2dae0b742d686b902f2eae231be7707a450dfc1fa96590c2643e36e3639
-MISC metadata.xml 250 RMD160 5abde015543bb5073014e221d8b3727460d8489c SHA1 4bc07f87a2fa263bbef041a1f167ee4228b88107 SHA256 99e258c24b9b78cc2a0be65c30dc2684d99b64269bab224005d86f8e14c428b4
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX 1.34-acpi.patch 469 SHA256 f8dae526b35333963628509e8016f4370b657f7a889e1da06668f62114b99e3d SHA512 d559c774f6ac25c1e0460c66ed5327de365f12bb3acc22be96b72bd3f73e499e0012110d57b94e609b25521fd7e67b392e5f419319cfddea11feabc83673229b WHIRLPOOL 5d592c867f258cc154d6ea439f0c74ab411a572e5ac7fd61af2f437c4139d3722a57085c4c22ca488f9a33656c2cb2b3c6630d548d0ea4f929cb871a943a3ebb
+AUX 1.34-apm.patch 466 SHA256 2b20fe75daeefa302f8ca3c5deead8ab062517e999469e08a47f6d0d1774e4f7 SHA512 46fd03b84ab29ac571b663bcf65a2d1aec71385872010d14b08ed9c4ce51a00b0443028f7dc18f7cb2e5372a73735a3ab8c993337e785d39bb0e1916dd334270 WHIRLPOOL d12c82e3f906a041a25ea8f4368160324a6be8e6bf7138c0833abfcafbec070ca3680bdcf2c84b356b0509e0912a9534f5c1e331725cfcfb870a6157fdf17831
+AUX 2.1rc1-nodeps.patch 544 SHA256 311f854223fcd3d5002214988b9330a908a2b863a6d479756a1452edf6b3816a SHA512 96d0112a405f250017aaf2c1eaf1ddd40ece7e14b4df78dea13c5d7c3714db790499a95d90b154f4d9c5e37226567ea7fc14622dde06e6ca22f528b1cedf2953 WHIRLPOOL 3859189e3443163e94a9e95f538c2779ee4567d71e50a3469d831b1ca491259f2854cfe3626a92ac70149bcfa3baedf6b38c244411ff367923d702d8ced8ecb4
+AUX 2.1rc1-windowed.patch 918 SHA256 11885f4a5d976fb05a8c6eeedabafe3a5e26a5388f1704c453369ba9024fac49 SHA512 8ec4ff64ae971724df871f3bdf54a2606636d7d4ac263281a2801a23730214db54d209d971105b64a923eae2945710900c8795abe47f2e0530ee1d245042f695 WHIRLPOOL fa493ea35c5a4112d594b825a5bce94f282465277fd7c874bcfd69486683e738dcac5d3003621c3d22718dbf5ef3354fa4dad4adc52366b36c5c8df4ef93852d
+AUX wmacpi-2.2-makefile.patch 1614 SHA256 67df4faabf9d31a77b18b46640a6f64c18f65527501e03dd077356f792654ffb SHA512 0943a1edbf8629fe0eae3e5f17a5bf19b0fb952646ab5909dc863b085b3a3a78caf49f50f115614cec17abcc42dc530f7b4e286e97577e16d689fa47de6f996d WHIRLPOOL ffac11eb3a581d1f966b467f0b802853d18a7121f1c90749e12edce33969089ef44ea702cf4f6328491bd6df1c5986d7047fd55d948214d49b2c2e56cdd97da2
+AUX wmacpi-2.2_rc1-makefile.patch 1859 SHA256 884196cbfddbb047891ae22d9e3bbbb93ffb014a6485da4924c1769d1c14785a SHA512 c5afae8ddd36f49675e92a65f1fa5ea6aeb964717dcb3d270134c6d37d35f26c9ff73c76e0c04064b3cb77d4ff3aa2699785660d447bcc6e67cacc3398421993 WHIRLPOOL 8d5a08a59d3e0738415f5d38ce6b90b6efcae083d03e0d94d0b8eb4e2c8036873e315535988cff8d3ff79949b383f2e87176b3c291c96b1157b8637f5b3cacaa
+DIST wmacpi-1.34.tar.gz 15509 SHA256 65f7a1da06fd3489ed97391d1c9b77b570bc30c14b1f846007028353d0fa51e2
+DIST wmacpi-2.2.tar.gz 39355 SHA256 d45276c8557bebb9eaff2aa836bcd6fac8216b532c985ebe05d52e7adcaf8dab SHA512 49820a02909a2388eabc3e44b299f9aa96e8d0a92fcbea47ad743a410399bd280169256740e6da846de22df6263c3ece767a5f27a7dee26e9fc93de7bf866ed9 WHIRLPOOL 150a495495a8a3762a61be24ed9a951fa0d6bb5f118fd89e9253315686ddcd25372383ecee9164e8f9ca1f0774148819f2cdefc9fbadc037c71479bfb2c7e23c
+DIST wmacpi-2.2rc1.tar.bz2 30233 SHA256 25fc405e6e653caf9cfd90104b184cb4ed73114e710e229ed012ec155083a11f
+EBUILD wmacpi-1.34.ebuild 1002 SHA256 ccdd9d6eea9cbe17fe2ca35a86a6907733b198cac9128a56291089a5c9b6a718 SHA512 0bd0c272ccf7ed3a40ac867ea766f19633721f969a84d79702d39918f865b1429f02a355b2129dc76f4f8f514410edf5651ea70399d5076cd0f08359daf368d2 WHIRLPOOL dccb3d3147e21432c19c0c50bcc60008240cb833da85c7c162e62fa4731a32bc54a053220473a780a44a2a999e45d5e6323266c6f39d386bdf17721e17518048
+EBUILD wmacpi-2.2.ebuild 778 SHA256 3d252b47a21758e7ddc4b558b16738ee41bf74aaa93e4334acad491f6a463d00 SHA512 f35105cdcda19d4184e30d189e90abb044b03ad7d464ad6fd02b19c81d29747e593f26df8410388d1f9739d17d758e242498652fb0c8ab4254cbc34f83936bdf WHIRLPOOL feb8d8211a96d3b0f8d6ee4d173587549c8fc000a35689e18920487da8d024d124a8e1c0940d759e3eebe1e47d2c32506bb2b15308299d6a5d18701b53b1deec
+EBUILD wmacpi-2.2_rc1.ebuild 1146 SHA256 7d46d64773e9a7fdfcd724e3bc7089756c16c2e8873a80f02a8f1e61e1045869 SHA512 47f839fffebfd58d0b9d312812d5491b6e43c44f51bf6fbce932aacf733efe404b92d3bb30fc54f6d13ba57c7a3327f5564f27b3da6173d308e613e5a2e43585 WHIRLPOOL 00ebbc23f6ea3c146a7c13e9b619ef7175d1588b2d407801db07c629c48e07553481054a1675ad10497cfd8d46e0a9e4edfc1abb17d5c3d96481564d57b2dee2
+MISC ChangeLog 3348 SHA256 036e6dd81f38b2c6e96f86341e3a7573ab2a8898c74e043f2dbd0c4586f864dc SHA512 fe6ace7ebfdf6321a032f8df0e2bdd26ae8bca4f06c436027cdf341007ed3a174435412e08fc6f93f7b57be147c76faa06a3d9c2485b02f66630ca0e4cc0c16c WHIRLPOOL 1155d89278b3338ec04179ed65c5f026b2c757494c927117e18f784c5dae2605f64a2f905833327a4b1575ebd538001353aec00fd0b2a65b6b196799bd809c21
+MISC metadata.xml 250 SHA256 99e258c24b9b78cc2a0be65c30dc2684d99b64269bab224005d86f8e14c428b4 SHA512 fffe6a77ad8b6a98478b4c2c4478f40f7259cc2f14fe05f73525a50e9c83bf9d49be6984b775c6ef36a52e113223284ce1ceb0cb7921b137dda8555b65c3c2ef WHIRLPOOL f92a70223252262943c0250a1fa96f3e444019209b5bfb6af8851694312ce390c207b9e1b5ad99f56f1eac34abded1d122e33debb254d3f36dd1ca3d9b2cdf31
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2
+
+iF4EAREIAAYFAlQ33A8ACgkQFYEBGcdFJfJKSAD+JkGsqBcsQAzShlV5wF60MFpI
+Ff9L77utXM0PN6blzB4A/3jPUjvwdurhOr7LgrZRbHyraQXqnFpvqP0wm26lyhlD
+=idbC
+-----END PGP SIGNATURE-----
diff --git a/x11-plugins/wmacpi/files/wmacpi-2.2-makefile.patch b/x11-plugins/wmacpi/files/wmacpi-2.2-makefile.patch
new file mode 100644
index 000000000000..930f83459ced
--- /dev/null
+++ b/x11-plugins/wmacpi/files/wmacpi-2.2-makefile.patch
@@ -0,0 +1,63 @@
+--- Makefile.orig	2014-10-10 14:37:55.000000000 +0200
++++ Makefile	2014-10-10 15:00:33.348752026 +0200
+@@ -13,8 +13,8 @@
+ #OPT	= -pg -g
+ 
+ CC	:= gcc
+-CFLAGS	+= $(OPT) -Wall -W -g -ansi -I/usr/X11R6/include
+-LDFLAGS += $(OPT) -lX11 -ldockapp
++CFLAGS	:= -Wall -W -g -ansi
++LIBS := -lX11 -ldockapp
+ 
+ WMSRC	:= wmacpi.c libacpi.c
+ HEADERS := libacpi.h wmacpi.h
+@@ -26,7 +26,8 @@
+ doc_targets += wmacpi-cli.1
+ endif
+ 
+-PREFIX := /usr/local
++PREFIX := /usr
++MANDIR := $(PREFIX)/share/man
+ 
+ all: $(targets)
+ 
+@@ -37,7 +38,7 @@
+ -include $(WMOBJ:.o=.d)
+ 
+ wmacpi:	$(WMOBJ)
+-	$(CC) -o $@ $^ $(LDFLAGS)
++	$(CC) $(LDFLAGS) -o $@ $^ $(LIBS)
+ 
+ # for the Debian package, we want to make building the command line tools
+ # optional. So, we hide all the necessary stuff here . . . 
+@@ -47,13 +48,13 @@
+ -include $(CLOBJ:.o=.d)
+ 
+ wmacpi-cli: $(CLOBJ)
+-	$(CC) $(LDFLAGS) -o $@ $^
++	$(CC) $(LDFLAGS) -o $@ $^ $(LIBS)
+ endif
+ 
+ # build per-file dependencies - note that -MM may not be supported
+ # in gcc versions older than 2.95.4, but most likely is.
+ %.d: %.c
+-	gcc -MM $(CFLAGS) $< > $@
++	$(CC) -MM $(CFLAGS) $< > $@
+ 
+ clean:
+ 	rm -f TAGS *.o *~ trace *.out *.bb *.bbg 
+@@ -62,10 +63,10 @@
+ 	rm -f *.d $(targets)
+ 
+ install: $(targets)
+-	install -d $(PREFIX)/bin/
+-	install -pc $(targets) $(PREFIX)/bin/
+-	install -d $(PREFIX)/share/man/man1/
+-	install -pc $(doc_targets) $(PREFIX)/share/man/man1/
++	install -d $(DESTDIR)$(PREFIX)/bin/
++	install -pc $(targets) $(DESTDIR)$(PREFIX)/bin/
++	install -d $(DESTDIR)$(MANDIR)/man1/
++	install -pc $(doc_targets) $(DESTDIR)$(MANDIR)/man1/
+ 
+ tags:
+ 	etags $(WMSRC) $(CLSRC) $(HEADERS)
diff --git a/x11-plugins/wmacpi/wmacpi-2.2.ebuild b/x11-plugins/wmacpi/wmacpi-2.2.ebuild
new file mode 100644
index 000000000000..df2c01d3cb11
--- /dev/null
+++ b/x11-plugins/wmacpi/wmacpi-2.2.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/wmacpi/wmacpi-2.2.ebuild,v 1.1 2014/10/10 13:15:37 voyageur Exp $
+
+EAPI=5
+inherit eutils toolchain-funcs
+
+DESCRIPTION="DockApp ACPI status monitor for laptops"
+HOMEPAGE="http://windowmaker.org/dockapps/?name=wmacpi"
+SRC_URI="http://windowmaker.org/dockapps/?download=${P}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 -ppc -sparc ~x86"
+IUSE=""
+
+DEPEND="x11-libs/libdockapp
+	x11-libs/libX11"
+
+S=${WORKDIR}/dockapps
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-makefile.patch
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	dodoc AUTHORS ChangeLog README TODO
+}