gentoo resync : 02.06.2018

28 files changed, 97 insertions, 134 deletions

diff --git a/x11-plugins/Manifest.gz b/x11-plugins/Manifest.gz
index e2db44bf082a..798b525091d2 100644
--- a/x11-plugins/Manifest.gz
+++ b/x11-plugins/Manifest.gz
diff --git a/x11-plugins/enigmail/Manifest b/x11-plugins/enigmail/Manifest
index 923090d2f48f..89b4a4d568db 100644
--- a/x11-plugins/enigmail/Manifest
+++ b/x11-plugins/enigmail/Manifest
@@ -1,9 +1,9 @@
 AUX enigmail-2.0.5-fix-missing-missingMdcError.patch 1059 BLAKE2B 70b247f23be20df0dc9b5edb77eb48f56a2538f53af50f29b11ef0ca5c0b196e80b7adb3f1687d6ee3a1246935cc0d299f4c2f74f5a6fab89be5620ade66da1d SHA512 fa7ec8a1390636af1380a9a25f4b8b8cf23c13f82fe5bd1ad555d4a88b5cbef28d89e8dc706d738a5ec54d1d4fc439f630aa660e91509efb7709e6b2ce3013ff
 DIST enigmail-1.9.9.tar.gz 1787556 BLAKE2B 729cf7e404b4cc5d964df476e627b476916cd6c834ce5f220a26738bc32eabbd9fd2c4c3cbaccef6e1d8c4b5b7313b54278a4170808f8b722443b338fda87b55 SHA512 39b37305362c88527d897ed95aa9d8457137d5f026359d19b838ab9df531c14099e157afdc8fefae78a6fa2ddded8dbfbeaf84eb91ac6cfbb05ae808731da2cb
-DIST enigmail-2.0.4.tar.gz 2533719 BLAKE2B 9c3a38233df2c05e4bbbdfa2fd762b6362cc0bbc143b7a417cdabee44b3873bd73747a7b8d50317987f5d1750acf7badfae631cc2827718ed5702c5df2d10709 SHA512 eadcd6bfe42c43d8dd569a8085d82b7acf94f77e5fc2c7632e4148b9cc21389552de687a81a3e88e9b2639adad677c85d6db9b14a39f994f79c0524500de0b3b
 DIST enigmail-2.0.5.tar.gz 2534693 BLAKE2B ad5984b74df2bd1c563f89a23136d9c9742aa7ba94d5683b9046f93eb11c5f729231497e5bb6e8c002c03feb55f2e2a07b43063bc63de3c7c578ea5b4b136fd1 SHA512 9edf78f38dbdb73f16190cc6b08eb02dcc199c41026003d19ce302a48fb4d9a6be6e765bbb7a8ef7f1bc3eea1065182437850da23c3ef5b89d1d5c66c602480b
+DIST enigmail-2.0.6.tar.gz 2535125 BLAKE2B 1fd0d220f7f1020bac9487a7b6ed234e2b3b9b5929a7997954e735e2aee08ab6276c58790b57d7f7cb29e284e9a1e50ca50a373ed4e75524fbd85349a31f8667 SHA512 d2d5b1a5d2ca99735ad40532a04a935235bb62b5eb2494ec5c5f2e17b271b40d43552895bb977e892d0a226cd3514c4314f541ac8eb1d610c3b20b183b18f229
 EBUILD enigmail-1.9.9.ebuild 1922 BLAKE2B 91c9d28229704a6fc1b529a3b9948c3b4b32e097a2f9ec4d44e9e036ad2b7615314c1cf14120e536304cfb43c3ce0d71a6e327f92992c4f79b51ad484ffad6dd SHA512 b2e8dd3b86c1aaf37954c067bdaae67217f7446317817af837f9a2affd4c886d0e3d3b81b10f402105cd54a4534449a86ebe69673024367a34467fea400b6cba
-EBUILD enigmail-2.0.4.ebuild 2174 BLAKE2B 8a2cc0d181c27dc6dfdfaf5e0d51983fe290b8b4fdaf7e3dcaba6401a1c874ff20d363a2b13ac14fac225c3d9aeb904e529de5945112a158ac6b32db37690e6c SHA512 be8c9b87f459bf006a2455d492190f5a4ad7a38ef3369c8408cb27fa65cfe36208175df1752cd5715c6f4592cafeec80b8f1e9535158cac771d74823d0d31afa
 EBUILD enigmail-2.0.5-r1.ebuild 2240 BLAKE2B 7a9cba65cf9cc571d6052e0bcdb474915614f2bfbc0a24c85df56979290fe7d51d96d9baa7d3faead6d20b21877021a93eac0b05971f02b97ee468632f6541b6 SHA512 72e9eccc842581b7b3c6827f57059919624535a804b265704f37b074dfcd853049a0384b91fa94f9fe3a1494defc8fabc3d64ef357e9c44ebe829e42d43bb40a
+EBUILD enigmail-2.0.6.ebuild 2176 BLAKE2B 941c7f06bb44515c26c920ba15fe6c7babb041a01c84ac747c72c1bb3ec0e652a92a6277b16912724ef39250553ee7853f3d96883224b3ebb0552b2e38b56c76 SHA512 4fa175b4ad4412c7e3f18fcbb8d5dcb4cce5605dec07dd39e62e6ff1399d9f805d228ba9d0de083f66ac8802d0af8b2b5e6189e7baafc378cb418504fdfa6376
 EBUILD enigmail-9999.ebuild 2105 BLAKE2B 47053af959ddf2b745ad0aa620b8e1666905e5bb0ca60cb7fe8cfe02eb8160cbbc981940a78a0ddb0c01e1e7a557465f243eea15c44d6ff7e613f03695d58076 SHA512 4c7c4051d47d1692cd8eff3cd1d32027cbc6608257faf2fe437483df9676b70c320cb5546acd632142d8de0c612c6a6281d5eb6d151eeac494c7c1b359060a3e
 MISC metadata.xml 250 BLAKE2B 9e6643b2a0b90fc083246090047db38d3b9a3b71db8542051307b7e87394135d3337e1ea54b83a0c7474661a0fd07d950385b44cbed6ee95f6e6ad718bd0b062 SHA512 ba5e7c1f6ee117471a3804bc54211e7f89c75e965a865f45f85015a0a28ec7d511ef9bbc196eef8245dc9259f54b04eb3563d83811a293bb946cf0977563892b
diff --git a/x11-plugins/enigmail/enigmail-2.0.4.ebuild b/x11-plugins/enigmail/enigmail-2.0.6.ebuild
index c61c12f8ec4a..9e8d0cbb3958 100644
--- a/x11-plugins/enigmail/enigmail-2.0.4.ebuild
+++ b/x11-plugins/enigmail/enigmail-2.0.6.ebuild
@@ -21,7 +21,7 @@ else
 		SRC_URI="http://www.enigmail.net/download/beta/${P/_/-}.tar.gz"
 	else
 		SRC_URI="http://www.enigmail.net/download/source/${P}.tar.gz"
-		KEYWORDS="~alpha amd64 ~arm ~ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+		KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 	fi
 	S="${WORKDIR}/${PN}"
 fi
diff --git a/x11-plugins/pidgin-extprefs/Manifest b/x11-plugins/pidgin-extprefs/Manifest
index fe495976ec50..18cffead7a74 100644
--- a/x11-plugins/pidgin-extprefs/Manifest
+++ b/x11-plugins/pidgin-extprefs/Manifest
@@ -1,3 +1,3 @@
 DIST pidgin-extprefs-0.7.tar.gz 332742 BLAKE2B 39a12a595f6eb7a66b071ef4d3e94d7e4d54201baa29280f3dc24e790976dfd57e7f3a656cea398c76759d02b258429b0cae46fd4ed7c07ec9f2219f5b0e97e4 SHA512 f2157403463c1a9621396c84ea71c4e02a853796d5c7b7aa33def03f9b6eccc52a0fad7f5edcfa1506cdc2c6e9dfb056a445cdfa985b0c3885d7ffe666150c3a
-EBUILD pidgin-extprefs-0.7-r1.ebuild 497 BLAKE2B cd814efee45c306bc4611ea32a237e8fa219d679c9fdb5be576ea984910e4dd1e605f025b2bc5ec105e4e51cdf8f81e8767cb6511a55e98fc8e38c0b98dc8f04 SHA512 06074e470ab71c734b3482c1097e9717d70a02ca5cde640c9561248a428ecb3cdef3aba77c9fc8f131112cb85cbcffda68d31a19a49107fbe3cd996f9889cfe2
+EBUILD pidgin-extprefs-0.7-r1.ebuild 441 BLAKE2B 679fe2ab1ba9f7b6c8b1b465e136e9547b9804b3a146b418302c3b015ac78306a9ca6732c6767eb8728ca95739f0db0b60db3117b03dc227af2bd24bbbe1e7b5 SHA512 a93bcf45803730e385328db75b05735a908fb3f8a4c2597a8eba4d3294217f3cb5e5de26d87b6c17f69cd1decd4182a0b6139c17aa5fd3972009563b3d45162d
 MISC metadata.xml 429 BLAKE2B bd54667274f11c399f2feb083848551bea785a62668c034fca214afaded40f4b798ffafd6393bd99a9c6db7c3d1abca893adff6163aae3dd1f98e7fafdcf02c0 SHA512 45d92936f57d4de39761a5c6f6b3a9b2645041109857a96b3910ec097c3e8fe140439953defb65dae391474d8ae3bb54f0e10fd9142c322b09fa7c916f4bddf0
diff --git a/x11-plugins/pidgin-extprefs/pidgin-extprefs-0.7-r1.ebuild b/x11-plugins/pidgin-extprefs/pidgin-extprefs-0.7-r1.ebuild
index b291a7b8d448..cc4b162c7c60 100644
--- a/x11-plugins/pidgin-extprefs/pidgin-extprefs-0.7-r1.ebuild
+++ b/x11-plugins/pidgin-extprefs/pidgin-extprefs-0.7-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=2
+EAPI=6
 
 DESCRIPTION="Extra preferences that are desired but are not worthy for Pidgin"
 HOMEPAGE="http://gaim-extprefs.sourceforge.net"
@@ -16,7 +16,3 @@ RDEPEND="net-im/pidgin[gtk]"
 DEPEND="
 	virtual/pkgconfig
 	${RDEPEND}"
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-}
diff --git a/x11-plugins/pidgin-libnotify/Manifest b/x11-plugins/pidgin-libnotify/Manifest
index 8414ae9d52cc..fac30b2b71c2 100644
--- a/x11-plugins/pidgin-libnotify/Manifest
+++ b/x11-plugins/pidgin-libnotify/Manifest
@@ -1,5 +1,5 @@
-AUX pidgin-libnotify-0.14-libnotify-0.7.patch 555 BLAKE2B 93cfa73066161d40e70726d90e0d9c666b2055a3969412948bdcf905b3c9b4e7e0ea79e361ea7e9e0accf10f5a6d4f3fbdc18c3328654d4434c8fca84fac28f4 SHA512 242fb898521466dd5455e3488487bcbbceac2e3fc53979b14857ca527fbd43d480209c45217ae513eae0d7327819c24b3a64a0fa03b52ce54c390277d8c28d76
+AUX pidgin-libnotify-0.14-libnotify-0.7.patch 559 BLAKE2B 2189d5663489b04b267febac8536be618cd5d114007449ce9b0f93e58c0e5439023af2f32c0bf951cc15cd85f12d994bab36ddf07cb7d2202dbbe47804381d4e SHA512 dd2e38093a90f5501b2c60a6904db80be187e09a10426099b21fd88ac16926cd26c203f87f9d5cd2f32afe8626d6fea553954c5790a9bab34c719a9b4e4c66ce
 DIST pidgin-libnotify-0.14.tar.gz 316365 BLAKE2B 0635df1858f0893405ebd38049527bf9ea0e36bc599718677f35644fc29b458c375fb7bef33de9b3eb071c4591c5effcc682f143759a050f6a9ad9e9d51d43c9 SHA512 2ff6b2bad74cb2fd9a3de94c06a2261fa07938bc1971baa578b9a9ae120175943592bf773ec5f00857c5ea35771a7fd1943299521626ce49f410cfd70ea2b399
 DIST pidgin-libnotify_0.14-4.debian.tar.gz 4722 BLAKE2B c3e83636716ae84b1669a80b09d6776d0d8fbe0633c496022780d55bf9fe8fe0af661c35c9d99d4b53f736ee1e7f5b31cb59291319e5d3428009619b51da1616 SHA512 a95aab2e29b658650321ab794561fe085c619638c251d8555dfc6f79ddf298d4893671f43827ce742ebc5aa594324aeff12a57c51f3ca0a0454590195c760530
-EBUILD pidgin-libnotify-0.14-r1.ebuild 1003 BLAKE2B b99556971cf92614b4800608ac803a5ef8d043842ef9937f34297b7ad0175a1943b33d0533fdbc1da988381d98d7a37b3dc969972860ac9d8d56fbc5cf02617f SHA512 7b19bbfce9ef0a5bc628e4395385ff9fd7556dc9141df5cbdbc02beb4ae6cdfa5e06e4d2cc1161a2f38afc12ce38f920735984779d558b30dbe1bef6a32b6108
+EBUILD pidgin-libnotify-0.14-r1.ebuild 903 BLAKE2B 0b3a918c9eb75e3a55f40b5d1223b039b08d02eebcd43a66648d78ca70d26bfab2af11beae5dd88a01a071fb32271e95d1d1c3ada83da54e2668422add3b73bb SHA512 a9a1afc83048e748557ffc5a339fe05d189f3fdb23be9b33cc43a91fd63c698cd32c20c97ed042b7204e9f87a2d8078109596bb21e35f53bef44c822649131fc
 MISC metadata.xml 251 BLAKE2B c44e959881004ca2a5ac32e3f747223611bc94eaeba9e65d6f73c83fe20289f91cc14b001094d5fec0f33d28365a7eed6e7469ddd1897478ed146652b9997654 SHA512 39eb0f09edb034d2df728a8e001ed4e6b166bbddba6bb82f68264956e38b07617a928e87dbe4391739b8dfc8f3e25999529ad87bc588cfdb5beeb31a0d269c3f
diff --git a/x11-plugins/pidgin-libnotify/files/pidgin-libnotify-0.14-libnotify-0.7.patch b/x11-plugins/pidgin-libnotify/files/pidgin-libnotify-0.14-libnotify-0.7.patch
index 40e6c02b8152..7279c3ad7eaa 100644
--- a/x11-plugins/pidgin-libnotify/files/pidgin-libnotify-0.14-libnotify-0.7.patch
+++ b/x11-plugins/pidgin-libnotify/files/pidgin-libnotify-0.14-libnotify-0.7.patch
@@ -1,5 +1,5 @@
---- src/pidgin-libnotify.c
-+++ src/pidgin-libnotify.c
+--- a/src/pidgin-libnotify.c
++++ b/src/pidgin-libnotify.c
 @@ -286,7 +286,15 @@
  		g_free (tr_body);
  		return;
diff --git a/x11-plugins/pidgin-libnotify/pidgin-libnotify-0.14-r1.ebuild b/x11-plugins/pidgin-libnotify/pidgin-libnotify-0.14-r1.ebuild
index 325a0607571e..17b95492ef40 100644
--- a/x11-plugins/pidgin-libnotify/pidgin-libnotify-0.14-r1.ebuild
+++ b/x11-plugins/pidgin-libnotify/pidgin-libnotify-0.14-r1.ebuild
@@ -1,8 +1,7 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=2
-inherit eutils
+EAPI=6
 
 DESCRIPTION="pidgin-libnotify provides popups for pidgin via a libnotify interface"
 HOMEPAGE="http://gaim-libnotify.sourceforge.net/"
@@ -20,10 +19,14 @@ RDEPEND=">=x11-libs/libnotify-0.3.2
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
+PATCHES=(
+	"${WORKDIR}/debian/patches"
+	"${FILESDIR}/${P}-libnotify-0.7.patch"
+)
+
 src_prepare() {
-	EPATCH_FORCE=yes EPATCH_SUFFIX=diff epatch "${WORKDIR}"/debian/patches
-	epatch "${FILESDIR}"/${P}-libnotify-0.7.patch
-	sed -i -e '/CFLAGS/s:-g3::' configure || die
+	default
+	sed -i -e '/CFLAGS/s:-g3::' configure || die "sed failed"
 }
 
 src_configure() {
@@ -34,7 +37,6 @@ src_configure() {
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die
-	find "${D}" -name '*.la' -exec rm -f {} +
-	dodoc AUTHORS ChangeLog NEWS README TODO VERSION || die
+	default
+	find "${D}" -name '*.la' -delete || die "Pruning failed"
 }
diff --git a/x11-plugins/pidgin-mbpurple/Manifest b/x11-plugins/pidgin-mbpurple/Manifest
index 2e9cf8ef49f8..05a737c65b19 100644
--- a/x11-plugins/pidgin-mbpurple/Manifest
+++ b/x11-plugins/pidgin-mbpurple/Manifest
@@ -1,3 +1,3 @@
 DIST mbpurple-0.3.0.tar.gz 83685 BLAKE2B d1d39b659c0ecd0c81e749d81b8681d83202845232d906c665eec5bf18bc708acda087b117a16eecb510efa13f411ed4816ab4a686b6d38795d8d0cc2f78391b SHA512 9152ce783efd9d1841ec172ccc0f50f2fe0a5d64e9363fdc14150d40d0ec3ef642ed59662f4255dead1d32ce3ae2a47098c993c15c9d2c40b297ddc5f8fe110e
-EBUILD pidgin-mbpurple-0.3.0-r2.ebuild 917 BLAKE2B e99f058c820bf561b7db50f49075ebc41377f5d252d9a1a7a36caa37869d61ff05f83b908eeb796df98c781bdb84729693fa6b265500ee332ac45d92a6657d1c SHA512 63a6e522b24868fce92c9477f8b981fddfeef816bbde7200efb0ae8a7fb334a83a301aa5a676e14c0de6bf8f86fe5e27e6057a5ff503639ac66b5cee985ce01a
+EBUILD pidgin-mbpurple-0.3.0-r2.ebuild 968 BLAKE2B cdd5ad260003f217b76f4786dea4cdff1b77d6ab91cdeb94e80484f1e7cd5ea2a71d4f63c93f4944b1c7ce674a48d2926ff8102694f50ce1bf0e4ba4f28eacc9 SHA512 d40d61ad589209e25ee3e8c06456f1e06bf7773b0d6968f8da640a4dd6444cbb436b85df3e66ea3067c589c48b00459b4cd577e46a2ebed709ca27492a857036
 MISC metadata.xml 351 BLAKE2B 5378e33f3ef95c741a280f68f11763a618711a19ae32aef8dd68da6f1ca2ee6b075e21f5549953063e150644917dcad6023734870e5f94850eb966d80d0fb8e3 SHA512 fc43c5cbe0cadeb67e3ab8dad70c20eb02ad1f183f75c63d59db17985e0be07ab907a1389dae631b20813200ac8456b5e238c0dd57944e6f4fbbffdef5faedd1
diff --git a/x11-plugins/pidgin-mbpurple/pidgin-mbpurple-0.3.0-r2.ebuild b/x11-plugins/pidgin-mbpurple/pidgin-mbpurple-0.3.0-r2.ebuild
index 7a7eeeed84eb..4d1b4a1b27c1 100644
--- a/x11-plugins/pidgin-mbpurple/pidgin-mbpurple-0.3.0-r2.ebuild
+++ b/x11-plugins/pidgin-mbpurple/pidgin-mbpurple-0.3.0-r2.ebuild
@@ -1,13 +1,14 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=2
+EAPI=6
 
-inherit base toolchain-funcs
+inherit toolchain-funcs
+
+MY_P="${P/pidgin-/}"
 
 DESCRIPTION="Pidgin plug-in supporting microblog services like Twitter or identi.ca"
 HOMEPAGE="https://code.google.com/p/microblog-purple/"
-MY_P="${P/pidgin-/}"
 SRC_URI="https://microblog-purple.googlecode.com/files/${MY_P}.tar.gz"
 
 LICENSE="GPL-3"
@@ -21,19 +22,21 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 S=${WORKDIR}/${MY_P}
 
-pkg_setup() {
-	tc-export CC
-}
-
 src_prepare() {
+	default
+
 	# upstream Issue 226 (Respect LDFLAGS)
-	sed -i "/^LDFLAGS/d" global.mak || die
+	sed -i "/^LDFLAGS/d" global.mak || die "sed for LDFLAGS failed"
 
 	# upstream Issue 225 (Warnings during compilation using make -j2)
-	sed -i "s/make /\$(MAKE) /g" Makefile || die
+	sed -i "s/make /\$(MAKE) /g" Makefile || die "sed #2 failed"
 
 	# upstream Issue 224 (configurable twitgin)
 	if ! use twitgin; then
 		sed -i 's/twitgin//g' Makefile || die
 	fi
 }
+
+src_configure() {
+	tc-export CC
+}
diff --git a/x11-plugins/pidgin-mpris/Manifest b/x11-plugins/pidgin-mpris/Manifest
index 41079606f1ea..072f1b31060e 100644
--- a/x11-plugins/pidgin-mpris/Manifest
+++ b/x11-plugins/pidgin-mpris/Manifest
@@ -1,3 +1,3 @@
 DIST pidgin-mpris-0.2.6.tar.bz2 211675 BLAKE2B 412e66a02303ab45fff6e76207330ea4b2b310b9ba608ec33d043365b3cd2ed2ef46cc9823e4914be97f4be42d9f66ffe3659e24da8f554a7ee30b50c4604bea SHA512 19d27a9bfbbb359e8874eb42bb02eaa63f7a7e2805b80992ee77d26c994256b62b95bd19ac016f3194bc8f2b4da6982760405718752f15105a8bf43bde69bcb7
-EBUILD pidgin-mpris-0.2.6.ebuild 551 BLAKE2B 0e946eeebf9610083f52a7a0a2e88cad4385fc5400433e0548c18b0eff6520f2ad82d67e1c34593cc565aae5c61910d2d7976ba3ad7746735f78e57d037e1b37 SHA512 5b557f0c522d6e1c98e685dbe6093ad2474773f2b7eab513b7ca408102bb9f541fa326e7bd333ebcbffc7081ab5d4c6d2e24cc3ca2c9f75fccbb61e832895db3
+EBUILD pidgin-mpris-0.2.6.ebuild 451 BLAKE2B fadc2c09ed52a7b96d198c4714e0cabf9884423f94c505bbdbfd5fd8aea7289edd14a3e56f6cfff4c93661916a90e61445f1158342b9d42ef76f0e85ddbe37cd SHA512 bce99db987e065e7722c4bda29e84f5fdd5464db5419ca08d1075b13ed2af3a49f8a366d20770a000ca479e37a1fdbeecbf23767a224f968cadf57ff2a7bb175
 MISC metadata.xml 251 BLAKE2B d6cd51cc02ac1322483c5ab4655173de8b1c64bac285b55a47fa3a35d3995eef653829b7cb110488c156247cff12381888fcd3b1fe248c8f5e3feb059c490b9f SHA512 7ea734b9e52a4e36b11e004da4a8178aa529574adee2129ba57b1ce75fd5017431fdfffe7a4a536c798ae645497a44b07c748d77308325cf4d6af070ff167edd
diff --git a/x11-plugins/pidgin-mpris/pidgin-mpris-0.2.6.ebuild b/x11-plugins/pidgin-mpris/pidgin-mpris-0.2.6.ebuild
index 9276957bcdd5..3d72a02de6db 100644
--- a/x11-plugins/pidgin-mpris/pidgin-mpris-0.2.6.ebuild
+++ b/x11-plugins/pidgin-mpris/pidgin-mpris-0.2.6.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=2
+EAPI=7
 
 DESCRIPTION="Gets current song from MPRIS-aware media players"
 HOMEPAGE="http://m0n5t3r.info/work/pidgin-mpris/"
@@ -18,8 +18,3 @@ RDEPEND="net-im/pidgin[gtk]
 
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
-
-src_install() {
-	emake install DESTDIR="${D}" || die "Install failed"
-	dodoc INSTALL README TODO
-}
diff --git a/x11-plugins/pidgin-rhythmbox/Manifest b/x11-plugins/pidgin-rhythmbox/Manifest
index 6450e7b5abd9..dcb6c79f597e 100644
--- a/x11-plugins/pidgin-rhythmbox/Manifest
+++ b/x11-plugins/pidgin-rhythmbox/Manifest
@@ -1,3 +1,3 @@
 DIST pidgin-rhythmbox-2.0.tar.gz 320758 BLAKE2B b2d69803e25fce14f6a6ae79e44dbed8c15149b78450574972aaae0565fdbc77546da8e0a7416977b7823af41a7ee3604f411ef01e3bce3ada90d64b02459edf SHA512 7672bac993d2fa07be6f456c9dc32281689456cd5541245e1a3819592d333fec12afbd7ca42e517f02a0f1415e1fe5c3a3d25aa6fa032b8bdbca0d7d2dbda7d4
-EBUILD pidgin-rhythmbox-2.0.ebuild 623 BLAKE2B b3dcb0366d3385e3b104fcb59b9ce8013639c1c29eb8b540b65cbd7c8ec1f07a35b87a5ba7c2448bc8497463a94975c5851c613a24bda23671aa718d2b5eaae1 SHA512 ff04a0cd165008532a0450d5c3f9f3c1f8108b02e42e72fb3fbc670d80e432c576e073844d2f1dc656fb8a7ceb8d94d2d39656fa05273b69907c2ac7cb667bd5
+EBUILD pidgin-rhythmbox-2.0.ebuild 494 BLAKE2B c7dc67b85f7d4fb8dabf6b0e6be0a441e75ebb85aec2064d71abc025eebed3b12f9a77d7e443319af17304760b6453a06003996ad3a6761d4d98577990dec94a SHA512 c7c8a76478633f17aee01298d5cafa4086bfad8c23be6a0809a32e029adb37afa553d517a31361cb1cca1e2740c898f44db1eba9cc962b38f10be927b095ba54
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/x11-plugins/pidgin-rhythmbox/pidgin-rhythmbox-2.0.ebuild b/x11-plugins/pidgin-rhythmbox/pidgin-rhythmbox-2.0.ebuild
index 215239d48b94..242ddbd16662 100644
--- a/x11-plugins/pidgin-rhythmbox/pidgin-rhythmbox-2.0.ebuild
+++ b/x11-plugins/pidgin-rhythmbox/pidgin-rhythmbox-2.0.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=2
+EAPI=6
 
 DESCRIPTION="automatically update your pidgin profile with current info from Rhythmbox"
 HOMEPAGE="http://jon.oberheide.org/pidgin-rhythmbox/"
@@ -17,8 +17,3 @@ RDEPEND="net-im/pidgin
 	>=x11-libs/gtk+-2.4:2
 	dev-libs/dbus-glib"
 DEPEND="${RDEPEND}"
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc AUTHORS ChangeLog INSTALL NEWS README TODO
-}
diff --git a/x11-plugins/wmacpiload-ac/Manifest b/x11-plugins/wmacpiload-ac/Manifest
index f45c519aa62e..1e32dca884e6 100644
--- a/x11-plugins/wmacpiload-ac/Manifest
+++ b/x11-plugins/wmacpiload-ac/Manifest
@@ -1,7 +1,7 @@
-AUX wmacpiload-ac-acpi-fix-battery-unit.patch 1270 BLAKE2B 07a3db0e0ad32778fe9945b1460f6b327c572f747430a00aec99fbef034a3b59304fd5b5e95dc3acd1d5792f5f56b7302c2b35710f9e3eaa4ce418cf3fb2099c SHA512 46d5ab6cea2b7dd85bcec20ecf5f917f9025ae2c06f578c677c9defd1a8da3cc970f8158aacc87631d2f96b2c1017bc8c8d88271792200e809fd8623d24981f6
-AUX wmacpiload-ac-acpi-segfault.patch 805 BLAKE2B 00f5d87fda529f3afcc11e4ddcff09c25cc940cad28181514fff77685c93de2839885da32e692660d0f0bdf86cad521629d8b6b5cb2b317223e4a5c00acd21b8 SHA512 9903f06b95e0a372c980d9ca649fa5c11a47ffce709e98e03507303234fd8111cb0bd1e1204b69af332cfe0bb5293a6f758a7a593cc72244ee37547b579735d1
-AUX wmacpiload-ac-acpi-sys-temp-hwmon.patch 4320 BLAKE2B 9d36a49fc206b0395d2a388730a8ec3adbce25a8a454b3be70a7452a8a7de1c26e3db00b6ec5589ffbc99b3d1268a598b37b0bbef04167fe2f72e572921fa06d SHA512 fd7a08c6d7473c48c98d741827d33d6ccef592936379323d0c54ec588dde16b7131f2c6517ddac38e61350a122227818a51d4bf68da1121b71915d4bdb3c4467
+AUX wmacpiload-ac-acpi-fix-battery-unit.patch 1237 BLAKE2B 68b710b8d2fa4f06008cc89ac4f7d43d5cbf113a20bc0ebe8b9e4d7c347d091fc6892bf59c3eae7558fd50d79cf75afb8a8a0f059f4ab2d644560d77db63378c SHA512 b25701c576bc57db493e7560f67960e44d0a28412faca2e1bd92deaa67b78fe9baac5e56a68df00a5657d3bf7f4371720906e94bbe41e0f2293f5fbf426a9855
+AUX wmacpiload-ac-acpi-segfault.patch 666 BLAKE2B 2d936ce5685453332c188479a4d53f3151db143ccc09220196614db190ee434d41b154acfc7d32b8f459446b3305733c758576f67ebc5d7b9e7336347abc83c0 SHA512 b5110926503e197f3ef368e84bb99b9c8ba587fdbd143da9bea824d67f38e02b8978109201cf2eb63d6553ed7a4f7f6a3050220a1c2e1f4ee1b7a43a65d8ff52
+AUX wmacpiload-ac-acpi-sys-temp-hwmon.patch 4181 BLAKE2B e725a6679d53c3172a721d67bd0c74f59909ef1d8fe5799cc1878792b770ba34b284a0e61f0dbe48c8dea127d9347d869d93ec6bcbf40a0fa30ed16687d04ed9 SHA512 ac7d4c10fc5abffeb83e5a8efa79316505cb1560baaf29a9bfad9991aa0d543d366e9b48b47679853a92e53b39c51f3718b92d3c1df3406ec54908f21344fa01
 DIST wmacpiload-0.2.0.tar.bz2 112858 BLAKE2B a981f43e4a4738b662f8a302a0737d9f7ab9ce18fb5cbc40a84608ab75916af3b47cb2da93c130461280492f2624b23712a81d6cabc786a73e4bc83c043b3358 SHA512 f0256ae313ad4ecbaf1604578321b45173912f250ba6fb7abf88edbcf6875dee30f8d2f7547cc207768c9229697dbfd48e77617c590e0ca27113b8c675e32714
-EBUILD wmacpiload-ac-0.2.0-r1.ebuild 1023 BLAKE2B 39c62fb88a686f8e31c4d416f9b95f9f169d5b2c47b824833b30a4ad5f46cb8b88ca7bf33ba4377a38ee57566172e6e812c15fd57e72cddaab8f4cd34abc07d7 SHA512 f7183624746cb0ed317f607603d222448e9b9bf0d22075df9fe24bd1af4d0aa8eab668dbc8439a07711e9103b745af035dd820b850b791825bc671a0df4d3077
-EBUILD wmacpiload-ac-0.2.0.ebuild 736 BLAKE2B 074da7060ffdd7f243504111eb148b5e5c22be786af67b39bb3ed00401c19ada93bd72f013e214b5c231c57da62524292d5927bec99515db10870b1ff0c6dc5c SHA512 b264cd346cd08036bd9e219afe29afddcaa1f316a70c0de4d6d8526c64d2ca6f99ca6f76d329fb4143ffa0a8fd66e067c3e3fbbb78c413eb787a859f7fb297c6
+EBUILD wmacpiload-ac-0.2.0-r1.ebuild 738 BLAKE2B e1c2f3eebc3e70a219b77a0a5a2e870a5ca7096ec707d833553f9ba61eef96568c16ca7258780db4eead0065cba6429d135e5a52c91fee89ee5cede249f29a16 SHA512 3d5028c68474af13ca60f38719e6e5bb37b31990daab2d0cea90010ee759ec6c1af69322c2d612b35e87e55eb5b330bcc9bb415af668348fd7e574be5dbe910c
+EBUILD wmacpiload-ac-0.2.0.ebuild 586 BLAKE2B 9398e8dc82dbb412c0434028ce6dd920e5bb2722713aa5088bce17948a29cddb0ca799cbc89ba682b702a6a4612563935378166684b85077b77570f297f4bc31 SHA512 0ea6b2242f3a1688b2e6bc13dda2477cffc0009c5fd95a57439410401d5764816da1eff113a7a6953408f79d9a5d161afea03cc4e955616ad993993ae1b2bae4
 MISC metadata.xml 249 BLAKE2B ba223d81d4cf6b9ca1ba3a63e356bec0d9aa6f4cdf2ad3b29a6c97a6e5bad854154f8b9e6fc3d65d155c93daa706d03c84395b53951e3e326ffc19c8d0df0eb5 SHA512 1a1312bb0e9f74f1e3852218d8fd4817fbad3bc65633cecbe8735607bc33c1e05b414c2628ff3f6e24dfc4a3999de7191f6cdadd2161b03cf614d5b6f24fab8d
diff --git a/x11-plugins/wmacpiload-ac/files/wmacpiload-ac-acpi-fix-battery-unit.patch b/x11-plugins/wmacpiload-ac/files/wmacpiload-ac-acpi-fix-battery-unit.patch
index 6bf6179e7fc6..d0eabc166377 100644
--- a/x11-plugins/wmacpiload-ac/files/wmacpiload-ac-acpi-fix-battery-unit.patch
+++ b/x11-plugins/wmacpiload-ac/files/wmacpiload-ac-acpi-fix-battery-unit.patch
@@ -1,5 +1,5 @@
---- wmacpiload-0.2.0/src/battery.c	2012-10-18 15:42:04.000000000 +0200
-+++ wmacpiload-0.2.0.new/src/battery.c	2012-10-18 15:43:33.000000000 +0200
+--- a/src/battery.c	2012-10-18 15:42:04.000000000 +0200
++++ b/src/battery.c	2012-10-18 15:43:33.000000000 +0200
 @@ -42,7 +42,8 @@
   ************************************************************************/
  
@@ -27,4 +27,4 @@
 +            if (strcmp(endptr, CAPACITY_UNIT1) == 0 || strcmp(endptr, CAPACITY_UNIT2) == 0)
                  bat->percentage = (int) ((remain * 100.0) / bat->capacity);
              else
-                 bat->percentage = -1;
\ No newline at end of file
+                 bat->percentage = -1;
diff --git a/x11-plugins/wmacpiload-ac/files/wmacpiload-ac-acpi-segfault.patch b/x11-plugins/wmacpiload-ac/files/wmacpiload-ac-acpi-segfault.patch
index 15f8e05579a2..2f43cd358b70 100644
--- a/x11-plugins/wmacpiload-ac/files/wmacpiload-ac-acpi-segfault.patch
+++ b/x11-plugins/wmacpiload-ac/files/wmacpiload-ac-acpi-segfault.patch
@@ -1,6 +1,6 @@
-diff -ru wmacpiload-0.2.0/include/lib_acpi.h wmacpiload-0.2.0.new//include/lib_acpi.h
---- wmacpiload-0.2.0/include/lib_acpi.h	2005-07-21 21:33:19.000000000 -0400
-+++ wmacpiload-0.2.0.new//include/lib_acpi.h	2011-06-20 19:53:30.458953984 -0400
+diff -ru a/include/lib_acpi.h b/include/lib_acpi.h
+--- a/include/lib_acpi.h	2005-07-21 21:33:19.000000000 -0400
++++ b/include/lib_acpi.h	2011-06-20 19:53:30.458953984 -0400
 @@ -32,7 +32,7 @@
   * Macros
   ************************************************************************/
@@ -10,13 +10,13 @@ diff -ru wmacpiload-0.2.0/include/lib_acpi.h wmacpiload-0.2.0.new//include/lib_a
  
    /* use ? */
  #  ifndef ACPI_32_BIT_SUPPORT
-diff -ru wmacpiload-0.2.0/src/dockapp.c wmacpiload-0.2.0.new//src/dockapp.c
---- wmacpiload-0.2.0/src/dockapp.c	2005-08-16 18:38:36.000000000 -0400
-+++ wmacpiload-0.2.0.new//src/dockapp.c	2011-06-20 19:44:20.022684448 -0400
+diff -ru a/src/dockapp.c b/src/dockapp.c
+--- a/src/dockapp.c	2005-08-16 18:38:36.000000000 -0400
++++ b/src/dockapp.c	2011-06-20 19:44:20.022684448 -0400
 @@ -431,5 +431,6 @@
  void
  dockapp_cleanup(void)
  {
 +  if (display != NULL)
      XCloseDisplay(display);
- }
\ No newline at end of file
+ }
diff --git a/x11-plugins/wmacpiload-ac/files/wmacpiload-ac-acpi-sys-temp-hwmon.patch b/x11-plugins/wmacpiload-ac/files/wmacpiload-ac-acpi-sys-temp-hwmon.patch
index 69857717daeb..7fb8586ed1ee 100644
--- a/x11-plugins/wmacpiload-ac/files/wmacpiload-ac-acpi-sys-temp-hwmon.patch
+++ b/x11-plugins/wmacpiload-ac/files/wmacpiload-ac-acpi-sys-temp-hwmon.patch
@@ -1,6 +1,6 @@
-diff -ru wmacpiload-0.2.0/src/lib_acpi.c wmacpiload-0.2.0.new//src/lib_acpi.c
---- wmacpiload-0.2.0/src/lib_acpi.c	2005-07-21 21:41:31.000000000 -0400
-+++ wmacpiload-0.2.0.new//src/lib_acpi.c	2011-06-28 23:37:50.148092904 -0400
+diff -ru a/src/lib_acpi.c b/src/lib_acpi.c
+--- a/src/lib_acpi.c	2005-07-21 21:41:31.000000000 -0400
++++ b/src/lib_acpi.c	2011-06-28 23:37:50.148092904 -0400
 @@ -83,7 +83,7 @@
          if (!k->ac)
              fprintf(stderr, "%s : no AC adapter detected\n", PACKAGE);
@@ -23,9 +23,9 @@ diff -ru wmacpiload-0.2.0/src/lib_acpi.c wmacpiload-0.2.0.new//src/lib_acpi.c
                  char *src;
                  char *end;
                  size_t len;
-diff -ru wmacpiload-0.2.0/src/thermal.c wmacpiload-0.2.0.new//src/thermal.c
---- wmacpiload-0.2.0/src/thermal.c	2005-09-29 19:32:46.000000000 -0400
-+++ wmacpiload-0.2.0.new//src/thermal.c	2011-06-29 00:18:24.851904854 -0400
+diff -ru a/src/thermal.c b/src/thermal.c
+--- a/src/thermal.c	2005-09-29 19:32:46.000000000 -0400
++++ b/src/thermal.c	2011-06-29 00:18:24.851904854 -0400
 @@ -30,12 +30,17 @@
  #endif
  
@@ -118,4 +118,4 @@ diff -ru wmacpiload-0.2.0/src/thermal.c wmacpiload-0.2.0.new//src/thermal.c
 +        tz->temp = temp / 1000;
      }
  }
- 
\ No newline at end of file
+ 
diff --git a/x11-plugins/wmacpiload-ac/wmacpiload-ac-0.2.0-r1.ebuild b/x11-plugins/wmacpiload-ac/wmacpiload-ac-0.2.0-r1.ebuild
index 5336ef10ddd1..05c5ee785dea 100644
--- a/x11-plugins/wmacpiload-ac/wmacpiload-ac-0.2.0-r1.ebuild
+++ b/x11-plugins/wmacpiload-ac/wmacpiload-ac-0.2.0-r1.ebuild
@@ -1,11 +1,10 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="2"
-
-inherit eutils
+EAPI=7
 
 MY_P=${P/-ac}
+
 DESCRIPTION="WMACPILoad based dockapp to monitor CPU temp and battery time on ACPI kernels"
 HOMEPAGE="http://wmacpiload.tuxfamily.org/"
 SRC_URI="http://wmacpiload.tuxfamily.org/download/${MY_P}.tar.bz2"
@@ -25,21 +24,12 @@ DEPEND="${RDEPEND}
 
 S="${WORKDIR}/${MY_P}"
 
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-acpi-segfault.patch" || die "epatch failed"
-	epatch "${FILESDIR}/${PN}-acpi-sys-temp-hwmon.patch" || die "epatch failed"
-	epatch "${FILESDIR}/${PN}-acpi-fix-battery-unit.patch" || die "epatch failed"
-}
+PATCHES=(
+	"${FILESDIR}/${PN}-acpi-segfault.patch"
+	"${FILESDIR}/${PN}-acpi-sys-temp-hwmon.patch"
+	"${FILESDIR}/${PN}-acpi-fix-battery-unit.patch"
+)
 
 src_configure() {
 	econf $(use_enable debug)
 }
-
-src_compile() {
-	emake || die "compile failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "install failed"
-	dodoc AUTHORS ChangeLog NEWS README THANKS TODO
-}
diff --git a/x11-plugins/wmacpiload-ac/wmacpiload-ac-0.2.0.ebuild b/x11-plugins/wmacpiload-ac/wmacpiload-ac-0.2.0.ebuild
index ca8e850f9a53..5dd7b6116524 100644
--- a/x11-plugins/wmacpiload-ac/wmacpiload-ac-0.2.0.ebuild
+++ b/x11-plugins/wmacpiload-ac/wmacpiload-ac-0.2.0.ebuild
@@ -1,9 +1,10 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=0
+EAPI=6
 
 MY_P=${P/-ac}
+
 DESCRIPTION="WMACPILoad based dockapp to monitor CPU temp and battery time on ACPI kernels"
 HOMEPAGE="http://wmacpiload.tuxfamily.org/"
 SRC_URI="http://wmacpiload.tuxfamily.org/download/${MY_P}.tar.bz2"
@@ -22,12 +23,6 @@ DEPEND="${RDEPEND}
 
 S="${WORKDIR}/${MY_P}"
 
-src_compile() {
+src_configure() {
 	econf $(use_enable debug)
-	emake || die "compile failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "install failed"
-	dodoc AUTHORS ChangeLog NEWS README THANKS TODO
 }
diff --git a/x11-plugins/wmacpimon/Manifest b/x11-plugins/wmacpimon/Manifest
index 7cf33863d612..4d2bf7cd9c4d 100644
--- a/x11-plugins/wmacpimon/Manifest
+++ b/x11-plugins/wmacpimon/Manifest
@@ -1,6 +1,6 @@
-AUX Makefile.patch 650 BLAKE2B 6bd6bf5be53d188fda5b8daaf25e658cfa6b65aa00a5817f1a78f115c4e60f710eb195502d2a5061bc98573fa6e37059bdb870962c9ffe13044a97b0fb3634de SHA512 a6446fdfcd4d670f12dff0d35bfc0e94e663442b1cfabec29446b0d0a2652bcb8140263e30ac135b536262b657c836fab8c25599e5fc6c575e826d2535018d2a
-AUX wmacpimon.c.patch 968 BLAKE2B d94cd135917bfc682f002ee936b58822068d1167518ee4fb573fc44505523051cbfbc2783cd8526a901b93a461172f85be37773335c12254c97c38f3d348cf7d SHA512 ac719283af137e794430760919b300036e4bc9eb88011edf601fbfb5d4dcebfb5cad4115db26d1497e1a935b77ca0fd55df1077f12c5cc16e9996591967210f7
+AUX Makefile.patch 650 BLAKE2B 2dc6d65ff772b2a2594704acfcfac023183c1b5990075c9f72a884be2cc9bd6b0e60d43ac1303a6d0801841e16adedebf822ac3f3f18768bbeb83a83e80fcf4d SHA512 ebc248e97ef4147d5028b5de2b1a150186bd765d8853e3be37ea212c9aed42bcc650ea0f7c1708d02ea058db66cd3600fc871fc503eb6fb679f02f0261d7564f
+AUX wmacpimon.c.patch 972 BLAKE2B 70e600339f3a43ca190ba67201dbf9dc6f0b2c0eca8171b333058624dbcfda0280999106215e959fec84a77e0bdc593b17173c515391fa1455b6573e61c4a8f6 SHA512 cb9080de40ae41804c0b4f8d1c105c7eed758cd12be71fda85afc0eeebb67965e619a6ed95b09bcaef99f0a6bebb51fbb7764080fbe511f1fbb483d43e581650
 AUX wmacpimon.initscript 407 BLAKE2B f8a37c7f73febf9c1bc5403bf8f70ae95def8a2d411540ddda19d97bf07f4514ff13361a255dd52bf615e4243f3e9a32c38aa09d9b009068a5db01b259229c93 SHA512 cecadb137bc6acf2ef4c85afa75dd186c9217435c07384c8190a81e727509aa3715bf3b0e5c9851f0a54c6bb9d70c08339275aee30d110bd0cd3f37a9410f866
 DIST wmacpimon-0.2.1.tar.gz 26498 BLAKE2B db1d308b24786a0db0fed5763ab5191f6ac2654c62d75996acaa93867cf7bc588da1f763b5483d64563b1e26b8d48063f143c28a61b61c4cbdb8de6c7ad58d1b SHA512 2b2d1da7608272969f0a2c98fae6398ebaa663a847acb79c795870cad85ca8d1317f5dfde6443634419c0c59b7457356bb8c195c1e7936f3cd8f3b251406084b
-EBUILD wmacpimon-0.2.1.ebuild 1089 BLAKE2B 3ecf49c18e98b5c9dfe54bc6e6a8b7782fc5fb6270d6fed066e2318f56cd9c5ef0f7dc530bf64c1fe2d4f5e566a564974ceac610e3b3c8a1aa8c681742b0a973 SHA512 65c56718312e7488a1360b4db7a8ee4cc727df326155cbed0e95e10f3d0d0fa97cc6c7860bda0c31dec27664ca5037584a26d96a678ffa8e189c175a941712a9
+EBUILD wmacpimon-0.2.1.ebuild 1031 BLAKE2B 193648338b13254fc1260724427754d16faf5add076dd0cecba27f78a2bf74b270a02ceb39585a4a2f7c57737212dcf698eabb57bec5ca2d6c794a4fcf0d4546 SHA512 0d30931801d86cdb961422bcda2c4c02de98885aeb4829a84e8b0f1b383e90fb0a1bdb5f39f90079ced9a8f74223f07191ed29ddc7f12ec95031e4c768eda904
 MISC metadata.xml 571 BLAKE2B cd4ecf0c7fdd14001596376389736f3efb5ae152884a188d9dd4568ac62385635e2d331de2a445e8a22947c1f48dd417784d0fc3e2cbacfaad8ec79a19ff2546 SHA512 a749cc0ff0e2ac2aed7f2e06e5d389e7a98142468c971940343ee704eae69b9e9d440056cae76b33d69d330096fd1c216504ac0509b0c4a2bc1a4e98e4111959
diff --git a/x11-plugins/wmacpimon/files/Makefile.patch b/x11-plugins/wmacpimon/files/Makefile.patch
index aab28fc89392..73646d10fa93 100644
--- a/x11-plugins/wmacpimon/files/Makefile.patch
+++ b/x11-plugins/wmacpimon/files/Makefile.patch
@@ -1,5 +1,5 @@
---- Makefile	2010-09-06 11:33:16.000000000 +0200
-+++ Makefile.new	2010-09-06 11:36:28.000000000 +0200
+--- a/Makefile	2010-09-06 11:33:16.000000000 +0200
++++ b/Makefile	2010-09-06 11:36:28.000000000 +0200
 @@ -1,8 +1,5 @@
 -OPT	= -O3 -DACPI
 -
diff --git a/x11-plugins/wmacpimon/files/wmacpimon.c.patch b/x11-plugins/wmacpimon/files/wmacpimon.c.patch
index 001c1d8c96be..adc03ce3fd0c 100644
--- a/x11-plugins/wmacpimon/files/wmacpimon.c.patch
+++ b/x11-plugins/wmacpimon/files/wmacpimon.c.patch
@@ -1,5 +1,5 @@
---- wmacpimon.c	2004-07-08 14:16:22.184359328 +0200
-+++ wmacpimon.c	2004-07-08 14:15:59.677780848 +0200
+--- a/wmacpimon.c	2004-07-08 14:16:22.184359328 +0200
++++ b/wmacpimon.c	2004-07-08 14:15:59.677780848 +0200
 @@ -314,7 +314,7 @@
      acpinfo = calloc(1, sizeof(ACPInfo));
      dockapp->blink = OFF;
diff --git a/x11-plugins/wmacpimon/wmacpimon-0.2.1.ebuild b/x11-plugins/wmacpimon/wmacpimon-0.2.1.ebuild
index d902e3de4a33..ffc03d2648bb 100644
--- a/x11-plugins/wmacpimon/wmacpimon-0.2.1.ebuild
+++ b/x11-plugins/wmacpimon/wmacpimon-0.2.1.ebuild
@@ -1,8 +1,7 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=2
-inherit eutils
+EAPI=6
 
 DESCRIPTION="DockApp monitors the temperature and Speedstep features in ACPI-based systems"
 HOMEPAGE="http://www.vrlteam.org/wmacpimon/"
@@ -19,18 +18,18 @@ RDEPEND="x11-libs/libX11
 DEPEND="${RDEPEND}
 	x11-base/xorg-proto"
 
-src_prepare() {
+PATCHES=(
 	# patch wmacpimon.c file to set default path for
 	# wmacpimon.prc to /var/tmp/
-	epatch "${FILESDIR}"/wmacpimon.c.patch
+	"${FILESDIR}/wmacpimon.c.patch"
 
 	# fix LDFLAGS ordering. See bug #248618.
 	# fix LDFLAGS ordering again and other stuff. See bug #336091.
-	epatch "${FILESDIR}"/Makefile.patch
-}
+	"${FILESDIR}/Makefile.patch"
+)
 
 src_install() {
-	dobin wmacpimond wmacpimon || die "dobin failed."
+	dobin wmacpimond wmacpimon
 	dodoc AUTHORS ChangeLog README
 	newinitd "${FILESDIR}"/wmacpimon.initscript wmacpimon
 }
diff --git a/x11-plugins/wmbio/Manifest b/x11-plugins/wmbio/Manifest
index 76531cc8a128..e5b362f381cf 100644
--- a/x11-plugins/wmbio/Manifest
+++ b/x11-plugins/wmbio/Manifest
@@ -1,3 +1,3 @@
 DIST wmbio-1.02.tar.gz 21799 BLAKE2B f3736ad83e4441f027b8091d398f7f819de79d29d9d48dff0f1ab3c159e1da2fc367f8faa92addedb770d7137e7a93f8e91a29935264a6505d16c9598daad64b SHA512 bebe8de364f782c38164fdd3910c3f63ff8313fa46fce1215218a4d14b9be0c793ee1d234fdb694798c1ab49b17eca90957d22c076920bf50ecf24b563a07d5b
-EBUILD wmbio-1.02.ebuild 794 BLAKE2B 1a8916983313a986dcd424309f3acfbde29c24f0ecdbb63235ffc60b89e4c3613ae4f5620ef4eb833fc758624fbb87a4021029ba5a8311c386309f68bc621ecc SHA512 d18004236959202956b6b77904cb155c6551bd16dab07f2a1a14085ce6998327ffaaa6466fb1ce29d93ab0b4492d59d82e8659e3e49815c1885d796d1c8d7df1
+EBUILD wmbio-1.02.ebuild 774 BLAKE2B 2cfee485b2ca4719fac6b37754eaa03b3495902f58c94c3cb1d56e702265c55e9e2916cde37896387987104b5549fc414c474038714cf65070c687fea94e208e SHA512 dc5e6a95e1137e0329533e707ffd1e7b8dab3a6532bf686c970739307ef9c18c8beeb604d210ee0e9301cfd14a39141b2a687de9c1b32f5a5a6afdd19399eb2c
 MISC metadata.xml 603 BLAKE2B 80e4c0fe2c556274da84f248b415737be477445c3da6e9fce5fd6a66480a2c2455c3100d6e2466d124ca6f2c6d6939dff229eb948ac9ef30127b68e9172d25f8 SHA512 fd27767ae3ef58f3eae5cb89cb62257989d5d574b2cdda8b2acdf25fb35091c1903037121cb127189f7c35343d588c4ea99741f292097854a6aebdda01ed3e3b
diff --git a/x11-plugins/wmbio/wmbio-1.02.ebuild b/x11-plugins/wmbio/wmbio-1.02.ebuild
index b6fcce6d4152..b2be120eed9c 100644
--- a/x11-plugins/wmbio/wmbio-1.02.ebuild
+++ b/x11-plugins/wmbio/wmbio-1.02.ebuild
@@ -1,8 +1,7 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=2
-inherit eutils
+EAPI=6
 
 DESCRIPTION="A Window Maker applet that shows your biorhythm"
 HOMEPAGE="http://wmbio.sourceforge.net/"
@@ -22,18 +21,15 @@ DEPEND="${RDEPEND}
 S=${WORKDIR}/${P}/src
 
 src_prepare() {
+	default
 	# Honour Gentoo CFLAGS
-	sed -i "s/-g -O2/\$(CFLAGS)/" Makefile
+	sed -i "s/-g -O2/\$(CFLAGS)/" Makefile || die "sed for CFLAGS failed"
 
 	# Honour Gentoo LDFLAGS
-	sed -i "s/-o wmbio/\$(LDFLAGS) -o wmbio/" Makefile
-}
-
-src_compile() {
-	emake || die "emake failed"
+	sed -i "s/-o wmbio/\$(LDFLAGS) -o wmbio/" Makefile || die "sed for LDFLAGS failed"
 }
 
 src_install () {
-	dobin wmbio || die "dobin failed"
-	dodoc ../{AUTHORS,Changelog,NEWS,README} || die
+	dobin wmbio
+	dodoc ../{AUTHORS,Changelog,NEWS,README}
 }
diff --git a/x11-plugins/wmmp/Manifest b/x11-plugins/wmmp/Manifest
index 8ba73f49da59..67cc84006d1a 100644
--- a/x11-plugins/wmmp/Manifest
+++ b/x11-plugins/wmmp/Manifest
@@ -1,3 +1,3 @@
 DIST WMmp-0.10.0.tar.gz 228560 BLAKE2B ec405452112131cad8738b28d13bdbe7f6a60a3204374aa76632bb0cb16c3eea087e58f5294354bd4c201bd9b989d009d417c38fa09d334a4ab72c08e0c527c3 SHA512 5a2777afcb879dd42556f169d4e472660f3cb2bd2b3a1e3833328d3be793e859f7b36dce6e59ca39a4a074b89d305a7704d60382dfc6bed0578c046fe3a8598c
-EBUILD wmmp-0.10.0-r1.ebuild 720 BLAKE2B 672cb57665b21f960c0f95fb907afcd9e3faa541bb8a022d7e34c5fe0bbd61c4e977db6c7678a98b8c54ee03e713e0e71ae20a55102af39d3bad23830028f6c1 SHA512 3cb3a7e39276dca10a94fda0387f4e9529278956d87499dafd1df7b24fa45c1596276f2a9b3f3a4824973c22810d23e8ae73a68438ffff5667441668934bf574
+EBUILD wmmp-0.10.0-r1.ebuild 529 BLAKE2B 6f860ee16d1e7a3ba004cd8bf500db65e672aa12d8ae2da9a614e288afdabd57ce348f5fa2c1ea434868282fab25947adf6409959616951bc455aca39d310006 SHA512 9a51b82b4da976bef64536b602ba46565d37af2fe7525279a2a72cbabddd9bab7e5fe99dfc3753e8f852c46e9b83f022aff5289d6088bb3d6443224aaf17099d
 MISC metadata.xml 330 BLAKE2B ae3e6e55e7242be59fb78c323c1cd469cb0aa389bcde7f8bca9b6f15ffb60bef085f46c0ec89a0f4c875a0497cf90ea6978975bc3a84f4cbae9d18f4516db64d SHA512 4057990697f90e26393a6703378247c2d0eaa5a3d459a72ed90c5cbd20ed1d74afecae9265fde640f8acb603d3f4f5dbedfb18a957606fe96b9a2c26ede51574
diff --git a/x11-plugins/wmmp/wmmp-0.10.0-r1.ebuild b/x11-plugins/wmmp/wmmp-0.10.0-r1.ebuild
index dd2da3471c27..f34a25371de1 100644
--- a/x11-plugins/wmmp/wmmp-0.10.0-r1.ebuild
+++ b/x11-plugins/wmmp/wmmp-0.10.0-r1.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=2
+EAPI=6
+
 MY_P=${P/wm/WM}
 
 DESCRIPTION="A Window Maker dock app client for Music Player Daemon(media-sound/mpd)"
@@ -22,12 +23,3 @@ S=${WORKDIR}/${MY_P}
 src_configure() {
 	econf --with-default-port=6600
 }
-
-src_compile() {
-	emake LDFLAGS="${LDFLAGS}" || die "make failed"
-}
-
-src_install () {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc AUTHORS ChangeLog README THANKS TODO
-}