gentoo auto-resync : 03:02:2023 - 09:09:48

31 files changed, 59 insertions, 69 deletions

diff --git a/metadata/md5-cache/x11-plugins/Manifest.gz b/metadata/md5-cache/x11-plugins/Manifest.gz
index 8fda53b54a17..2573439e5508 100644
--- a/metadata/md5-cache/x11-plugins/Manifest.gz
+++ b/metadata/md5-cache/x11-plugins/Manifest.gz
diff --git a/metadata/md5-cache/x11-plugins/bfm-0.6.4-r3 b/metadata/md5-cache/x11-plugins/bfm-0.6.4-r4
index 69a3c8e745bb..a5b71d95e4bf 100644
--- a/metadata/md5-cache/x11-plugins/bfm-0.6.4-r3
+++ b/metadata/md5-cache/x11-plugins/bfm-0.6.4-r4
@@ -1,14 +1,15 @@
+BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile install
-DEPEND=x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXext virtual/pkgconfig gkrellm? ( >=app-admin/gkrellm-2[X] )
-DESCRIPTION=a dockapp and gkrellm plug-in combining timecop's bubblemon and wmfishtime
-EAPI=7
+DEPEND=gkrellm? ( >=app-admin/gkrellm-2[X] ) x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXext
+DESCRIPTION=Dockapp and gkrellm plug-in combining timecop's bubblemon and wmfishtime
+EAPI=8
 HOMEPAGE=https://github.com/JNRowe-retired/bfm
 INHERIT=toolchain-funcs
 IUSE=gkrellm
 KEYWORDS=amd64 ppc ~sparc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
-RDEPEND=x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXext
+RDEPEND=gkrellm? ( >=app-admin/gkrellm-2[X] ) x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXext
 SLOT=0
 SRC_URI=https://github.com/JNRowe-retired/bfm/archive/0.6.4.tar.gz -> bfm-0.6.4.tar.gz
 _eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
-_md5_=f8f27683eb9932f6abc170779cf9fbac
+_md5_=22a930ab2f20598f8e039cc9f98df343
diff --git a/metadata/md5-cache/x11-plugins/gkrellaclock-0.3.4-r1 b/metadata/md5-cache/x11-plugins/gkrellaclock-0.3.4-r2
index 84a8cc14c9ec..14b2e399914d 100644
--- a/metadata/md5-cache/x11-plugins/gkrellaclock-0.3.4-r1
+++ b/metadata/md5-cache/x11-plugins/gkrellaclock-0.3.4-r2
@@ -1,13 +1,14 @@
+BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile install prepare
-DEPEND=app-admin/gkrellm:2[X] virtual/pkgconfig
+DEPEND=app-admin/gkrellm:2[X]
 DESCRIPTION=Nice analog clock for GKrellM2
-EAPI=6
-HOMEPAGE=http://www.gkrellm.net/
+EAPI=8
+HOMEPAGE=http://gkrellm.srcbox.net/
 INHERIT=gkrellm-plugin toolchain-funcs
 KEYWORDS=~alpha amd64 ~ppc sparc x86
 LICENSE=GPL-2
 RDEPEND=app-admin/gkrellm:2[X]
 SLOT=2
 SRC_URI=mirror://gentoo/gkrellaclock-0.3.4.tar.gz
-_eclasses_=gkrellm-plugin	89064f1d970bb2fc6aa07996909a5792	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
-_md5_=84c9f2d66df5ccc8e00105ce9af66359
+_eclasses_=gkrellm-plugin	430906fd3b1074aa206a3c5f3baee057	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
+_md5_=a288ac41678476301fedf64d78b7e456
diff --git a/metadata/md5-cache/x11-plugins/gkrellfire-0.4.2-r1 b/metadata/md5-cache/x11-plugins/gkrellfire-0.4.2-r2
index 54daa2e54d07..e341805ccaa2 100644
--- a/metadata/md5-cache/x11-plugins/gkrellfire-0.4.2-r1
+++ b/metadata/md5-cache/x11-plugins/gkrellfire-0.4.2-r2
@@ -1,7 +1,8 @@
+BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile install
-DEPEND=app-admin/gkrellm:2[X] virtual/pkgconfig
+DEPEND=app-admin/gkrellm:2[X]
 DESCRIPTION=CPU load flames for GKrellM 2
-EAPI=6
+EAPI=8
 HOMEPAGE=http://people.freenet.de/thomas-steinke
 INHERIT=gkrellm-plugin toolchain-funcs
 KEYWORDS=amd64 x86
@@ -9,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=app-admin/gkrellm:2[X]
 SLOT=0
 SRC_URI=ftp://ftp.freebsd.org/pub/FreeBSD/ports/distfiles/gkrellfire-0.4.2.tgz
-_eclasses_=gkrellm-plugin	89064f1d970bb2fc6aa07996909a5792	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
-_md5_=a6bca139d1ecaa561ce12c917df9b819
+_eclasses_=gkrellm-plugin	430906fd3b1074aa206a3c5f3baee057	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
+_md5_=766294e64cd69be1bfad2a509848fc70
diff --git a/metadata/md5-cache/x11-plugins/gkrellkam-2.0.0-r1 b/metadata/md5-cache/x11-plugins/gkrellkam-2.0.0-r1
index eda085a75703..3d85b65cc58b 100644
--- a/metadata/md5-cache/x11-plugins/gkrellkam-2.0.0-r1
+++ b/metadata/md5-cache/x11-plugins/gkrellkam-2.0.0-r1
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=app-admin/gkrellm:2[X] net-misc/wget
 SLOT=0
 SRC_URI=mirror://sourceforge/gkrellkam/gkrellkam_2.0.0.tar.gz
-_eclasses_=gkrellm-plugin	89064f1d970bb2fc6aa07996909a5792	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
+_eclasses_=gkrellm-plugin	430906fd3b1074aa206a3c5f3baee057	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
 _md5_=ef623417ff0d2e7bfe6109c4039eef02
diff --git a/metadata/md5-cache/x11-plugins/gkrellm-bgchanger-0.1.11-r3 b/metadata/md5-cache/x11-plugins/gkrellm-bgchanger-0.1.11-r3
index e64235c20f05..962cee6b780b 100644
--- a/metadata/md5-cache/x11-plugins/gkrellm-bgchanger-0.1.11-r3
+++ b/metadata/md5-cache/x11-plugins/gkrellm-bgchanger-0.1.11-r3
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=app-admin/gkrellm:2[X]
 SLOT=2
 SRC_URI=http://www.bender-suhl.de/stefan/comp/sources/gkrellmbgchg2-0.1.11.tar.gz
-_eclasses_=gkrellm-plugin	89064f1d970bb2fc6aa07996909a5792	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
+_eclasses_=gkrellm-plugin	430906fd3b1074aa206a3c5f3baee057	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
 _md5_=9b62e2ed2318b9e5b3226ed7b00db736
diff --git a/metadata/md5-cache/x11-plugins/gkrellm-bluez-0.2-r2 b/metadata/md5-cache/x11-plugins/gkrellm-bluez-0.2-r3
index 483a9d00fcc9..9155a4f7b46b 100644
--- a/metadata/md5-cache/x11-plugins/gkrellm-bluez-0.2-r2
+++ b/metadata/md5-cache/x11-plugins/gkrellm-bluez-0.2-r3
@@ -1,7 +1,8 @@
+BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=configure install prepare
-DEPEND=app-admin/gkrellm:2[X] net-wireless/bluez virtual/pkgconfig
+DEPEND=app-admin/gkrellm:2[X] net-wireless/bluez
 DESCRIPTION=GKrellm plugin for monitoring bluetooth (Linux BlueZ) adapters
-EAPI=6
+EAPI=8
 HOMEPAGE=http://gkrellm-bluez.sourceforge.net
 INHERIT=gkrellm-plugin
 KEYWORDS=amd64 x86
@@ -9,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=app-admin/gkrellm:2[X] net-wireless/bluez
 SLOT=0
 SRC_URI=mirror://sourceforge/gkrellm-bluez/gkrellm-bluez-0.2.tar.gz
-_eclasses_=gkrellm-plugin	89064f1d970bb2fc6aa07996909a5792	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
-_md5_=8e4ecae719ba27705154ae807c4293bd
+_eclasses_=gkrellm-plugin	430906fd3b1074aa206a3c5f3baee057	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
+_md5_=a2e456a5e2fe7c253e9be74ca0eec843
diff --git a/metadata/md5-cache/x11-plugins/gkrellm-countdown-0.1.2-r2 b/metadata/md5-cache/x11-plugins/gkrellm-countdown-0.1.2-r2
index 1fdee1a9e251..d29ded3c8225 100644
--- a/metadata/md5-cache/x11-plugins/gkrellm-countdown-0.1.2-r2
+++ b/metadata/md5-cache/x11-plugins/gkrellm-countdown-0.1.2-r2
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=app-admin/gkrellm:2[X]
 SLOT=0
 SRC_URI=http://oss.pugsplace.net/gkrellm-countdown-0.1.2.tar.gz
-_eclasses_=gkrellm-plugin	89064f1d970bb2fc6aa07996909a5792	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
+_eclasses_=gkrellm-plugin	430906fd3b1074aa206a3c5f3baee057	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
 _md5_=527197bdbb4a9a3bb90a97c3eb4ec693
diff --git a/metadata/md5-cache/x11-plugins/gkrellm-cpupower-0.2-r2 b/metadata/md5-cache/x11-plugins/gkrellm-cpupower-0.2-r2
index 7c36679ecde0..61c5a47f6f9c 100644
--- a/metadata/md5-cache/x11-plugins/gkrellm-cpupower-0.2-r2
+++ b/metadata/md5-cache/x11-plugins/gkrellm-cpupower-0.2-r2
@@ -3,12 +3,12 @@ DEFINED_PHASES=compile install postinst
 DEPEND=app-admin/gkrellm:2[X]
 DESCRIPTION=A Gkrellm2 plugin for displaying and manipulating CPU frequency
 EAPI=8
-HOMEPAGE=https://github.com/sainsaar/gkrellm2-cpupower/
+HOMEPAGE=https://github.com/sainsaar/gkrellm2-cpupower
 INHERIT=gkrellm-plugin toolchain-funcs
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=app-admin/gkrellm:2[X] app-admin/sudo sys-power/cpupower
 SLOT=0
 SRC_URI=https://github.com/sainsaar/gkrellm2-cpupower/archive/0.2.tar.gz -> gkrellm2-cpupower-0.2.tar.gz
-_eclasses_=gkrellm-plugin	89064f1d970bb2fc6aa07996909a5792	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
-_md5_=5ba8a165bb8a07ffbcd604b7aabf0ab9
+_eclasses_=gkrellm-plugin	430906fd3b1074aa206a3c5f3baee057	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
+_md5_=4dd70cd7d2551d97e40282cfa7dcb1db
diff --git a/metadata/md5-cache/x11-plugins/gkrellm-imonc-0.2-r2 b/metadata/md5-cache/x11-plugins/gkrellm-imonc-0.2-r2
index 662a21853523..95cf496eefdb 100644
--- a/metadata/md5-cache/x11-plugins/gkrellm-imonc-0.2-r2
+++ b/metadata/md5-cache/x11-plugins/gkrellm-imonc-0.2-r2
@@ -10,5 +10,5 @@ LICENSE=GPL-2+
 RDEPEND=app-admin/gkrellm:2[X]
 SLOT=0
 SRC_URI=mirror://sourceforge/gkrellm-imonc/gkrellm-imonc-src-0.2.tar.bz2
-_eclasses_=gkrellm-plugin	89064f1d970bb2fc6aa07996909a5792	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
+_eclasses_=gkrellm-plugin	430906fd3b1074aa206a3c5f3baee057	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
 _md5_=d8278da029d97a3b44605225da1a3e29
diff --git a/metadata/md5-cache/x11-plugins/gkrellm-leds-0.8.2-r2 b/metadata/md5-cache/x11-plugins/gkrellm-leds-0.8.2-r2
index 025014f16d37..011c323e8a18 100644
--- a/metadata/md5-cache/x11-plugins/gkrellm-leds-0.8.2-r2
+++ b/metadata/md5-cache/x11-plugins/gkrellm-leds-0.8.2-r2
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=app-admin/gkrellm:2[X] x11-libs/libXtst
 SLOT=2
 SRC_URI=http://heim.ifi.uio.no/~oyvinha/e107_files/downloads/gkleds-0.8.2.tar.gz
-_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	gkrellm-plugin	89064f1d970bb2fc6aa07996909a5792	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
+_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	gkrellm-plugin	430906fd3b1074aa206a3c5f3baee057	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
 _md5_=99871cf0e0c59491d318fc35370e55a2
diff --git a/metadata/md5-cache/x11-plugins/gkrellm-mailwatch-2.4.3-r3 b/metadata/md5-cache/x11-plugins/gkrellm-mailwatch-2.4.3-r3
index dabb1a28cd79..16e9083d7c6a 100644
--- a/metadata/md5-cache/x11-plugins/gkrellm-mailwatch-2.4.3-r3
+++ b/metadata/md5-cache/x11-plugins/gkrellm-mailwatch-2.4.3-r3
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=app-admin/gkrellm:2[X]
 SLOT=2
 SRC_URI=http://gkrellm.luon.net/files/gkrellm-mailwatch-2.4.3.tar.gz
-_eclasses_=gkrellm-plugin	89064f1d970bb2fc6aa07996909a5792	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
+_eclasses_=gkrellm-plugin	430906fd3b1074aa206a3c5f3baee057	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
 _md5_=932ed20fd1c7b8d8600124ca6deb876f
diff --git a/metadata/md5-cache/x11-plugins/gkrellm-plugins-2.0 b/metadata/md5-cache/x11-plugins/gkrellm-plugins-2.0
deleted file mode 100644
index 33be93dff6a1..000000000000
--- a/metadata/md5-cache/x11-plugins/gkrellm-plugins-2.0
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=emerge this package to install all of the gkrellm plugins
-EAPI=6
-HOMEPAGE=http://gkrellm.srcbox.net/
-IUSE=wifi
-KEYWORDS=~ppc ~x86
-LICENSE=GPL-2
-RDEPEND=!<app-admin/gkrellm-2 >=x11-plugins/gkrellaclock-0.3.2 >=x11-plugins/gkrellkam-2.0.0 >=x11-plugins/gkrellm-leds-0.8.0 >=x11-plugins/gkrellm-volume-2.1.4 >=x11-plugins/gkrellmlaunch-0.5 >=x11-plugins/gkrellmoon-0.6 wifi? ( >=x11-plugins/gkrellmwireless-2.0.2 ) >=x11-plugins/gkrellshoot-0.4.1 >=x11-plugins/gkrellstock-0.5 >=x11-plugins/gkrellsun-0.12.2 x11-plugins/gkrelltop >=x11-plugins/gkrellweather-2.0.6 x11-plugins/gkrellm-countdown x11-plugins/gkrellm-trayicons
-SLOT=0
-_md5_=19a4127881d6c569b49cd7f1e238717d
diff --git a/metadata/md5-cache/x11-plugins/gkrellm-plugins-2.0-r1 b/metadata/md5-cache/x11-plugins/gkrellm-plugins-2.0-r1
new file mode 100644
index 000000000000..66760f3f9a1b
--- /dev/null
+++ b/metadata/md5-cache/x11-plugins/gkrellm-plugins-2.0-r1
@@ -0,0 +1,10 @@
+DEFINED_PHASES=-
+DESCRIPTION=Meta-package for all of the gkrellm plugins
+EAPI=8
+HOMEPAGE=http://gkrellm.srcbox.net/
+IUSE=wifi
+KEYWORDS=~ppc ~x86
+LICENSE=metapackage
+RDEPEND=!<app-admin/gkrellm-2 >=x11-plugins/gkrellaclock-0.3.2 >=x11-plugins/gkrellkam-2.0.0 >=x11-plugins/gkrellm-leds-0.8.0 >=x11-plugins/gkrellm-volume-2.1.4 >=x11-plugins/gkrellmlaunch-0.5 >=x11-plugins/gkrellmoon-0.6 >=x11-plugins/gkrellshoot-0.4.1 >=x11-plugins/gkrellstock-0.5 >=x11-plugins/gkrellsun-0.12.2 x11-plugins/gkrelltop >=x11-plugins/gkrellweather-2.0.6 x11-plugins/gkrellm-countdown x11-plugins/gkrellm-trayicons wifi? ( >=x11-plugins/gkrellmwireless-2.0.2 )
+SLOT=0
+_md5_=1433410a3b1bb7c8f2134e6948577f82
diff --git a/metadata/md5-cache/x11-plugins/gkrellm-radio-2.0.4-r1 b/metadata/md5-cache/x11-plugins/gkrellm-radio-2.0.4-r1
index 685cde056293..408953206de3 100644
--- a/metadata/md5-cache/x11-plugins/gkrellm-radio-2.0.4-r1
+++ b/metadata/md5-cache/x11-plugins/gkrellm-radio-2.0.4-r1
@@ -11,5 +11,5 @@ LICENSE=GPL-2
 RDEPEND=app-admin/gkrellm:2[X] lirc? ( app-misc/lirc )
 SLOT=2
 SRC_URI=http://gkrellm.luon.net/files/gkrellm-radio-2.0.4.tar.gz
-_eclasses_=gkrellm-plugin	89064f1d970bb2fc6aa07996909a5792	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
+_eclasses_=gkrellm-plugin	430906fd3b1074aa206a3c5f3baee057	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
 _md5_=38c33bf13b7576b063fcbce02c935f56
diff --git a/metadata/md5-cache/x11-plugins/gkrellm-trayicons-1.03-r2 b/metadata/md5-cache/x11-plugins/gkrellm-trayicons-1.03-r2
index 6555ba864c56..29a2de4bfcf0 100644
--- a/metadata/md5-cache/x11-plugins/gkrellm-trayicons-1.03-r2
+++ b/metadata/md5-cache/x11-plugins/gkrellm-trayicons-1.03-r2
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=app-admin/gkrellm:2[X]
 SLOT=0
 SRC_URI=mirror://gentoo/gkrellm-trayicons-1.03.tar.gz
-_eclasses_=gkrellm-plugin	89064f1d970bb2fc6aa07996909a5792	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
+_eclasses_=gkrellm-plugin	430906fd3b1074aa206a3c5f3baee057	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
 _md5_=75f34f8d9e78ca762fd66800b6ac6dbc
diff --git a/metadata/md5-cache/x11-plugins/gkrellm-vaiobright-2.5-r3 b/metadata/md5-cache/x11-plugins/gkrellm-vaiobright-2.5-r3
index cf8251f8cc57..0277b7547bcb 100644
--- a/metadata/md5-cache/x11-plugins/gkrellm-vaiobright-2.5-r3
+++ b/metadata/md5-cache/x11-plugins/gkrellm-vaiobright-2.5-r3
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=app-admin/gkrellm:2[X]
 SLOT=2
 SRC_URI=http://nerv-un.net/~dragorn/code/vaiobright-2.5.tar.gz
-_eclasses_=gkrellm-plugin	89064f1d970bb2fc6aa07996909a5792	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
+_eclasses_=gkrellm-plugin	430906fd3b1074aa206a3c5f3baee057	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
 _md5_=9c88c0cadde043a45d18ba88a2fbc330
diff --git a/metadata/md5-cache/x11-plugins/gkrellm-volume-2.1.13-r3 b/metadata/md5-cache/x11-plugins/gkrellm-volume-2.1.13-r3
index 764b8aa19dec..e43efd6c7e3e 100644
--- a/metadata/md5-cache/x11-plugins/gkrellm-volume-2.1.13-r3
+++ b/metadata/md5-cache/x11-plugins/gkrellm-volume-2.1.13-r3
@@ -11,5 +11,5 @@ LICENSE=GPL-2
 RDEPEND=app-admin/gkrellm:2[X] alsa? ( media-libs/alsa-lib )
 SLOT=2
 SRC_URI=http://gkrellm.luon.net/files/gkrellm-volume-2.1.13.tar.gz
-_eclasses_=gkrellm-plugin	89064f1d970bb2fc6aa07996909a5792	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
+_eclasses_=gkrellm-plugin	430906fd3b1074aa206a3c5f3baee057	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
 _md5_=72a96ef8494aa5d71552fe1619b3490d
diff --git a/metadata/md5-cache/x11-plugins/gkrellm-xkb-1.05-r2 b/metadata/md5-cache/x11-plugins/gkrellm-xkb-1.05-r2
index 75d1b3f94f9c..d95d70a2e1eb 100644
--- a/metadata/md5-cache/x11-plugins/gkrellm-xkb-1.05-r2
+++ b/metadata/md5-cache/x11-plugins/gkrellm-xkb-1.05-r2
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=app-admin/gkrellm:2[X]
 SLOT=0
 SRC_URI=http://tripie.sweb.cz/gkrellm/xkb/dist/gkrellm-xkb-1.05.tar.gz
-_eclasses_=gkrellm-plugin	89064f1d970bb2fc6aa07996909a5792	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
+_eclasses_=gkrellm-plugin	430906fd3b1074aa206a3c5f3baee057	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
 _md5_=6d17370297faf8f7353ff52df46adb8d
diff --git a/metadata/md5-cache/x11-plugins/gkrellmlaunch-0.5-r1 b/metadata/md5-cache/x11-plugins/gkrellmlaunch-0.5-r1
index c6939f9f6c86..a030cc4a4ba2 100644
--- a/metadata/md5-cache/x11-plugins/gkrellmlaunch-0.5-r1
+++ b/metadata/md5-cache/x11-plugins/gkrellmlaunch-0.5-r1
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=app-admin/gkrellm:2[X]
 SLOT=2
 SRC_URI=mirror://sourceforge/gkrellmlaunch/gkrellmlaunch-0.5.tar.gz
-_eclasses_=gkrellm-plugin	89064f1d970bb2fc6aa07996909a5792	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
+_eclasses_=gkrellm-plugin	430906fd3b1074aa206a3c5f3baee057	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
 _md5_=87be39f52440013e1e9f4c995ee49140
diff --git a/metadata/md5-cache/x11-plugins/gkrellmoon-0.6-r3 b/metadata/md5-cache/x11-plugins/gkrellmoon-0.6-r3
index 0bbd3c3b0446..6ef1aefc485e 100644
--- a/metadata/md5-cache/x11-plugins/gkrellmoon-0.6-r3
+++ b/metadata/md5-cache/x11-plugins/gkrellmoon-0.6-r3
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=app-admin/gkrellm:2[X] media-libs/imlib2
 SLOT=2
 SRC_URI=mirror://sourceforge/gkrellmoon/gkrellmoon-0.6.tar.gz
-_eclasses_=gkrellm-plugin	89064f1d970bb2fc6aa07996909a5792	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
+_eclasses_=gkrellm-plugin	430906fd3b1074aa206a3c5f3baee057	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
 _md5_=44876f791f1940c3e14100023c29d4e6
diff --git a/metadata/md5-cache/x11-plugins/gkrellmss-2.6-r5 b/metadata/md5-cache/x11-plugins/gkrellmss-2.6-r5
index 857b5a7ebf96..0c884452f13d 100644
--- a/metadata/md5-cache/x11-plugins/gkrellmss-2.6-r5
+++ b/metadata/md5-cache/x11-plugins/gkrellmss-2.6-r5
@@ -4,12 +4,12 @@ DEPEND=app-admin/gkrellm:2[X] media-libs/alsa-lib sci-libs/fftw:3.0=
 DESCRIPTION=A plugin for GKrellM2 that has a VU meter and a sound chart
 EAPI=8
 HOMEPAGE=http://members.dslextreme.com/users/billw/gkrellmss/gkrellmss.html
-INHERIT=gkrellm-plugin
+INHERIT=gkrellm-plugin toolchain-funcs
 IUSE=nls
 KEYWORDS=~alpha amd64 ~ppc ~sparc x86
 LICENSE=GPL-2
 RDEPEND=app-admin/gkrellm:2[X] media-libs/alsa-lib sci-libs/fftw:3.0=
 SLOT=0
 SRC_URI=http://web.wt.net/~billw/gkrellmss/gkrellmss-2.6.tar.gz
-_eclasses_=gkrellm-plugin	89064f1d970bb2fc6aa07996909a5792	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
-_md5_=212a63ab76bed65a0e27b685ea4dbf9f
+_eclasses_=gkrellm-plugin	430906fd3b1074aa206a3c5f3baee057	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
+_md5_=ca33796099a839064e9be38c56e3e422
diff --git a/metadata/md5-cache/x11-plugins/gkrellmwireless-2.0.3-r3 b/metadata/md5-cache/x11-plugins/gkrellmwireless-2.0.3-r3
index b2b6424a150a..10a3f999cce6 100644
--- a/metadata/md5-cache/x11-plugins/gkrellmwireless-2.0.3-r3
+++ b/metadata/md5-cache/x11-plugins/gkrellmwireless-2.0.3-r3
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=app-admin/gkrellm:2[X]
 SLOT=2
 SRC_URI=http://gkrellm.luon.net/files/gkrellmwireless-2.0.3.tar.gz
-_eclasses_=gkrellm-plugin	89064f1d970bb2fc6aa07996909a5792	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
+_eclasses_=gkrellm-plugin	430906fd3b1074aa206a3c5f3baee057	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
 _md5_=a8829f832f3e465cea5e3d8f7349ab0d
diff --git a/metadata/md5-cache/x11-plugins/gkrellshoot-0.4.4-r4 b/metadata/md5-cache/x11-plugins/gkrellshoot-0.4.4-r4
deleted file mode 100644
index 0f9cc8ccfe2a..000000000000
--- a/metadata/md5-cache/x11-plugins/gkrellshoot-0.4.4-r4
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/pkgconfig virtual/pkgconfig
-DEFINED_PHASES=compile install
-DEPEND=app-admin/gkrellm:2[X]
-DESCRIPTION=GKrellm2 plugin to take screen shots and lock screen
-EAPI=8
-HOMEPAGE=http://gkrellshoot.sourceforge.net/
-INHERIT=gkrellm-plugin toolchain-funcs
-KEYWORDS=~alpha amd64 ~ppc sparc x86
-LICENSE=GPL-2
-RDEPEND=app-admin/gkrellm:2[X] virtual/imagemagick-tools
-SLOT=2
-SRC_URI=mirror://sourceforge/gkrellshoot/gkrellshoot-0.4.4.tar.gz
-_eclasses_=gkrellm-plugin	89064f1d970bb2fc6aa07996909a5792	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
-_md5_=89aa8f667703b3046cee81c8fafa0c86
diff --git a/metadata/md5-cache/x11-plugins/gkrellshoot-0.4.4-r5 b/metadata/md5-cache/x11-plugins/gkrellshoot-0.4.4-r5
index 3da3b76f6651..64e4dfba784a 100644
--- a/metadata/md5-cache/x11-plugins/gkrellshoot-0.4.4-r5
+++ b/metadata/md5-cache/x11-plugins/gkrellshoot-0.4.4-r5
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=app-admin/gkrellm:2[X] virtual/imagemagick-tools
 SLOT=2
 SRC_URI=mirror://sourceforge/gkrellshoot/gkrellshoot-0.4.4.tar.gz
-_eclasses_=gkrellm-plugin	89064f1d970bb2fc6aa07996909a5792	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
+_eclasses_=gkrellm-plugin	430906fd3b1074aa206a3c5f3baee057	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
 _md5_=2e75f1cc40281c7f2854b8489bba1a22
diff --git a/metadata/md5-cache/x11-plugins/gkrellstock-0.5.1-r2 b/metadata/md5-cache/x11-plugins/gkrellstock-0.5.1-r2
index bf47382b1cef..4f21464bdfd8 100644
--- a/metadata/md5-cache/x11-plugins/gkrellstock-0.5.1-r2
+++ b/metadata/md5-cache/x11-plugins/gkrellstock-0.5.1-r2
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=app-admin/gkrellm:2[X] dev-libs/glib:2 x11-libs/gtk+:2 dev-perl/libwww-perl dev-perl/Finance-Quote
 SLOT=2
 SRC_URI=mirror://sourceforge/gkrellstock/gkrellstock-0.5.1.tar.gz
-_eclasses_=flag-o-matic	69394e25812406faa1f90edaf4969395	gkrellm-plugin	89064f1d970bb2fc6aa07996909a5792	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
+_eclasses_=flag-o-matic	69394e25812406faa1f90edaf4969395	gkrellm-plugin	430906fd3b1074aa206a3c5f3baee057	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
 _md5_=7ff93ab8e817065d20a60b143b7814e4
diff --git a/metadata/md5-cache/x11-plugins/gkrellsun-1.0.0-r5 b/metadata/md5-cache/x11-plugins/gkrellsun-1.0.0-r5
index 5b776c23f354..a7c067613ac6 100644
--- a/metadata/md5-cache/x11-plugins/gkrellsun-1.0.0-r5
+++ b/metadata/md5-cache/x11-plugins/gkrellsun-1.0.0-r5
@@ -11,5 +11,5 @@ LICENSE=GPL-2
 RDEPEND=app-admin/gkrellm:2[X]
 SLOT=1
 SRC_URI=mirror://sourceforge/gkrellsun/gkrellsun-1.0.0.tar.gz
-_eclasses_=gkrellm-plugin	89064f1d970bb2fc6aa07996909a5792	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
+_eclasses_=gkrellm-plugin	430906fd3b1074aa206a3c5f3baee057	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
 _md5_=ddd4f80d0b4c03b977aad140e2990c13
diff --git a/metadata/md5-cache/x11-plugins/gkrelltop-2.2.13-r3 b/metadata/md5-cache/x11-plugins/gkrelltop-2.2.13-r3
index f146afba2a4d..0a607ebdcb94 100644
--- a/metadata/md5-cache/x11-plugins/gkrelltop-2.2.13-r3
+++ b/metadata/md5-cache/x11-plugins/gkrelltop-2.2.13-r3
@@ -11,5 +11,5 @@ LICENSE=GPL-2
 RDEPEND=app-admin/gkrellm:2[X] dev-libs/glib:2 x11-libs/gtk+:2
 SLOT=0
 SRC_URI=mirror://sourceforge/gkrelltop/gkrelltop_2.2.13.orig.tar.gz
-_eclasses_=gkrellm-plugin	89064f1d970bb2fc6aa07996909a5792	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
+_eclasses_=gkrellm-plugin	430906fd3b1074aa206a3c5f3baee057	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
 _md5_=6e3282a24a4c4247951cf6afd5213adf
diff --git a/metadata/md5-cache/x11-plugins/gkrellweather-2.0.8-r2 b/metadata/md5-cache/x11-plugins/gkrellweather-2.0.8-r2
index 27c884664e58..a4ac9d587826 100644
--- a/metadata/md5-cache/x11-plugins/gkrellweather-2.0.8-r2
+++ b/metadata/md5-cache/x11-plugins/gkrellweather-2.0.8-r2
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=app-admin/gkrellm:2[X] dev-lang/perl net-misc/wget x11-libs/gtk+:2
 SLOT=2
 SRC_URI=https://sites.google.com/site/makovick/projects/gkrellweather-2.0.8.tgz
-_eclasses_=flag-o-matic	69394e25812406faa1f90edaf4969395	gkrellm-plugin	89064f1d970bb2fc6aa07996909a5792	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
+_eclasses_=flag-o-matic	69394e25812406faa1f90edaf4969395	gkrellm-plugin	430906fd3b1074aa206a3c5f3baee057	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
 _md5_=5294d099259ec2ff9428efb56e9b2c3e
diff --git a/metadata/md5-cache/x11-plugins/gkwebmon-0.2-r3 b/metadata/md5-cache/x11-plugins/gkwebmon-0.2-r3
index b5d71830c53b..f62bd1807058 100644
--- a/metadata/md5-cache/x11-plugins/gkwebmon-0.2-r3
+++ b/metadata/md5-cache/x11-plugins/gkwebmon-0.2-r3
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=app-admin/gkrellm:2[X] dev-libs/glib:2 dev-libs/openssl x11-libs/gtk+:2
 SLOT=0
 SRC_URI=mirror://sourceforge/gkwebmon/gkwebmon-0.2.tgz
-_eclasses_=gkrellm-plugin	89064f1d970bb2fc6aa07996909a5792	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
+_eclasses_=gkrellm-plugin	430906fd3b1074aa206a3c5f3baee057	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
 _md5_=57e28fc6ed203b19ee5c4b5f71da5e4f
diff --git a/metadata/md5-cache/x11-plugins/i8krellm-2.5-r3 b/metadata/md5-cache/x11-plugins/i8krellm-2.5-r3
index 78ec370c9b4a..024119bad43f 100644
--- a/metadata/md5-cache/x11-plugins/i8krellm-2.5-r3
+++ b/metadata/md5-cache/x11-plugins/i8krellm-2.5-r3
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=app-admin/gkrellm:2[X] >=app-laptop/i8kutils-1.5
 SLOT=0
 SRC_URI=http://www.coding-zone.com/i8krellm-2.5.tar.gz
-_eclasses_=gkrellm-plugin	89064f1d970bb2fc6aa07996909a5792	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
+_eclasses_=gkrellm-plugin	430906fd3b1074aa206a3c5f3baee057	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	9a610728b9bcca1919234cceb35a1027
 _md5_=065f0875dc8c9942ced472dc12dca80c