Version bump, mostly packaging cleanup over previous version

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

5 files changed, 65 insertions, 74 deletions

diff --git a/x11-plugins/wmacpi/ChangeLog b/x11-plugins/wmacpi/ChangeLog
index 76df0d0e8c65..ba7870c76eed 100644
--- a/x11-plugins/wmacpi/ChangeLog
+++ b/x11-plugins/wmacpi/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-plugins/wmacpi
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmacpi/ChangeLog,v 1.26 2014/11/05 13:04:39 voyageur Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmacpi/ChangeLog,v 1.27 2015/01/12 10:34:11 voyageur Exp $
+
+*wmacpi-2.3 (12 Jan 2015)
+
+  12 Jan 2015; Bernard Cafarelli <voyageur@gentoo.org> -wmacpi-2.2.ebuild,
+  +wmacpi-2.3.ebuild, -files/wmacpi-2.2-makefile.patch,
+  +files/wmacpi-2.3-makefile.patch:
+  Version bump, mostly packaging cleanup over previous version
 
   05 Nov 2014; Bernard Cafarelli <voyageur@gentoo.org> wmacpi-2.2.ebuild:
   Host tarball on my devspace, bug #527610
diff --git a/x11-plugins/wmacpi/Manifest b/x11-plugins/wmacpi/Manifest
index dffcdb0f61bb..2b15e4e98504 100644
--- a/x11-plugins/wmacpi/Manifest
+++ b/x11-plugins/wmacpi/Manifest
@@ -5,20 +5,20 @@ AUX 1.34-acpi.patch 469 SHA256 f8dae526b35333963628509e8016f4370b657f7a889e1da06
 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
+AUX wmacpi-2.3-makefile.patch 1104 SHA256 0078722a3b562ff7772d316d25542644c60c3cee0a7a367d5baf31a79b2d4a32 SHA512 f35c8675352004f49d495f3ff26a1bd2b3f250968760fb46131fe1d7470691d4cec07fc0c1b7c6febfe59b846ecbcf101dca25a757c16671d2a7a49eb84c47d5 WHIRLPOOL beab0c99ce5c2ade9229a2d2a51d778f94b54aabf012c4313befb4a470ecae48fc7fa231f3ae84677544c217c5c4b7599e0359af087ad4eb23703ff598eebbde
 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
+DIST wmacpi-2.3.tar.gz 39374 SHA256 5ae0ae6ca447e29acaf206f2321a50207509eb2a17ccb98ed196adf734263105 SHA512 47c260989cd3fdb8d7ceadba19224e6350056741b03c6f1b73a38b06d7e471a08972dfbcaeacdcbc460bc19b0f952641eda75e11468b4d7155eecd07e1e14cd9 WHIRLPOOL 0735582a3ee47144ab6ae57a5f6095a2adb006e62b536620b1036dab9ccee4b3ef6e581fde314440398cfc622f4db1ff150ec6c64ce08e791c2559397ef7cb8d
 EBUILD wmacpi-1.34.ebuild 1002 SHA256 ccdd9d6eea9cbe17fe2ca35a86a6907733b198cac9128a56291089a5c9b6a718 SHA512 0bd0c272ccf7ed3a40ac867ea766f19633721f969a84d79702d39918f865b1429f02a355b2129dc76f4f8f514410edf5651ea70399d5076cd0f08359daf368d2 WHIRLPOOL dccb3d3147e21432c19c0c50bcc60008240cb833da85c7c162e62fa4731a32bc54a053220473a780a44a2a999e45d5e6323266c6f39d386bdf17721e17518048
-EBUILD wmacpi-2.2.ebuild 829 SHA256 e0cdafa4599ec0833c2a8bdc222c829dddec9d6ef736bc814b47b0a84d71225a SHA512 0d5579dd24868d440a47a2fc9cfdfdc25eac28967b85432de3759216dade8b62f460c8ca9a1ad88d40c609f3382c1e0e2a17a84db27067122922407e63a821bf WHIRLPOOL c7da4d6bf5d4be21d9a83617c41fe68b0289694bbbd01e332e12077f217141376fb154d4aa9e8831e1a302a71e2d02b618a1c71c5a304d2d94659c03a6286aea
 EBUILD wmacpi-2.2_rc1.ebuild 1146 SHA256 7d46d64773e9a7fdfcd724e3bc7089756c16c2e8873a80f02a8f1e61e1045869 SHA512 47f839fffebfd58d0b9d312812d5491b6e43c44f51bf6fbce932aacf733efe404b92d3bb30fc54f6d13ba57c7a3327f5564f27b3da6173d308e613e5a2e43585 WHIRLPOOL 00ebbc23f6ea3c146a7c13e9b619ef7175d1588b2d407801db07c629c48e07553481054a1675ad10497cfd8d46e0a9e4edfc1abb17d5c3d96481564d57b2dee2
-MISC ChangeLog 3466 SHA256 84ba3ae7b8f4a229790959c21cf6b5131647e162a9d4f00d2eda5f08eda784de SHA512 e52d1f8fe3c640de43bc32cb472f61c43cb765d2673894cb462c751bb9c3ab63d79546646f3a8df4e12b774320f7fa9081384765ab12f0f2f3b38afa9101ce20 WHIRLPOOL 100288c7c7ccc029bd90244440cdde5a0efa0de0c8097781fa0f41a3c62056fcf3ad3e3855d48b44a297885feb18247d52c567e99bafedcd0326230bd3559ab3
+EBUILD wmacpi-2.3.ebuild 829 SHA256 4f3fa13b86856c7e42ca7418ad113e7d671e090b8ca0e2eaf2bee616eaa1eeb4 SHA512 55c1627610b4b91bc101ff37f4bd930fd58982b621cd7f561a9eb2a5b34b35373ff6a809e2f43ed7daaa1b6b0009c860a7330ae4bc3e89f8fdc72625566b322a WHIRLPOOL cb132a87516fd26e17dddaf7301e38a1139e0ba8a9232e210bfb63e62e35df7d89c9839e00eccfdd6061ec7ae1aa8867d6f5fecbf6e7a785224b59b06c4a7c4f
+MISC ChangeLog 3724 SHA256 37d8cbd19e07d15c215345b16cb49696ff2a1903c7c7b62ca3e9b8e96676b8b0 SHA512 8dc7814b2b61935ed6532a561634a1b53be07c3c67ed1a27948973ffd6ff78d0b0d62e2685f090f04fdabb24385cce44843706b2da0304fe5add3729b0a2f704 WHIRLPOOL 9ee1b0ab693958058f3fb536f7c0fbfa58692a887fe7e3085fbcd88ec5dd6e69d86a4155e6234f02574399146e3ba0c07656a245f4e9648c300bc342c7ead3e8
 MISC metadata.xml 250 SHA256 99e258c24b9b78cc2a0be65c30dc2684d99b64269bab224005d86f8e14c428b4 SHA512 fffe6a77ad8b6a98478b4c2c4478f40f7259cc2f14fe05f73525a50e9c83bf9d49be6984b775c6ef36a52e113223284ce1ceb0cb7921b137dda8555b65c3c2ef WHIRLPOOL f92a70223252262943c0250a1fa96f3e444019209b5bfb6af8851694312ce390c207b9e1b5ad99f56f1eac34abded1d122e33debb254d3f36dd1ca3d9b2cdf31
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iF4EAREIAAYFAlRaIG0ACgkQFYEBGcdFJfI+HAEAhdjQNUPWkFwqCt57WFQxwJKG
-08XEQ59yFV/j/d+Pdw4A/2uVVblIccZrmEfJMzusmOjx+jydXE1gDMFZ/ddMVIWg
-=Iq7n
+iF4EAREIAAYFAlSzoy4ACgkQFYEBGcdFJfJJrQEAlzF8eBt09zMPey1P2TkjkXuO
+DxWx6TrvaFpuleu+4wgA/3WRuzH+ggCJ0ZrAA8KWra3f+Ubrt69UmOapQY3J8Ipz
+=zV9e
 -----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
deleted file mode 100644
index 930f83459ced..000000000000
--- a/x11-plugins/wmacpi/files/wmacpi-2.2-makefile.patch
+++ /dev/null
@@ -1,63 +0,0 @@
---- 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/files/wmacpi-2.3-makefile.patch b/x11-plugins/wmacpi/files/wmacpi-2.3-makefile.patch
new file mode 100644
index 000000000000..d1ec49689060
--- /dev/null
+++ b/x11-plugins/wmacpi/files/wmacpi-2.3-makefile.patch
@@ -0,0 +1,47 @@
+--- Makefile.orig	2015-01-12 11:27:07.396319323 +0100
++++ Makefile	2015-01-12 11:29:21.531298827 +0100
+@@ -13,8 +13,8 @@
+ #OPT	= -pg -g
+ 
+ CC	:= gcc
+-CFLAGS	+= $(OPT) -Wall -W -g -ansi
+-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,7 @@
+ doc_targets += wmacpi-cli.1
+ endif
+ 
+-PREFIX := /usr/local
++PREFIX := /usr
+ 
+ all: $(targets)
+ 
+@@ -37,7 +37,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 +47,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
diff --git a/x11-plugins/wmacpi/wmacpi-2.2.ebuild b/x11-plugins/wmacpi/wmacpi-2.3.ebuild
index 70c8c841272e..f03e26b90e2a 100644
--- a/x11-plugins/wmacpi/wmacpi-2.2.ebuild
+++ b/x11-plugins/wmacpi/wmacpi-2.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 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.2 2014/11/05 13:04:39 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmacpi/wmacpi-2.3.ebuild,v 1.1 2015/01/12 10:34:11 voyageur Exp $
 
 EAPI=5
 inherit eutils toolchain-funcs