gentoo resync : 04.01.2018

30 files changed, 144 insertions, 145 deletions

diff --git a/metadata/md5-cache/x11-plugins/Manifest.gz b/metadata/md5-cache/x11-plugins/Manifest.gz
index 361a76fffec4..db37092a1a97 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/gkrellaclock-0.3.4-r1 b/metadata/md5-cache/x11-plugins/gkrellaclock-0.3.4-r1
index 2912279084fc..6870fe7df38d 100644
--- a/metadata/md5-cache/x11-plugins/gkrellaclock-0.3.4-r1
+++ b/metadata/md5-cache/x11-plugins/gkrellaclock-0.3.4-r1
@@ -1,12 +1,12 @@
-DEFINED_PHASES=compile install setup
-DEPEND=app-admin/gkrellm[X] =app-admin/gkrellm-2* virtual/pkgconfig
+DEFINED_PHASES=compile install prepare
+DEPEND=app-admin/gkrellm:2[X] virtual/pkgconfig
 DESCRIPTION=Nice analog clock for GKrellM2
 EAPI=6
 HOMEPAGE=http://www.gkrellm.net/
 KEYWORDS=alpha amd64 ppc sparc x86
 LICENSE=GPL-2
-RDEPEND=app-admin/gkrellm[X] =app-admin/gkrellm-2*
+RDEPEND=app-admin/gkrellm:2[X]
 SLOT=2
 SRC_URI=mirror://gentoo/gkrellaclock-0.3.4.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	gkrellm-plugin	0c6887ede1f3cc3067a1d1acb8aff2e9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=8b7546bd40f3c6f129b9ab92d6ad75dc
+_eclasses_=gkrellm-plugin	e3548dfd06a50087a45520f52934a39c	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=5bf8dc2b27393d9dd0837ae8c88c8ac1
diff --git a/metadata/md5-cache/x11-plugins/gkrellfire-0.4.2-r1 b/metadata/md5-cache/x11-plugins/gkrellfire-0.4.2-r1
index 8d79bbc6b8ee..2ae315fa5e88 100644
--- a/metadata/md5-cache/x11-plugins/gkrellfire-0.4.2-r1
+++ b/metadata/md5-cache/x11-plugins/gkrellfire-0.4.2-r1
@@ -1,12 +1,12 @@
-DEFINED_PHASES=compile install setup
-DEPEND=app-admin/gkrellm[X] =app-admin/gkrellm-2* virtual/pkgconfig
+DEFINED_PHASES=compile install
+DEPEND=app-admin/gkrellm:2[X] virtual/pkgconfig
 DESCRIPTION=CPU load flames for GKrellM 2
 EAPI=6
 HOMEPAGE=http://people.freenet.de/thomas-steinke
 KEYWORDS=amd64 x86
 LICENSE=GPL-2
-RDEPEND=app-admin/gkrellm[X] =app-admin/gkrellm-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_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	gkrellm-plugin	0c6887ede1f3cc3067a1d1acb8aff2e9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=7eaf8ac25b274d59201854b8ce119433
+_eclasses_=gkrellm-plugin	e3548dfd06a50087a45520f52934a39c	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=a6bca139d1ecaa561ce12c917df9b819
diff --git a/metadata/md5-cache/x11-plugins/gkrellflynn-0.8 b/metadata/md5-cache/x11-plugins/gkrellflynn-0.8
index 6a8d2a5f958f..8a600186e88e 100644
--- a/metadata/md5-cache/x11-plugins/gkrellflynn-0.8
+++ b/metadata/md5-cache/x11-plugins/gkrellflynn-0.8
@@ -1,12 +1,12 @@
-DEFINED_PHASES=compile install prepare setup
-DEPEND=app-admin/gkrellm[X] =app-admin/gkrellm-2* virtual/pkgconfig
+DEFINED_PHASES=compile install
+DEPEND=app-admin/gkrellm:2[X] virtual/pkgconfig
 DESCRIPTION=A funny GKrellM2 load monitor (for Doom(tm) fans)
-EAPI=5
+EAPI=6
 HOMEPAGE=http://bax.comlab.uni-rostock.de/en/projects/flynn.html
 KEYWORDS=alpha amd64 ppc sparc x86
 LICENSE=GPL-2
-RDEPEND=app-admin/gkrellm[X] =app-admin/gkrellm-2*
+RDEPEND=app-admin/gkrellm:2[X]
 SLOT=0
 SRC_URI=http://bax.comlab.uni-rostock.de/fileadmin/downloads/gkrellflynn-0.8.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	gkrellm-plugin	0c6887ede1f3cc3067a1d1acb8aff2e9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=088173f2aa0eb326d7bd9d19bad54c05
+_eclasses_=gkrellm-plugin	e3548dfd06a50087a45520f52934a39c	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=1ac274c867fa0cb144fc3a26f06c9f1a
diff --git a/metadata/md5-cache/x11-plugins/gkrellkam-2.0.0 b/metadata/md5-cache/x11-plugins/gkrellkam-2.0.0
index 6f0bbd745db3..f82c727dcc17 100644
--- a/metadata/md5-cache/x11-plugins/gkrellkam-2.0.0
+++ b/metadata/md5-cache/x11-plugins/gkrellkam-2.0.0
@@ -1,12 +1,12 @@
-DEFINED_PHASES=compile install prepare setup
-DEPEND=net-misc/wget app-admin/gkrellm[X] =app-admin/gkrellm-2* virtual/pkgconfig
+DEFINED_PHASES=compile install
+DEPEND=app-admin/gkrellm:2[X] net-misc/wget virtual/pkgconfig
 DESCRIPTION=an Image-Watcher-Plugin for GKrellM2
-EAPI=5
+EAPI=6
 HOMEPAGE=http://gkrellkam.sourceforge.net
 KEYWORDS=x86 ppc sparc alpha amd64
 LICENSE=GPL-2
-RDEPEND=net-misc/wget app-admin/gkrellm[X] =app-admin/gkrellm-2*
+RDEPEND=app-admin/gkrellm:2[X] net-misc/wget
 SLOT=0
 SRC_URI=mirror://sourceforge/gkrellkam/gkrellkam_2.0.0.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	gkrellm-plugin	0c6887ede1f3cc3067a1d1acb8aff2e9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=cb235bee911f611d548d910034da75ab
+_eclasses_=gkrellm-plugin	e3548dfd06a50087a45520f52934a39c	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=20baaafe1a3dd14944f9b85f1b49cd5d
diff --git a/metadata/md5-cache/x11-plugins/gkrellm-bgchanger-0.1.11-r2 b/metadata/md5-cache/x11-plugins/gkrellm-bgchanger-0.1.11-r2
index c4be78a259ae..a4602b2ababf 100644
--- a/metadata/md5-cache/x11-plugins/gkrellm-bgchanger-0.1.11-r2
+++ b/metadata/md5-cache/x11-plugins/gkrellm-bgchanger-0.1.11-r2
@@ -1,12 +1,12 @@
-DEFINED_PHASES=install prepare setup
-DEPEND=app-admin/gkrellm[X] =app-admin/gkrellm-2* virtual/pkgconfig
+DEFINED_PHASES=configure install
+DEPEND=app-admin/gkrellm:2[X] virtual/pkgconfig
 DESCRIPTION=Plugin for GKrellM2 to change your desktop background
 EAPI=6
 HOMEPAGE=http://www.bender-suhl.de/stefan/english/comp/gkrellmbgchg.html
 KEYWORDS=~alpha ~amd64 ~ppc ~sparc ~x86
 LICENSE=GPL-2
-RDEPEND=app-admin/gkrellm[X] =app-admin/gkrellm-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_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	gkrellm-plugin	0c6887ede1f3cc3067a1d1acb8aff2e9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=9c912339ba88c48ebb40537ae217e14f
+_eclasses_=gkrellm-plugin	e3548dfd06a50087a45520f52934a39c	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=fb10770585a0ebd987468f86d779dc08
diff --git a/metadata/md5-cache/x11-plugins/gkrellm-bluez-0.2-r2 b/metadata/md5-cache/x11-plugins/gkrellm-bluez-0.2-r2
index 6847ed193040..35b4fa5b0426 100644
--- a/metadata/md5-cache/x11-plugins/gkrellm-bluez-0.2-r2
+++ b/metadata/md5-cache/x11-plugins/gkrellm-bluez-0.2-r2
@@ -1,12 +1,12 @@
-DEFINED_PHASES=configure install prepare setup
-DEPEND==app-admin/gkrellm-2* virtual/pkgconfig
+DEFINED_PHASES=configure install prepare
+DEPEND=virtual/pkgconfig
 DESCRIPTION=GKrellm plugin for monitoring bluetooth (Linux BlueZ) adapters
 EAPI=6
 HOMEPAGE=http://gkrellm-bluez.sourceforge.net
 KEYWORDS=amd64 x86
 LICENSE=GPL-2
-RDEPEND=app-admin/gkrellm[X] net-wireless/bluez =app-admin/gkrellm-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_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	gkrellm-plugin	0c6887ede1f3cc3067a1d1acb8aff2e9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=003aaa7c03c84438840b14ed152d5864
+_eclasses_=gkrellm-plugin	e3548dfd06a50087a45520f52934a39c	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=9802a2278c93f10d2fcb58961843bee7
diff --git a/metadata/md5-cache/x11-plugins/gkrellm-countdown-0.1.2-r1 b/metadata/md5-cache/x11-plugins/gkrellm-countdown-0.1.2-r1
index 715a94e92f69..61da272c7a8a 100644
--- a/metadata/md5-cache/x11-plugins/gkrellm-countdown-0.1.2-r1
+++ b/metadata/md5-cache/x11-plugins/gkrellm-countdown-0.1.2-r1
@@ -1,12 +1,12 @@
-DEFINED_PHASES=compile install setup
-DEPEND=app-admin/gkrellm[X] =app-admin/gkrellm-2* virtual/pkgconfig
+DEFINED_PHASES=compile install
+DEPEND=app-admin/gkrellm:2[X] virtual/pkgconfig
 DESCRIPTION=A simple countdown clock for GKrellM2
 EAPI=6
 HOMEPAGE=http://freecode.com/projects/gkrellm-countdown
 KEYWORDS=~amd64 ppc sparc x86
 LICENSE=GPL-2
-RDEPEND=app-admin/gkrellm[X] =app-admin/gkrellm-2*
+RDEPEND=app-admin/gkrellm:2[X]
 SLOT=0
 SRC_URI=http://oss.pugsplace.net/gkrellm-countdown-0.1.2.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	gkrellm-plugin	0c6887ede1f3cc3067a1d1acb8aff2e9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=40a3574cc5d00e7aaa9891298fd4833b
+_eclasses_=gkrellm-plugin	e3548dfd06a50087a45520f52934a39c	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=999426cc7806f8c0c4bb2ac377c89e73
diff --git a/metadata/md5-cache/x11-plugins/gkrellm-cpupower-0.2-r1 b/metadata/md5-cache/x11-plugins/gkrellm-cpupower-0.2-r1
index 378ed3d36fae..34d36cfa6f29 100644
--- a/metadata/md5-cache/x11-plugins/gkrellm-cpupower-0.2-r1
+++ b/metadata/md5-cache/x11-plugins/gkrellm-cpupower-0.2-r1
@@ -1,12 +1,12 @@
-DEFINED_PHASES=install postinst setup
-DEPEND==app-admin/gkrellm-2* virtual/pkgconfig
+DEFINED_PHASES=install postinst
+DEPEND=app-admin/gkrellm:2[X] virtual/pkgconfig
 DESCRIPTION=A Gkrellm2 plugin for displaying and manipulating CPU frequency
 EAPI=6
 HOMEPAGE=https://github.com/sainsaar/gkrellm2-cpupower/
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=app-admin/gkrellm[X] app-admin/sudo sys-power/cpupower =app-admin/gkrellm-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_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	gkrellm-plugin	0c6887ede1f3cc3067a1d1acb8aff2e9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=55ca5364544f2092ea1210b7263ef85c
+_eclasses_=gkrellm-plugin	e3548dfd06a50087a45520f52934a39c	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=13e8f73575994dc6e8dcb4f5cb66babd
diff --git a/metadata/md5-cache/x11-plugins/gkrellm-imonc-0.2-r1 b/metadata/md5-cache/x11-plugins/gkrellm-imonc-0.2-r1
index cfc36f77dca5..e73c309f9891 100644
--- a/metadata/md5-cache/x11-plugins/gkrellm-imonc-0.2-r1
+++ b/metadata/md5-cache/x11-plugins/gkrellm-imonc-0.2-r1
@@ -1,12 +1,12 @@
-DEFINED_PHASES=compile install setup
-DEPEND=app-admin/gkrellm[X] =app-admin/gkrellm-2* virtual/pkgconfig
+DEFINED_PHASES=compile install
+DEPEND=app-admin/gkrellm:2[X] virtual/pkgconfig
 DESCRIPTION=A GKrellM2 plugin to control a fli4l router
 EAPI=6
 HOMEPAGE=http://gkrellm-imonc.sourceforge.net/
 KEYWORDS=~amd64 x86
 LICENSE=GPL-2+
-RDEPEND=app-admin/gkrellm[X] =app-admin/gkrellm-2*
+RDEPEND=app-admin/gkrellm:2[X]
 SLOT=0
 SRC_URI=mirror://sourceforge/gkrellm-imonc/gkrellm-imonc-src-0.2.tar.bz2
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	gkrellm-plugin	0c6887ede1f3cc3067a1d1acb8aff2e9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=c01e4f83af938fb55b50ec2bb1c0ee47
+_eclasses_=gkrellm-plugin	e3548dfd06a50087a45520f52934a39c	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=2a1578696586626338a0d6d815dd1fa8
diff --git a/metadata/md5-cache/x11-plugins/gkrellm-leds-0.8.2-r1 b/metadata/md5-cache/x11-plugins/gkrellm-leds-0.8.2-r1
index c73f529d3332..a38c5771e53a 100644
--- a/metadata/md5-cache/x11-plugins/gkrellm-leds-0.8.2-r1
+++ b/metadata/md5-cache/x11-plugins/gkrellm-leds-0.8.2-r1
@@ -1,12 +1,12 @@
-DEFINED_PHASES=install setup
-DEPEND=app-admin/gkrellm[X] x11-proto/inputproto =app-admin/gkrellm-2* virtual/pkgconfig
+DEFINED_PHASES=install
+DEPEND=app-admin/gkrellm:2[X] x11-libs/libXtst x11-proto/inputproto virtual/pkgconfig
 DESCRIPTION=GKrellM2 plugin for monitoring keyboard LEDs
 EAPI=6
 HOMEPAGE=http://heim.ifi.uio.no/~oyvinha/gkleds/
 KEYWORDS=alpha amd64 ~ppc ~sparc x86
 LICENSE=GPL-2
-RDEPEND=app-admin/gkrellm[X] x11-libs/libXtst =app-admin/gkrellm-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_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	gkrellm-plugin	0c6887ede1f3cc3067a1d1acb8aff2e9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=e4e9f88ebecdbea354fe69aea0a7a636
+_eclasses_=gkrellm-plugin	e3548dfd06a50087a45520f52934a39c	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=3155bbb2fd02abe059880821ce05b17c
diff --git a/metadata/md5-cache/x11-plugins/gkrellm-mailwatch-2.4.3-r2 b/metadata/md5-cache/x11-plugins/gkrellm-mailwatch-2.4.3-r2
index de5119fd962f..557f0c388589 100644
--- a/metadata/md5-cache/x11-plugins/gkrellm-mailwatch-2.4.3-r2
+++ b/metadata/md5-cache/x11-plugins/gkrellm-mailwatch-2.4.3-r2
@@ -1,12 +1,12 @@
-DEFINED_PHASES=compile install setup
-DEPEND==app-admin/gkrellm-2* virtual/pkgconfig
+DEFINED_PHASES=configure install
+DEPEND=app-admin/gkrellm:2[X] virtual/pkgconfig
 DESCRIPTION=A GKrellM2 plugin that shows the status of additional mail boxes
 EAPI=6
 HOMEPAGE=http://gkrellm.luon.net/mailwatch.php
 KEYWORDS=~alpha ~amd64 ~ppc ~sparc ~x86
 LICENSE=GPL-2
-RDEPEND=app-admin/gkrellm[X] =app-admin/gkrellm-2*
+RDEPEND=app-admin/gkrellm:2[X]
 SLOT=2
 SRC_URI=http://gkrellm.luon.net/files/gkrellm-mailwatch-2.4.3.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	gkrellm-plugin	0c6887ede1f3cc3067a1d1acb8aff2e9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=d359a738360e3c7e7dc83081f9b1c997
+_eclasses_=gkrellm-plugin	e3548dfd06a50087a45520f52934a39c	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=678f52db6a1a5cf4ccfd7b476427dea6
diff --git a/metadata/md5-cache/x11-plugins/gkrellm-radio-2.0.4 b/metadata/md5-cache/x11-plugins/gkrellm-radio-2.0.4
index 999b3988726b..3fd08873ea9f 100644
--- a/metadata/md5-cache/x11-plugins/gkrellm-radio-2.0.4
+++ b/metadata/md5-cache/x11-plugins/gkrellm-radio-2.0.4
@@ -1,13 +1,13 @@
-DEFINED_PHASES=compile install setup
-DEPEND=lirc? ( app-misc/lirc ) =app-admin/gkrellm-2* virtual/pkgconfig
+DEFINED_PHASES=compile install
+DEPEND=app-admin/gkrellm:2[X] lirc? ( app-misc/lirc ) virtual/pkgconfig
 DESCRIPTION=A minimalistic GKrellM2 plugin to control radio tuners
 EAPI=6
 HOMEPAGE=http://gkrellm.luon.net/gkrellm-radio.php
 IUSE=lirc
 KEYWORDS=~amd64 ppc sparc x86
 LICENSE=GPL-2
-RDEPEND=lirc? ( app-misc/lirc ) app-admin/gkrellm[X] =app-admin/gkrellm-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_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	gkrellm-plugin	0c6887ede1f3cc3067a1d1acb8aff2e9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=9b7f91819d7199a9772d0f2e314ed72c
+_eclasses_=gkrellm-plugin	e3548dfd06a50087a45520f52934a39c	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=3c96eb4b7aa98b7c72085cdf1e7d9e27
diff --git a/metadata/md5-cache/x11-plugins/gkrellm-trayicons-1.03-r1 b/metadata/md5-cache/x11-plugins/gkrellm-trayicons-1.03-r1
index fea2caa6ea1f..16582a4ea6d5 100644
--- a/metadata/md5-cache/x11-plugins/gkrellm-trayicons-1.03-r1
+++ b/metadata/md5-cache/x11-plugins/gkrellm-trayicons-1.03-r1
@@ -1,12 +1,12 @@
-DEFINED_PHASES=compile install setup
-DEPEND==app-admin/gkrellm-2* virtual/pkgconfig
+DEFINED_PHASES=compile install
+DEPEND=app-admin/gkrellm:2[X] virtual/pkgconfig
 DESCRIPTION=Configurable Tray Icons for GKrellM
 EAPI=6
 HOMEPAGE=http://gkrellm.srcbox.net/Plugins.html
 KEYWORDS=amd64 ppc sparc x86
 LICENSE=GPL-2
-RDEPEND=app-admin/gkrellm[X] =app-admin/gkrellm-2*
+RDEPEND=app-admin/gkrellm:2[X]
 SLOT=0
 SRC_URI=mirror://gentoo/gkrellm-trayicons-1.03.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	gkrellm-plugin	0c6887ede1f3cc3067a1d1acb8aff2e9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=e6b77815c930324acfc4d08e1053c4f7
+_eclasses_=gkrellm-plugin	e3548dfd06a50087a45520f52934a39c	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=893ebe4c81fae4fd2124b42bf486a4a6
diff --git a/metadata/md5-cache/x11-plugins/gkrellm-vaiobright-2.5-r2 b/metadata/md5-cache/x11-plugins/gkrellm-vaiobright-2.5-r2
index 7a221847625d..449e07330fc4 100644
--- a/metadata/md5-cache/x11-plugins/gkrellm-vaiobright-2.5-r2
+++ b/metadata/md5-cache/x11-plugins/gkrellm-vaiobright-2.5-r2
@@ -1,12 +1,12 @@
-DEFINED_PHASES=install setup
-DEPEND==app-admin/gkrellm-2* virtual/pkgconfig
+DEFINED_PHASES=install
+DEPEND=app-admin/gkrellm:2[X] virtual/pkgconfig
 DESCRIPTION=Superslim VAIO LCD Brightness Control Plugin for Gkrellm
 EAPI=6
 HOMEPAGE=http://nerv-un.net/~dragorn/
 KEYWORDS=~amd64 x86
 LICENSE=GPL-2
-RDEPEND=app-admin/gkrellm[X] =app-admin/gkrellm-2*
+RDEPEND=app-admin/gkrellm:2[X]
 SLOT=2
 SRC_URI=http://nerv-un.net/~dragorn/code/vaiobright-2.5.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	gkrellm-plugin	0c6887ede1f3cc3067a1d1acb8aff2e9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=61e7f7a7c46bd661760692d3ba51ffc2
+_eclasses_=gkrellm-plugin	e3548dfd06a50087a45520f52934a39c	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=2bf3973b2dfd419e4f538430569ccdf3
diff --git a/metadata/md5-cache/x11-plugins/gkrellm-volume-2.1.13-r2 b/metadata/md5-cache/x11-plugins/gkrellm-volume-2.1.13-r2
index d140e7cdd9ab..28661998e3e6 100644
--- a/metadata/md5-cache/x11-plugins/gkrellm-volume-2.1.13-r2
+++ b/metadata/md5-cache/x11-plugins/gkrellm-volume-2.1.13-r2
@@ -1,13 +1,13 @@
-DEFINED_PHASES=compile install setup
-DEPEND=alsa? ( media-libs/alsa-lib ) =app-admin/gkrellm-2* virtual/pkgconfig
+DEFINED_PHASES=compile install
+DEPEND=app-admin/gkrellm:2[X] alsa? ( media-libs/alsa-lib ) virtual/pkgconfig
 DESCRIPTION=A mixer control plugin for gkrellm
 EAPI=6
 HOMEPAGE=http://gkrellm.luon.net/volume.php
 IUSE=alsa
 KEYWORDS=~alpha amd64 ~ppc ~sparc x86
 LICENSE=GPL-2
-RDEPEND=alsa? ( media-libs/alsa-lib ) app-admin/gkrellm[X] =app-admin/gkrellm-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_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	gkrellm-plugin	0c6887ede1f3cc3067a1d1acb8aff2e9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=0ea4af709f960a0b119081cc3feeee63
+_eclasses_=gkrellm-plugin	e3548dfd06a50087a45520f52934a39c	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=565ad88301287f07d7a0dc51cf14954a
diff --git a/metadata/md5-cache/x11-plugins/gkrellm-xkb-1.05-r1 b/metadata/md5-cache/x11-plugins/gkrellm-xkb-1.05-r1
index 2644f380412d..2b6884ce786e 100644
--- a/metadata/md5-cache/x11-plugins/gkrellm-xkb-1.05-r1
+++ b/metadata/md5-cache/x11-plugins/gkrellm-xkb-1.05-r1
@@ -1,12 +1,12 @@
-DEFINED_PHASES=compile install setup
-DEPEND=app-admin/gkrellm[X] =app-admin/gkrellm-2* virtual/pkgconfig
+DEFINED_PHASES=compile install
+DEPEND=app-admin/gkrellm:2[X] virtual/pkgconfig
 DESCRIPTION=XKB keyboard switcher for gkrellm2
 EAPI=6
 HOMEPAGE=http://tripie.sweb.cz/gkrellm/xkb/
 KEYWORDS=amd64 x86
 LICENSE=GPL-2
-RDEPEND=app-admin/gkrellm[X] =app-admin/gkrellm-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_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	gkrellm-plugin	0c6887ede1f3cc3067a1d1acb8aff2e9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=38e9ce3546d7ab59ae1150de5bb25d89
+_eclasses_=gkrellm-plugin	e3548dfd06a50087a45520f52934a39c	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=59b4af46e773a3ba7575b63bfbc6c070
diff --git a/metadata/md5-cache/x11-plugins/gkrellmlaunch-0.5 b/metadata/md5-cache/x11-plugins/gkrellmlaunch-0.5
index f7084caf4ca8..be394e3ec8eb 100644
--- a/metadata/md5-cache/x11-plugins/gkrellmlaunch-0.5
+++ b/metadata/md5-cache/x11-plugins/gkrellmlaunch-0.5
@@ -1,12 +1,12 @@
-DEFINED_PHASES=compile install prepare setup
-DEPEND=app-admin/gkrellm[X] =app-admin/gkrellm-2* virtual/pkgconfig
+DEFINED_PHASES=compile install
+DEPEND=app-admin/gkrellm:2[X] virtual/pkgconfig
 DESCRIPTION=A Program-Launcher Plugin for GKrellM2
-EAPI=5
+EAPI=6
 HOMEPAGE=http://gkrellmlaunch.sourceforge.net/
 KEYWORDS=x86 ppc sparc alpha amd64
 LICENSE=GPL-2
-RDEPEND=app-admin/gkrellm[X] =app-admin/gkrellm-2*
+RDEPEND=app-admin/gkrellm:2[X]
 SLOT=2
 SRC_URI=mirror://sourceforge/gkrellmlaunch/gkrellmlaunch-0.5.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	gkrellm-plugin	0c6887ede1f3cc3067a1d1acb8aff2e9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=bc76b31e5bf588e113cc1cdabeb92bb4
+_eclasses_=gkrellm-plugin	e3548dfd06a50087a45520f52934a39c	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=38d895f94175105c5a7dd2e07b26597e
diff --git a/metadata/md5-cache/x11-plugins/gkrellmoon-0.6-r2 b/metadata/md5-cache/x11-plugins/gkrellmoon-0.6-r2
index 75e53e3b8201..2386f8ca99eb 100644
--- a/metadata/md5-cache/x11-plugins/gkrellmoon-0.6-r2
+++ b/metadata/md5-cache/x11-plugins/gkrellmoon-0.6-r2
@@ -1,12 +1,12 @@
-DEFINED_PHASES=compile install prepare setup
-DEPEND=media-libs/imlib2 =app-admin/gkrellm-2* virtual/pkgconfig
+DEFINED_PHASES=compile install prepare
+DEPEND=app-admin/gkrellm:2[X] media-libs/imlib2 virtual/pkgconfig
 DESCRIPTION=A GKrellM2 plugin of the famous wmMoonClock dockapp
 EAPI=6
 HOMEPAGE=http://gkrellmoon.sourceforge.net/
 KEYWORDS=alpha amd64 ppc sparc x86
 LICENSE=GPL-2
-RDEPEND=media-libs/imlib2 app-admin/gkrellm[X] =app-admin/gkrellm-2*
+RDEPEND=app-admin/gkrellm:2[X] media-libs/imlib2
 SLOT=2
 SRC_URI=mirror://sourceforge/gkrellmoon/gkrellmoon-0.6.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	gkrellm-plugin	0c6887ede1f3cc3067a1d1acb8aff2e9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=96041879f8ec11638b15e28ac732b7b1
+_eclasses_=gkrellm-plugin	e3548dfd06a50087a45520f52934a39c	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=6715215fa59fdb3df9c172b8b296cf02
diff --git a/metadata/md5-cache/x11-plugins/gkrellmss-2.6-r4 b/metadata/md5-cache/x11-plugins/gkrellmss-2.6-r4
index 3ea7747c1a0b..de92f5a785ee 100644
--- a/metadata/md5-cache/x11-plugins/gkrellmss-2.6-r4
+++ b/metadata/md5-cache/x11-plugins/gkrellmss-2.6-r4
@@ -1,13 +1,13 @@
-DEFINED_PHASES=compile install setup
-DEPEND=app-admin/gkrellm[X] media-libs/alsa-lib sci-libs/fftw:3.0= =app-admin/gkrellm-2* virtual/pkgconfig
+DEFINED_PHASES=compile install
+DEPEND=app-admin/gkrellm:2[X] media-libs/alsa-lib sci-libs/fftw:3.0= virtual/pkgconfig
 DESCRIPTION=A plugin for GKrellM2 that has a VU meter and a sound chart
 EAPI=6
 HOMEPAGE=http://members.dslextreme.com/users/billw/gkrellmss/gkrellmss.html
 IUSE=nls
 KEYWORDS=~alpha amd64 ~ppc ~sparc x86
 LICENSE=GPL-2
-RDEPEND=app-admin/gkrellm[X] media-libs/alsa-lib sci-libs/fftw:3.0= =app-admin/gkrellm-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_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	gkrellm-plugin	0c6887ede1f3cc3067a1d1acb8aff2e9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=7576c43a7b4cbe3bf287af8ab1599a1c
+_eclasses_=gkrellm-plugin	e3548dfd06a50087a45520f52934a39c	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=18267ad0b04763836afbe63572f008bc
diff --git a/metadata/md5-cache/x11-plugins/gkrellmwireless-2.0.3-r2 b/metadata/md5-cache/x11-plugins/gkrellmwireless-2.0.3-r2
index 434737850590..a9fc472f1f07 100644
--- a/metadata/md5-cache/x11-plugins/gkrellmwireless-2.0.3-r2
+++ b/metadata/md5-cache/x11-plugins/gkrellmwireless-2.0.3-r2
@@ -1,12 +1,12 @@
-DEFINED_PHASES=install prepare setup
-DEPEND==app-admin/gkrellm-2* virtual/pkgconfig
+DEFINED_PHASES=configure install
+DEPEND=app-admin/gkrellm:2[X] virtual/pkgconfig
 DESCRIPTION=A plugin for GKrellM that monitors your wireless network card
 EAPI=6
 HOMEPAGE=http://gkrellm.luon.net/gkrellmwireless.php
 KEYWORDS=amd64 ~ppc ~sparc x86
 LICENSE=GPL-2
-RDEPEND=app-admin/gkrellm[X] =app-admin/gkrellm-2*
+RDEPEND=app-admin/gkrellm:2[X]
 SLOT=2
 SRC_URI=http://gkrellm.luon.net/files/gkrellmwireless-2.0.3.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	gkrellm-plugin	0c6887ede1f3cc3067a1d1acb8aff2e9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=aa4f9c17426f87b689f1d7ea6fafa653
+_eclasses_=gkrellm-plugin	e3548dfd06a50087a45520f52934a39c	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=6dbbfac3b6f0fcf0e905e24052c740dc
diff --git a/metadata/md5-cache/x11-plugins/gkrellshoot-0.4.4-r2 b/metadata/md5-cache/x11-plugins/gkrellshoot-0.4.4-r2
index 3a60bec47747..e18a488d3f72 100644
--- a/metadata/md5-cache/x11-plugins/gkrellshoot-0.4.4-r2
+++ b/metadata/md5-cache/x11-plugins/gkrellshoot-0.4.4-r2
@@ -1,12 +1,12 @@
-DEFINED_PHASES=install setup
-DEPEND==app-admin/gkrellm-2* virtual/pkgconfig
+DEFINED_PHASES=install
+DEPEND=app-admin/gkrellm:2[X] virtual/pkgconfig
 DESCRIPTION=GKrellm2 plugin to take screen shots and lock screen
 EAPI=6
 HOMEPAGE=http://gkrellshoot.sourceforge.net/
 KEYWORDS=alpha amd64 ppc sparc x86
 LICENSE=GPL-2
-RDEPEND=app-admin/gkrellm[X] virtual/imagemagick-tools =app-admin/gkrellm-2*
+RDEPEND=app-admin/gkrellm:2[X] virtual/imagemagick-tools
 SLOT=2
 SRC_URI=mirror://sourceforge/gkrellshoot/gkrellshoot-0.4.4.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	gkrellm-plugin	0c6887ede1f3cc3067a1d1acb8aff2e9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=47a79c4fc5378efcfaf8da0a9ad2b475
+_eclasses_=gkrellm-plugin	e3548dfd06a50087a45520f52934a39c	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=f02aefc1334be14aa902393dc9ea1ed5
diff --git a/metadata/md5-cache/x11-plugins/gkrellstock-0.5.1-r1 b/metadata/md5-cache/x11-plugins/gkrellstock-0.5.1-r1
index dc17bb8050ca..af8e83bde128 100644
--- a/metadata/md5-cache/x11-plugins/gkrellstock-0.5.1-r1
+++ b/metadata/md5-cache/x11-plugins/gkrellstock-0.5.1-r1
@@ -1,12 +1,12 @@
-DEFINED_PHASES=compile install prepare setup
-DEPEND=virtual/pkgconfig =app-admin/gkrellm-2* virtual/pkgconfig
+DEFINED_PHASES=compile configure install
+DEPEND=app-admin/gkrellm:2[X] dev-libs/glib:2 x11-libs/gtk+:2 dev-perl/libwww-perl dev-perl/Finance-Quote virtual/pkgconfig virtual/pkgconfig
 DESCRIPTION=Get Stock quotes plugin for Gkrellm2
 EAPI=6
 HOMEPAGE=http://gkrellstock.sourceforge.net/
 KEYWORDS=amd64 ~ppc x86
 LICENSE=GPL-2
-RDEPEND=app-admin/gkrellm[X] dev-libs/glib:2 x11-libs/gtk+:2 dev-perl/libwww-perl dev-perl/Finance-Quote =app-admin/gkrellm-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_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	gkrellm-plugin	0c6887ede1f3cc3067a1d1acb8aff2e9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=3f607f539ec50aaab0a90347d04a0695
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	gkrellm-plugin	e3548dfd06a50087a45520f52934a39c	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=c69ab8d1018f36d89a20dff9008eeeac
diff --git a/metadata/md5-cache/x11-plugins/gkrellsun-1.0.0-r4 b/metadata/md5-cache/x11-plugins/gkrellsun-1.0.0-r4
index d472a07c509c..2ea991f2d062 100644
--- a/metadata/md5-cache/x11-plugins/gkrellsun-1.0.0-r4
+++ b/metadata/md5-cache/x11-plugins/gkrellsun-1.0.0-r4
@@ -1,13 +1,13 @@
-DEFINED_PHASES=compile install setup
-DEPEND=app-admin/gkrellm[X] nls? ( sys-devel/gettext ) =app-admin/gkrellm-2* virtual/pkgconfig
+DEFINED_PHASES=compile install
+DEPEND=app-admin/gkrellm:2[X] nls? ( sys-devel/gettext ) virtual/pkgconfig
 DESCRIPTION=A GKrellM plugin that shows sunrise and sunset times
 EAPI=6
 HOMEPAGE=http://gkrellsun.sourceforge.net/
 IUSE=nls
 KEYWORDS=alpha amd64 hppa ia64 ppc sparc x86
 LICENSE=GPL-2
-RDEPEND=app-admin/gkrellm[X] nls? ( sys-devel/gettext ) =app-admin/gkrellm-2*
+RDEPEND=app-admin/gkrellm:2[X]
 SLOT=1
 SRC_URI=mirror://sourceforge/gkrellsun/gkrellsun-1.0.0.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	gkrellm-plugin	0c6887ede1f3cc3067a1d1acb8aff2e9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=7f401c66a6e681b06999c79871c9020e
+_eclasses_=gkrellm-plugin	e3548dfd06a50087a45520f52934a39c	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=2b82223227001eaba46589d5fcc55404
diff --git a/metadata/md5-cache/x11-plugins/gkrelltop-2.2.13-r2 b/metadata/md5-cache/x11-plugins/gkrelltop-2.2.13-r2
index 71e8201d70cf..ce87c30593b0 100644
--- a/metadata/md5-cache/x11-plugins/gkrelltop-2.2.13-r2
+++ b/metadata/md5-cache/x11-plugins/gkrelltop-2.2.13-r2
@@ -1,13 +1,13 @@
-DEFINED_PHASES=compile install postinst prepare setup
-DEPEND=app-admin/gkrellm[X] dev-libs/glib:2 x11-libs/gtk+:2 =app-admin/gkrellm-2* virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst
+DEPEND=app-admin/gkrellm:2[X] dev-libs/glib:2 x11-libs/gtk+:2 virtual/pkgconfig
 DESCRIPTION=a GKrellM2 plugin which displays the top three processes
 EAPI=6
 HOMEPAGE=https://sourceforge.net/projects/gkrelltop
 IUSE=X
 KEYWORDS=amd64 ppc x86
 LICENSE=GPL-2
-RDEPEND=app-admin/gkrellm[X] dev-libs/glib:2 x11-libs/gtk+:2 =app-admin/gkrellm-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_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	gkrellm-plugin	0c6887ede1f3cc3067a1d1acb8aff2e9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=dbdc9b82430eeea06f49144cea9bc4cf
+_eclasses_=gkrellm-plugin	e3548dfd06a50087a45520f52934a39c	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=99fc6f90a872ff25e1c156b6f4e5b388
diff --git a/metadata/md5-cache/x11-plugins/gkrellweather-2.0.8-r1 b/metadata/md5-cache/x11-plugins/gkrellweather-2.0.8-r1
index ec6c37fc5d89..cd05b1eaa7c0 100644
--- a/metadata/md5-cache/x11-plugins/gkrellweather-2.0.8-r1
+++ b/metadata/md5-cache/x11-plugins/gkrellweather-2.0.8-r1
@@ -1,12 +1,12 @@
-DEFINED_PHASES=compile install prepare setup
-DEPEND=>=sys-apps/sed-4.0.5 virtual/pkgconfig =app-admin/gkrellm-2* virtual/pkgconfig
+DEFINED_PHASES=compile configure install
+DEPEND=app-admin/gkrellm:2[X] dev-lang/perl net-misc/wget x11-libs/gtk+:2 virtual/pkgconfig virtual/pkgconfig
 DESCRIPTION=GKrellM2 Plugin that monitors a METAR station and displays weatherinfo
 EAPI=6
 HOMEPAGE=https://sites.google.com/site/makovick/gkrellm-plugins
 KEYWORDS=~alpha amd64 ~ppc ~sparc x86
 LICENSE=GPL-2
-RDEPEND=app-admin/gkrellm[X] >=dev-lang/perl-5.6.1 >=net-misc/wget-1.5.3 =app-admin/gkrellm-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_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	gkrellm-plugin	0c6887ede1f3cc3067a1d1acb8aff2e9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=f6f8e929415573a5cf94adf487c553b8
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	gkrellm-plugin	e3548dfd06a50087a45520f52934a39c	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=d63bf636af975b24945b7101a6a56f8a
diff --git a/metadata/md5-cache/x11-plugins/gkwebmon-0.2-r2 b/metadata/md5-cache/x11-plugins/gkwebmon-0.2-r2
index 05117bd549be..ad6c68f31c90 100644
--- a/metadata/md5-cache/x11-plugins/gkwebmon-0.2-r2
+++ b/metadata/md5-cache/x11-plugins/gkwebmon-0.2-r2
@@ -1,12 +1,12 @@
-DEFINED_PHASES=compile install setup
-DEPEND=app-admin/gkrellm[X] dev-libs/openssl:0 =app-admin/gkrellm-2* virtual/pkgconfig
+DEFINED_PHASES=compile install
+DEPEND=app-admin/gkrellm:2[X] dev-libs/openssl:0= virtual/pkgconfig
 DESCRIPTION=A web monitor plugin for GKrellM2
 EAPI=6
 HOMEPAGE=http://gkwebmon.sourceforge.net/
 KEYWORDS=alpha ~amd64 ppc ~sparc x86
 LICENSE=GPL-2
-RDEPEND=app-admin/gkrellm[X] dev-libs/openssl:0 =app-admin/gkrellm-2*
+RDEPEND=app-admin/gkrellm:2[X] dev-libs/openssl:0=
 SLOT=0
 SRC_URI=mirror://sourceforge/gkwebmon/gkwebmon-0.2.tgz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	gkrellm-plugin	0c6887ede1f3cc3067a1d1acb8aff2e9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=5847a2d021c707edb03ea0db1812ea19
+_eclasses_=gkrellm-plugin	e3548dfd06a50087a45520f52934a39c	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=cde177de4f05bba32e3cb6dc1f6a085b
diff --git a/metadata/md5-cache/x11-plugins/i8krellm-2.5-r2 b/metadata/md5-cache/x11-plugins/i8krellm-2.5-r2
index 9ccfe4e125dc..8c32e0c3e417 100644
--- a/metadata/md5-cache/x11-plugins/i8krellm-2.5-r2
+++ b/metadata/md5-cache/x11-plugins/i8krellm-2.5-r2
@@ -1,12 +1,12 @@
-DEFINED_PHASES=install setup
-DEPEND=app-admin/gkrellm[X] >=app-laptop/i8kutils-1.5 =app-admin/gkrellm-2* virtual/pkgconfig
+DEFINED_PHASES=install
+DEPEND=app-admin/gkrellm:2[X] >=app-laptop/i8kutils-1.5 virtual/pkgconfig
 DESCRIPTION=GKrellM2 Plugin for the Dell Inspiron and Latitude notebooks
 EAPI=6
 HOMEPAGE=http://www.coding-zone.com/?page=i8krellm
 KEYWORDS=amd64 x86
 LICENSE=GPL-2
-RDEPEND=app-admin/gkrellm[X] >=app-laptop/i8kutils-1.5 =app-admin/gkrellm-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_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	gkrellm-plugin	0c6887ede1f3cc3067a1d1acb8aff2e9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=03765fcef946a4ea1e8bac99cd11fb93
+_eclasses_=gkrellm-plugin	e3548dfd06a50087a45520f52934a39c	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=1cd25cff53e4bd65e61b6c87c55d3afb
diff --git a/metadata/md5-cache/x11-plugins/pidgin-bot-sentry-1.3.0 b/metadata/md5-cache/x11-plugins/pidgin-bot-sentry-1.3.0
index 65dd1c464807..19ce4c1339ef 100644
--- a/metadata/md5-cache/x11-plugins/pidgin-bot-sentry-1.3.0
+++ b/metadata/md5-cache/x11-plugins/pidgin-bot-sentry-1.3.0
@@ -1,12 +1,11 @@
 DEFINED_PHASES=install
 DEPEND=net-im/pidgin[gtk] x11-libs/gtk+:2 >=dev-util/intltool-0.40 virtual/pkgconfig
 DESCRIPTION=Bot Sentry is a Pidgin plugin to prevent Instant Message (IM) spam
-EAPI=3
+EAPI=6
 HOMEPAGE=http://pidgin-bs.sourceforge.net/
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=net-im/pidgin[gtk] x11-libs/gtk+:2
 SLOT=0
 SRC_URI=mirror://sourceforge/pidgin-bs/bot-sentry-1.3.0.tar.bz2
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=bd1a98faf73c46cb74fcb8f084ada9e8
+_md5_=4e569b948a3546bcdf50c6acc25545a8
diff --git a/metadata/md5-cache/x11-plugins/pidgin-led-notification-0.1 b/metadata/md5-cache/x11-plugins/pidgin-led-notification-0.1
index 33c65bd6cd44..815f10c079c2 100644
--- a/metadata/md5-cache/x11-plugins/pidgin-led-notification-0.1
+++ b/metadata/md5-cache/x11-plugins/pidgin-led-notification-0.1
@@ -1,12 +1,12 @@
-DEFINED_PHASES=compile install prepare
+DEFINED_PHASES=compile install
 DEPEND=net-im/pidgin[gtk] x11-libs/gtk+:2 virtual/pkgconfig
 DESCRIPTION=Pidgin plugin to notify by writing user defined strings to (led control) files
-EAPI=3
+EAPI=6
 HOMEPAGE=https://sites.google.com/site/simohmattila/led-notification
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=GPL-2
 RDEPEND=net-im/pidgin[gtk] x11-libs/gtk+:2
 SLOT=0
 SRC_URI=https://sites.google.com/site/simohmattila/led-notification-0.1.tar.bz2
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=8b77ef34d1ef729d3c1203a1a5c21358
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=0fd367ce876b915ce0ea90e470ce2721