gentoo resync : 04.01.2018

author: V3n3RiX <venerix@redcorelinux.org> 2018-01-04 18:55:01 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2018-01-04 18:55:01 +0000
commit: 423d21dcfee183cc4b04d29c1621615e8c30f834 (patch)
tree: 23bd6110b9a77b8d679b5ab60fb7663b8627f698 /x11-plugins
parent: 81e4fbcb846ed1cabdad699c0029b166dd7273b7 (diff)
65 files changed, 377 insertions, 289 deletions
diff --git a/x11-plugins/Manifest.gz b/x11-plugins/Manifest.gz
index efed959fb2ba..b753241dbe74 100644
--- a/x11-plugins/Manifest.gz
+++ b/x11-plugins/Manifest.gz
diff --git a/x11-plugins/gkrellaclock/Manifest b/x11-plugins/gkrellaclock/Manifest
index ec2cad3c8227..31237a0d57e7 100644
--- a/x11-plugins/gkrellaclock/Manifest
+++ b/x11-plugins/gkrellaclock/Manifest
@@ -1,4 +1,4 @@
 AUX gkrellaclock-makefile.patch 1599 BLAKE2B 611169960bfb154dc602fd3a35a4bdaec7cf6c8b078045872be05e8e49b52ff9058234f071fee256ba58f65a7fbc2da659d549df8cc3ddab6e601ca8254b0cae SHA512 7fa38a69f262f64dc8eca09179b56804ef3be20f52fef78b21cd001f34ecfff1c78c2e691da8441899e4f4e3a9d2d51418a02dde24cd144e64772026058872df
 DIST gkrellaclock-0.3.4.tar.gz 18853 BLAKE2B b91b4cb9ae42f68d3a3d430f7713170c788515280330a1f785f11d4335e859dbd6f840fb7e47fe8f77676bb55e97dda628fa79d442d4be8a37c69bcea836aa52 SHA512 2e6002bc4d535899cc8b86377d596bcee5e64d05fe4239eaab2de8e387a40b8dee600d9fcd5f30feb68bb3e54bf6b4745d4c7b79ea9fee57b856eeb3dac12524
-EBUILD gkrellaclock-0.3.4-r1.ebuild 707 BLAKE2B f69436f92135b9c7c60c83c8ce7ae18f82e180c7b6b2117024e89c49cbd83be4eab3237203fd02856dd9ec9c8db3a29441b637fe6f24102680ad0d7fee251fab SHA512 9a85a8323ee81d683729b6865cec139469a403490e774b15daee922c1f7ceb0590700edffd4939639877bd68e6aa8c6e5cb2e784cf9b792afcbd4fcf11ffd751
+EBUILD gkrellaclock-0.3.4-r1.ebuild 737 BLAKE2B 4713c424a1af55bc9f6413766d8a21bedbd03c6534e6c6c83a6cc297f42c82f1b70cef78c1b5efcdb9ac19e78ce6fd1bac9c99b0dbb719e4c4396a0918f45624 SHA512 1d0d33b79ee067825adbcc2bede2b639cfe9d4c644a443a61d4130e63c7f2a44f4b969976173e75893febab02c19c5e8a8f53c0a3d64ce8f3c399f812be083da
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/x11-plugins/gkrellaclock/gkrellaclock-0.3.4-r1.ebuild b/x11-plugins/gkrellaclock/gkrellaclock-0.3.4-r1.ebuild
index baff467ed08a..ecd130b2b603 100644
--- a/x11-plugins/gkrellaclock/gkrellaclock-0.3.4-r1.ebuild
+++ b/x11-plugins/gkrellaclock/gkrellaclock-0.3.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,16 +14,20 @@ SLOT="2"
 KEYWORDS="alpha amd64 ppc sparc x86"
 IUSE=""
 
-RDEPEND="app-admin/gkrellm[X]"
+RDEPEND="app-admin/gkrellm:2[X]"
 DEPEND="${RDEPEND}"
 
-PATCHES=( "${FILESDIR}/${PN}-makefile.patch" )
-
 S="${WORKDIR}/${P/a/A}"
+PATCHES=( "${FILESDIR}"/${PN}-makefile.patch )
+
+src_prepare() {
+	default
 
-src_compile() {
 	# The tarball contains a pre-compiled x86 object that needs to be
 	# removed if we're going to build it properly. See bug 166133.
 	rm -f gkrellaclock.o || die 'failed to remove gkrellaclock.o'
+}
+
+src_compile() {
 	emake CC="$(tc-getCC)"
 }
diff --git a/x11-plugins/gkrellfire/Manifest b/x11-plugins/gkrellfire/Manifest
index 6b52e2bd2192..05a88bd44f8b 100644
--- a/x11-plugins/gkrellfire/Manifest
+++ b/x11-plugins/gkrellfire/Manifest
@@ -1,4 +1,4 @@
 AUX fix-CC-CFLAGS-LDFLAGS-handling.patch 1788 BLAKE2B 3cd9c4f40fe30fed10d7a3c14c8b9887e76220caab5073a27df66a84088fbed45910fb874f6b0d2976fb418ada32b564ab815a7439a99d900e46e31b0b4c62c4 SHA512 bf28ded021d3325df8fa725c0b264939e1d4e86bcd87e60e2bc010f1223a0371996516749d162a07d3661d6589c7b8f5a102a0ebe87f60aba36b913fd83cf3d2
 DIST gkrellfire-0.4.2.tgz 12474 BLAKE2B e4c488061e18200fd75cca991032d1d64d0bd36da74aab33b3075cc6e5fae9b890ff3d906713ceb4ce15ffc409fb0916e77e1edcd9b686410bc2c8e637941b9f SHA512 1b7f6229567819092cd2eb2e33e3b7fd8340b0e913f6bcd1d11e9dd604730e3ca4fc1adaa8ae36895d80000f61931da14a586be6929c141c64b8519f8dc328bf
-EBUILD gkrellfire-0.4.2-r1.ebuild 534 BLAKE2B 0dfbba92923c2c7eb1cb6e188beceec65a2561cf3437f83406f956bb94f9db995361ebced2f4d9ff7f1d30acc4aff9ecf9d2fac68e476127837a3760a9e32005 SHA512 714cdef58548a5af1e2ed30959b8ebfd3f22363d1540c65e999cac08661ca83a1ee1e43945cb0cea8ce3399dfc45c9eafffba17cf7b3b53337162b21ac2bbff7
+EBUILD gkrellfire-0.4.2-r1.ebuild 536 BLAKE2B 587bfee735fea7b0b2a517208a9ffdbb53517d00db17fe3a779dad1520f4ab12527cc9f17eedb39029908bf5dce7a3f4608a434fb6f7c1de266d9c657ac2a80e SHA512 4b842053327fbc2fcdf9c72bc405f88769245e909081678dab5cbb7fbb69524786c2bf5dad15aa3b95442775b932ba33239808d964de359e9a8025f8db9d5e79
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/x11-plugins/gkrellfire/gkrellfire-0.4.2-r1.ebuild b/x11-plugins/gkrellfire/gkrellfire-0.4.2-r1.ebuild
index 201cad761f91..498b3ae4f309 100644
--- a/x11-plugins/gkrellfire/gkrellfire-0.4.2-r1.ebuild
+++ b/x11-plugins/gkrellfire/gkrellfire-0.4.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,10 +14,10 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE=""
 
-RDEPEND="app-admin/gkrellm[X]"
+RDEPEND="app-admin/gkrellm:2[X]"
 DEPEND="${RDEPEND}"
 
-PATCHES=( "${FILESDIR}/fix-CC-CFLAGS-LDFLAGS-handling.patch" )
+PATCHES=( "${FILESDIR}"/fix-CC-CFLAGS-LDFLAGS-handling.patch )
 
 src_compile() {
 	emake CC="$(tc-getCC)"
diff --git a/x11-plugins/gkrellflynn/Manifest b/x11-plugins/gkrellflynn/Manifest
index 03d0792bb908..7dadf64445ad 100644
--- a/x11-plugins/gkrellflynn/Manifest
+++ b/x11-plugins/gkrellflynn/Manifest
@@ -1,4 +1,4 @@
-AUX gkrellflynn-0.8-makefile.patch 1003 BLAKE2B b3d265ab44140635043b3daf3d5499f81d9ebf8b2bdedac63ae2b2223c36bedf52d2a1245105ab32ef116fbc42d0bffbf33689f5b7033034c45fdaae20af0ebf SHA512 0bf88e97955076c5b2495331f7e3022d8a997eb3b0c8c42c123d830809679e8db086099b3dca5df4d7a833287b95501269eb0cfb903822dc75bebb6269529d10
+AUX gkrellflynn-0.8-makefile.patch 931 BLAKE2B 6cd8037d5645014247768991448a61259413f955b10fbf34c191eb729b52aef806bd40d254510befc2cc8edc55dd69d8afe2f499120f567d1e237cce19d7ed86 SHA512 20936480ac1129fe5d4cd5ac0bdfe00dfa137e27e2fbbe1e7f60aeead5c450f9a7fbf6e344bb7505b160fd63bb49b03bed29de21098eb2699ed45b832aa1ab9e
 DIST gkrellflynn-0.8.tar.gz 26722 BLAKE2B 92c11c57181ec800b6b4dd34fe26d20cb6160b668d3a8a0f0fdf5a67126a691993aac3673283fb3fcec811afc25cfa847dc96b1d13edade891e589c8687f9ef7 SHA512 36c643adcfb1ecb994eb6c2bb590225df1f268e885508ede28ea8b9760bdca33bfb48821d356ce0c56e38be5f7b16ad7062bc191e8a77aef1c792bd02da2f366
-EBUILD gkrellflynn-0.8.ebuild 625 BLAKE2B 52f3a4260acccf6da2483a1f218af7fdaf32b9d5b640a8582060b315b5fdf2284cadb599fb4f03ab52ba0dd7ea19522fa5ad2ca0d0245e634386cf56f681e6f8 SHA512 7ffdceca6155d684a3a1639d4b8369c314a54913167df1c7e0c9b5b0df12484e0553983820fa40edd43933c850fa10ec7aad2a14d3e2661f59527cb92b3ec0ef
+EBUILD gkrellflynn-0.8.ebuild 607 BLAKE2B a78d48bf1795416dd596339315bcd081aa131425e3241a60437658fed4e10eada0fbf5f9597506b10f297a02410869ca1960ae7f31ee45997c750e5458352d74 SHA512 d71e5e559607a82f870f1916c47e6d49af8db4d4035f197b2d5ad87e815cbb60be2f2e27f8fe9b0c2516ea51a8f0448364a61f2ace981779914c6f8eec3a3f52
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/x11-plugins/gkrellflynn/files/gkrellflynn-0.8-makefile.patch b/x11-plugins/gkrellflynn/files/gkrellflynn-0.8-makefile.patch
index 0b539fa6635f..bcfef8b8f824 100644
--- a/x11-plugins/gkrellflynn/files/gkrellflynn-0.8-makefile.patch
+++ b/x11-plugins/gkrellflynn/files/gkrellflynn-0.8-makefile.patch
@@ -1,5 +1,5 @@
---- Makefile	2002-05-07 10:04:49.000000000 +0200
-+++ Makefile_new	2013-03-12 21:10:15.888656809 +0100
+--- a/Makefile
++++ b/Makefile
 @@ -3,11 +3,10 @@
  #
  # updated for gkrellm2.0
diff --git a/x11-plugins/gkrellflynn/gkrellflynn-0.8.ebuild b/x11-plugins/gkrellflynn/gkrellflynn-0.8.ebuild
index e0014a4bc095..10c704f676c6 100644
--- a/x11-plugins/gkrellflynn/gkrellflynn-0.8.ebuild
+++ b/x11-plugins/gkrellflynn/gkrellflynn-0.8.ebuild
@@ -1,23 +1,23 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
-inherit eutils gkrellm-plugin toolchain-funcs
+EAPI=6
+
+inherit gkrellm-plugin toolchain-funcs
 
 HOMEPAGE="http://bax.comlab.uni-rostock.de/en/projects/flynn.html"
 SRC_URI="http://bax.comlab.uni-rostock.de/fileadmin/downloads/${P}.tar.gz"
 DESCRIPTION="A funny GKrellM2 load monitor (for Doom(tm) fans)"
+
 KEYWORDS="alpha amd64 ppc sparc x86"
 SLOT="0"
 LICENSE="GPL-2"
 IUSE=""
 
-RDEPEND="app-admin/gkrellm[X]"
+RDEPEND="app-admin/gkrellm:2[X]"
 DEPEND="${RDEPEND}"
 
-src_prepare(){
-	epatch "${FILESDIR}"/${P}-makefile.patch
-}
+PATCHES=( "${FILESDIR}"/${P}-makefile.patch )
 
 src_compile() {
 	emake CC="$(tc-getCC)" LDFLAGS="${LDFLAGS}" gkrellm2
diff --git a/x11-plugins/gkrellkam/Manifest b/x11-plugins/gkrellkam/Manifest
index 0668f41ddc00..4c524c8983cb 100644
--- a/x11-plugins/gkrellkam/Manifest
+++ b/x11-plugins/gkrellkam/Manifest
@@ -1,4 +1,4 @@
-AUX gkrellkam-2.0.0-makefile.patch 736 BLAKE2B cc877ccf0220c828eacc2d878727596b562cd0a434ed0decc996acf1d39e9cc46c5888bc2ddadbf1805af0b8979b22d75bc15caf9ea189cae0e29b5ac3a8c6be SHA512 2f1e9d506bdd56413ef3dd15c3525adb2dc33ddf3304bbb7c0a64e38a027f5aa3e79304448fd301eef8aa031630b8d45d295a01ff3c0a16cff51b1ed8bbfddf3
+AUX gkrellkam-2.0.0-makefile.patch 664 BLAKE2B 314b6971723bd4342aa4640d685eecf3e247d43849d3d9d05fc8acfbf8c4eb5f0a04d35eb054bd5d35103d195c3f4e3486469023234414fd8070921fa2d36acd SHA512 0bd0cfb320119eb32019616f4e52a1c821116b6abfd0b0d45c7fa06a642cb980fd6f0e62769388885691e5a4ecb06d812541b7b7b6ac37c9dd2042fdc6fd3898
 DIST gkrellkam_2.0.0.tar.gz 27028 BLAKE2B 4bdfb89e2aa0f9001fbaedacb095e868497564612982cd3743547e1070bfbf173be5a441339d32e1be5146a511b840f6fd9a5450edad641895630d33eb5eb554 SHA512 a5a5d0a41de37b006c42150f0388ba573c968679f3f15c6b1d4837361d136cb529c2152723382e99bb46a76be5f1bde641137cea22e07a502402560dcd18699f
-EBUILD gkrellkam-2.0.0.ebuild 717 BLAKE2B e97027adc0c19cfb0b616cae83f4fb12d5a554d11a5cdfc011dd6c6cf3d266645ac6cc327a5aba44c63cf5d01f5a0a30ac1828fe786f70873cfec53faa85fcb6 SHA512 67affe4426f96d539ceab1005a9a05e8fb1fb47b5f5bc31b2e59b5a0cff17587e154cf44e42b6907d3fcc7b21d45205ce01d7cda4b2958d0e642834b86453a51
+EBUILD gkrellkam-2.0.0.ebuild 727 BLAKE2B 5c5d974bc32d77be8ca77b25a972bf0f7244e5c8ee4fae6ffb3aa9ec6f434edfdb862ee56253cdd5f55206800e9bb489fcbb888b20194dba466dd8e17b3f4dd0 SHA512 28cd394ce263b45f79f1c13efbb581c3c63789a8ec94dc759813c6019f69d7407c1cf71b348252dc1d788a23d7978fbd3621736bdb9b1bf848fc33940266b8a1
 MISC metadata.xml 246 BLAKE2B 02e03e5f94e8a28286db77b20493789bcaa67239d0fe35342b11f2372957c07f2164cb8ebc6c4f200d648ec650e1cc60e6a9d206aeb33ada5ac150523b704692 SHA512 d2f8e92a8d448540a85d35b296a7946560b91b984662eb6a955180874cc4219b7ac35294da7384525d59e743808beec95ffbf6aa343cb9304a4e7179b136276e
diff --git a/x11-plugins/gkrellkam/files/gkrellkam-2.0.0-makefile.patch b/x11-plugins/gkrellkam/files/gkrellkam-2.0.0-makefile.patch
index 83178b4b0ff8..f897f4102b6c 100644
--- a/x11-plugins/gkrellkam/files/gkrellkam-2.0.0-makefile.patch
+++ b/x11-plugins/gkrellkam/files/gkrellkam-2.0.0-makefile.patch
@@ -1,5 +1,5 @@
---- Makefile	2002-10-23 18:36:20.000000000 +0200
-+++ Makefile_new	2013-03-16 14:02:42.979029588 +0100
+--- a/Makefile
++++ b/Makefile
 @@ -12,10 +12,10 @@
  # This should point to the GKrellM headers
  GKRELLM_HDRS = /usr/include
diff --git a/x11-plugins/gkrellkam/gkrellkam-2.0.0.ebuild b/x11-plugins/gkrellkam/gkrellkam-2.0.0.ebuild
index ae3ad974d5de..bbb98a017154 100644
--- a/x11-plugins/gkrellkam/gkrellkam-2.0.0.ebuild
+++ b/x11-plugins/gkrellkam/gkrellkam-2.0.0.ebuild
@@ -1,35 +1,36 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
-inherit eutils gkrellm-plugin toolchain-funcs
+EAPI=6
+
+inherit gkrellm-plugin toolchain-funcs
 
 MY_P=${P/-/_}
 
 DESCRIPTION="an Image-Watcher-Plugin for GKrellM2"
 SRC_URI="mirror://sourceforge/gkrellkam/${MY_P}.tar.gz"
 HOMEPAGE="http://gkrellkam.sourceforge.net"
+
 LICENSE="GPL-2"
 SLOT="0"
-IUSE=""
 KEYWORDS="x86 ppc sparc alpha amd64"
+IUSE=""
 
-RDEPEND="net-misc/wget
-	 app-admin/gkrellm[X]"
+RDEPEND="
+	 app-admin/gkrellm:2[X]
+	 net-misc/wget"
 DEPEND="${RDEPEND}"
 
-PLUGIN_SO=gkrellkam2.so
-PLUGIN_DOCS="example.list"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-makefile.patch
-}
+PATCHES=( "${FILESDIR}"/${P}-makefile.patch )
 
 src_compile() {
 	emake CC="$(tc-getCC)" LDFLAGS="${LDFLAGS}"
 }
 
-src_install () {
+src_install() {
+	local PLUGIN_SO=( ${PN}2$(get_modname) )
+	local PLUGIN_DOCS=( example.list )
+
 	gkrellm-plugin_src_install
 	doman gkrellkam-list.5
 }
diff --git a/x11-plugins/gkrellm-bgchanger/Manifest b/x11-plugins/gkrellm-bgchanger/Manifest
index 51b4c1aeb61a..a7ac645243f2 100644
--- a/x11-plugins/gkrellm-bgchanger/Manifest
+++ b/x11-plugins/gkrellm-bgchanger/Manifest
@@ -1,3 +1,4 @@
+AUX gkrellm-bgchanger-0.1.11-fix-build-system.patch 245 BLAKE2B 742212aae7f59649481aac6868fc1648290ea623aa07d29cee4be2ca3992a359896da180161ade8ba8132621f48ed20ecb5fa8df386503eea70905cb58302e5b SHA512 b7d65deba2c6064c526dc0809e15773a3b4afc2c4be01ef44afa760037ea2fec80934f6d9ffa51455f1593e107e372fa88b31f48e8f1dababd825a5b3287f773
 DIST gkrellmbgchg2-0.1.11.tar.gz 24164 BLAKE2B 07b502ee8e86a26cc46b0d136241369cf26daa2c4ece3e2544ae14a6d69e11602e8d549769a342ead71e1838f9cdabf1f47c4ea79b69d65a26aa95411e0e5240 SHA512 648f56260e756d23ce616efb863e5746a7400a3fd7df135fc3b7548ac07ebb058e9c4f7c76af92cc2c4942ba6c1108b6e294b72afe831de6285e2329ca7c4803
-EBUILD gkrellm-bgchanger-0.1.11-r2.ebuild 717 BLAKE2B 330ae62c8f1842c0991e2a6ab7a2e0751258fddae27de9fc96e33da1bb278716fcca5e7cc62850ce702623de0704b2c48a42d74cffbacdbfb204087e67a941fb SHA512 a1304f5581529722129ebb1b57dcbb2929b00c85d8f7f4e6e1d345c11f3ed6bea6bbe6961d9530a2ccd2d4b9e562f97c12e9dbfe3732d25212c3909cf97c914f
+EBUILD gkrellm-bgchanger-0.1.11-r2.ebuild 754 BLAKE2B 7a01c7eadc4fb506dc6d7c9065c895f5e0bc8725c26484c3212beb6e4c01194e792821ac47ae46cbb4bd8fcddeb97f825a4fc50cd0c90801db38a45b8357b17a SHA512 a6455069e174ee4ddb307cd84a7b9e4e67bcf2e1659fa59f6c2e19988b90e89e252ba1b08a4f8c9634f1f697e505c1663efde039cc91bb5085e663793d012128
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/x11-plugins/gkrellm-bgchanger/files/gkrellm-bgchanger-0.1.11-fix-build-system.patch b/x11-plugins/gkrellm-bgchanger/files/gkrellm-bgchanger-0.1.11-fix-build-system.patch
new file mode 100644
index 000000000000..30eb43d3b83d
--- /dev/null
+++ b/x11-plugins/gkrellm-bgchanger/files/gkrellm-bgchanger-0.1.11-fix-build-system.patch
@@ -0,0 +1,11 @@
+--- a/Makefile
++++ b/Makefile
+@@ -13,7 +13,7 @@
+ GTK_INCLUDE = `$(GTK_CONFIG) gtk+-2.0 --cflags`
+ GTK_LIB = `$(GTK_CONFIG) gtk+-2.0 --libs`
+ 
+-GKRELLM_INCLUDE= -I/usr/local/include
++GKRELLM_INCLUDE= -I/usr/include
+ 
+ INSTALL=install -c -m 755
+ 
diff --git a/x11-plugins/gkrellm-bgchanger/gkrellm-bgchanger-0.1.11-r2.ebuild b/x11-plugins/gkrellm-bgchanger/gkrellm-bgchanger-0.1.11-r2.ebuild
index 47a89c183f0f..e1853d3a37f8 100644
--- a/x11-plugins/gkrellm-bgchanger/gkrellm-bgchanger-0.1.11-r2.ebuild
+++ b/x11-plugins/gkrellm-bgchanger/gkrellm-bgchanger-0.1.11-r2.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
+
 inherit gkrellm-plugin toolchain-funcs
 
 MY_PN="gkrellmbgchg2"
@@ -12,19 +13,19 @@ DESCRIPTION="Plugin for GKrellM2 to change your desktop background"
 HOMEPAGE="http://www.bender-suhl.de/stefan/english/comp/gkrellmbgchg.html"
 SRC_URI="http://www.bender-suhl.de/stefan/comp/sources/${MY_P}.tar.gz"
 
-SLOT="2"
 LICENSE="GPL-2"
+SLOT="2"
 KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
 IUSE=""
 
-RDEPEND="app-admin/gkrellm[X]"
+RDEPEND="app-admin/gkrellm:2[X]"
 DEPEND="${RDEPEND}"
 
-PLUGIN_SO="gkrellmbgchg.so"
-PLUGIN_DOCS="bgchg_info.sh kdewallpaper.sh"
+PATCHES=( "${FILESDIR}"/${PN}-0.1.11-fix-build-system.patch )
+
+PLUGIN_SO=( gkrellmbgchg$(get_modname) )
+PLUGIN_DOCS=( bgchg_info.sh kdewallpaper.sh )
 
-src_prepare() {
-	default
-	sed -i "s:local/::" Makefile || die
+src_configure() {
 	tc-export CC
 }
diff --git a/x11-plugins/gkrellm-bluez/Manifest b/x11-plugins/gkrellm-bluez/Manifest
index 9b3cc616015d..8be92af71498 100644
--- a/x11-plugins/gkrellm-bluez/Manifest
+++ b/x11-plugins/gkrellm-bluez/Manifest
@@ -1,4 +1,4 @@
 AUX gkrellm-bluez-0.2-notheme.patch 2115 BLAKE2B 1ce93d7a0d751c1b902f048aaedc12f459324303c52aeddd7100c02ff3a82d9bbb7ca3939c3d9b06ae85b57bc8c445949405eab06f511e423e80bd15f21e81a4 SHA512 caaf1d308c2c786bb54a1785509ff58ff29c22950ab0eee266adf07bf2ba1d37d35cb24cf748d255d13b7a48672234dc193baacf4dbb01ab955f86fe33d5c2d1
 DIST gkrellm-bluez-0.2.tar.gz 330247 BLAKE2B 8fa585fdd10892018e749428afded5cfb6c94258befedfe2652bcc027210ea9bb0db7379e052b19d6dbeb6c3abdf51be9504078e8e135bb74fce52bcc4febf71 SHA512 56a288874bf7de9f09aaa49a3bbc1ccf71da95dded5baa4af20941866f5acf777234a7726c49d491f252e175fc34266abd068cac0ca204ca6d1785a1d7e230f9
-EBUILD gkrellm-bluez-0.2-r2.ebuild 751 BLAKE2B e6e2f52e1848147699696f7150d03be59a0205dbfe98620e6ff359a8dd031f70f3f918a45ed7e7ca1c3dbc4882411032fead6de18b18cb4425e3db1bb67281e2 SHA512 418c4e386fefd86f59120cc22cc1ecaa294140ba6f1fd0293851a93d8582c1139303c02d149f2e365e411ac62064135868fe643d6fd4968f70fd49040ccddfa1
+EBUILD gkrellm-bluez-0.2-r2.ebuild 756 BLAKE2B e94a0355be85b94d455ea9965bcc3d86894863b12e44bb2470cc14c76ac20296751bd012bd4bcebf463e49ba39f60ab8e8f0a6fd313a8402fb10a31645d55940 SHA512 aafaa119a824a119c5a54265d7fcc4f2f39cf8df28e4051f710ded64db4ff1201d1678eb41b03d09ea05a8b8513bd6b2450ed02086c3cf237230175cff0fafff
 MISC metadata.xml 250 BLAKE2B 949f589de5cc44aad3371ea1fb19e7d0a5affd6d456a7b6040a303a2329d4597852d2bd4c94e2b25dccaac9215bd0a3e2c25d635a535d4b8f04deaa636eab283 SHA512 0b11486946f6ae39a0fd129a0eaefc07e5739f1ad79b3811bab15dd6d0b4543550ff8b814c0706a6d7be84be2888ec2a89fa976b702211be2c890bb453d99f7d
diff --git a/x11-plugins/gkrellm-bluez/gkrellm-bluez-0.2-r2.ebuild b/x11-plugins/gkrellm-bluez/gkrellm-bluez-0.2-r2.ebuild
index 9a6bd8488cca..47fafd1df54c 100644
--- a/x11-plugins/gkrellm-bluez/gkrellm-bluez-0.2-r2.ebuild
+++ b/x11-plugins/gkrellm-bluez/gkrellm-bluez-0.2-r2.ebuild
@@ -1,32 +1,33 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
+
 inherit gkrellm-plugin
 
 DESCRIPTION="GKrellm plugin for monitoring bluetooth (Linux BlueZ) adapters"
 SRC_URI="mirror://sourceforge/gkrellm-bluez/${P}.tar.gz"
 HOMEPAGE="http://gkrellm-bluez.sourceforge.net"
 
-RDEPEND="
-	app-admin/gkrellm[X]
-	net-wireless/bluez
-"
-
 LICENSE="GPL-2"
+SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE=""
-SLOT="0"
 
-PLUGIN_SO="src/.libs/gkrellmbluez.so"
-PLUGIN_DOCS="THEMING NEWS"
+RDEPEND="
+	app-admin/gkrellm:2[X]
+	net-wireless/bluez"
+DEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}"/${P}-notheme.patch )
+
+PLUGIN_SO=( src/.libs/gkrellmbluez$(get_modname) )
+PLUGIN_DOCS=( THEMING NEWS )
 
 src_prepare() {
 	default
 	# Be a bit more future proof, bug #260948
-	sed "s/-Werror//" -i src/Makefile.am src/Makefile.in || die "sed failed"
-
-	eapply "${FILESDIR}"/${P}-notheme.patch || die "Patch failed"
+	sed "s/-Werror//" -i src/Makefile.am src/Makefile.in || die
 }
 
 src_configure() {
diff --git a/x11-plugins/gkrellm-countdown/Manifest b/x11-plugins/gkrellm-countdown/Manifest
index 7b5ccf51a3a7..fb8c5d6c662e 100644
--- a/x11-plugins/gkrellm-countdown/Manifest
+++ b/x11-plugins/gkrellm-countdown/Manifest
@@ -1,4 +1,4 @@
 AUX gkrellm-countdown-makefile.patch 1005 BLAKE2B 80711f28134b9241e5844a30e84a1bf634c9c75a880c1a5dfdad32e427b7e50d802c049a424086d6bed05d50a5bd5b8d39e31265c900d7bcdc5111a95301b6b7 SHA512 ae7ed8c952698b8cf23f99ce18abff865ed0168df42a3b9db54326131dbbbc982ef3490b93fb0e76b05cbb746b34fe43fb98a7b0d18e459e773b723a80bc8178
 DIST gkrellm-countdown-0.1.2.tar.gz 12482 BLAKE2B eb619cc1da6ef90f843ab2a30e24da63d90988e85b4d48e2425f9c69a77ee64e7eaa674a7bed79da202633037aa56d5dd1f3b1c3ac9895172eed11af4b507dc0 SHA512 974a885ed56ffa95d2b5972fd309721e0043e8798fc1289fbb34bfd0320ec78db7a0572f8e43eee922b2823a2aa80789b8d24fdf106074e683b218e731b6de71
-EBUILD gkrellm-countdown-0.1.2-r1.ebuild 593 BLAKE2B c578c19d894fa0e92f7e4c86284c47814e2e167eae80c525d441d83b672db000a6cd0aa9e8b3867121566532912edddd7924228047a9474540a03ac13602022d SHA512 20e3e0633f00d57d85172b3108110cc9a12402b81d6082856116ef6bf0542c4405e3f4f4ccb0479d0e3999566b7c70842f6e75c8323ec486365b7480386ad6d7
+EBUILD gkrellm-countdown-0.1.2-r1.ebuild 548 BLAKE2B 6b32f8725974ff5bb56f8a03697c8f0efc0317a9df8b04c7f20d68d3f34fd7bb85a866f51939687fe0a4286ad7bb72ad4eddf3506a26adcc12ea97b3fbefd483 SHA512 70f5b74be60d750bc26ee0480d71c126535297fba5d543dd947843a7e05886b1484ee426fd90a23f9376e3ccfd2e0578855d39bdd274e4fd5b1e5ed5b8c8e608
 MISC metadata.xml 251 BLAKE2B 56b93d75989820d690eb681b917d29f689b06ba963a184f6231dc2c6832952b28800211f92f56da38261f260a98f7366e84929d99a8662e03a83abb6c4b4672c SHA512 cb7741f0e8e8f07e6264f62b224e166e1f3a1e7df00df62c5de94c211bf6b60b413b7bbdb1c5fccdd3596e53fc9eb56c6c0cbe0d680690c1bc0e31ff881ee47d
diff --git a/x11-plugins/gkrellm-countdown/gkrellm-countdown-0.1.2-r1.ebuild b/x11-plugins/gkrellm-countdown/gkrellm-countdown-0.1.2-r1.ebuild
index 7c36a135768d..81e9a1f50a6d 100644
--- a/x11-plugins/gkrellm-countdown/gkrellm-countdown-0.1.2-r1.ebuild
+++ b/x11-plugins/gkrellm-countdown/gkrellm-countdown-0.1.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,18 +9,16 @@ DESCRIPTION="A simple countdown clock for GKrellM2"
 SRC_URI="http://oss.pugsplace.net/${P}.tar.gz"
 HOMEPAGE="http://freecode.com/projects/gkrellm-countdown"
 
-SLOT="0"
 LICENSE="GPL-2"
+SLOT="0"
 KEYWORDS="~amd64 ppc sparc x86"
 IUSE=""
 
-COMMON_DEPEND="app-admin/gkrellm[X]"
-RDEPEND+=" ${COMMON_DEPEND}"
-DEPEND+="  ${COMMON_DEPEND}"
-
-S="${WORKDIR}/${PN}"
+RDEPEND="app-admin/gkrellm:2[X]"
+DEPEND="${RDEPEND}"
 
-PATCHES=( "${FILESDIR}/${PN}-makefile.patch" )
+S=${WORKDIR}/${PN}
+PATCHES=( "${FILESDIR}"/${PN}-makefile.patch )
 
 src_compile() {
 	emake CC="$(tc-getCC)" LDFLAGS="${LDFLAGS}"
diff --git a/x11-plugins/gkrellm-cpupower/Manifest b/x11-plugins/gkrellm-cpupower/Manifest
index 69069f3ddc76..d0b69bfd9de8 100644
--- a/x11-plugins/gkrellm-cpupower/Manifest
+++ b/x11-plugins/gkrellm-cpupower/Manifest
@@ -1,3 +1,3 @@
 DIST gkrellm2-cpupower-0.2.tar.gz 14274 BLAKE2B 6ad0c0825743b3c37670e5b3f7390f601ee3ffc012cc658b0fbd72c4a195ec680eaef8a5dc8f9b72a17199a293865007fc60877addf7c811d9735116d600f934 SHA512 80cf86548c8329af41462cb5cdd0de67cfab05d8d9a7c3315fcc662e0b5e511ffc1f46d2eb3ccf13b9f1607c35860921658eb74970c241a4c56b74e32e4f779e
-EBUILD gkrellm-cpupower-0.2-r1.ebuild 888 BLAKE2B ab3846e2b95063ccdc9ac860f6f7c2398d290951702ee8820b5f996d75187ce54b1a47f47c5168e2cc73b05a4a39ca7a7b95c91af3f564cd8ebbce0ba4634581 SHA512 a497be4a8995ebf64aa23aa2609c9e97349b0f4f896d718a3eb42af862c02e79e96bd5a55c58266f74261fcbf9aa262a244f593b16947cebdc81ed2d2798aef6
+EBUILD gkrellm-cpupower-0.2-r1.ebuild 927 BLAKE2B cfdbb89a487eaab3044d65b10a6758f82d1b4e03a773809b1fd8683d5962079625e7c622423a23154c310b3b2f8b1c4c85e00bc5d5be360a4887e3b339c2d73a SHA512 cc2c3506c11816a0b3b859e40dc89436b17cefa274363fbfb1a9f31e0eded98fb5c37a20b092e38084d191d27a6b3c534fb6207d279556bd63621c84465ee118
 MISC metadata.xml 352 BLAKE2B c00fb6aeda6be1b3c110acdad1e3cb929e7afcbc98aaceb67c0ad8f3f8080c9dff2aba553ad053e04d0b9eae73a8dd16767b448baecb638e885b3e399b38cded SHA512 3b888fd955af3995185f304f23db788f7513de23e63a370db1d708a360fa17e0e3a128042884707941f8e377ee6a70e40380c4ecf0212b61416985940a69c630
diff --git a/x11-plugins/gkrellm-cpupower/gkrellm-cpupower-0.2-r1.ebuild b/x11-plugins/gkrellm-cpupower/gkrellm-cpupower-0.2-r1.ebuild
index f8679d71309f..dcf420b95721 100644
--- a/x11-plugins/gkrellm-cpupower/gkrellm-cpupower-0.2-r1.ebuild
+++ b/x11-plugins/gkrellm-cpupower/gkrellm-cpupower-0.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -16,25 +16,24 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-S="${WORKDIR}/${MY_P}"
-
+DEPEND="app-admin/gkrellm:2[X]"
 RDEPEND="
-	app-admin/gkrellm[X]
+	${DEPEND}
 	app-admin/sudo
-	sys-power/cpupower
-"
+	sys-power/cpupower"
 
-PLUGIN_SO="cpupower.so"
+S=${WORKDIR}/${MY_P}
 
 src_install() {
+	local PLUGIN_SO=( cpupower$(get_modname) )
 	gkrellm-plugin_src_install
 	emake DESTDIR="${D}" install-sudo
 }
 
 pkg_postinst() {
-	echo
+	einfo
 	einfo "For changing the governor and CPU frequencies as a user, create the \"trusted\""
 	einfo "group, and add those users to that group who should be allowed to perform"
 	einfo "these changes."
-	echo
+	einfo
 }
diff --git a/x11-plugins/gkrellm-imonc/Manifest b/x11-plugins/gkrellm-imonc/Manifest
index c8377331f68d..24fcd59cbf40 100644
--- a/x11-plugins/gkrellm-imonc/Manifest
+++ b/x11-plugins/gkrellm-imonc/Manifest
@@ -1,4 +1,4 @@
 AUX gkrellm-imonc-makefile.patch 744 BLAKE2B 4eea5f69d20aed05a06f8e2b05429070bcf66b61ccedba70dd925629217bfcf093723aa1b38084c0ab79a0c04da388460ba1044f752e3b406855d513b9c6e90a SHA512 69181444d2d83c872d0f480db26f2538633556c5f63cb592de9d1aabe05581138aca93f8098147e2b56ec6ad79763bd7e876dea19aabab9d7ad80be08b7fd517
 DIST gkrellm-imonc-src-0.2.tar.bz2 19189 BLAKE2B a0a2e48eca12dcdccedbc347e15f3cf72ae7be050e8f4b1ff71a48a2f53b6991119b413333620e9544f25337f966dd16742b280990364a69f9ef45a1a141cbaa SHA512 b6f5d8cfa90c708ed6e43d676c965ef0d850d12497adae35122fe07ac4ea235dd024b8415fbc40cf153e1bbcbeed1e632984b6f1e5ec9079a1fcfce915ace36e
-EBUILD gkrellm-imonc-0.2-r1.ebuild 668 BLAKE2B 5e76dbe7983048b48af24a419b81ce3d5f99f77de45ba103e61e7b061ea199656655b77413e73febf3c852678ddd7ae776fcfece3c18896bfa90ed1d43888b67 SHA512 23b65a9feaf00652ce895a4c1eee448f90162199f593d4217dde09821070d1ae3fa8bfd6eb922b12768d6e4a5366cb091fff7b71fab17e100dbd7ac150872b1b
+EBUILD gkrellm-imonc-0.2-r1.ebuild 643 BLAKE2B 8fc7fe51dc251ec9f38004b68615eef9b2702a4776004f550e2b0e051b8b1408d5aeb3cb31ff6882ae7c36a73ef2bfdef72e1f3ce67db76f2bd55273fc4895df SHA512 8f67a3b1c8b2b49e30712c7974efbbc68acb65b7ba6901b7b0348ba567c835083bda480c6ef22e9be62555f22943eec28538e0e3902fc691809b21c9a6589ed6
 MISC metadata.xml 250 BLAKE2B f9bbd12e88f30431583c201e36a7922bedaadce514b19a76029ca5f3ec5bf55b15744814494bdd68a365a8b0bd1fa9126bfc2b1217a07e006e5f1517426626aa SHA512 ee33e9f804547c64d7fcf1fa34e38d84606cf6a11315fb0c2f765c278cbb70094d2bbad282cdcd198d04a949944bdd58bafbf0f6fd1597b30a6de8b3a79c2053
diff --git a/x11-plugins/gkrellm-imonc/gkrellm-imonc-0.2-r1.ebuild b/x11-plugins/gkrellm-imonc/gkrellm-imonc-0.2-r1.ebuild
index 3ab0c71bc701..05fffe8d8853 100644
--- a/x11-plugins/gkrellm-imonc/gkrellm-imonc-0.2-r1.ebuild
+++ b/x11-plugins/gkrellm-imonc/gkrellm-imonc-0.2-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit gkrellm-plugin
+inherit gkrellm-plugin toolchain-funcs
 
 DESCRIPTION="A GKrellM2 plugin to control a fli4l router"
 SRC_URI="mirror://sourceforge/${PN}/${PN}-src-${PV}.tar.bz2"
@@ -15,13 +15,12 @@ SLOT="0"
 KEYWORDS="~amd64 x86"
 IUSE=""
 
-COMMON_DEPEND="app-admin/gkrellm[X]"
-DEPEND+=" ${COMMON_DEPEND}"
-RDEPEND+=" ${COMMON_DEPEND}"
+RDEPEND="app-admin/gkrellm:2[X]"
+DEPEND="${RDEPEND}"
 
 S="${WORKDIR}/${PN}-src-${PV}"
 
-PATCHES=( "${FILESDIR}/${PN}-makefile.patch" )
+PATCHES=( "${FILESDIR}"/${PN}-makefile.patch )
 
 src_compile() {
 	emake CC="$(tc-getCC)" LDFLAGS="${LDFLAGS}"
diff --git a/x11-plugins/gkrellm-leds/Manifest b/x11-plugins/gkrellm-leds/Manifest
index bfbb6b2b1ecc..accba5afd85d 100644
--- a/x11-plugins/gkrellm-leds/Manifest
+++ b/x11-plugins/gkrellm-leds/Manifest
@@ -1,3 +1,3 @@
 DIST gkleds-0.8.2.tar.gz 322409 BLAKE2B f5b3303069e923d69ca4c61261428c0d938aa1ed881ea7095ccacac2e01501cd6ec8b71724dc3587c64d79fd7d385532fa296d7127163037415778311f22c0c9 SHA512 0db2f7c62b799c262f1ef3af4bf3eb147717c567862d30c07033b77bc890a33afc40389afd1d4f0a5e05c344d4bc3b12a0b7d2c42044eb4c5be00c5ca5aa7191
-EBUILD gkrellm-leds-0.8.2-r1.ebuild 612 BLAKE2B fe015145c80ee8ffb9f327f177060d5211de0d29b631bcf5d435e5149ec6a566541d0694a31d490ff862d82b5ec72e6d43b163db1b3314932431f49f2b4b6d30 SHA512 5bdea7dff57206e337c8207f3fc5fd86f5b016aa5569db5bdfeb0d9cd8224018d4cfc70836e98f142fd0fcf456e106db61d136479e150fa1b12aea8879fd1bcb
+EBUILD gkrellm-leds-0.8.2-r1.ebuild 588 BLAKE2B 2f0b3c08695910cccef7e9ad3c8ce0a6b64443d098d2ca26cb13ff029cb6fb4f0f9d82af0337c2b11149d630de3e36a978cc7730bd1e3c1db21a9d88a214c4ea SHA512 47e5218202a4afd0df82bfd950980358ddc2a87e0e7a810d4641ea675646046fae5145516d0576fac601d90e9e58742981ae757681fcd9b4e32c042a4ac771d0
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/x11-plugins/gkrellm-leds/gkrellm-leds-0.8.2-r1.ebuild b/x11-plugins/gkrellm-leds/gkrellm-leds-0.8.2-r1.ebuild
index e1cf0a439a5f..253934df329f 100644
--- a/x11-plugins/gkrellm-leds/gkrellm-leds-0.8.2-r1.ebuild
+++ b/x11-plugins/gkrellm-leds/gkrellm-leds-0.8.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,15 +10,18 @@ MY_P="${P/rellm-/}"
 DESCRIPTION="GKrellM2 plugin for monitoring keyboard LEDs"
 HOMEPAGE="http://heim.ifi.uio.no/~oyvinha/gkleds/"
 SRC_URI="http://heim.ifi.uio.no/~oyvinha/e107_files/downloads/${MY_P}.tar.gz"
+
 LICENSE="GPL-2"
 SLOT="2"
 KEYWORDS="alpha amd64 ~ppc ~sparc x86"
 IUSE=""
 
-COMMON_DEPEND="app-admin/gkrellm[X]"
-DEPEND+="  ${COMMON_DEPEND} x11-proto/inputproto"
-RDEPEND+=" ${COMMON_DEPEND} x11-libs/libXtst"
+RDEPEND="
+	app-admin/gkrellm:2[X]
+	x11-libs/libXtst"
+DEPEND="${RDEPEND}
+	x11-proto/inputproto"
 
 S="${WORKDIR}/${MY_P}"
 
-PLUGIN_SO="src/.libs/gkleds.so"
+PLUGIN_SO=( src/.libs/gkleds$(get_modname) )
diff --git a/x11-plugins/gkrellm-mailwatch/Manifest b/x11-plugins/gkrellm-mailwatch/Manifest
index 31bcffb3fb24..b67a20ccc8e9 100644
--- a/x11-plugins/gkrellm-mailwatch/Manifest
+++ b/x11-plugins/gkrellm-mailwatch/Manifest
@@ -3,5 +3,5 @@ AUX 2.4.3-0002-Use-gkrellm_gkd_string_width.patch 914 BLAKE2B 1dd49adf69b55c360d
 AUX 2.4.3-0003-Remove-a-few-more-GCC-warnings.patch 1227 BLAKE2B a3613b61b6b46a1b2b5540b607e28e8197edf618b49149d82e561cf5c9858de7c4b83d43397b1e9739dc9bce0b79b0234ea1b0f5de7f304d71d08f3c59f717cf SHA512 608088d86196397e8a43edabfae0bed2f44f0e6a0e8e6ff0607589365c53a0448a8a8207b53a9b7255b16a071cdc4c34a8c4abf3ffe1d1b603d0d4d29910dedb
 AUX 2.4.3-0004-Do-not-force-O2-in-CFLAGS.patch 761 BLAKE2B 0192c481f2e2a49fc5c0954e75d67c39ea70a4739edb48d1ec83739a3b7b58dab1241feb1c2495b17d228dd4a1139759d7cbadf11a659baf01b9c1ae868820c4 SHA512 48381a81041befe925bb50fc7026e9543671242e824b8ccaadd7614778258af1dfd819aa4c0bdeb856b822a23af8f265463da1eb11e4340e328e13c969d42808
 DIST gkrellm-mailwatch-2.4.3.tar.gz 27407 BLAKE2B 38c9559d2a36872e9c4203c7e6cef8cfaed7f41b944afa0e74091d09f3e812dcd8a59d58a426baa7d51f53bf6763b574aa383e1882b9e48755c880f4665b4dc4 SHA512 31ada9fa55a97a1c76e93f1130b5d84ce3c3db52608aaaeedcd8d482917c53e0c868ca2b61c58da966bdce7de74a88a6bdc5869c40b41e017014f34626df4bb9
-EBUILD gkrellm-mailwatch-2.4.3-r2.ebuild 785 BLAKE2B c6be656383f13e044f6097fdc2dfcd3ca012af1c2e2129ebbbf3f585da59a39c98720ba8ca909a019b8c2b791f24fa565679cfebfc667df87b27483265ca3012 SHA512 3a394e6eb7d6eb9d3f68130def85c8102a378ebb8b0c4712bfca16cc456a7c69ae043ed57fefceb2a85dfa902c629ab25e1128f01d37b9400dc7e369cdcbc826
+EBUILD gkrellm-mailwatch-2.4.3-r2.ebuild 802 BLAKE2B 82940b6d7811566990321f39d38cac5a65de2ddd2a58f5125acedff6f4e6eef112b02c40f2fd4c401800622295b2927ca861cd4868d9845030af0d767aeed9a2 SHA512 3c6b2035a1d71763c250671544422574d1731167bd4e339c4962740db41295b9a59245178294d6f1a2d88e31e7130d347172e42ec59d1ed4eda98425e947d76e
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/x11-plugins/gkrellm-mailwatch/gkrellm-mailwatch-2.4.3-r2.ebuild b/x11-plugins/gkrellm-mailwatch/gkrellm-mailwatch-2.4.3-r2.ebuild
index d46420e88244..2fb046fa1453 100644
--- a/x11-plugins/gkrellm-mailwatch/gkrellm-mailwatch-2.4.3-r2.ebuild
+++ b/x11-plugins/gkrellm-mailwatch/gkrellm-mailwatch-2.4.3-r2.ebuild
@@ -1,23 +1,23 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
+
 inherit gkrellm-plugin toolchain-funcs
 
 DESCRIPTION="A GKrellM2 plugin that shows the status of additional mail boxes"
 SRC_URI="http://gkrellm.luon.net/files/${P}.tar.gz"
 HOMEPAGE="http://gkrellm.luon.net/mailwatch.php"
 
-SLOT="2"
 LICENSE="GPL-2"
+SLOT="2"
 KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
 IUSE=""
 
-PLUGIN_SO=mailwatch.so
-S="${WORKDIR}/${PN}"
-
-RDEPEND="app-admin/gkrellm[X]"
+RDEPEND="app-admin/gkrellm:2[X]"
+DEPEND="${RDEPEND}"
 
+S=${WORKDIR}/${PN}
 PATCHES=(
 	"${FILESDIR}"/2.4.3-0001-Respect-LDFLAGS.patch
 	"${FILESDIR}"/2.4.3-0002-Use-gkrellm_gkd_string_width.patch
@@ -25,7 +25,8 @@ PATCHES=(
 	"${FILESDIR}"/2.4.3-0004-Do-not-force-O2-in-CFLAGS.patch
 )
 
-src_compile() {
+PLUGIN_SO=( mailwatch$(get_modname) )
+
+src_configure() {
 	tc-export CC
-	default_src_compile
 }
diff --git a/x11-plugins/gkrellm-radio/Manifest b/x11-plugins/gkrellm-radio/Manifest
index 611e75b91151..bfdf453d1403 100644
--- a/x11-plugins/gkrellm-radio/Manifest
+++ b/x11-plugins/gkrellm-radio/Manifest
@@ -1,4 +1,4 @@
 AUX gkrellm-radio-2.0.4-makefile.patch 554 BLAKE2B ed67079c01041db8fe8e5d53e96469286d9f04ca02fc65d380665622ae3060e9b9289caf1617c952f4476a516a3971e9f5a760cac48dd0221466d35b9b410e41 SHA512 a994bfb44d8c3d1844d309d792c1084ffa5c2bb37769b714511fb90f626ed9d636d8720bb32dd536c3ce616dd25ae460ae831099f8a5b5dc6880d382b2d949ff
 DIST gkrellm-radio-2.0.4.tar.gz 15685 BLAKE2B c23d9627e503f0853bfd403cbb17c5550cc572540f1e7544179a57501e5793fe19aa654d2b622d34aa68765d89cbc45810b0fececbe9e9a0cfe810795b918406 SHA512 0e5de0cc114c915dcc78f3588766a0a6d9c7bd75da5626fbf7959e539c1f505babc94a0054cceb5a67c8145174d49adb331eefae69ba1637c9121ebd630998de
-EBUILD gkrellm-radio-2.0.4.ebuild 684 BLAKE2B 40adc3f8be01d494db97f5f14918cd71ffc62e31712e130064c1ff83b8948883ea9d592e189e923d73cbb2f04432930e48b6240225b80aeda27ac2669352508b SHA512 241059d6fbdb2b7bd465cea1da649004ebdded67841462949e353872520b7e564f9685a37eb22edc8d4fa1c0d4fd93a44f266fd9671d9bcfc839d5efce13a860
+EBUILD gkrellm-radio-2.0.4.ebuild 700 BLAKE2B f323dc41c9800c21705f935e560e05ce479c13e7499a9f8e0d786b17144144e1d238f8089cad7fd0f2bacc3c4e4fdff95feb013963d391d32affc6652d3e6811 SHA512 d81f8a3f1262cd0d0f35aa2aa0e4e7352c8b65a8087c2739da89f221cf17625ccb8af70597508615600ab5a5998815c103d0cd3085c6cd1efa9272d5f2c9497e
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/x11-plugins/gkrellm-radio/gkrellm-radio-2.0.4.ebuild b/x11-plugins/gkrellm-radio/gkrellm-radio-2.0.4.ebuild
index 541296313c57..5f7915f98273 100644
--- a/x11-plugins/gkrellm-radio/gkrellm-radio-2.0.4.ebuild
+++ b/x11-plugins/gkrellm-radio/gkrellm-radio-2.0.4.ebuild
@@ -1,28 +1,29 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
+
 inherit gkrellm-plugin toolchain-funcs
 
 DESCRIPTION="A minimalistic GKrellM2 plugin to control radio tuners"
 SRC_URI="http://gkrellm.luon.net/files/${P}.tar.gz"
 HOMEPAGE="http://gkrellm.luon.net/gkrellm-radio.php"
 
-DEPEND="lirc? ( app-misc/lirc )"
-RDEPEND="${DEPEND}
-	app-admin/gkrellm[X]
-"
-
-IUSE="lirc"
-SLOT="2"
 LICENSE="GPL-2"
+SLOT="2"
 KEYWORDS="~amd64 ppc sparc x86"
+IUSE="lirc"
 
-PLUGIN_SO="radio.so"
-S="${WORKDIR}/${PN}"
+RDEPEND="
+	app-admin/gkrellm:2[X]
+	lirc? ( app-misc/lirc )"
+DEPEND="${RDEPEND}"
 
+S=${WORKDIR}/${PN}
 PATCHES=( "${FILESDIR}"/${P}-makefile.patch )
 
+PLUGIN_SO=( radio$(get_modname) )
+
 src_compile() {
 	use lirc && myconf="${myconf} WITH_LIRC=1"
 	emake CC="$(tc-getCC)" LDFLAGS="${LDFLAGS}" ${myconf}
diff --git a/x11-plugins/gkrellm-trayicons/Manifest b/x11-plugins/gkrellm-trayicons/Manifest
index e69138af746c..05403b604c61 100644
--- a/x11-plugins/gkrellm-trayicons/Manifest
+++ b/x11-plugins/gkrellm-trayicons/Manifest
@@ -1,4 +1,4 @@
 AUX gkrellm-trayicons-1.03-ldflags.patch 743 BLAKE2B 078ee5216b432592b136f812e24282c4e001d2399a11ce6768cf2122f24b0a90e169f51a7b4aa0b44b4e3b02b28669f0008df0177e1b0aedbd58deeb19318b1e SHA512 e122db6d9ae37a17d58c3a065f4b2210bf7e8f6832f8687c60efc54145fddf2e1f6898927b699f64194382dadd035710c7e3540221c3e229ec26d2ca8e01e785
 DIST gkrellm-trayicons-1.03.tar.gz 185474 BLAKE2B b291c13785e7c42e3e14ef987b4c29f47d91f993653653215afb254415827c437be32aec55b2c1465a8c6de9f08bd575c4b394b1d72fa46f5573ff29b57fe31f SHA512 2f80c7b18453b3cd9694dbd9854ab88fa94f4b4de52e779bc2fb7c13633deec096d0ed0146da3d52567569df9466aa64512f870b6e142a784779444a3e6a4a4b
-EBUILD gkrellm-trayicons-1.03-r1.ebuild 524 BLAKE2B cd99a3ad23a6abeacc0a4f7beec6ecae0bff6506b57f124de28682dd4844f10a7087c0d8c58c3ed9bcfd2ad0bc23e15f40d48d9856ed2328b9cbd7dfcc98b4e7 SHA512 8f36d3e968ddb397bac5202e74eb27a104fa92dc5596b40f591a3be5f7b44765981c6df285e742586d45e79972c85d7f2045ff9c87d9a5d235ae5fd178c3998c
+EBUILD gkrellm-trayicons-1.03-r1.ebuild 562 BLAKE2B 5ec5b9c1eb9dc1b6cdc67c4738f296c279dddb2c86be18c998dc913fca77d04c642fcf4cd0183e6910d89ef4d844597dadb2ad5228c239e9551a8ffefb9341cc SHA512 5eeb6023924aeea9d2822a3a23d12438e45ac0a5cebac92637545a686c77f4c16297f7d63f0689a5636020de6495f4e32c0f0fd6c67337d2b12526a3b57e96e4
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/x11-plugins/gkrellm-trayicons/gkrellm-trayicons-1.03-r1.ebuild b/x11-plugins/gkrellm-trayicons/gkrellm-trayicons-1.03-r1.ebuild
index e195c9658202..9600e6cfeb20 100644
--- a/x11-plugins/gkrellm-trayicons/gkrellm-trayicons-1.03-r1.ebuild
+++ b/x11-plugins/gkrellm-trayicons/gkrellm-trayicons-1.03-r1.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
+
 inherit gkrellm-plugin toolchain-funcs
 
 DESCRIPTION="Configurable Tray Icons for GKrellM"
@@ -13,11 +14,12 @@ SLOT="0"
 KEYWORDS="amd64 ppc sparc x86"
 IUSE=""
 
-RDEPEND="app-admin/gkrellm[X]"
+RDEPEND="app-admin/gkrellm:2[X]"
+DEPEND="${RDEPEND}"
 
 PATCHES=( "${FILESDIR}"/${P}-ldflags.patch )
 
-PLUGIN_SO=trayicons.so
+PLUGIN_SO=( trayicons$(get_modname) )
 
 src_compile() {
 	emake CC="$(tc-getCC)" LDFLAGS="${LDFLAGS}"
diff --git a/x11-plugins/gkrellm-vaiobright/Manifest b/x11-plugins/gkrellm-vaiobright/Manifest
index 3223b9e68d1b..0f3616b27c11 100644
--- a/x11-plugins/gkrellm-vaiobright/Manifest
+++ b/x11-plugins/gkrellm-vaiobright/Manifest
@@ -1,5 +1,5 @@
 AUX gkrellm-vaiobright-2.5-fixinfo.patch 1774 BLAKE2B fd08b2b417147723d868b0b9062b66cbd22508e2f131f18c1ffdf087d2ac9e4a3f552282d7eb17ac1e0f0fcdc965207953a5533cb7955f89ea75f9dae9668ec4 SHA512 51c7983830a045f38dd08039dcc0e9c1fdc682394649761a998511e72ccd7e9ea6a2632312ed589967b1e3b02cd5c7764c7724da19fee770f71048d43818d160
 AUX gkrellm-vaiobright-2.5-textrel.patch 1053 BLAKE2B 2a8a14fb2bba01a46cfd137b55294d858a0a9688cd4b907cfb9f1999e7c35ff3a631ab629ab2c7810c1bb28b3c48de006fd675b150a6c60a1142c1ba4defa4c5 SHA512 2742b7e75af6f83ac6f5cc53116dee9802d12262eb4f2a3628740b2d5f50cdf6485aacfe36eb546e36d7800be0dfc874dc6f7dee0e09a5f269ec29cd52dc1943
 DIST vaiobright-2.5.tar.gz 6178 BLAKE2B ed7add9147db7676e66cd51eee89e60a071896aeb33d1246b45918c2d63bf1b3cb074cb85b404a411e1cf93ffc244b8847b888a4b2f89957e282d4d41757fc0e SHA512 e58b74fe5dedd8ccc69cbcadf4b273aeb0e52fb2619e148121f79c53e41dcbff36e6ddf748b0c24a33e26c6d84ec84cf5e2cfa4d655443b9fe03d6e0150b5c3d
-EBUILD gkrellm-vaiobright-2.5-r2.ebuild 543 BLAKE2B 398b35fb8cfca689a05476ca1056a056da7df61115de955dac248ea4f24f3ecf7a54e8ebcc17898735dd6faee06b811ab71a5344f610b22a882e548e9c8522e0 SHA512 e79f62a84f35dd9b2efec72da3816030cd7bd9abc2d05bae089b229108ded1f1a65554d2d91a4a5dd041772b3d47b27635b8e401186236f2d7458ff7c3c572a5
+EBUILD gkrellm-vaiobright-2.5-r2.ebuild 582 BLAKE2B 5d4775acd85a0e1e7649686f6e23776e5d3452dd416959e70b13f4e89f89782568a3628e72e3f4780e5c0754b25f5fe1ad27db5030bc70927fd8fe3a63bc225e SHA512 8ae63b5574d4ccc4e33a5451ac0e20dfd72df3904e3a76b6deb9df4bc450c554cb052b61dfa92cea2c743c8233e4e0e829b8dc338393023dd96b6feccdfa775c
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/x11-plugins/gkrellm-vaiobright/gkrellm-vaiobright-2.5-r2.ebuild b/x11-plugins/gkrellm-vaiobright/gkrellm-vaiobright-2.5-r2.ebuild
index 4f67780e0125..efe7712aba51 100644
--- a/x11-plugins/gkrellm-vaiobright/gkrellm-vaiobright-2.5-r2.ebuild
+++ b/x11-plugins/gkrellm-vaiobright/gkrellm-vaiobright-2.5-r2.ebuild
@@ -1,25 +1,28 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
+
 inherit gkrellm-plugin
 
 MY_P=${P/gkrellm-/}
-S=${WORKDIR}/${MY_P}
+
 DESCRIPTION="Superslim VAIO LCD Brightness Control Plugin for Gkrellm"
 SRC_URI="http://nerv-un.net/~dragorn/code/${MY_P}.tar.gz"
 HOMEPAGE="http://nerv-un.net/~dragorn/"
-IUSE=""
 
-SLOT="2"
 LICENSE="GPL-2"
+SLOT="2"
 KEYWORDS="~amd64 x86"
+IUSE=""
 
-RDEPEND="app-admin/gkrellm[X]"
-
-PLUGIN_SO=vaiobright.so
+RDEPEND="app-admin/gkrellm:2[X]"
+DEPEND="${RDEPEND}"
 
+S=${WORKDIR}/${MY_P}
 PATCHES=(
 	"${FILESDIR}"/${P}-textrel.patch
 	"${FILESDIR}"/${P}-fixinfo.patch
 )
+
+PLUGIN_SO=( vaiobright$(get_modname) )
diff --git a/x11-plugins/gkrellm-volume/Manifest b/x11-plugins/gkrellm-volume/Manifest
index 1a04d46443d7..d33977b1d913 100644
--- a/x11-plugins/gkrellm-volume/Manifest
+++ b/x11-plugins/gkrellm-volume/Manifest
@@ -1,5 +1,5 @@
 AUX gkrellm-volume-2.1.13-makefile.patch 1293 BLAKE2B 1372f887a00955ea23789a9ff0ab1716544339cec69f6172e75052d08ef51ed88b5ca9b53a031e92e46d1f6b737115e08bc69c983a832a6e12165a26b50fd89c SHA512 2e4843be7f03b17fd7a496bc31509d83a6733e26231fcae683fcae4abb7ce21fb1465e2f5aa6d813d1f9fc449c4a8cddc738e12d6d93394fc472e5976d05fd4c
 AUX gkrellm-volume-2.1.13-reenable.patch 463 BLAKE2B d20017a62eacfa42a9186697d98b02ea2924eb018b71cec952f5b7bf459f8ce20014ca6aa24de8f41bc08a295658596eef14faf2fef8bdbf9869d15311074c40 SHA512 e3d37f60094da39717309d3cfa644f51c0802dac624ab18e97a1303731f3c9c62561a9ab01e56d70af133fa0b8720fcd88eec0e4cc4bf53b312df997174b1a8f
 DIST gkrellm-volume-2.1.13.tar.gz 42087 BLAKE2B fa4641a9a618ad341c81069231e7edb69390b82f2959f416d1f2c9cb757fd554a942c8e002330af06cca9a53b01525b17a2e913a86bd7a53d3875e43a95c8c5d SHA512 4f244978ea8b68994540b050244350c7c2389b227541822fde009408378ce0511c32956daea205465a4c4890c68e47f64dcd8b3eca8901963d38fd1852526eb5
-EBUILD gkrellm-volume-2.1.13-r2.ebuild 730 BLAKE2B 6829a566f33856f88fdab991afb9c77dc8485739d60ab9fbcb1a7d28fd03cf2f5cff1e0263f2a011a4e4030f14a32a0b694daf7d8e48b3ed4fc3d88114eeb498 SHA512 c9ba53e9464e1eed09594550bf47517799fa10af8b3cd3931aae3c5871ccae3a72d2d96f72f8d852cee14a84a759f1bf891f61d60da0a6ecbc6223be48507bcd
+EBUILD gkrellm-volume-2.1.13-r2.ebuild 722 BLAKE2B 8725ca2a0ed734430df9aad20ed6ae230fc68393bd6a78aea5940a48e90b004b4a9b739089a2b749384ad3e7884503a7ec378f3772265672b2b3d0e8e8b2c342 SHA512 fbb1054136dfcd6af6f5f761942a7858246b67484963429f1b79fe622008b63de3e864bfe49e5b283b30731e73b7289be4290af0ca71ab4628f9453f0509f7ce
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/x11-plugins/gkrellm-volume/gkrellm-volume-2.1.13-r2.ebuild b/x11-plugins/gkrellm-volume/gkrellm-volume-2.1.13-r2.ebuild
index db88433d0fe0..208a9d80056f 100644
--- a/x11-plugins/gkrellm-volume/gkrellm-volume-2.1.13-r2.ebuild
+++ b/x11-plugins/gkrellm-volume/gkrellm-volume-2.1.13-r2.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
+
 inherit gkrellm-plugin toolchain-funcs
 
 DESCRIPTION="A mixer control plugin for gkrellm"
@@ -13,22 +14,20 @@ SLOT="2"
 KEYWORDS="~alpha amd64 ~ppc ~sparc x86"
 IUSE="alsa"
 
-DEPEND="alsa? ( media-libs/alsa-lib )"
-RDEPEND="${DEPEND}
-	app-admin/gkrellm[X]
-"
-
-S="${WORKDIR}/${PN}"
-
-PLUGIN_SO="volume.so"
+RDEPEND="
+	app-admin/gkrellm:2[X]
+	alsa? ( media-libs/alsa-lib )"
+DEPEND="${RDEPEND}"
 
+S=${WORKDIR}/${PN}
 PATCHES=(
 	"${FILESDIR}/${P}-reenable.patch"
 	"${FILESDIR}/${P}-makefile.patch"
 )
 
+PLUGIN_SO=( volume$(get_modname) )
+
 src_compile() {
-	local myconf=""
-	use alsa && myconf="${myconf} enable_alsa=1"
-	emake CC="$(tc-getCC)" LDFLAGS="${LDFLAGS}" "${myconf}"
+	use alsa && local myconf="enable_alsa=1"
+	emake CC="$(tc-getCC)" LDFLAGS="${LDFLAGS}" ${myconf}
 }
diff --git a/x11-plugins/gkrellm-xkb/Manifest b/x11-plugins/gkrellm-xkb/Manifest
index deccf592b6ff..bdd963b5cad1 100644
--- a/x11-plugins/gkrellm-xkb/Manifest
+++ b/x11-plugins/gkrellm-xkb/Manifest
@@ -1,4 +1,4 @@
 AUX gkrellm-xkb-makefile.patch 1030 BLAKE2B 24b53321c36b974541f77347a38da677a4b8b91408e7cdfb5de6f44bc07c3be9ff338937a957c3e9dcc1c6795d96addb020f4e5f4776d1c048dac549be9fd6de SHA512 2a9e3959ad0920126f1c93193f76b087590f5428fe2b8d1cd66670343547ed8030937723b4a0a71e620d1ac518ae4a36231aced63d88171976ea1cf1d3c2c4b7
 DIST gkrellm-xkb-1.05.tar.gz 37775 BLAKE2B 5b074d2777c250d1f7aeca4402401f36f7aed29ca2c7bf286348e73687b85f53b152b4cdb862c38ff7325a718dc694c0a921e8ec3ecefb52ad6646e1345a2101 SHA512 451c66c875af8dcb6998ba1b6242332002328b81112315cd6eee453612cbd8e23f78d7b829224d623cee90b08445b721dfd60e2483a710f4f97860c82654ba2e
-EBUILD gkrellm-xkb-1.05-r1.ebuild 576 BLAKE2B 1fae159ce932ef513a690c015480f10fd61db4f4fe2e2583d99902872ee3a7e5fd25e98623138c5839078282e7e1082dab2fe06abed1c30cfbbc334a150a0343 SHA512 cd35c4f120cb28f0bd056a3596105fbd428640dbcf0f650afda48e06ec06d3f6f957198a5d883c54cc33bde01ae400615788a418ec8b59d8d4c13b3f1fe28d3b
+EBUILD gkrellm-xkb-1.05-r1.ebuild 566 BLAKE2B f0f1abc6ba1e00a992a8e467d356dbf705bdc8e2b0739f7133c4b877e8a2c3fc4c70f800b73c7e4162005ca882cc94cae45e140dcdab14a3ada75aa92508d5da SHA512 6cbf05b477b5926db62e12b985e7b86f7adc192bb9fa71f65ce8b90360a563623065c9c12a37a5cb8e3fa9651403867b67a866672d5f6b25fbd4fa568a16dbea
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/x11-plugins/gkrellm-xkb/gkrellm-xkb-1.05-r1.ebuild b/x11-plugins/gkrellm-xkb/gkrellm-xkb-1.05-r1.ebuild
index 81db97705c9d..ab92387a631d 100644
--- a/x11-plugins/gkrellm-xkb/gkrellm-xkb-1.05-r1.ebuild
+++ b/x11-plugins/gkrellm-xkb/gkrellm-xkb-1.05-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit gkrellm-plugin
+inherit gkrellm-plugin toolchain-funcs
 
 DESCRIPTION="XKB keyboard switcher for gkrellm2"
 HOMEPAGE="http://tripie.sweb.cz/gkrellm/xkb/"
@@ -14,13 +14,12 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE=""
 
-COMMON_DEPEND="app-admin/gkrellm[X]"
-RDEPEND+=" ${COMMON_DEPEND}"
-DEPEND+=" ${COMMON_DEPEND}"
+RDEPEND="app-admin/gkrellm:2[X]"
+DEPEND="${RDEPEND}"
 
-PLUGIN_SO=xkb.so
+PATCHES=( "${FILESDIR}"/${PN}-makefile.patch )
 
-PATCHES=( "${FILESDIR}/${PN}-makefile.patch" )
+PLUGIN_SO=( xkb$(get_modname) )
 
 src_compile() {
 	emake CC="$(tc-getCC)" LDFLAGS="${LDFLAGS}"
diff --git a/x11-plugins/gkrellmlaunch/Manifest b/x11-plugins/gkrellmlaunch/Manifest
index 4b848779f3d5..4dc85bbcb845 100644
--- a/x11-plugins/gkrellmlaunch/Manifest
+++ b/x11-plugins/gkrellmlaunch/Manifest
@@ -1,4 +1,4 @@
-AUX gkrellmlaunch-0.5-makefile.patch 808 BLAKE2B 84a213bd4476b1739b78e69f0453833b62fe0088d4bff02f21a63791b1dedda565a08866ab5e90d9c66931b98caad02dfea3b36e8f138b16f8085ec8ce99506d SHA512 d9ec682a5502933ceec00104a745aa4b2a5cccea83dff3b144f7439241b544f42b16836286e1fba6c846dee2e9b7491cb7fa5a0ee181f8a396ac89f5af75842d
+AUX gkrellmlaunch-0.5-makefile.patch 736 BLAKE2B fef75b45fe35864a6d39c7c521c270d15593a391272984a10a0a268c417c6dc8faf9a79f8276dcba030c8904abf086302625598c0ce3e3a6c27190fe7a36f2c0 SHA512 8222a135c201cca99d9d7a03aa583f1a731e2d9ae7f131b3dcc22edc47f3d2cd6b1e751571f9f74fa0140380b099b7dec98d471a3a6de1f7240c8460721c3175
 DIST gkrellmlaunch-0.5.tar.gz 22035 BLAKE2B 444dbd76c4bba420d7bd9977f2ce25b9d0260168ea6a730d1fd009eaa0ea064804028c2103efee3afe58b928d858475886fd90c6d77e5a03b3c97ab8bd8c79d2 SHA512 be3a6df6a1648a61103d389dcea24454a142d64b1192156787b42546c485ed592dca916394e46bc0413110a90fa1f4e952fef077e9014274e74610efe8573693
-EBUILD gkrellmlaunch-0.5.ebuild 569 BLAKE2B 6aa0163947c8c90141f4e33bd322b4c0ed28570db2434395ab86b026e8921ee78056b0a1c0c1bfa99e3ba0d9ce883bbb5a0b219408d3b8433a20b49fcde72deb SHA512 6cf38719472a82e32a46bd588ccea53b39582934f59947579ab7f1d9280e0b68d199bcd1e8b753bb44b6d229e1397f29761a0eaffc052a1af49ea27e37acf5ee
+EBUILD gkrellmlaunch-0.5.ebuild 551 BLAKE2B 3856e10ac6c6aa347b3451f1be699cd27266429e589994f06d39b91c4bf6b50db0c335925943e95c2a5c5add82a4af1d1195de1aa3e006ad2f85b4513643eefc SHA512 faa6603b5cd1d252bdcf6c40aafec51cd31fe445090f0e424dc4fd1104b21a5bb344a5ca14afce73ddb1b7e9d7642d7737c95f34d7d4c533ab756c8f0724593f
 MISC metadata.xml 250 BLAKE2B c21f7fe322719d9662f74d1c9224b5cbe19f1b8acf9c5919b1d2e26fbd0842c4bbdd105bad93b71ceec935109313f2ec84a9cb99af192d18c490a82b085ebc26 SHA512 bcd323e882e3cb34e2c52c42aacb692ad55c6c398839b9c77a41a7790fcba8ad82308f3fa1249ffb47499cd6e2762fe152d205d0bb608426049c5e3a51ada8c1
diff --git a/x11-plugins/gkrellmlaunch/files/gkrellmlaunch-0.5-makefile.patch b/x11-plugins/gkrellmlaunch/files/gkrellmlaunch-0.5-makefile.patch
index 31175b664837..8b0a4fee6669 100644
--- a/x11-plugins/gkrellmlaunch/files/gkrellmlaunch-0.5-makefile.patch
+++ b/x11-plugins/gkrellmlaunch/files/gkrellmlaunch-0.5-makefile.patch
@@ -1,5 +1,5 @@
---- Makefile	2002-09-26 15:56:06.000000000 +0200
-+++ Makefile_new	2013-03-15 17:26:19.398383410 +0100
+--- a/Makefile
++++ b/Makefile
 @@ -4,21 +4,25 @@
  GTK_LIB = `pkg-config gtk+-2.0 --libs`
  
diff --git a/x11-plugins/gkrellmlaunch/gkrellmlaunch-0.5.ebuild b/x11-plugins/gkrellmlaunch/gkrellmlaunch-0.5.ebuild
index a0157f2e4b71..616508568460 100644
--- a/x11-plugins/gkrellmlaunch/gkrellmlaunch-0.5.ebuild
+++ b/x11-plugins/gkrellmlaunch/gkrellmlaunch-0.5.ebuild
@@ -1,25 +1,24 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit eutils gkrellm-plugin toolchain-funcs
+EAPI=6
+
+inherit gkrellm-plugin toolchain-funcs
 
 DESCRIPTION="A Program-Launcher Plugin for GKrellM2"
 SRC_URI="mirror://sourceforge/gkrellmlaunch/${P}.tar.gz"
 HOMEPAGE="http://gkrellmlaunch.sourceforge.net/"
-IUSE=""
 
-SLOT="2"
 LICENSE="GPL-2"
+SLOT="2"
 KEYWORDS="x86 ppc sparc alpha amd64"
+IUSE=""
 
-RDEPEND="app-admin/gkrellm[X]"
+RDEPEND="app-admin/gkrellm:2[X]"
 DEPEND="${RDEPEND}"
 
-src_prepare() {
-	epatch "${FILESDIR}/${P}-makefile.patch"
-}
+PATCHES=( "${FILESDIR}"/${P}-makefile.patch )
 
 src_compile() {
-	emake LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)"
+	emake CC="$(tc-getCC)" LDFLAGS="${LDFLAGS}"
 }
diff --git a/x11-plugins/gkrellmoon/Manifest b/x11-plugins/gkrellmoon/Manifest
index 92f2ac6ff1bd..c0a2c4c35dd7 100644
--- a/x11-plugins/gkrellmoon/Manifest
+++ b/x11-plugins/gkrellmoon/Manifest
@@ -1,4 +1,4 @@
 AUX gkrellmoon-0.6-makefile.patch 798 BLAKE2B 2d1925d08e44e7fecab8bbf2c810e47c082d5ad7cbc94dccca88009585e825201bd007a87f7ecadba4b74b6ded2b5238e0a04d0949d2637db758065f04e379a9 SHA512 3e167144eca00fe855a7dd04a90b9a8eae7f3297d980fd838bd3391fa67f5e19af2de791e32669e24748552f33dcae8dd81766d43297d73c11e8ef16b1d74436
 DIST gkrellmoon-0.6.tar.gz 55035 BLAKE2B 1b72ffbb3f08bc7264d86cb1ff76ec65d79a5552c4857758ea5caffa8023fc1be4ff9fdfcc812ac48284af66c97fd4e4c6e3c19c0725cb422664621e3bd3a40b SHA512 d0f1008b4501c412817168f751c1d948dc4fdda97572a85c950c7595dfdb0466be964a04ccd8eb31b1bfd83709607fe6cb422ec15d144ef8615dd9700adf127d
-EBUILD gkrellmoon-0.6-r2.ebuild 669 BLAKE2B 7942042cb83cc901b337ea807b62f21bf02742fecd859e9ff5272a11ddc0ae8798005b38c3633c6c9211afcaa29a1cb5ac3465152c38f896d503288c66ab9dc3 SHA512 1c399af50bf4c214eaf6c9fd34fec3a25e926e7bd0bc75e5b6c1267fd579b697b39089b98e509552fb1494e934e912b1f758fd942e7510abda57875a7926ee35
+EBUILD gkrellmoon-0.6-r2.ebuild 681 BLAKE2B 76614a7578760bac7d57d6e6f15cedd797677b918338f8dc975b1e44bb93f4ecb94837da05115385d873405ade8b9f70e8491e61a44ad33197b6fe5c69f9c6bd SHA512 982492580e30cd7ddc8899295bce95f8620772f8f44f02f35fba693bcc3f3d08bbfe14ec563aa995bab60be9e29ee7587e8172e41cb56259671b506df0998ebb
 MISC metadata.xml 247 BLAKE2B f2fc0c05c1a8a6335cff6dca0709df566ba6af42ab9ef60e30f901987d81270a139ca0a78865bce47a0c96f18fccfa19d5124787d633fbe36e66b4c0207d9838 SHA512 6c79353536080aaf6c795116baf16e0dd6a785795f72642479b77d1da4c4ae580010c3e0912f75f1fdfdbfb02e756c01d8c44d90226aa5d8c07024a39c282232
diff --git a/x11-plugins/gkrellmoon/gkrellmoon-0.6-r2.ebuild b/x11-plugins/gkrellmoon/gkrellmoon-0.6-r2.ebuild
index 43e7a619c6cc..1364430d6906 100644
--- a/x11-plugins/gkrellmoon/gkrellmoon-0.6-r2.ebuild
+++ b/x11-plugins/gkrellmoon/gkrellmoon-0.6-r2.ebuild
@@ -1,28 +1,29 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
+
 inherit gkrellm-plugin toolchain-funcs
 
-IUSE=""
 DESCRIPTION="A GKrellM2 plugin of the famous wmMoonClock dockapp"
 SRC_URI="mirror://sourceforge/gkrellmoon/${P}.tar.gz"
 HOMEPAGE="http://gkrellmoon.sourceforge.net/"
 
-DEPEND="media-libs/imlib2"
-RDEPEND="${DEPEND}
-	app-admin/gkrellm[X]
-"
-
-SLOT="2"
 LICENSE="GPL-2"
+SLOT="2"
 KEYWORDS="alpha amd64 ppc sparc x86"
+IUSE=""
+
+RDEPEND="
+	app-admin/gkrellm:2[X]
+	media-libs/imlib2"
+DEPEND="${RDEPEND}"
 
 PATCHES=( "${FILESDIR}"/${P}-makefile.patch )
 
 src_prepare() {
 	default
-	sed -i -e '/^#include <stdio.h>/a#include <string.h>' CalcEphem.h
+	sed -i -e '/^#include <stdio.h>/a#include <string.h>' CalcEphem.h || die
 }
 
 src_compile() {
diff --git a/x11-plugins/gkrellmss/Manifest b/x11-plugins/gkrellmss/Manifest
index aac0b4ce9ad7..888882c8142b 100644
--- a/x11-plugins/gkrellmss/Manifest
+++ b/x11-plugins/gkrellmss/Manifest
@@ -1,4 +1,4 @@
 AUX gkrellmss-2.6-Respect-LDFLAGS.patch 498 BLAKE2B 2eb34f01a8f20325f34ba6176d68046645528fd7cddd3ee342be5df4c812e7f986b0d39d6a25e1d52d9521ca73cb30fc3784a1cf0aecc634b0618b3c09240bbd SHA512 8c050353c212ea0791b7e5160ba720ee1e91359612565bc9b074424de8d2da93a581696d54ec5210265609267c767eb8d5bb0678dcd9e1e9d7d61648a626e472
 DIST gkrellmss-2.6.tar.gz 32082 BLAKE2B 73164229fbbf08fc781bf697653be19a41b63df46ea7fc2aac230c74ad042809f2f33d199a08ccbe20cdb5610ab2350ee32ec2a09803bb71e367d21f18e752bb SHA512 d9773cfed6e4de006df32102419773f9af5047e3fb5e7aa4c7a686b4775c3af30c14321fe404aa65ec27eb13bcd849dbd25ef4eaa2daa723177040da05c74f76
-EBUILD gkrellmss-2.6-r4.ebuild 700 BLAKE2B 18839518a1fba1b23a9e84f1700d1a71864643f767539394553795a0b56496bbef31550170376fa14e2ab21cb26870256b68bc90dc303e217e8c7f532b17b8f1 SHA512 28a6dd212a242680b5ffaf9b989beae75b4e41786575f8c10e5b81ba3fbab3ee0eb064d95a202c50081b150344e3ce1e95dfe8b8265afc19cf220af599021820
+EBUILD gkrellmss-2.6-r4.ebuild 717 BLAKE2B c4678970f98537516c449e1011e2dc494d11c767f65715e7248b27116d03feabb8988983cc44e4340a24736c8c6bdd92a4128817d56adefd6407de6b1a67193f SHA512 1843c99ce290ce1264f2653cca79a0b1ded1e5995820a0fc8ecaea9856a876fb39f4b2a655c1bd5d31fe438d371f56980343d43dc720d46bc3ddb6bf2b5810fa
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/x11-plugins/gkrellmss/gkrellmss-2.6-r4.ebuild b/x11-plugins/gkrellmss/gkrellmss-2.6-r4.ebuild
index 3255120187b8..473087da1408 100644
--- a/x11-plugins/gkrellmss/gkrellmss-2.6-r4.ebuild
+++ b/x11-plugins/gkrellmss/gkrellmss-2.6-r4.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
+
 inherit gkrellm-plugin
 
 DESCRIPTION="A plugin for GKrellM2 that has a VU meter and a sound chart"
@@ -14,16 +15,15 @@ KEYWORDS="~alpha amd64 ~ppc ~sparc x86"
 IUSE="nls"
 
 RDEPEND="
-	app-admin/gkrellm[X]
+	app-admin/gkrellm:2[X]
 	media-libs/alsa-lib
-	sci-libs/fftw:3.0=
-"
+	sci-libs/fftw:3.0="
 DEPEND="${RDEPEND}"
 
-PLUGIN_SO="src/gkrellmss.so"
-PLUGIN_DOCS="Themes"
+PATCHES=( "${FILESDIR}"/${P}-Respect-LDFLAGS.patch )
 
-PATCHES=( "${FILESDIR}/${P}-Respect-LDFLAGS.patch" )
+PLUGIN_SO=( src/gkrellmss$(get_modname) )
+PLUGIN_DOCS=( Themes )
 
 src_compile() {
 	addpredict /dev/snd
diff --git a/x11-plugins/gkrellmwireless/Manifest b/x11-plugins/gkrellmwireless/Manifest
index 7905b7a07be8..d28e4648018e 100644
--- a/x11-plugins/gkrellmwireless/Manifest
+++ b/x11-plugins/gkrellmwireless/Manifest
@@ -1,3 +1,4 @@
+AUX gkrellmwireless-2.0.3-fix-build-system.patch 581 BLAKE2B faba9c577d0bb7f72458999481e9181933fa0103e2e55a6d06122dcf9546c2a9e269153962bab7bc0177a9b1eb1bf2f6e6651b3110038361550b46e6e592faae SHA512 0e4725e1550487d9305f2f2500c12401558e9a1509852276fa3f7e49a516459f70e189c15a25a6320d24b77decba9749184e0a5a39ccc43ccd17f5e1392f0f96
 DIST gkrellmwireless-2.0.3.tar.gz 9557 BLAKE2B 74ad963540597bddadc8a8e110ad441a2341a36b10f8620c392179909fe4582d973f51a4f0ffc2fc552ae1917e1c70373992a3801c9e1fec1f162194749e788c SHA512 7d005502bd65ea16f589f94fba38e67dffec69974177d4e7b83bf50d805e431d64a8cd0795f21547100487a9cb4ed7c01883514cb2d66165f0a7b8aa91162ab1
-EBUILD gkrellmwireless-2.0.3-r2.ebuild 657 BLAKE2B 860e7306281e7de33215a4bf97fc558e3786b505730f312f9a5abdebdda0b19c260165deff76e9a8d20fb457ad30a281aa94d21c06e44763bfb2f9689f917bf2 SHA512 2275521078b61627da62607553b2b2f932d033bd3687ebc3cbd82d52bc1eea6954065e27d5c4c55f59cf17e3bf3133e45805eda2e529d93d432c6310c3325950
+EBUILD gkrellmwireless-2.0.3-r2.ebuild 614 BLAKE2B 18a2f5c9340c822ba4e472c49450fd6a6a0a308734611ef25496f11062a7a2fd43037a472085ce4c4046481700b5fdb69be869b02b0f407917ac955403a06f26 SHA512 da99081aa86502cb811ce6467b9b5f09704114651a0b895b053c9954a69fe4d87292e7a8bfd5ad028e954654b82e48a47cc8fcff722cf6f7a69fecac3d2a537d
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/x11-plugins/gkrellmwireless/files/gkrellmwireless-2.0.3-fix-build-system.patch b/x11-plugins/gkrellmwireless/files/gkrellmwireless-2.0.3-fix-build-system.patch
new file mode 100644
index 000000000000..eb821e9b2de0
--- /dev/null
+++ b/x11-plugins/gkrellmwireless/files/gkrellmwireless-2.0.3-fix-build-system.patch
@@ -0,0 +1,26 @@
+--- a/Makefile
++++ b/Makefile
+@@ -16,12 +16,11 @@
+ GTK_CFLAGS = `$(GTK_CONFIG) --cflags` 
+ GTK_LIB = `$(GTK_CONFIG) --libs`
+ 
+-FLAGS = -O2 -Wall -fPIC $(GTK_CFLAGS) $(GKRELLM_INCLUDE)
++CFLAGS += -Wall -fPIC
++CPPFLAGS += $(GTK_CFLAGS) $(GKRELLM_INCLUDE)
+ LIBS = $(GTK_LIB)
+ LFLAGS = -shared
+ 
+-CC = gcc $(CFLAGS) $(FLAGS)
+-
+ OBJS = wireless.o
+ 
+ PLUGIN_DIR = /usr/lib/gkrellm2/plugins
+@@ -32,7 +31,7 @@
+ all:	wireless.so
+ 
+ wireless.so: $(OBJS)
+-	$(CC) $(OBJS) -o wireless.so $(LFLAGS) $(LIBS)
++	$(CC) $(LDFLAGS) $^ -o $@ $(LFLAGS) $(LIBS)
+ 
+ clean:
+ 	rm -f *.o core *.so* *.bak *~
diff --git a/x11-plugins/gkrellmwireless/gkrellmwireless-2.0.3-r2.ebuild b/x11-plugins/gkrellmwireless/gkrellmwireless-2.0.3-r2.ebuild
index 85fd1b160794..d3956e0aa0d0 100644
--- a/x11-plugins/gkrellmwireless/gkrellmwireless-2.0.3-r2.ebuild
+++ b/x11-plugins/gkrellmwireless/gkrellmwireless-2.0.3-r2.ebuild
@@ -1,27 +1,27 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
+
 inherit gkrellm-plugin toolchain-funcs
 
-S="${WORKDIR}/${PN}"
 DESCRIPTION="A plugin for GKrellM that monitors your wireless network card"
 SRC_URI="http://gkrellm.luon.net/files/${P}.tar.gz"
 HOMEPAGE="http://gkrellm.luon.net/gkrellmwireless.php"
 
-SLOT="2"
 LICENSE="GPL-2"
+SLOT="2"
 KEYWORDS="amd64 ~ppc ~sparc x86"
 IUSE=""
 
-RDEPEND="app-admin/gkrellm[X]"
+RDEPEND="app-admin/gkrellm:2[X]"
+DEPEND="${RDEPEND}"
+
+S=${WORKDIR}/${PN}
+PATCHES=( "${FILESDIR}"/${PN}-2.0.3-fix-build-system.patch )
 
-PLUGIN_SO=wireless.so
+PLUGIN_SO=( wireless$(get_modname) )
 
-src_prepare() {
-	default
-	sed -i \
-		-e '/^CC =/s:gcc $(CFLAGS) $(FLAGS):'"$(tc-getCC)"' $(FLAGS) $(CFLAGS):' \
-		-e '/-o wireless.so/s: : $(LDFLAGS) :' \
-		Makefile || die
+src_configure() {
+	tc-export CC
 }
diff --git a/x11-plugins/gkrellshoot/Manifest b/x11-plugins/gkrellshoot/Manifest
index 471c9cd40682..74d8beabf8e9 100644
--- a/x11-plugins/gkrellshoot/Manifest
+++ b/x11-plugins/gkrellshoot/Manifest
@@ -1,3 +1,3 @@
 DIST gkrellshoot-0.4.4.tar.gz 16556 BLAKE2B 417217ffa500d8b0cc4ddd80849b2da83e3e55bc489db83fd7c8992f42af9ebb385c1ece17cae65cb7393bffadaaffd70e11a4dea16aa4d2b2f19e0b828a6833 SHA512 9363c045a99c23f8fedf95ac82c7bab4ce21acb675fdabdd831f174d9816a14a22ed6d7048d475b4c4199b9e6a88f3f663702ac2f9304f08860339beb323322a
-EBUILD gkrellshoot-0.4.4-r2.ebuild 463 BLAKE2B 3c453575cd21c205777e8fe1283f2c388470d6433afe188c0c0fed79ea91863a3cc1fb1ecda064117ebe61505ad3e7d81891ced3b95fddab400332cde2538588 SHA512 b045d592a4c6dd4cd5217242b0c201ace54fe2d8f45ff41a26dae69ff0de0861c4562676291b4aa72ec385dfd65958838aceee3f75b5d9b12cc926a542f48ca3
+EBUILD gkrellshoot-0.4.4-r2.ebuild 485 BLAKE2B ea1d3a8d689c8e4062644511e92aeceebfee13bdfda59c98415b8116262807f58087481bd2953bce823e134d0eac122c281d243d0c409dc4dc87843b39d87f6e SHA512 50d1c6f8caaeee7861b3cc98b5aa7a9698a87bc54015a88cb3bc0df0a65418e087ef44414c6f4bbefe61baba1a87bfb1d7e83a9d3284ff8e4574b3cd6542c5f5
 MISC metadata.xml 248 BLAKE2B b817c84fa8044cf6ab49f6d3eefcc03a6aeb9265ffcf5faaafdfb724adb13cc5bbdf3e67db3344e18f33ecd9653b10e5e70bd6ae13f67b55c24ef740e5ee3bba SHA512 f79b95ea2ff69eb3928e65d5d184c98f5f34fe3ab5b851ce8ace6597a7ffeb64f86cc82f6d7a3d522322bbdf2a234d50efd64b0fbffd4a4ba6f10462ab0870f1
diff --git a/x11-plugins/gkrellshoot/gkrellshoot-0.4.4-r2.ebuild b/x11-plugins/gkrellshoot/gkrellshoot-0.4.4-r2.ebuild
index c423ab7a64c3..0f25feb62d4f 100644
--- a/x11-plugins/gkrellshoot/gkrellshoot-0.4.4-r2.ebuild
+++ b/x11-plugins/gkrellshoot/gkrellshoot-0.4.4-r2.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
+
 inherit gkrellm-plugin
 
-S=${WORKDIR}/${P/s/S}
 DESCRIPTION="GKrellm2 plugin to take screen shots and lock screen"
 HOMEPAGE="http://gkrellshoot.sourceforge.net/"
 SRC_URI="mirror://sourceforge/gkrellshoot/${P}.tar.gz"
@@ -14,7 +14,9 @@ SLOT="2"
 KEYWORDS="alpha amd64 ppc sparc x86"
 IUSE=""
 
+DEPEND="app-admin/gkrellm:2[X]"
 RDEPEND="
-	app-admin/gkrellm[X]
-	virtual/imagemagick-tools
-"
+	${DEPEND}
+	virtual/imagemagick-tools"
+
+S=${WORKDIR}/${P/s/S}
diff --git a/x11-plugins/gkrellstock/Manifest b/x11-plugins/gkrellstock/Manifest
index 428f73c0b587..5ae936ac56f4 100644
--- a/x11-plugins/gkrellstock/Manifest
+++ b/x11-plugins/gkrellstock/Manifest
@@ -1,4 +1,4 @@
 AUX gkrellstock-0.5-ldflags.patch 412 BLAKE2B 93761f0b972727b6b20a74ac0fd14ec2f359557f2067a53ee7ced7d63f6f33921b58554597e2d50d0f3dfffb6dd9812fae9a1458ad610ceb7b00d06ab959dc28 SHA512 626b1953988ce00d76270a779fcf7c5a2c0b599cd57ec0873ce2328c6cbbaaf7042cb8d608da9b0398205d29879c37ef9179edadf980ad5601b6eecac5fb7613
 DIST gkrellstock-0.5.1.tar.gz 22385 BLAKE2B c948651631aba700a23fd3ef6c74b564662383ee2bb69cf9ee8a3dad2f35d9e45ae6839f0c576aab0f0aa9eb296ba624bf3077ba2312a6b853bf7174fda6a25e SHA512 040e6271a0b0ca3f7be52cc64076a8d1b538fc7607a9ae54acf1c9dc176b094c1483b10c1813a929dcf47dff4fee8c18b7ca58472343c83edfa58a32edc7776c
-EBUILD gkrellstock-0.5.1-r1.ebuild 818 BLAKE2B 052fa1dad8eba221558e409aca853dd86ef42803ca7598d2777b5e6c731ed0a3c031104b162ddecddf89d3b8740e583689b36e07da8964ea0df85b6631cbc872 SHA512 50bdc6ec6c6bbe3ed687522049e7a6eb1f8320a3cc23d9cdd589e74dbfd6bbe00849c7fa7fc951cf444f2ebb5e484bdb175e64d6c8f7b02ae006ca8704abc2a7
+EBUILD gkrellstock-0.5.1-r1.ebuild 817 BLAKE2B b2622f83ff56f96c48cb871513b9ebad95f86e5df9ca1da69168d8f43126aecb54993badf529bc699db228f87090587f435147e4f5b972be42a1944e83b155ed SHA512 7bd023ca7ae01e7daf4779251e5b2e5495cf1226c9772a0a8c0b80f3519330740af66a6427ce1ee5a1e08b7c36ac60a0d9b543ba5ca9fe09b992ac2fd75e73b8
 MISC metadata.xml 253 BLAKE2B 061c01de39ffe2a9180cc4c3023c7b630f1553c5a05597439fa7c6c5580ee5d6df935eff00af07d1fdf5032804c21dccf2c23a84f3a1b39eef565bcbcbcedf3e SHA512 e3035e8f82cfbe32727054a8ce727ffd771b4d908f78f6fa2f0e84ff82b0f9a6cf6c9abe2a32f148eeee28d2bf7c9cfc57d6b51b0860febdf6a640caa953827e
diff --git a/x11-plugins/gkrellstock/gkrellstock-0.5.1-r1.ebuild b/x11-plugins/gkrellstock/gkrellstock-0.5.1-r1.ebuild
index adbd9c88ad4f..3f7aff6dea76 100644
--- a/x11-plugins/gkrellstock/gkrellstock-0.5.1-r1.ebuild
+++ b/x11-plugins/gkrellstock/gkrellstock-0.5.1-r1.ebuild
@@ -1,34 +1,32 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
+
 inherit flag-o-matic gkrellm-plugin toolchain-funcs
 
 DESCRIPTION="Get Stock quotes plugin for Gkrellm2"
 HOMEPAGE="http://gkrellstock.sourceforge.net/"
 SRC_URI="mirror://sourceforge/gkrellstock/${P}.tar.gz"
 
-SLOT="2"
 LICENSE="GPL-2"
+SLOT="2"
 KEYWORDS="amd64 ~ppc x86"
 IUSE=""
 
 RDEPEND="
-	app-admin/gkrellm[X]
+	app-admin/gkrellm:2[X]
 	dev-libs/glib:2
 	x11-libs/gtk+:2
 	dev-perl/libwww-perl
-	dev-perl/Finance-Quote
-"
-DEPEND="${DEPEND}
-	virtual/pkgconfig
-"
+	dev-perl/Finance-Quote"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
 
 S="${WORKDIR}/${P/s/S}"
+PATCHES=( "${FILESDIR}"/${PN}-0.5-ldflags.patch )
 
-src_prepare() {
-	default
-	eapply "${FILESDIR}"/${PN}-0.5-ldflags.patch
+src_configure() {
 	append-cppflags $($(tc-getPKG_CONFIG) --cflags gtk+-2.0)
 	append-flags -fPIC
 }
diff --git a/x11-plugins/gkrellsun/Manifest b/x11-plugins/gkrellsun/Manifest
index 724c50bf1481..6d8b7732ca55 100644
--- a/x11-plugins/gkrellsun/Manifest
+++ b/x11-plugins/gkrellsun/Manifest
@@ -1,5 +1,5 @@
 AUX gkrellsun-1.0.0-Respect-LDFLAGS.patch 334 BLAKE2B 18bc916fd4d6834731cc02a720347a49a926f57f8477c8ee91bf9711b92aecc85b427a77d53edc6658ffe6b918b61b7d52a0ca0d7215b2008ec71710a34a985f SHA512 093ab16f6852b9a75a9c2e31a7ddf3ad6a407fd5c0f881340980f3f59b3c9abe10fa1855e09e9a73bd53cd3b3d532e3372bb227d95614e7fcbc014637c3ee906
 AUX gkrellsun-1.0.0-reenable.patch 520 BLAKE2B fab0e90b893620b8d1724e21953845fbbc990948712f25ff0f4903ef51bcbcb00f3d3989cc8f9cbbc515daff3391c14a37a260f07309f3fe400915c293a8eefe SHA512 e4cfba81e20e08f2fc5fd005e5ff2e630a90f2cd1743334440b7f78f2de256959347d93f9e1c25416b9d151dd5465087dbf3e39a30429023cd9e9c635dcda229
 DIST gkrellsun-1.0.0.tar.gz 96970 BLAKE2B aef5bed2a077c7dccb8573bafa9a14df53c52522872d77d08b6a8d29c824d3ef09c54ea5d0b6268dd502508fed264ebc250bd558a602e41dabddab9556158668 SHA512 1a34812e94f16d19311c23d44a0353dade50b802dd3ab115738959b9322c3bc6a28daa2bcea889700e6cc2ff8eb9400b989bf02c6f138bb878b94118ffd6e27a
-EBUILD gkrellsun-1.0.0-r4.ebuild 709 BLAKE2B 56769774b6c8d92027c911574ceff362d667a7b27742e5d7a3d611d629b2a11a58321c9f35fe88aa86c39439d728f3857df4dbe08fc47a7e502079b2bc4d8a11 SHA512 1bd966d53852c167f81d3ddbf91d3d400d8f33e95749f691717bb67f56ef68948948482ad3ba7a3875e6f4216103c5518df3a92880852d0ec9db8acf71efe982
+EBUILD gkrellsun-1.0.0-r4.ebuild 682 BLAKE2B 245305d6132572f6730ea23b42f2bda05425392ebf5cb4389a51f819a3854a3eea240befd02580e8c5433cb2168e38204ce87a00a28683594785e763cb165926 SHA512 673efb89f9690b5c639cd259020f82d971f7258eff820e0b29447aec28a506edece6518311ae82711c765f0568bef96990c9ec385fc4f53426540a58928a9991
 MISC metadata.xml 246 BLAKE2B aa7aeed52cbd6f0cbf3fb397c465f56a6b23276e59ebfc8aea46683b5f1d7c40857d40dc4aa3a8dbba8dfb3dbc4bc9b388b32c9c78c2fba505875ebea4264282 SHA512 d314e742c911fe837b685a8f4f8ab7701c213b55a06efcb805aff28214ddab008539ab6682258c0b2fe6cd5ccc045d2d321c22aef6af3b39758f821f08dc8ce6
diff --git a/x11-plugins/gkrellsun/gkrellsun-1.0.0-r4.ebuild b/x11-plugins/gkrellsun/gkrellsun-1.0.0-r4.ebuild
index 40deb42b5728..e054182aac83 100644
--- a/x11-plugins/gkrellsun/gkrellsun-1.0.0-r4.ebuild
+++ b/x11-plugins/gkrellsun/gkrellsun-1.0.0-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,24 +8,24 @@ inherit gkrellm-plugin
 DESCRIPTION="A GKrellM plugin that shows sunrise and sunset times"
 HOMEPAGE="http://gkrellsun.sourceforge.net/"
 SRC_URI="mirror://sourceforge/gkrellsun/${P}.tar.gz"
+
 LICENSE="GPL-2"
 SLOT="1"
 KEYWORDS="alpha amd64 hppa ia64 ppc sparc x86"
 IUSE="nls"
 
-COMMON_DEPEND="app-admin/gkrellm[X]
+RDEPEND="app-admin/gkrellm:2[X]"
+DEPEND="${RDEPEND}
 	nls? ( sys-devel/gettext )"
-DEPEND+=" ${COMMON_DEPEND}"
-RDEPEND+=" ${COMMON_DEPEND}"
-
-PLUGIN_SO=src20/gkrellsun.so
 
 PATCHES=(
-	"${FILESDIR}/${P}-reenable.patch"
-	"${FILESDIR}/${P}-Respect-LDFLAGS.patch"
+	"${FILESDIR}"/${P}-reenable.patch
+	"${FILESDIR}"/${P}-Respect-LDFLAGS.patch
 )
 
+PLUGIN_SO=( src20/gkrellsun$(get_modname) )
+
 src_compile() {
-	use nls && myconf="$myconf enable_nls=1"
+	use nls && local myconf="enable_nls=1"
 	emake ${myconf}
 }
diff --git a/x11-plugins/gkrelltop/Manifest b/x11-plugins/gkrelltop/Manifest
index 631a64009c76..7ac4c4734535 100644
--- a/x11-plugins/gkrelltop/Manifest
+++ b/x11-plugins/gkrelltop/Manifest
@@ -1,3 +1,4 @@
+AUX gkrelltop-2.2.13-fix-build-system.patch 1088 BLAKE2B 8b8b00fde60ace4fc98848eb436224419f7ec1a13a5da232a28081ecb47825be039aa9a515768478d1bc0fb7114ba040929d9ac05edcbd78bcd0b24562e824fc SHA512 d53dcd1cce67b6b18c5e6ab3cf679a16510cfb8f811d90f47315a5d2161364ee47f1c975c85b26886145c40a95ef7c77a944a0056ada470c176d8791b2b0f2b0
 DIST gkrelltop_2.2.13.orig.tar.gz 49023 BLAKE2B d2857b6d73fca2a2933f4bcaa207dbf34f9bbc2bb9de922d564a865d2238b91d9bbcfbdf5753d7976d941d9ba98c9e7b81812018a2d9d1ac07984e26c3317382 SHA512 9479c5b860833671451b6fb8583e741b1ac755ed76b7e73dffd65d13d30d0b5da1916436901642f738e0d72f8c8696f4dea9c041a203e76d309f2782acf7024e
-EBUILD gkrelltop-2.2.13-r2.ebuild 939 BLAKE2B aa190c276939299c575972af2ef103ed135392984e924a7f3c84ef0f0659c843b9042337c6ad5192454c8c738416fcd350f4a4ead11c5cc131c22c6c6e70a942 SHA512 ad91724a6f4fa17fec3261d92e7bd371fc86c3f989f7e6542836b4933f9ccf6b815c965713699d1d0d3771dc63db7112b7d8177c294f1106b739df6bf8af6294
+EBUILD gkrelltop-2.2.13-r2.ebuild 935 BLAKE2B 2f4384122d72c42171fdebf30dbade57b25dec2ae06db47a5d9eb383c6a2df952a7f37b72788e085651343ca652b87c6e9cb713f570cfa9012ad963960780d33 SHA512 cefad0c4db70c8fd3b7d29e8a8588858d7ebed7d9976e0c07f0046ebc67ed2f1b4dd061b984883989487bc2a8ce7391467463b693dc400348b7a0571743054bc
 MISC metadata.xml 246 BLAKE2B 272c861c71ad2484ff839452b7fff0877f2c464023dffe073ea29271be932a439027031c8811fb34f5e98b61f5fb54045268ed619feb3d0b54361a1b33dddeba SHA512 51eb6bcc872b3c8eecd9ea2eb00437bdcf70db3a550becc013752a793ffd9ef05c37c760af1151c37c15dd5565fd3376b7485f761ed42efc87adc05b390bcb27
diff --git a/x11-plugins/gkrelltop/files/gkrelltop-2.2.13-fix-build-system.patch b/x11-plugins/gkrelltop/files/gkrelltop-2.2.13-fix-build-system.patch
new file mode 100644
index 000000000000..9eaa9cc3d4e8
--- /dev/null
+++ b/x11-plugins/gkrelltop/files/gkrelltop-2.2.13-fix-build-system.patch
@@ -0,0 +1,41 @@
+--- a/Makefile
++++ b/Makefile
+@@ -45,11 +45,10 @@
+ # Parameters for gkrellm version 2.*
+ CFLAGS2 = -g -D$(OSFLAG) -DGKRELLM2 -fPIC -Wall `pkg-config gtk+-2.0 --cflags`
+ LIBS =  
+-CC=/usr/bin/gcc $(CFLAGS2)
++CC += $(CFLAGS) $(CFLAGS2)
+ 
+ else 
+ # Parameters for gkrellm version 1.*
+-CC=/usr/bin/cc
+ CFLAGS = -D$(OSFLAG) -Wall -fPIC `gtk-config --cflags` `imlib-config --cflags-gdk` 
+ LIBS=
+ 
+@@ -78,7 +77,7 @@
+ ifeq ($(INSTALLDIRD),)
+ 	INSTALLDIRD=$(HOME)/.gkrellm2/plugins-gkrellmd
+ endif
+-CCD=/usr/bin/gcc $(CFLAGSD)
++CCD = $(CC) $(CFLAGS) $(CFLAGSD)
+ OBJD = gkrelltopd.o top_three.o
+ 
+ DUMMY_VAR := $(shell ./configure $(CONFIGURE_ARGS))
+@@ -100,14 +99,14 @@
+ warn: ; $(WARN)
+ 
+ $(GKRELLTOP): $(OBJ) warn
+-	$(CC)  -shared $(OBJ) -o $(GKRELLTOP) 
++	$(CC)  $(LDFLAGS) -shared $(OBJ) -o $(GKRELLTOP) 
+ 
+ # Compile gkrelltopd.so server plugin
+ server: $(GKRELLTOPD) warn
+ 	@echo ""
+ 
+ $(GKRELLTOPD): $(OBJD) 
+-	$(CCD)  $(LIBSD) -shared $(OBJD) -o $(GKRELLTOPD)
++	$(CCD)  $(LIBSD) $(LDFLAGS) -shared $(OBJD) -o $(GKRELLTOPD)
+ 
+ gkrelltop.o: gkrelltop.c
+ 	$(CC) -c gkrelltop.c -o gkrelltop.o
diff --git a/x11-plugins/gkrelltop/gkrelltop-2.2.13-r2.ebuild b/x11-plugins/gkrelltop/gkrelltop-2.2.13-r2.ebuild
index 4e6349415d03..059b7d824e5b 100644
--- a/x11-plugins/gkrelltop/gkrelltop-2.2.13-r2.ebuild
+++ b/x11-plugins/gkrelltop/gkrelltop-2.2.13-r2.ebuild
@@ -1,41 +1,38 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
+
 inherit gkrellm-plugin toolchain-funcs
 
 DESCRIPTION="a GKrellM2 plugin which displays the top three processes"
 SRC_URI="mirror://sourceforge/${PN}/${PN}_${PV}.orig.tar.gz"
 HOMEPAGE="https://sourceforge.net/projects/gkrelltop"
 
-SLOT="0"
 LICENSE="GPL-2"
+SLOT="0"
 KEYWORDS="amd64 ppc x86"
 IUSE="X"
 
-PLUGIN_SERVER_SO=gkrelltopd.so
-PLUGIN_SO=gkrelltop.so
-
-S="${WORKDIR}/${P}.orig"
-
 RDEPEND="
-	app-admin/gkrellm[X]
+	app-admin/gkrellm:2[X]
 	dev-libs/glib:2
-	x11-libs/gtk+:2
-"
+	x11-libs/gtk+:2"
 DEPEND="${RDEPEND}"
 
-src_prepare() {
-	sed -i \
-		-e "s:/usr/bin/gcc:$(tc-getCC) \$(CFLAGS):" \
-		-e 's/-shared/$(LDFLAGS) &/' \
-		Makefile || die
-	default
+S=${WORKDIR}/${P}.orig
+PATCHES=( "${FILESDIR}"/${PN}-2.2.13-fix-build-system.patch )
+
+PLUGIN_SERVER_SO=( gkrelltopd$(get_modname) )
+PLUGIN_SO=( gkrelltop$(get_modname) )
+
+src_configure() {
+	tc-export CC
 }
 
 src_compile() {
-	use X || TARGET="server"
-	emake ${TARGET}
+	use X || local target="server"
+	emake ${target}
 }
 
 pkg_postinst() {
diff --git a/x11-plugins/gkrellweather/Manifest b/x11-plugins/gkrellweather/Manifest
index 6389799f263b..de9b83c062e6 100644
--- a/x11-plugins/gkrellweather/Manifest
+++ b/x11-plugins/gkrellweather/Manifest
@@ -2,5 +2,5 @@ AUX gkrellweather-2.0.8-Move-GrabWeather.patch 2162 BLAKE2B d6a38021b10cf0ec97ea
 AUX gkrellweather-2.0.8-Respect-LDFLAGS.patch 537 BLAKE2B 1b73e7b152ade7dda78e4799a93320f644e54f68e80b1e02f37c4563c3291b252eb05ab39b3f2c1231876c329dda07ccbccbfe090b2e144b5fd0ce9a7e083a6d SHA512 0735a7ebdb322ea55ffb0204c2cf52d15638687f462dc5303f070d5ca8cd9218e083db1ff6f9d6eb2be345dd02580822612eaf1df0158b2e3683add34042eb2b
 AUX gkrellweather-2.0.8-update-locations.patch 567 BLAKE2B aff5c3d4bb291d0a97c21c946c81aca539fed0076f553a8570d5a76ac597061fde58a4dcefcd3de6e5d2ecafcf3aabdcd7392fe3c07649534a09809e357ae318 SHA512 963e81b73812fb1bc18e2c29bb8f69b655032441b537dc7a3a083e2331e0337a5faec86940f2779546aa024d59944fd6d5fb7f88f474d2e22532bd85cbe37c6b
 DIST gkrellweather-2.0.8.tgz 20227 BLAKE2B 7c3fd369e323229359bc397e07b422b625a14038aff573cf7c3fd6218c733a1d69f5754dcb86ab2172a8a5ae08fbab022a87100a6422c5e8b3b3068e108fd9a7 SHA512 da9408ebc9518fe805d3f0dd9496b4aeb805a2ab6566b619b61fc25c91122c0ee45e2a7b804206b2ee08300309dd9b1e1c3b6605a41c594cf75fd39b58767264
-EBUILD gkrellweather-2.0.8-r1.ebuild 1014 BLAKE2B ceec2b357fe729fec2fed4a4dcca1f2552abd0561202a344228bfc1c1442ada533f73b9403f7d852a1cd3968db5bb9dd5b5d17b9922cfd4264f569a4005a29c5 SHA512 6f15755b45f6216d7ede2e2720a3aff57cf17e39992321025cb5ddd23e943d84ecb387861fd4101762f080b84b867e39e810f3ea0dbc427ffbb3641c09d160a5
+EBUILD gkrellweather-2.0.8-r1.ebuild 1013 BLAKE2B 001e8f5704d5ffcdb9bc0854c4ba1f4986489ca29c4b7e5361f12e213321e3dd1f664bf14c2f3aa439e8dfd22ca22972ab5188299f75da42ebe08d86a04a20dc SHA512 201b12a4cfb7c2665b4e41dd696587083a190ae68b3bf40c498d13b94ad58531b006d9264a417a5d9e41bb611dbf6532dd171ed02c907e0132f58abfb00623a0
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/x11-plugins/gkrellweather/gkrellweather-2.0.8-r1.ebuild b/x11-plugins/gkrellweather/gkrellweather-2.0.8-r1.ebuild
index 2eab84402441..5e42ff7bb2ee 100644
--- a/x11-plugins/gkrellweather/gkrellweather-2.0.8-r1.ebuild
+++ b/x11-plugins/gkrellweather/gkrellweather-2.0.8-r1.ebuild
@@ -1,27 +1,27 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
+
 inherit flag-o-matic gkrellm-plugin toolchain-funcs
 
 DESCRIPTION="GKrellM2 Plugin that monitors a METAR station and displays weatherinfo"
 HOMEPAGE="https://sites.google.com/site/makovick/gkrellm-plugins"
 SRC_URI="https://sites.google.com/site/makovick/projects/${P}.tgz"
 
-SLOT="2"
 LICENSE="GPL-2"
+SLOT="2"
 KEYWORDS="~alpha amd64 ~ppc ~sparc x86"
 IUSE=""
 
 RDEPEND="
-	app-admin/gkrellm[X]
-	>=dev-lang/perl-5.6.1
-	>=net-misc/wget-1.5.3
-"
+	app-admin/gkrellm:2[X]
+	dev-lang/perl
+	net-misc/wget
+	x11-libs/gtk+:2"
 DEPEND="
-	>=sys-apps/sed-4.0.5
-	virtual/pkgconfig
-"
+	${RDEPEND}
+	virtual/pkgconfig"
 
 PATCHES=(
 	"${FILESDIR}"/${P}-Respect-LDFLAGS.patch
@@ -29,14 +29,13 @@ PATCHES=(
 	"${FILESDIR}"/${P}-update-locations.patch
 )
 
-src_prepare() {
-	default
+src_configure() {
 	append-cflags $($(tc-getPKG_CONFIG) --cflags gtk+-2.0)
 	append-flags -fPIC
 }
 
 src_compile() {
-	emake PREFIX=/usr CC=$(tc-getCC) CFLAGS="${CFLAGS}"
+	emake PREFIX="${EPREFIX}"/usr CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
 }
 
 src_install () {
diff --git a/x11-plugins/gkwebmon/Manifest b/x11-plugins/gkwebmon/Manifest
index bc2547d11db8..ce5c8af9e5bd 100644
--- a/x11-plugins/gkwebmon/Manifest
+++ b/x11-plugins/gkwebmon/Manifest
@@ -1,4 +1,4 @@
 AUX respect-cc-cflags-ldflags.patch 1232 BLAKE2B e983a46154113d21586e0b59121f0798fc1d359dbbf7b5388421b88a46b018fcc740bcfc23fc6074ec985b7c377197fb431027d9a623ef381b540601e2908d72 SHA512 0ce0b0ed7832ede335447d4abb7cf3904e97f9dff334aeb14a03e09cfe042de47bca456b7fc38bd7171440bcefd0da8a17cc01f1d540b84ffbf644e216f273a2
 DIST gkwebmon-0.2.tgz 14163 BLAKE2B c6c0c9352e2f68eca56f981abb8188a7a300604c8c0fc05c1b0b95f0cdc117c12e55aeace66f9c3dcc16a13acb2b44683a77de36a83d9e9b7c273ec619173235 SHA512 0af4eaa8636b43232e209e6381a3852eb92b9505da4b19e31137766f4bee7977bf4e4bed40518df0fcc3aef2dc62767c85169e70f1fbfc738bb428ae8affac63
-EBUILD gkwebmon-0.2-r2.ebuild 615 BLAKE2B e0622f6eb5387165db552f26f2d31fb921fa8a14c9cc4b1aee70b517bd5ece9b0ae04c5a21b917e05353d5fe01e4ad6d3bf2b247df27b8f6434dc2dfc46d8e09 SHA512 431ce8dfc2a878d67a5c8c93e78e4e22b86abd0d88669396d2886d132a6e48c9c68e50e7f70c10c27699f0efa7b5f54b6e5edda44d86af8c93d8d257bd8a95b0
+EBUILD gkwebmon-0.2-r2.ebuild 576 BLAKE2B 66c2d977cfd8d7471053f07f8d022c18e70c4fb58846de6907b0481cbd78c895a85dd502186a707bf2fecf0c06e09bf82e44392e9de8fb4c3d8514ed5ee3f436 SHA512 557ad6cce4071bbaf79efa20d762e25c7caf87bd5ec49691293d6cd7d0065a50a8d7061e277f55f120a8ee3e46f7df9a366dbd42b98ab94c1c2adee491e5d9a1
 MISC metadata.xml 245 BLAKE2B 75768cbacfd8436bec6cd03c95eaf6aea36aad0fff02f24e9be259be1a01722d32c3cc84a7f54ab7da842fbf036aa4ac6a65ee3ea77a01ad8d0e55b89303d49d SHA512 9059fda6f95a78a0bb5334c05a118b9159d8dd28701bf6986574bb95ba897f1ff03257a8a939c6353136e5ab28f4614cd927cc593c41558ec8826b9c1ca1a015
diff --git a/x11-plugins/gkwebmon/gkwebmon-0.2-r2.ebuild b/x11-plugins/gkwebmon/gkwebmon-0.2-r2.ebuild
index ee1350023bac..92dd27bf91f4 100644
--- a/x11-plugins/gkwebmon/gkwebmon-0.2-r2.ebuild
+++ b/x11-plugins/gkwebmon/gkwebmon-0.2-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -15,13 +15,12 @@ KEYWORDS="alpha ~amd64 ppc ~sparc x86"
 IUSE=""
 
 # The Makefile links with -lssl.
-COMMON_DEPEND="app-admin/gkrellm[X]
-	dev-libs/openssl:0"
+RDEPEND="
+	app-admin/gkrellm:2[X]
+	dev-libs/openssl:0="
+DEPEND="${RDEPEND}"
 
-DEPEND+=" ${COMMON_DEPEND}"
-RDEPEND+=" ${COMMON_DEPEND}"
-
-PATCHES=( "${FILESDIR}/respect-cc-cflags-ldflags.patch" )
+PATCHES=( "${FILESDIR}"/respect-cc-cflags-ldflags.patch )
 
 src_compile() {
 	emake CC="$(tc-getCC)"
diff --git a/x11-plugins/i8krellm/Manifest b/x11-plugins/i8krellm/Manifest
index 37a756296553..42555aa6f9c1 100644
--- a/x11-plugins/i8krellm/Manifest
+++ b/x11-plugins/i8krellm/Manifest
@@ -1,4 +1,4 @@
 AUX i8krellm-2.5-Respect-LDFLAGS.patch 187 BLAKE2B 20c7ea678a56d705c2289bec2690e4254594fb1815101c4a4ac18f77a4de639b9a71392925d197db98033d716ba9cb604509da9858bd7d40f5cc5d7b23b2771c SHA512 78b953668ee6041f01f56c67cb0b2f3eb680585e833df0bdbc577c31b68d7155cd27e90ece352e50b6b93b189c6f996e5c45c93214f8a2fd31deecc26e22ec14
 DIST i8krellm-2.5.tar.gz 15378 BLAKE2B be6af7ce0ee2986fd5463fba2b747721407fe3d06bcd1ae7e30dc273a883fd2f9a092ab73b97b6f7d20dd87454eec28db9e12d701dcaec4dda9267af889e662b SHA512 d1cd452fc83c24369b4773d959e0182bd5c7fe317bed6a1df716c1576f5ba078a4e82d202ff641f0784532b77a51d466e57ffc675895a1875a868d92caf79576
-EBUILD i8krellm-2.5-r2.ebuild 507 BLAKE2B e66ba176c5787fd664253c756839c2d846e3da61b017dbc2ba4a3c3b2e80f21c7fcc4512420c5442e52bac0ae76f00b8e8bd8f31ee798f26715367d185d878a5 SHA512 29e420c988a11de113c91df9186877104c1423d93eff84148fc796f47877d51a9c5f5786d46dde158e7bd65a87c7ce1e4bc50d8e42379067ca9287140793163e
+EBUILD i8krellm-2.5-r2.ebuild 509 BLAKE2B fece596d5c46ac1b92a0a2db1ffedaa01a8501cab672a4983c267e0b5a221fee4ce20c9b2d442db5f66006e2d0c09f53723223a8a0b57b8c160031d9a9e3587f SHA512 dda3d7d3a229cb49908a9d2a9b828b95b9361dbcd20c9a2c2c1de0cb477672aa605aa42f64498ca125959afa668233074d06c6995624ed223700df1e2ec0b7d9
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/x11-plugins/i8krellm/i8krellm-2.5-r2.ebuild b/x11-plugins/i8krellm/i8krellm-2.5-r2.ebuild
index 907a5c58802d..3940327a3c51 100644
--- a/x11-plugins/i8krellm/i8krellm-2.5-r2.ebuild
+++ b/x11-plugins/i8krellm/i8krellm-2.5-r2.ebuild
@@ -1,22 +1,22 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
+
 inherit gkrellm-plugin
 
 DESCRIPTION="GKrellM2 Plugin for the Dell Inspiron and Latitude notebooks"
 SRC_URI="http://www.coding-zone.com/${P}.tar.gz"
 HOMEPAGE="http://www.coding-zone.com/?page=i8krellm"
-IUSE=""
 
-SLOT="0"
 LICENSE="GPL-2"
+SLOT="0"
 KEYWORDS="amd64 x86"
+IUSE=""
 
 RDEPEND="
-	app-admin/gkrellm[X]
-	>=app-laptop/i8kutils-1.5
-"
+	app-admin/gkrellm:2[X]
+	>=app-laptop/i8kutils-1.5"
 DEPEND="${RDEPEND}"
 
-PATCHES=( "${FILESDIR}/${P}-Respect-LDFLAGS.patch" )
+PATCHES=( "${FILESDIR}"/${P}-Respect-LDFLAGS.patch )
diff --git a/x11-plugins/pidgin-bot-sentry/Manifest b/x11-plugins/pidgin-bot-sentry/Manifest
index 71bd649bb67e..66833896b90b 100644
--- a/x11-plugins/pidgin-bot-sentry/Manifest
+++ b/x11-plugins/pidgin-bot-sentry/Manifest
@@ -1,3 +1,3 @@
 DIST bot-sentry-1.3.0.tar.bz2 280673 BLAKE2B 30dd8b7811b6cb6e9779fd15cb32f94c7f01302ccb1c827aa9033c1784d5ea501a569561419796fcedfabf2e6e9cf64e3bf8f0f311e272327c534cde6237567b SHA512 ec665eee2f9b64eccabd10116cb1d1e4be046bc9a6132cb815373be915d265b29b33d41298047f82f920f5daac70a966169ecb201450ba47d76d090c581ee788
-EBUILD pidgin-bot-sentry-1.3.0.ebuild 655 BLAKE2B f1a0097f8f908317452e8787c34945c1fb572d5174645053f63daf1198e93b709629c4997e69aabb1578902b2426c62ef8a105e39ec510f5affa3e5e3ac5af76 SHA512 fb5b61b2dcf0a4f116bc703c1c8fea09ea86a94ae04f3de888764e16b3a6e1981193416ed00cadad6add27553d8abb2e47dd42558f6903dfb32cd5764ea94f8c
+EBUILD pidgin-bot-sentry-1.3.0.ebuild 582 BLAKE2B 8dd50b220131c03011049aaf332978e22e9a3364517059811478688c413eceb42d5202c564cfabe6c210965e6d2c5712a5ca505046cb5ed0c46cc1d15d43974d SHA512 bff9384fc7ccb0d9949c6b14637b6437acb8783df17f355ca071561ac54faf98a13981435103a5508fb812206a2b4b4988756116e7ce001c207a516c09ed93bd
 MISC metadata.xml 632 BLAKE2B e050f74b9e54fcc3e43f6f8ccf6db556bf9835dcaa1ccd4109272a491379a607eae353e623e6fa90b9c0d628971028a39c7081fa5482744828acd0acc697f410 SHA512 04ea684e516bbe941f75cbb6b0687a780aa26a02c1b759c1790cdb94d4a58fbf8d26a437a45f857e2b984fa2bffa4270f867e8768fead87e4442bd23dc21504a
diff --git a/x11-plugins/pidgin-bot-sentry/pidgin-bot-sentry-1.3.0.ebuild b/x11-plugins/pidgin-bot-sentry/pidgin-bot-sentry-1.3.0.ebuild
index 848cafaec1f4..576645b15f09 100644
--- a/x11-plugins/pidgin-bot-sentry/pidgin-bot-sentry-1.3.0.ebuild
+++ b/x11-plugins/pidgin-bot-sentry/pidgin-bot-sentry-1.3.0.ebuild
@@ -1,11 +1,10 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="3"
-
-inherit eutils multilib
+EAPI=6
 
 MY_P="${P#pidgin-}"
+
 DESCRIPTION="Bot Sentry is a Pidgin plugin to prevent Instant Message (IM) spam"
 HOMEPAGE="http://pidgin-bs.sourceforge.net/"
 SRC_URI="mirror://sourceforge/pidgin-bs/${MY_P}.tar.bz2"
@@ -17,7 +16,6 @@ IUSE=""
 
 RDEPEND="net-im/pidgin[gtk]
 	x11-libs/gtk+:2"
-
 DEPEND="${RDEPEND}
 	>=dev-util/intltool-0.40
 	virtual/pkgconfig"
@@ -25,6 +23,6 @@ DEPEND="${RDEPEND}
 S="${WORKDIR}/${MY_P}"
 
 src_install() {
-	emake install DESTDIR="${D}" || die "make install failed"
-	dodoc AUTHORS ChangeLog NEWS README
+	default
+	find "${D}" -name '*.la' -delete || die
 }
diff --git a/x11-plugins/pidgin-led-notification/Manifest b/x11-plugins/pidgin-led-notification/Manifest
index a33b255bfeda..ab27ed66c23b 100644
--- a/x11-plugins/pidgin-led-notification/Manifest
+++ b/x11-plugins/pidgin-led-notification/Manifest
@@ -1,4 +1,4 @@
 AUX pidgin-led-notification-0.1-hardware.patch 1217 BLAKE2B f690121631b48b160b965b4aeafb447d98ef205b5984eaf3e45b711560b4d8c0e84400a4b3e43b92bd895530175b60b69dd1fb10e93fa531fc68c5cd97df2b63 SHA512 ce90c57c216f0811256a562820f346fc1ee900f5c08696daf4aae44410578ca3dd039101378594aeae258b38145003e7ec21dadce5c5a829a46b2f4b2e917868
 DIST led-notification-0.1.tar.bz2 8848 BLAKE2B e609c61105a8ef00244be5f21fec6c55cadde3b79c22bf6c42886973089aa88ae4149270d5f71a4940025179f950c92aebac92e2dd20f687042b312d304f1b4b SHA512 40773a14c42e3c723d6cb693288378184b291df106810de99d7887c3ef8e938633498326419febb17d80e0aa4fb4e4cf7ced16ce5186f30df1ee84b38c0f6ed2
-EBUILD pidgin-led-notification-0.1.ebuild 966 BLAKE2B 7331835e175656c626242e2e339c986850f62629171ee40308e4d759e04009b13c3414484444c918169e9a37939d11bdc25f4cd76db5591000423ecf5d92d514 SHA512 d424e3a74f21d973b0c417dede6397dd212341514e09a129743f6fb554c0f2b02be36986817c2e72d42ff5bb9eb73828f57cd14766a1591d98afa0d655d1da37
+EBUILD pidgin-led-notification-0.1.ebuild 953 BLAKE2B a00376b8ae93ac0a458e81577cf96ed60e1e5f4cc5a83cb4c9825ed1eb9b7080fc4fe694de3a33b6c6d6eb718f5d8315b6c8e866025ad8341c69b25b6048813d SHA512 85d9db9f6690ad9c7e2668093d8ad1dcfbb3fcd147217a152df291ae2586b9a5b60648d86752b68f53c2966ab7d42e6643dfbf5372c7573ad83be4d6f85ed1be
 MISC metadata.xml 237 BLAKE2B f22c3926ba75c18fce7667217807f3710a315b12b1341622c949e7bc0056cd1cb403ea6c66d838675f3cb5dcd53d2fc4ec71425ec3f96aaffb94b70b73e99320 SHA512 ae2360aa6b1b00c67e0acea4935c02b64585b9a15e126fec9d5d99637021c542c0a495e5116205f3da287def46fa5b19cb1a7f3042c12c5f7a78d66d92fcb03f
diff --git a/x11-plugins/pidgin-led-notification/pidgin-led-notification-0.1.ebuild b/x11-plugins/pidgin-led-notification/pidgin-led-notification-0.1.ebuild
index 87efacac2590..bcfaf3ba9a2a 100644
--- a/x11-plugins/pidgin-led-notification/pidgin-led-notification-0.1.ebuild
+++ b/x11-plugins/pidgin-led-notification/pidgin-led-notification-0.1.ebuild
@@ -1,14 +1,15 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=3
+EAPI=6
 
-inherit eutils multilib toolchain-funcs
+inherit toolchain-funcs
 
-DESCRIPTION="Pidgin plugin to notify by writing user defined strings to (led control) files"
-HOMEPAGE="https://sites.google.com/site/simohmattila/led-notification"
 MY_PN=${PN/pidgin-/}
 MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Pidgin plugin to notify by writing user defined strings to (led control) files"
+HOMEPAGE="https://sites.google.com/site/simohmattila/led-notification"
 SRC_URI="https://sites.google.com/site/simohmattila/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
@@ -16,27 +17,29 @@ SLOT="0"
 KEYWORDS="~amd64 ~arm ~x86"
 IUSE=""
 
-RDEPEND="net-im/pidgin[gtk]
+RDEPEND="
+	net-im/pidgin[gtk]
 	x11-libs/gtk+:2"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
 S=${WORKDIR}/${MY_P}
 
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-hardware.patch
-}
+PATCHES=( "${FILESDIR}"/${P}-hardware.patch )
 
 src_compile() {
 	$(tc-getCC) \
-		${CFLAGS} -fpic $(pkg-config --cflags gtk+-2.0 pidgin) \
+		${CFLAGS} -fPIC \
+		${CPPFLAGS} \
+		${LDFLAGS} \
+		$($(tc-getPKG_CONFIG) --cflags gtk+-2.0 pidgin) \
 		-shared ${MY_PN}.c -o ${MY_PN}.so \
-		${LDFLAGS} $(pkg-config --libs gtk+-2.0 pidgin) || die
+		$($(tc-getPKG_CONFIG) --libs gtk+-2.0 pidgin) || die
 }
 
 src_install() {
-	insinto /usr/$(get_libdir)/pidgin
-	insopts -m755
-	doins ${MY_PN}.so || die
-	dodoc README || die
+	exeinto /usr/$(get_libdir)/pidgin
+	doexe ${MY_PN}.so
+
+	einstalldocs
 }
author	V3n3RiX <venerix@redcorelinux.org>	2018-01-04 18:55:01 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2018-01-04 18:55:01 +0000
commit	423d21dcfee183cc4b04d29c1621615e8c30f834 (patch)
tree	23bd6110b9a77b8d679b5ab60fb7663b8627f698 /x11-plugins
parent	81e4fbcb846ed1cabdad699c0029b166dd7273b7 (diff)