6 files changed, 3 insertions, 197 deletions
diff --git a/x11-plugins/wmacpi/Manifest b/x11-plugins/wmacpi/Manifest
index db33a16dcdb9..a71f2c50c0e0 100644
--- a/x11-plugins/wmacpi/Manifest
+++ b/x11-plugins/wmacpi/Manifest
@@ -1,13 +1,4 @@
-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 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 SHA512 d2e3fb2b5ba9fc4d0996262d63cf935c4fe1bfda9d04acc3aec174172551bfa97b656aa445c747c3e9c58e32d2f4b1eba69e6d8b9b754b3d9066a84277b8f286 WHIRLPOOL 67263284e36be7257dbd662b8e78714f02f16f93accbc51433ce15754e0714c8c05a6306d70028914bf18a8d7d1bbb9d516afb7ee09fdbcbffb26ea1825270a5
-DIST wmacpi-2.2rc1.tar.bz2 30233 SHA256 25fc405e6e653caf9cfd90104b184cb4ed73114e710e229ed012ec155083a11f SHA512 491709b5f0019084f6423737bbb47de4353f297f2469b72cd8eec1e93d62487db5d590235b0b774ce3828a26f6f589ddf9bf9896cfecd47249c37e6e230b739e WHIRLPOOL 7eb717cde21490e395beacacb89bb3df6bffae7f64c6a5298f955a8c68abae36fabe271d9815de4c3a45c9fa3e579dc5f46f85a6441bb566c11efaca86aa8575
+AUX wmacpi-2.3-makefile.patch 1104 BLAKE2B 5ca28a6b83c68bb04975399f1573074c56357fb9f053e960070b0827f6025933b9ae60e9c0f737a1d5bcc6a19f198a9b082e2dd9941bd1c0b2bcd2d0272914a7 SHA512 f35c8675352004f49d495f3ff26a1bd2b3f250968760fb46131fe1d7470691d4cec07fc0c1b7c6febfe59b846ecbcf101dca25a757c16671d2a7a49eb84c47d5
 DIST wmacpi-2.3.tar.gz 39374 SHA256 5ae0ae6ca447e29acaf206f2321a50207509eb2a17ccb98ed196adf734263105 SHA512 47c260989cd3fdb8d7ceadba19224e6350056741b03c6f1b73a38b06d7e471a08972dfbcaeacdcbc460bc19b0f952641eda75e11468b4d7155eecd07e1e14cd9 WHIRLPOOL 0735582a3ee47144ab6ae57a5f6095a2adb006e62b536620b1036dab9ccee4b3ef6e581fde314440398cfc622f4db1ff150ec6c64ce08e791c2559397ef7cb8d
-EBUILD wmacpi-1.34.ebuild 916 SHA256 efc85eedca66fe7a757ee849f58c52c523e520eac9150136c612e82dc13fc6cb SHA512 dc5025114084494056c6366928e102cc43650b5d2f3cbe337180403dc1baa02913e4e3f23f49170513e839ec837f3771b249e5d7c6202e28e2dade6a9cec8b1b WHIRLPOOL a8193674c284fb8db117db4e41cd4200289f4aaef69e239815abdd51d091547787a276ca43313a7c0cf64dcf26c314e9b6fc16c262106dfc9c729e583fbdabcd
-EBUILD wmacpi-2.2_rc1.ebuild 1056 SHA256 1daccad8e49a15a3e0f78258be8ee1d91a240eb279e873566bf345595b371c3d SHA512 16ab50c8d5c85a2696ee1cf8d8b9f7062acaec976e255603c5f365699230d4e2370f08d29ab07bf696d60cad5b1f79b0d0d0f93e96598b573e5b57cc689d5a51 WHIRLPOOL 2f521869c642bb912e0dba2ec83eb8664266a0729de0aa11e79b9ecc9099001c97375150a0ddf71c3caef309c6039f8c94c497ab80e393ca8feaaf5134d0e647
-EBUILD wmacpi-2.3.ebuild 706 SHA256 0952c1b6da6d0b69a4c0cc187e38d75ec1bf66bbec775c9d7862775ed30571d8 SHA512 e19e57d00988232a6e2a7188082762a149f1a68eb242a9367c1dc2cc7dc473164b47227b8699b9a94a93b7c2ab0e62bf0967b78013ba168af11792978f4a517f WHIRLPOOL b828afce20ad895b756693f661b518bad6a487a601c374154dbf1c0f49b0b1f7f00fa40258991ff0c1a2fed5dc2a61d7b7892bf2edd2e7afcca6f7df2fae6285
-MISC ChangeLog 4043 SHA256 412352dec297514eea6df7748d1d6586b576e11cb353f8a312ce7a3d53105a81 SHA512 bc5129381a8220c4b58ff91594c7bd980d4ba70e2489b7db908d96fbb28ca4e9c1d2cc331e12823371d2f77f42240ff9b87cd62ab8b8d4dddc315a791a151a8f WHIRLPOOL 4c2ed470ffb4a5815720fc9f9cc8b1e6fd9042ff963a16791a5ec15edfe116e5bf3f3818bf736f43e9deb36b2c2166e71d6b2690d2d44d4b65fb2ee5abfdacef
-MISC ChangeLog-2015 3724 SHA256 37d8cbd19e07d15c215345b16cb49696ff2a1903c7c7b62ca3e9b8e96676b8b0 SHA512 8dc7814b2b61935ed6532a561634a1b53be07c3c67ed1a27948973ffd6ff78d0b0d62e2685f090f04fdabb24385cce44843706b2da0304fe5add3729b0a2f704 WHIRLPOOL 9ee1b0ab693958058f3fb536f7c0fbfa58692a887fe7e3085fbcd88ec5dd6e69d86a4155e6234f02574399146e3ba0c07656a245f4e9648c300bc342c7ead3e8
-MISC metadata.xml 334 SHA256 594a8b4e1d1d5eed3832527a5cab2cce368bfcf7161f897626adb76738e9fbb2 SHA512 708cecfa079327ebfa542b48b792e049348df0664e197c68cc148931820882aaa423ddcb996b47db98a05a87d1b65824ae7fb60492f77936592e3817c0af71b9 WHIRLPOOL 0c4d6f1b3f7c6dee48aa9505618ae0dcea89368b9bf9bd50e02cf837276f5c4aca63b007183f489ef8ec7f6b708cc9d1068b57b2435dff7c226b50d91884597d
+EBUILD wmacpi-2.3.ebuild 706 BLAKE2B 0e81e166c990d99af0e3e4c8df3f8393ebdf343b223f83c25e47421e24eb430668974cf34940c41cd3102885de8480fa22e89dbc3556ef73436ea7166fc0be6b SHA512 e19e57d00988232a6e2a7188082762a149f1a68eb242a9367c1dc2cc7dc473164b47227b8699b9a94a93b7c2ab0e62bf0967b78013ba168af11792978f4a517f
+MISC metadata.xml 334 BLAKE2B f36478f76f93ad154022208ad0f1417400de70c9091166fb46e60a05c1f920f20e736f45628f7681c3f1e607d077c0a93689529fde8866c15b2dda7d07838e18 SHA512 708cecfa079327ebfa542b48b792e049348df0664e197c68cc148931820882aaa423ddcb996b47db98a05a87d1b65824ae7fb60492f77936592e3817c0af71b9
diff --git a/x11-plugins/wmacpi/files/1.34-acpi.patch b/x11-plugins/wmacpi/files/1.34-acpi.patch
deleted file mode 100644
index 76a94e57f77e..000000000000
--- a/x11-plugins/wmacpi/files/1.34-acpi.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- Makefile.orig	2003-09-04 13:00:48.784055072 -0400
-+++ Makefile	2003-09-04 13:03:41.399813488 -0400
-@@ -11,11 +11,11 @@
- #OPT	= -pg -g -DPRO -DACPI
- 
- CC	= gcc
--CFLAGS	= $(OPT) -Wall -ansi -I/usr/X11R6/include
-+CFLAGS	= $(OPT) -Wall -ansi -I/usr/X11R6/include -DACPI
- LDFLAGS = $(OPT) -L/usr/X11R6/lib -lX11 -lXpm -lXext
- 
--SRCS	= wmacpi.c libapm.c libacpi.c
--OBJS	= wmacpi.o libapm.o libacpi.o
-+SRCS	= wmacpi.c libacpi.c
-+OBJS	= wmacpi.o libacpi.o
- 
- all:	wmacpi
- 
diff --git a/x11-plugins/wmacpi/files/1.34-apm.patch b/x11-plugins/wmacpi/files/1.34-apm.patch
deleted file mode 100644
index 6b640b781b13..000000000000
--- a/x11-plugins/wmacpi/files/1.34-apm.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- Makefile.orig	2003-09-04 13:00:48.784055072 -0400
-+++ Makefile	2003-09-04 13:04:23.297444080 -0400
-@@ -11,11 +11,11 @@
- #OPT	= -pg -g -DPRO -DACPI
- 
- CC	= gcc
--CFLAGS	= $(OPT) -Wall -ansi -I/usr/X11R6/include
-+CFLAGS	= $(OPT) -Wall -ansi -I/usr/X11R6/include -DAPM
- LDFLAGS = $(OPT) -L/usr/X11R6/lib -lX11 -lXpm -lXext
- 
--SRCS	= wmacpi.c libapm.c libacpi.c
--OBJS	= wmacpi.o libapm.o libacpi.o
-+SRCS	= wmacpi.c libapm.c
-+OBJS	= wmacpi.o libapm.o
- 
- all:	wmacpi
- 
diff --git a/x11-plugins/wmacpi/files/wmacpi-2.2_rc1-makefile.patch b/x11-plugins/wmacpi/files/wmacpi-2.2_rc1-makefile.patch
deleted file mode 100644
index af142fd574ee..000000000000
--- a/x11-plugins/wmacpi/files/wmacpi-2.2_rc1-makefile.patch
+++ /dev/null
@@ -1,71 +0,0 @@
---- Makefile.orig	2007-07-13 17:26:30.000000000 +0200
-+++ Makefile	2008-01-28 16:36:41.000000000 +0100
-@@ -13,8 +13,8 @@
- #OPT	= -pg -g
- 
- CC	:= gcc
--CFLAGS	:= $(OPT) -Wall -W -g -ansi -I/usr/X11R6/include
--LDFLAGS := $(OPT) -lX11 -ldockapp
-+CFLAGS	:= $(OPT) -Wall -W -g -ansi -I/usr/include
-+LDFLAGS += -lX11 -ldockapp
- 
- WMSRC	:= wmacpi.c libacpi.c
- HEADERS := libacpi.h wmacpi.h
-@@ -22,11 +22,12 @@
- doc_targets := wmacpi.1
- 
- ifdef BUILD_CLI
--targets += acpi
--doc_targets += acpi.1
-+targets += acpi-batt-status
-+doc_targets += acpi-batt-status.1
- endif
- 
--PREFIX := /usr/local
-+PREFIX := /usr
-+MANDIR	:= $(PREFIX)/share/man
- 
- all: $(targets)
- 
-@@ -34,20 +35,20 @@
- WMOBJ := $(patsubst %.c,%.o,$(filter %.c,$(WMSRC)))
- 
- # include per-file dependencies
---include $(WMOBJ:.o=.d)
-+#-include $(WMOBJ:.o=.d)
- 
- wmacpi:	$(WMOBJ)
--	$(CC) $(LDFLAGS) -o $@ $^
-+	$(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS)
- 
- # for the Debian package, we want to make building the command line tools
- # optional. So, we hide all the necessary stuff here . . . 
- ifdef BUILD_CLI
--CLSRC := acpi.c libacpi.c
-+CLSRC := acpi-batt-status.c libacpi.c
- CLOBJ := $(patsubst %.c,%.o,$(filter %.c,$(CLSRC)))
---include $(CLOBJ:.o=.d)
-+#-include $(CLOBJ:.o=.d)
- 
--acpi: $(CLOBJ)
--	$(CC) $(LDFLAGS) -o $@ $^
-+acpi-batt-status: $(CLOBJ)
-+	$(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS)
- endif
- 
- # build per-file dependencies - note that -MM may not be supported
-@@ -62,10 +63,10 @@
- 	rm -f *.d $(targets)
- 
- install: $(targets)
--	install -d $(PREFIX)/bin/
--	install -pc $(targets) $(PREFIX)/bin/
--	install -d $(PREFIX)/man/man1/
--	install -pc $(doc_targets) $(PREFIX)/man/man1/
-+	install -d $(DESTDIR)$(PREFIX)/bin/
-+	install -pc $(targets) $(DESTDIR)$(PREFIX)/bin/
-+	install -d $(DESTDIR)$(MANDIR)/man1/
-+	install -p -m 0644 $(doc_targets) $(DESTDIR)$(MANDIR)/man1/
- 
- tags:
- 	etags $(WMSRC) $(CLSRC) $(HEADERS)
diff --git a/x11-plugins/wmacpi/wmacpi-1.34.ebuild b/x11-plugins/wmacpi/wmacpi-1.34.ebuild
deleted file mode 100644
index 54fe653240dc..000000000000
--- a/x11-plugins/wmacpi/wmacpi-1.34.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-inherit eutils
-
-DESCRIPTION="WMaker DockApp: ACPI status monitor for laptops"
-HOMEPAGE="http://www.ne.jp/asahi/linux/timecop/"
-SRC_URI="http://www.ne.jp/asahi/linux/timecop/software/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc -sparc x86"
-IUSE="acpi apm"
-
-DEPEND="<x11-libs/libdockapp-0.7"
-RDEPEND="${DEPEND}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	use apm && use acpi && eerror "APM and ACPI are in USE ... defaulting to ACPI"
-	use apm || use acpi || eerror "Neither APM or ACPI are in USE ... defaulting to ACPI"
-	if use acpi || ! use apm ; then
-		epatch "${FILESDIR}"/${PV}-acpi.patch
-	else
-		epatch "${FILESDIR}"/${PV}-apm.patch
-	fi
-}
-
-src_compile() {
-	emake OPT="${CFLAGS}" || die "emake failed."
-}
-
-src_install() {
-	dobin wmacpi || die "dobin failed."
-	dodoc AUTHORS ChangeLog README
-}
diff --git a/x11-plugins/wmacpi/wmacpi-2.2_rc1.ebuild b/x11-plugins/wmacpi/wmacpi-2.2_rc1.ebuild
deleted file mode 100644
index f994beede5f3..000000000000
--- a/x11-plugins/wmacpi/wmacpi-2.2_rc1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="WMaker DockApp: ACPI status monitor for laptops"
-HOMEPAGE="http://himi.org/wmacpi/"
-MY_PV="${PV/_}"
-MY_P="${PN}-${MY_PV}"
-S="${WORKDIR}/${MY_P}"
-SRC_URI="http://himi.org/wmacpi/download/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 -ppc -sparc x86"
-IUSE=""
-
-DEPEND="<x11-libs/libdockapp-0.7
-	x11-libs/libX11"
-RDEPEND="${DEPEND}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	# acpi and acpi.1 conflict with sys-power/acpi - Bug #60685
-	mv acpi.c acpi-batt-status.c
-	mv acpi.1 acpi-batt-status.1
-	epatch "${FILESDIR}"/${P}-makefile.patch
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" OPT="${CFLAGS}" || die "compile failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "install failed"
-	dodoc AUTHORS ChangeLog README TODO
-}
-
-pkg_postinst() {
-	elog "The command-line utility are corresponding manpage are installed"
-	elog "as acpi-batt-status to prevent collisions with sys-power/acpi"
-}