gentoo resync : 07.10.2018

14 files changed, 15 insertions, 168 deletions

diff --git a/x11-plugins/Manifest.gz b/x11-plugins/Manifest.gz
index c77f58b7877f..eedea28623b1 100644
--- a/x11-plugins/Manifest.gz
+++ b/x11-plugins/Manifest.gz
diff --git a/x11-plugins/wmSMPmon/Manifest b/x11-plugins/wmSMPmon/Manifest
index eb005713fed8..f1ca3925b967 100644
--- a/x11-plugins/wmSMPmon/Manifest
+++ b/x11-plugins/wmSMPmon/Manifest
@@ -1,5 +1,4 @@
 AUX wmSMPmon-3.1-makefile.patch 1300 BLAKE2B d017661312fe29484eaeffe05a5f8cbacd54c19c3ebc9f52ca6605704427292b23ec695b9403360aaec0d48c61453cf69d4e269f777cbffd8b194a3d078150bc SHA512 e94f9a66d782aaaab3bd637c2657cd34efe1b5e1f556c932171e30814551236f67a1846b688bda8983a072ba1622d37f8aa14528c657e9542404fa8b96358826
 DIST wmSMPmon-3.1.tar.gz 24834 BLAKE2B c02c49810f69b9d28d42f24e7fde6556d46f214d4cb5b47cd705bed2ff5c2c00205829018179ecd6c63162a58d0a957d5fa35d33f0075532c72d3d6876ac6c40 SHA512 b13caa3c4bc7971d35bc52bb66c1f6da482b55a5073b61b3f059fac97f6affbf091816c933981c1c88c17127ab8d21c09c59d0f3c93364e659ca409f13de43b7
-EBUILD wmSMPmon-3.1-r1.ebuild 756 BLAKE2B 66ba5e71a613e7eb4e0ff34afa1d36d043a564c00450f2049f64364d50adc1b3cc6b967f84a1166c8c111584de69bfc527bcc5265353b72f10b8d4e8c0385cb0 SHA512 c3ada7218117596b7472613c96d54515ed16b9b54afa3aca675ce951c3ff5ae00e58187d030ffc0d33929d99bdf6400efcedf51a676cc964d69aa540491a0d6a
-EBUILD wmSMPmon-3.1-r2.ebuild 610 BLAKE2B 3a9012afdded56e4257dc955b67ccd6ee2fc1d0d1cfb009a15f608cf416c32a7cb140f1545432a50305c520b5bd63c0a08f2aca71dc0f3b6f20ab7be0f98436d SHA512 2e46edf7078a58e07467b155312b083a39c941a6c64ca1536ad44388be6069853b412046210403f05ab67b90af79006aa4867b850736d08a92ee9bc4aa34bb14
+EBUILD wmSMPmon-3.1-r2.ebuild 606 BLAKE2B cb23f1aa1c267ed95ad3387aab7a4df80c3d19dabf92d29c2466b72a58874723027527db5c2f26b0480b99d37eee45e7f4fd58d1f3d1ed54122d02cae4ec51dc SHA512 9258edec15c7ad331f3fb13d9c6fa7db32c0e6f374a7c219dc20fbc9fb24bda8b0f418a93b7e4d0c1491b056a761e8f8140dde473ff5eb4d80e4cdb7ac52de99
 MISC metadata.xml 379 BLAKE2B 8d029b244f6cba1311fc8af0fa96705ad2701ffe2d4aad6a45e3e86d6a7b07c1749f7ffdd171217c5f610681921006400f6641618a6cf93541e7b257f2441198 SHA512 2fc60cceb3fbdbbb8fd85048bc50b6777461a9c7cf37d8b672ac09d1556f284acfa5df747d704c9335bfe91f93142be1cf39cd4eb19c808a50eb8fe5a27f67d5
diff --git a/x11-plugins/wmSMPmon/wmSMPmon-3.1-r1.ebuild b/x11-plugins/wmSMPmon/wmSMPmon-3.1-r1.ebuild
deleted file mode 100644
index 8005c831f09c..000000000000
--- a/x11-plugins/wmSMPmon/wmSMPmon-3.1-r1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit eutils multilib toolchain-funcs
-
-DESCRIPTION="SMP system monitor dockapp"
-HOMEPAGE="https://www.dockapps.net/wmsmpmon"
-SRC_URI="https://www.dockapps.net/download/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXpm"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto"
-
-S="${WORKDIR}/${P}/${PN}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-makefile.patch
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" LIBDIR="/usr/$(get_libdir)" || die "compile failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "install failed"
-	dodoc ../Changelog
-}
diff --git a/x11-plugins/wmSMPmon/wmSMPmon-3.1-r2.ebuild b/x11-plugins/wmSMPmon/wmSMPmon-3.1-r2.ebuild
index 268d59eb5219..9619fe673e8c 100644
--- a/x11-plugins/wmSMPmon/wmSMPmon-3.1-r2.ebuild
+++ b/x11-plugins/wmSMPmon/wmSMPmon-3.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://www.dockapps.net/download/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="x11-libs/libX11
diff --git a/x11-plugins/wmSpaceWeather/Manifest b/x11-plugins/wmSpaceWeather/Manifest
index 2e16fad1b7c2..710a5317d18c 100644
--- a/x11-plugins/wmSpaceWeather/Manifest
+++ b/x11-plugins/wmSpaceWeather/Manifest
@@ -2,6 +2,5 @@ AUX wmSpaceWeather-1.04_p19-gentoo.patch 2034 BLAKE2B b81b73f9fb8c64c8ba9560f999
 AUX wmSpaceWeather-1.04_p19-getkp.patch 1290 BLAKE2B dd350e57e2c0d40716ead4fb6bdc215f263bf5340c242550668ba252d78873a5ceab7cbf789209214daec41e33abea3a128b6cd5a5a83ee4e22b9de694ccecec SHA512 54f1ee8d2152bafc7895b2a626f27a4c5bf7b3702a2d14e2523952fcffb8e636f6f3ceb30d95b12b80470a58cb16dd50e04435ccae91e81c83097d41e2949b59
 DIST wmspaceweather_1.04-19.diff.gz 9429 BLAKE2B c32b02d123783789962ef56f54b79b7afacc69573526cd5254b7083673a5ae0d70abaa82d84421c86d95139f9033a35de6511d131f73ff1360d43d1d0e320979 SHA512 f8228c15642b88b355f977a8ce73b474bf8874b4b64bce3f519e6ec6c5de1db7bbd1e5f40e57e367dc0a1dec47e5c32b87d4ce61e35043d71cee0005b06a5a78
 DIST wmspaceweather_1.04.orig.tar.gz 36295 BLAKE2B 8f12a4ba7dc55d06ab1b3c86f387c0f4dc930d89b8ccf151096d736adb80deaf647e47bb4592f309042e2273936996b215cb2fffe83dbbe20bd10d94b1b7c109 SHA512 d422806d44a2929cfdb3e36c7075a4e02b64416db7c528d08411944f574dc34bb5e5ee48c55a3b9e796b15529857bcb480dc650ebdfe23cf1079ba09e2749154
-EBUILD wmSpaceWeather-1.04_p19-r1.ebuild 1619 BLAKE2B f836bc702eafe72bdacae41fd2bdea9767f82f925862b7157175c701927f6e1704ea5fcf51d11193c888464f59887e83e690538ffbd7120ab81b7590d095a107 SHA512 810e92b8dc510b127adcc6cd87cc64e4de65096e16c27b7f1c5f1325bc244a9bc01c8225f4773cb3ebbb8f328f42416f2898afed95856014c790a8f594a08aaf
-EBUILD wmSpaceWeather-1.04_p19.ebuild 1744 BLAKE2B a50f25070cef9f86cde7af708cc5549f064f6d2bf0ca2c5889d9bde24ab847a238b767f819d3e813baeddc9d8315257fef85aa511aa33f06dbc868962c4b28f9 SHA512 a918147033cb30022ab49c7121531fc14c5dad791d79f156cd220f9ef573fd51e30a903a9465d28b1395d9366d2d5fb1c2bc4dd17339db4e53c20f32490442bd
+EBUILD wmSpaceWeather-1.04_p19-r1.ebuild 1615 BLAKE2B 14fe0fcfbd5c1f97d41544d5da48a40c38c017c097c925dd164166bb7c20bf6538f814d2d87eb1a9f87f7393b15f4c7af4859f37e36a72052abf2506e6d5f6d6 SHA512 22994e3a83bb5b196e2815d42991dc2231e3cbe998125a32078e886d3c48b24e6121061a67daafd13a222416d42e637a18ac94dcf3e340abb20abd24b9ce638c
 MISC metadata.xml 349 BLAKE2B 1b79557d30af25f4419b0824e2f99a529447ad80c9c398d22b023eada927a3c840f8787aca77fff8f9073873f01a6be766595bd073cf8b11d335fea81f3e01ab SHA512 f39cf6f8c99788992a57ed0598fcd5d13b25fdf80dc5cf133091f5babae34e269b55e3464bec7b660e3ebb295edc4d46e76dda1978e4fde30e70620cefa21264
diff --git a/x11-plugins/wmSpaceWeather/wmSpaceWeather-1.04_p19-r1.ebuild b/x11-plugins/wmSpaceWeather/wmSpaceWeather-1.04_p19-r1.ebuild
index 21f8049f3673..568c3f7524fb 100644
--- a/x11-plugins/wmSpaceWeather/wmSpaceWeather-1.04_p19-r1.ebuild
+++ b/x11-plugins/wmSpaceWeather/wmSpaceWeather-1.04_p19-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -18,7 +18,7 @@ SRC_URI="mirror://debian/pool/main/w/${MY_PN}/${MY_P_ORIG}.tar.gz
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~hppa ~mips ppc ~sparc x86"
+KEYWORDS="amd64 ~hppa ~mips ppc ~sparc x86"
 
 DOCS=( ../{BUGS,CHANGES,HINTS,README} )
 
diff --git a/x11-plugins/wmSpaceWeather/wmSpaceWeather-1.04_p19.ebuild b/x11-plugins/wmSpaceWeather/wmSpaceWeather-1.04_p19.ebuild
deleted file mode 100644
index 8a6964c62500..000000000000
--- a/x11-plugins/wmSpaceWeather/wmSpaceWeather-1.04_p19.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit eutils multilib toolchain-funcs
-
-MY_PN="wmspaceweather"
-MY_PV_ORIG="${PV/_p*}"
-MY_PV_PATCH="${PV/_p/-}"
-MY_P_ORIG="${MY_PN}_${MY_PV_ORIG}.orig"
-MY_P_PATCH="${MY_PN}_${MY_PV_PATCH}.diff"
-
-DESCRIPTION="dockapp showing weather at geosynchronous orbit"
-HOMEPAGE="https://www.dockapps.net/wmspaceweather"
-SRC_URI="mirror://debian/pool/main/w/${MY_PN}/${MY_P_ORIG}.tar.gz
-	    mirror://debian/pool/main/w/${MY_PN}/${MY_P_PATCH}.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="amd64 hppa ~mips ppc sparc x86"
-IUSE=""
-
-CDEPEND="x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXpm"
-DEPEND="${CDEPEND}
-	x11-base/xorg-proto"
-RDEPEND="${CDEPEND}
-	net-misc/curl
-	dev-lang/perl"
-
-S="${WORKDIR}/${MY_P_ORIG/_/-}/${PN}"
-
-src_unpack() {
-	unpack ${MY_P_ORIG}.tar.gz
-	epatch "${DISTDIR}"/${MY_P_PATCH}.gz
-
-	# need to apply patches from Debian first, do NOT change the order
-	cd "${S}"
-	mv ../debian/patches "${WORKDIR}"/patch
-	EPATCH_SUFFIX="dpatch" EPATCH_FORCE="yes" \
-		EPATCH_MULTI_MSG="Applying Debian patches ..." epatch
-	epatch "${FILESDIR}"/${P}-gentoo.patch
-	epatch "${FILESDIR}"/${P}-getkp.patch
-}
-
-src_compile() {
-	emake clean || die "make clean failed"
-	emake CC="$(tc-getCC)" LIBDIR="/usr/$(get_libdir)" || die "parallel make failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die install failed
-	dodoc ../{BUGS,CHANGES,HINTS,README}
-}
-
-pkg_postinst() {
-	elog "You need to emerge www-client/firefox or www-client/firefox-bin"
-	elog "to use the -url functionality - see man ${PN} for more info."
-	elog
-	elog "This version uses curl instead of wget. You may edit /usr/share/wmspaceweather/GetKp"
-	elog "if you don't like it."
-}
diff --git a/x11-plugins/wmSun/Manifest b/x11-plugins/wmSun/Manifest
index 4e6c84919f70..6b669199d376 100644
--- a/x11-plugins/wmSun/Manifest
+++ b/x11-plugins/wmSun/Manifest
@@ -1,4 +1,4 @@
 DIST wmsun-1.05.tar.gz 20680 BLAKE2B 86e75467133b23e3f062203df6bbd8fe0aa1ca90c468bd91f3de3ec360e4d677bf5a117becf63e111557a17dbf346a1b23a61b78030d197264d71989097c9d77 SHA512 baa610db04ba67ca09112765e28c0fa945a98a61b642925dbaaa56a5b3e7da7424d8dd15097dcec932e3b603219d1f8806c0e50c025370226a157791f16911da
-EBUILD wmSun-1.05-r1.ebuild 701 BLAKE2B 361e7281d6df55bc048dcbc7cd6e301b9ef3019d525aab1a9e7b98a1836d00cbdfe52d299fe139a0fcf4a9000ebcfbddceb42d9e07ec0b5fd99404d5065a4b34 SHA512 62ec7d190c1c3e1019ecdac87e63032afb023b6c2e708cbd6bcf07d73d0a4d232626f1f6f3add6b5ac36c640f6ee5bc7e271527e10459d3f285ad23147889d01
+EBUILD wmSun-1.05-r1.ebuild 697 BLAKE2B 5199b2477717b7549e85c224296a2b801b70f06dba811ffd40b20aa5585539a47d5c1ffe29fc6d5b6394142030e19832ddfc552905e79145a0febbfafcd6b87b SHA512 ada913df888b6a5513746119b02e26d27a89ec558b84752e82015764595ccda6b2cfc8213ea844f5d9131044dc33b63681c92c8e0acb234196d02effa8df1ad0
 EBUILD wmSun-1.05.ebuild 723 BLAKE2B 60e1ef0c33cb53316b2c3bf0b10862880b73bfdb0a83b6eb1690207515d033270d05b1a276cb1130e87310d0db7f9f8e3e394b64d8287ce848e463c95c251ddb SHA512 b0e878e7d950679e66279deea4e9ae76689a665236056b82e42af16eb09f8b2e4b2f2c88e357aa1b35f61b5b7164f9a54ac7522eec86c6fd4df2a83f044092a9
 MISC metadata.xml 498 BLAKE2B 5b9cf3d5fc309ce34ff85551823b360a8bab9af01b39896d8c305837dfcbe64b4ada8f2bd61245870bffeec9d64bd7f70db1c16b6676af3996df64ab59898de5 SHA512 e94d3712d961ae49fdb73b15a70270915cfcdaacf95acb7176c35d64ba6b186d6144d55f4c6e1eed36d33656ed82ced988ece1a38f08a5b08658db063d1ce3df
diff --git a/x11-plugins/wmSun/wmSun-1.05-r1.ebuild b/x11-plugins/wmSun/wmSun-1.05-r1.ebuild
index eef53142a91a..a68c23d6c316 100644
--- a/x11-plugins/wmSun/wmSun-1.05-r1.ebuild
+++ b/x11-plugins/wmSun/wmSun-1.05-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~voyageur/distfiles/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~mips ~ppc ~sparc x86"
+KEYWORDS="amd64 ~mips ~ppc ~sparc x86"
 
 RDEPEND=">=x11-libs/libdockapp-0.7:=
 	x11-libs/libX11
diff --git a/x11-plugins/wmsystray/Manifest b/x11-plugins/wmsystray/Manifest
index 9d0bacb27c96..e06c33649c8d 100644
--- a/x11-plugins/wmsystray/Manifest
+++ b/x11-plugins/wmsystray/Manifest
@@ -2,6 +2,5 @@ AUX wmsystray-0.1.1-Makefile.patch 1551 BLAKE2B b58ebdc03508d47d1eb6c58913493bbf
 AUX wmsystray-0.1.1-gcc-3.4.patch 269 BLAKE2B c3b126db45c7d2dcf38dfce5db9965f9f5c7bf9636a5f9f194d4f0209a737cf11d115ac42430b5ae6f00ad9770256a95e8f03cf47f23127251927172f2e8783a SHA512 ee03a2986af6e1f3de6751a2d90738ffeec2fff0c1f7f0ddc686cc4baeeb010bf2fca764b886e9ee1af82ac2926d4571519ae2371c172053834f3d6bac7e2570
 AUX wmsystray.desktop 185 BLAKE2B 5d4f524ddcc939ef335a043fad6c136e03f2a2cc7fdcc9a4703e210ad301d5e101f8c03caa6c5a069ca805ca44abdf6e56a18fcb8e98596f80f469482b8927e5 SHA512 f7a2c0391257d76c9024f2804de067b07f3669fbba6fd0af6471297f4c0fb876ecfdd7cd6b931187d657d6558ff27d01766c299048f7c16c4d4eed5c4586213b
 DIST wmsystray-0.1.1.tar.bz2 18261 BLAKE2B d232dcfd3077760d7990ec8e22249aafa9dacf415e71b6a662a1a32464e233cd5460f9b99d6e1c478ce69c6ad0e9973febfce2292992d5619792d4bf4dcc1d7c SHA512 a28d8cb6a3e74909a1467459f81a853dae2d74c28db166be15f398f00bc8066fbb1caa0e982fb3874279a7edd376ab892499e8981d2c2126eed591ef52f8d604
-EBUILD wmsystray-0.1.1-r1.ebuild 1180 BLAKE2B 8b0ad145eb5f3e4b7cc38afba7d25bf950b0aed22fb3cf88213ce675e9d1deab7288e1135a86bcb126b4690183efe92b34884d1d52e03e2ca0fae932d7d7d964 SHA512 f7f3b446527f88eb08e294cfc9147a8bbfd97498ba5051f8b0de42623bae14b3d55dda6079f8c55ea5ba22080a80c2224e1b5e4cfa0ee91dfe173c9fac201f63
-EBUILD wmsystray-0.1.1.ebuild 1204 BLAKE2B 8e9235f29442507f9f54ed5ec6e7680b9153d1a5a0a5d8d0dcbe0475faa62e831d8b2333d2e5141696bd17bfd1351210acaee59e6935f049c1a4ca44cf8788ce SHA512 dc8ba563e2c1da0e05f79541d701d89d3ad11d335eda486f00bd557aa141c27711ba92e7ee1cf5328733d6e7907e18bfb2fb42f959bfe1d9710825d9036ec522
+EBUILD wmsystray-0.1.1-r1.ebuild 1176 BLAKE2B ef119e6cff86bc2a4a07d86ac099ec6452ea8b1fb8e5d52f67e35090d604a05a02b3239182ad96d27e8d186c2232a9ca0e25ff2e4b3654c3814c242e161fc39d SHA512 85cf15c7ce31786d0d8551ecbb408d0d380d6e339a9d2600b84def259945ad218e12579b5f4b2054073c9db8853dda7141e433787667c9f7a7f4158c69195d81
 MISC metadata.xml 249 BLAKE2B ba223d81d4cf6b9ca1ba3a63e356bec0d9aa6f4cdf2ad3b29a6c97a6e5bad854154f8b9e6fc3d65d155c93daa706d03c84395b53951e3e326ffc19c8d0df0eb5 SHA512 1a1312bb0e9f74f1e3852218d8fd4817fbad3bc65633cecbe8735607bc33c1e05b414c2628ff3f6e24dfc4a3999de7191f6cdadd2161b03cf614d5b6f24fab8d
diff --git a/x11-plugins/wmsystray/wmsystray-0.1.1-r1.ebuild b/x11-plugins/wmsystray/wmsystray-0.1.1-r1.ebuild
index 0522567eab76..4756f31445fd 100644
--- a/x11-plugins/wmsystray/wmsystray-0.1.1-r1.ebuild
+++ b/x11-plugins/wmsystray/wmsystray-0.1.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,7 +15,7 @@ DEPEND="${RDEPEND}"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ppc ~sparc x86"
+KEYWORDS="amd64 ppc ~sparc x86"
 
 # Let's honour Gentoo CFLAGS and use correct install program
 # Fix for #61704, cannot compile with gcc 3.4.1:
diff --git a/x11-plugins/wmsystray/wmsystray-0.1.1.ebuild b/x11-plugins/wmsystray/wmsystray-0.1.1.ebuild
deleted file mode 100644
index 470cb2956245..000000000000
--- a/x11-plugins/wmsystray/wmsystray-0.1.1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit eutils
-
-DESCRIPTION="Window Maker dock app that provides a system tray for GNOME/KDE applications"
-HOMEPAGE="https://github.com/bbidulock/wmsystray"
-SRC_URI="https://github.com/bbidulock/wmsystray/releases/download/${PV}/${P}.tar.bz2"
-
-RDEPEND="x11-libs/libX11
-	x11-libs/libXpm"
-DEPEND="${RDEPEND}"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="amd64 ppc ~sparc x86"
-IUSE=""
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# Let's honour Gentoo CFLAGS and use correct install program
-	epatch "${FILESDIR}/${P}-Makefile.patch"
-
-	# Fix for #61704, cannot compile with gcc 3.4.1:
-	# it's a trivial change and does not affect other compilers...
-	epatch "${FILESDIR}/${P}-gcc-3.4.patch"
-
-	# Fix parallel compilation
-	sed -ie "s/make EXTRACFLAGS/make \${MAKEOPTS} EXTRACFLAGS/" Makefile
-
-	# Honour Gentoo LDFLAGS, see bug #336296
-	sed -ie "s/-o wmsystray/${LDFLAGS} -o wmsystray/" wmsystray/Makefile
-}
-
-src_compile() {
-	emake EXTRACFLAGS="${CFLAGS}" || die "emake failed"
-}
-
-src_install() {
-	einstall || die "einstall failed"
-	dodoc AUTHORS HACKING README || die
-
-	domenu "${FILESDIR}/${PN}.desktop"
-}
diff --git a/x11-plugins/wmudmount/Manifest b/x11-plugins/wmudmount/Manifest
index a5bd408402cf..bf32a5ab0671 100644
--- a/x11-plugins/wmudmount/Manifest
+++ b/x11-plugins/wmudmount/Manifest
@@ -1,5 +1,5 @@
 AUX wmudmount-2.2-perl_brace_regex.patch 417 BLAKE2B cada3b139df63f9cc78c2d6bdb3f243c3fac5d4517c166de6cfc166439beedf7398510ab9ff76596316db6b3ad6dd8fb234e42d55614e89bfaed671614e0ed18 SHA512 93afa7793d64cf0d3f2e7be5a112fbf8c8823006e97f8d7c654d5aed91e8578012558b8cafce43c73b09c6279ca3a9741214bd851899c63f3eb5cd0641862c73
 DIST wmudmount-2.2.tar.gz 181700 BLAKE2B f375aca9da44b5cba1483b70c36bbed81d897a691ce91ca5d3e11f8bbbbe1cc46685480d41144d6cca0bd10f625e46b5eec2ffc573ec7dd90b9b241dde7605a2 SHA512 6bc08b60430bbe66710ce183f0e7693a7818cee68cefac3a3bc191104663dd3649f8cdb62c7f214bdf4ed377b01fef250fe388f14645690aab7993c6071ceffe
-EBUILD wmudmount-2.2-r2.ebuild 917 BLAKE2B 570314970cb5985b6bf77577d91a324ca8c85a4afb4cb40a16b4df316857b56cc9adb52651f6c52fa6dac84bb484ee99e5e270a604ec3d89676069080f33fdd9 SHA512 89d5d3934ef2163db37324bf49c5457bdfa2d51bfe632472d5c139caedce738b259bdb921554b9388ec55f4e5f3288eb8cc9cf061c25628f613f87971b9f39a7
+EBUILD wmudmount-2.2-r2.ebuild 913 BLAKE2B ba78be7d9870e82c11d622b141e824717336b4c319e46add3a4aeabdac7df059f291df8faad2f7a777abff50a683dfd4f98435f55af32c49a3020e8703156b8e SHA512 35cdd7552465185f61632233bcedee4584bbdcfd1b7407a23420e15fac7d43e40efcb39a80f52f69ba24aefb662260b8b9765c602a81e814e60d7810b8f68818
 EBUILD wmudmount-2.2.ebuild 902 BLAKE2B 56afc5aada175b7623c238146fc74c68ba12779e5c9df60b1f3e043a6b9753e83e6bff4dce4f2e9f1831490f312e41f6b900d4249731f352f5a33599849b3e0a SHA512 c99a70da25007efcac2c16eec30420fba944dd43b1a54a43c84370bf45d7d67668acf0f41d859474e378103652a2eae1ad02e1c92438f4aa704bba63404a8689
 MISC metadata.xml 331 BLAKE2B 17327d6a39e4d1bc33e46b0e3e958713aac557a46aa2d478d455abdd9911531d6292c044604ebbdece25adb283fd80ed90538ebe18e910b4bb24ccd39a290cef SHA512 c930e5cae4d2478d607c0e1c21c4979cb49ec11140cddd5789844cce0bab5c48922f69306f26e98ca4c6d95939c93d2d5dcd99326a74886228839d9e30edc3c9
diff --git a/x11-plugins/wmudmount/wmudmount-2.2-r2.ebuild b/x11-plugins/wmudmount/wmudmount-2.2-r2.ebuild
index 231361dfca59..041cd3e713c4 100644
--- a/x11-plugins/wmudmount/wmudmount-2.2-r2.ebuild
+++ b/x11-plugins/wmudmount/wmudmount-2.2-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 IUSE="gnome-keyring libnotify"
 
 RDEPEND="sys-fs/udisks:2