gentoo resync : 30.09.2018

3 files changed, 2 insertions, 37 deletions

diff --git a/x11-plugins/wmacpi/Manifest b/x11-plugins/wmacpi/Manifest
index 3b31dd1bb1fa..21495bd9fbf3 100644
--- a/x11-plugins/wmacpi/Manifest
+++ b/x11-plugins/wmacpi/Manifest
@@ -1,5 +1,4 @@
 AUX wmacpi-2.3-makefile.patch 1103 BLAKE2B 8f0d0f15d322d0b318e9d5e94f120bf0eab00fc9559de72f5449abe4b0f78315cbb513ce7d8d84100257e21205d47136d2e9308c1f266d2ed26fe956eca17f14 SHA512 0c7e46514604b5f9e36e0ffbfda7a3a5d86d7932bd31cf88286e937db61fc516b5f5c0fac0edb96d6e1f657cb12d694b4b1505f7fd1e901872fc80e6aae50ab7
 DIST wmacpi-2.3.tar.gz 39374 BLAKE2B bcf55a801fbc7b7c4484cc8987366786e1a1dbaf4d9ff6800975de14bd295ced774eaeedfe0c9da524b774de7633d5d250e7be55742fca7893f7314b8b4fe6fc SHA512 47c260989cd3fdb8d7ceadba19224e6350056741b03c6f1b73a38b06d7e471a08972dfbcaeacdcbc460bc19b0f952641eda75e11468b4d7155eecd07e1e14cd9
-EBUILD wmacpi-2.3-r1.ebuild 616 BLAKE2B 0411c51ede028b40d97cafcae5553aa524a90e5ae2f2522e824ac60a7f28d2821fb8060d488e2e9386de44461eb8747cc4ae9e3494040a674b1e3ca5ecc25b7d SHA512 06738caa9b90d6ab543e75892a675428e0397cc1ed1bba15ca04d3faed9dd86389ea80f92261e91bfffffc065123b3bf97ce14c4fd43a1024a5d4be85aee76b2
-EBUILD wmacpi-2.3.ebuild 707 BLAKE2B 799d59451c5f676062f078bb52a9942ec874a835d18b0005d61608a9f10a77508b8349b1d33cb58e55b88b81b8888eb0770afc0cc1c535546e6036a58204a74f SHA512 e4448e910be662d38feafc95aaad209282cdb3c7201590cbb440424845af0247803a3186fc5bf542174f675a7a7197a379867f15d5de73ff6a6731a758307024
+EBUILD wmacpi-2.3-r1.ebuild 615 BLAKE2B f9a72aa134b869388724eef81fe7d80b99aa28ca8a2e7cc680942023790e431efb3513777d9776da9c0dc035bc3ca27cd607db5c9713212a08fdb34c6d3647da SHA512 6a8382be50b54718aafe328f26144131d4d61ff44175e6b6b36a214e92e0e229da809c5c6c75cfab1d1e7d58b15c893e1d143344a691cd1f6e04589e0c3383a7
 MISC metadata.xml 334 BLAKE2B f36478f76f93ad154022208ad0f1417400de70c9091166fb46e60a05c1f920f20e736f45628f7681c3f1e607d077c0a93689529fde8866c15b2dda7d07838e18 SHA512 708cecfa079327ebfa542b48b792e049348df0664e197c68cc148931820882aaa423ddcb996b47db98a05a87d1b65824ae7fb60492f77936592e3817c0af71b9
diff --git a/x11-plugins/wmacpi/wmacpi-2.3-r1.ebuild b/x11-plugins/wmacpi/wmacpi-2.3-r1.ebuild
index 10283f606758..5a0d2945eb42 100644
--- a/x11-plugins/wmacpi/wmacpi-2.3-r1.ebuild
+++ b/x11-plugins/wmacpi/wmacpi-2.3-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://dev.gentoo.org/~voyageur/distfiles/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 -ppc -sparc x86"
+KEYWORDS="amd64 -ppc -sparc x86"
 
 DEPEND=">=x11-libs/libdockapp-0.7:=
 	x11-libs/libX11"
diff --git a/x11-plugins/wmacpi/wmacpi-2.3.ebuild b/x11-plugins/wmacpi/wmacpi-2.3.ebuild
deleted file mode 100644
index e1d17de7d8a5..000000000000
--- a/x11-plugins/wmacpi/wmacpi-2.3.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils toolchain-funcs
-
-DESCRIPTION="DockApp ACPI status monitor for laptops"
-HOMEPAGE="https://www.dockapps.net/wmacpi"
-SRC_URI="https://dev.gentoo.org/~voyageur/distfiles/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 -ppc -sparc x86"
-IUSE=""
-
-DEPEND=">=x11-libs/libdockapp-0.7:=
-	x11-libs/libX11"
-
-S=${WORKDIR}/dockapps
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-makefile.patch
-
-	sed -e 's#<dockapp.h>#<libdockapp/dockapp.h>#' -i *.c || die
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc AUTHORS ChangeLog README TODO
-}