2017-07-26 11:57:59 UTC

29 files changed, 78 insertions, 197 deletions

diff --git a/metadata/md5-cache/media-libs/faad2-2.8.1 b/metadata/md5-cache/media-libs/faad2-2.8.1-r1
index 3e8aa9015de0..2ab9c86bd49e 100644
--- a/metadata/md5-cache/media-libs/faad2-2.8.1
+++ b/metadata/md5-cache/media-libs/faad2-2.8.1-r1
@@ -10,4 +10,4 @@ SLOT=0
 SRC_URI=mirror://sourceforge/faac/faad2-2.8.1.tar.gz
 _eclass_exported_funcs=src_prepare:- src_configure:multilib-minimal src_compile:multilib-minimal src_test:multilib-minimal src_install:multilib-minimal
 _eclasses_=autotools	7027963e8e8cc12c91117bdb9225dc26	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	libtool	e32ea84bf82cf8987965b574672dba93	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	8fec6b1eb195836560e70b66d98fb163
-_md5_=52d2a5874e37dcb52ce089b3cabcd2fd
+_md5_=b7396c871246ad9827feeedfd112d22c
diff --git a/metadata/md5-cache/net-misc/nextcloud-client-2.3.1-r2 b/metadata/md5-cache/net-misc/nextcloud-client-2.3.1-r2
index 4a186709f1a6..3913e184805a 100644
--- a/metadata/md5-cache/net-misc/nextcloud-client-2.3.1-r2
+++ b/metadata/md5-cache/net-misc/nextcloud-client-2.3.1-r2
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst prepare test unpack
-DEPEND=>=dev-db/sqlite-3.4:3 dev-libs/qtkeychain[qt5] dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtsql:5 dev-qt/qtwidgets:5 sys-fs/inotify-tools virtual/libiconv dolphin? ( kde-frameworks/kcoreaddons:5 kde-frameworks/kio:5 ) nautilus? ( dev-python/nautilus-python ) samba? ( >=net-fs/samba-3.5 ) sftp? ( >=net-libs/libssh-0.5 ) shibboleth? ( dev-qt/qtwebkit:5 ) dev-qt/linguist-tools:5 doc? ( dev-python/sphinx dev-texlive/texlive-latexextra virtual/latex-base ) dolphin? ( kde-frameworks/extra-cmake-modules ) test? ( dev-util/cmocka dev-qt/qttest:5 ) sys-devel/make >=dev-util/cmake-3.7.2
+DEPEND=>=dev-db/sqlite-3.4:3 dev-libs/qtkeychain[qt5] dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtsql:5 dev-qt/qtwidgets:5 sys-fs/inotify-tools virtual/libiconv dolphin? ( kde-frameworks/kcoreaddons:5 kde-frameworks/kio:5 ) nautilus? ( dev-python/nautilus-python ) samba? ( >=net-fs/samba-3.5 ) sftp? ( >=net-libs/libssh-0.5 ) shibboleth? ( dev-qt/qtwebkit:5 ) dev-qt/linguist-tools:5 doc? ( dev-python/sphinx dev-texlive/texlive-latexextra virtual/latex-base ) dolphin? ( kde-frameworks/extra-cmake-modules ) test? ( dev-util/cmocka dev-qt/qttest:5 ) sys-devel/make >=dev-util/cmake-3.7.2
 DESCRIPTION=Nextcloud themed desktop client
 EAPI=6
 HOMEPAGE=https://github.com/nextcloud/client_theming
 IUSE=doc dolphin nautilus samba +sftp shibboleth test
 KEYWORDS=~amd64 ~x86
 LICENSE=CC-BY-3.0 GPL-2
-RDEPEND=>=dev-db/sqlite-3.4:3 dev-libs/qtkeychain[qt5] dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtsql:5 dev-qt/qtwidgets:5 sys-fs/inotify-tools virtual/libiconv dolphin? ( kde-frameworks/kcoreaddons:5 kde-frameworks/kio:5 ) nautilus? ( dev-python/nautilus-python ) samba? ( >=net-fs/samba-3.5 ) sftp? ( >=net-libs/libssh-0.5 ) shibboleth? ( dev-qt/qtwebkit:5 ) !net-misc/ocsync !net-misc/owncloud-client
+RDEPEND=>=dev-db/sqlite-3.4:3 dev-libs/qtkeychain[qt5] dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtsql:5 dev-qt/qtwidgets:5 sys-fs/inotify-tools virtual/libiconv dolphin? ( kde-frameworks/kcoreaddons:5 kde-frameworks/kio:5 ) nautilus? ( dev-python/nautilus-python ) samba? ( >=net-fs/samba-3.5 ) sftp? ( >=net-libs/libssh-0.5 ) shibboleth? ( dev-qt/qtwebkit:5 ) !net-misc/ocsync !net-misc/owncloud-client
 SLOT=0
 SRC_URI=http://download.owncloud.com/desktop/stable/owncloudclient-2.3.1.tar.xz https://github.com/nextcloud/client_theming/archive/v2.3.1.tar.gz -> nextcloud-client-2.3.1.tar.gz
 _eclass_exported_funcs=pkg_postinst:- src_unpack:- src_prepare:- src_configure:- src_compile:cmake-utils src_test:cmake-utils src_install:cmake-utils
 _eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	8fec6b1eb195836560e70b66d98fb163	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=15f24e010ee19396c9e2d5a1ea87f685
+_md5_=2dba54f5f1866fe3e75bb7cda8893386
diff --git a/metadata/md5-cache/net-misc/nextcloud-client-2.3.2 b/metadata/md5-cache/net-misc/nextcloud-client-2.3.2
index 9a670ccb280e..9b04a4fa210a 100644
--- a/metadata/md5-cache/net-misc/nextcloud-client-2.3.2
+++ b/metadata/md5-cache/net-misc/nextcloud-client-2.3.2
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst prepare test unpack
-DEPEND=>=dev-db/sqlite-3.4:3 dev-libs/qtkeychain[qt5] dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtsql:5 dev-qt/qtwidgets:5 sys-fs/inotify-tools virtual/libiconv dolphin? ( kde-frameworks/kcoreaddons:5 kde-frameworks/kio:5 ) nautilus? ( dev-python/nautilus-python ) samba? ( >=net-fs/samba-3.5 ) sftp? ( >=net-libs/libssh-0.5 ) shibboleth? ( dev-qt/qtwebkit:5 ) dev-qt/linguist-tools:5 doc? ( dev-python/sphinx dev-texlive/texlive-latexextra virtual/latex-base ) dolphin? ( kde-frameworks/extra-cmake-modules ) test? ( dev-util/cmocka dev-qt/qttest:5 ) sys-devel/make >=dev-util/cmake-3.7.2
+DEPEND=>=dev-db/sqlite-3.4:3 dev-libs/qtkeychain[qt5] dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtsql:5 dev-qt/qtwidgets:5 sys-fs/inotify-tools virtual/libiconv dolphin? ( kde-frameworks/kcoreaddons:5 kde-frameworks/kio:5 ) nautilus? ( dev-python/nautilus-python ) samba? ( >=net-fs/samba-3.5 ) sftp? ( >=net-libs/libssh-0.5 ) shibboleth? ( dev-qt/qtwebkit:5 ) dev-qt/linguist-tools:5 doc? ( dev-python/sphinx dev-texlive/texlive-latexextra virtual/latex-base ) dolphin? ( kde-frameworks/extra-cmake-modules ) test? ( dev-util/cmocka dev-qt/qttest:5 ) sys-devel/make >=dev-util/cmake-3.7.2
 DESCRIPTION=Nextcloud themed desktop client
 EAPI=6
 HOMEPAGE=https://github.com/nextcloud/client_theming
 IUSE=doc dolphin nautilus samba +sftp shibboleth test
 KEYWORDS=~amd64 ~x86
 LICENSE=CC-BY-3.0 GPL-2
-RDEPEND=>=dev-db/sqlite-3.4:3 dev-libs/qtkeychain[qt5] dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtsql:5 dev-qt/qtwidgets:5 sys-fs/inotify-tools virtual/libiconv dolphin? ( kde-frameworks/kcoreaddons:5 kde-frameworks/kio:5 ) nautilus? ( dev-python/nautilus-python ) samba? ( >=net-fs/samba-3.5 ) sftp? ( >=net-libs/libssh-0.5 ) shibboleth? ( dev-qt/qtwebkit:5 ) !net-misc/ocsync !net-misc/owncloud-client
+RDEPEND=>=dev-db/sqlite-3.4:3 dev-libs/qtkeychain[qt5] dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtsql:5 dev-qt/qtwidgets:5 sys-fs/inotify-tools virtual/libiconv dolphin? ( kde-frameworks/kcoreaddons:5 kde-frameworks/kio:5 ) nautilus? ( dev-python/nautilus-python ) samba? ( >=net-fs/samba-3.5 ) sftp? ( >=net-libs/libssh-0.5 ) shibboleth? ( dev-qt/qtwebkit:5 ) !net-misc/ocsync !net-misc/owncloud-client
 SLOT=0
 SRC_URI=http://download.owncloud.com/desktop/stable/owncloudclient-2.3.2.tar.xz https://github.com/nextcloud/client_theming/archive/v2.3.2.tar.gz -> nextcloud-client-2.3.2.tar.gz
 _eclass_exported_funcs=pkg_postinst:- src_unpack:- src_prepare:- src_configure:- src_compile:cmake-utils src_test:cmake-utils src_install:cmake-utils
 _eclasses_=cmake-utils	026933aff3889190eeb565b642cfe252	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	8fec6b1eb195836560e70b66d98fb163	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=15f24e010ee19396c9e2d5a1ea87f685
+_md5_=2dba54f5f1866fe3e75bb7cda8893386
diff --git a/metadata/md5-cache/x11-plugins/gkrellfire-0.4.2 b/metadata/md5-cache/x11-plugins/gkrellfire-0.4.2
deleted file mode 100644
index 0e51e925876f..000000000000
--- a/metadata/md5-cache/x11-plugins/gkrellfire-0.4.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install setup
-DEPEND==app-admin/gkrellm-2* virtual/pkgconfig
-DESCRIPTION=Cpu load flames for GKrellM 2
-EAPI=0
-HOMEPAGE=http://people.freenet.de/thomas-steinke
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND==app-admin/gkrellm-2*
-SLOT=0
-SRC_URI=ftp://ftp.freebsd.org/pub/FreeBSD/ports/distfiles/gkrellfire-0.4.2.tgz
-_eclass_exported_funcs=pkg_setup:gkrellm-plugin src_install:gkrellm-plugin
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	gkrellm-plugin	0c6887ede1f3cc3067a1d1acb8aff2e9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	8fec6b1eb195836560e70b66d98fb163
-_md5_=55a1dc9decc9bc8fc66f342814e7c3ed
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 a9c7625c3290..ff087c684cdf 100644
--- a/metadata/md5-cache/x11-plugins/gkrellfire-0.4.2-r1
+++ b/metadata/md5-cache/x11-plugins/gkrellfire-0.4.2-r1
@@ -3,11 +3,11 @@ DEPEND=app-admin/gkrellm[X] =app-admin/gkrellm-2* virtual/pkgconfig
 DESCRIPTION=CPU load flames for GKrellM 2
 EAPI=6
 HOMEPAGE=http://people.freenet.de/thomas-steinke
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=app-admin/gkrellm[X] =app-admin/gkrellm-2*
 SLOT=0
 SRC_URI=ftp://ftp.freebsd.org/pub/FreeBSD/ports/distfiles/gkrellfire-0.4.2.tgz
 _eclass_exported_funcs=pkg_setup:gkrellm-plugin src_compile:- src_install:gkrellm-plugin
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	gkrellm-plugin	0c6887ede1f3cc3067a1d1acb8aff2e9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	8fec6b1eb195836560e70b66d98fb163
-_md5_=ad7adf82b8e4a523d87b0653c9fd14aa
+_md5_=7eaf8ac25b274d59201854b8ce119433
diff --git a/metadata/md5-cache/x11-plugins/gkrellm-bgchanger-0.1.10 b/metadata/md5-cache/x11-plugins/gkrellm-bgchanger-0.1.10
deleted file mode 100644
index 05a41ae98b28..000000000000
--- a/metadata/md5-cache/x11-plugins/gkrellm-bgchanger-0.1.10
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install setup
-DEPEND==app-admin/gkrellm-2* virtual/pkgconfig
-DESCRIPTION=Plugin for GKrellM2 to change your desktop background
-EAPI=4
-HOMEPAGE=http://www.bender-suhl.de/stefan/english/comp/gkrellmbgchg.html
-KEYWORDS=~alpha ~amd64 ~ppc ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND==app-admin/gkrellm-2*
-SLOT=2
-SRC_URI=http://www.bender-suhl.de/stefan/comp/sources/gkrellmbgchg2-0.1.10.tar.gz
-_eclass_exported_funcs=pkg_setup:gkrellm-plugin src_install:gkrellm-plugin
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	gkrellm-plugin	0c6887ede1f3cc3067a1d1acb8aff2e9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	8fec6b1eb195836560e70b66d98fb163
-_md5_=3d0babc8da953c6f5a274d7b94d509f1
diff --git a/metadata/md5-cache/x11-plugins/gkrellm-bgchanger-0.1.11 b/metadata/md5-cache/x11-plugins/gkrellm-bgchanger-0.1.11
deleted file mode 100644
index e72583fd71a9..000000000000
--- a/metadata/md5-cache/x11-plugins/gkrellm-bgchanger-0.1.11
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install setup
-DEPEND==app-admin/gkrellm-2* virtual/pkgconfig
-DESCRIPTION=Plugin for GKrellM2 to change your desktop background
-EAPI=4
-HOMEPAGE=http://www.bender-suhl.de/stefan/english/comp/gkrellmbgchg.html
-KEYWORDS=~alpha ~amd64 ~ppc ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND==app-admin/gkrellm-2*
-SLOT=2
-SRC_URI=http://www.bender-suhl.de/stefan/comp/sources/gkrellmbgchg2-0.1.11.tar.gz
-_eclass_exported_funcs=pkg_setup:gkrellm-plugin src_install:gkrellm-plugin
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	gkrellm-plugin	0c6887ede1f3cc3067a1d1acb8aff2e9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	8fec6b1eb195836560e70b66d98fb163
-_md5_=3d0babc8da953c6f5a274d7b94d509f1
diff --git a/metadata/md5-cache/x11-plugins/gkrellm-bgchanger-0.1.11-r1 b/metadata/md5-cache/x11-plugins/gkrellm-bgchanger-0.1.11-r2
index 5d3572c6ca9c..64b976bcd1c8 100644
--- a/metadata/md5-cache/x11-plugins/gkrellm-bgchanger-0.1.11-r1
+++ b/metadata/md5-cache/x11-plugins/gkrellm-bgchanger-0.1.11-r2
@@ -1,13 +1,13 @@
 DEFINED_PHASES=install prepare setup
-DEPEND==app-admin/gkrellm-2* virtual/pkgconfig
+DEPEND=app-admin/gkrellm[X] =app-admin/gkrellm-2* virtual/pkgconfig
 DESCRIPTION=Plugin for GKrellM2 to change your desktop background
-EAPI=4
+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-2*
+RDEPEND=app-admin/gkrellm[X] =app-admin/gkrellm-2*
 SLOT=2
 SRC_URI=http://www.bender-suhl.de/stefan/comp/sources/gkrellmbgchg2-0.1.11.tar.gz
 _eclass_exported_funcs=pkg_setup:gkrellm-plugin src_prepare:- src_install:gkrellm-plugin
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	gkrellm-plugin	0c6887ede1f3cc3067a1d1acb8aff2e9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	8fec6b1eb195836560e70b66d98fb163
-_md5_=e90ef67fb97d12d4b1501e9630835891
+_md5_=9c912339ba88c48ebb40537ae217e14f
diff --git a/metadata/md5-cache/x11-plugins/gkrellm-bluez-0.2-r1 b/metadata/md5-cache/x11-plugins/gkrellm-bluez-0.2-r2
index 83542947e5c1..5de1a705ba00 100644
--- a/metadata/md5-cache/x11-plugins/gkrellm-bluez-0.2-r1
+++ b/metadata/md5-cache/x11-plugins/gkrellm-bluez-0.2-r2
@@ -1,13 +1,13 @@
-DEFINED_PHASES=compile install setup unpack
+DEFINED_PHASES=configure install prepare setup
 DEPEND==app-admin/gkrellm-2* virtual/pkgconfig
 DESCRIPTION=GKrellm plugin for monitoring bluetooth (Linux BlueZ) adapters
-EAPI=0
+EAPI=6
 HOMEPAGE=http://gkrellm-bluez.sourceforge.net
 KEYWORDS=amd64 x86
 LICENSE=GPL-2
-RDEPEND=net-wireless/bluez =app-admin/gkrellm-2*
+RDEPEND=app-admin/gkrellm[X] net-wireless/bluez =app-admin/gkrellm-2*
 SLOT=0
 SRC_URI=mirror://sourceforge/gkrellm-bluez/gkrellm-bluez-0.2.tar.gz
-_eclass_exported_funcs=pkg_setup:gkrellm-plugin src_unpack:- src_compile:- src_install:gkrellm-plugin
+_eclass_exported_funcs=pkg_setup:gkrellm-plugin src_prepare:- src_configure:- src_install:gkrellm-plugin
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	gkrellm-plugin	0c6887ede1f3cc3067a1d1acb8aff2e9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	8fec6b1eb195836560e70b66d98fb163
-_md5_=2c2a910bb895317fa29b588c516ef161
+_md5_=003aaa7c03c84438840b14ed152d5864
diff --git a/metadata/md5-cache/x11-plugins/gkrellm-cpupower-0.1.6-r1 b/metadata/md5-cache/x11-plugins/gkrellm-cpupower-0.1.6-r1
deleted file mode 100644
index dd497021c373..000000000000
--- a/metadata/md5-cache/x11-plugins/gkrellm-cpupower-0.1.6-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst setup
-DEPEND==app-admin/gkrellm-2* 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/sudo sys-power/cpupower !x11-plugins/gkrellm-cpufreq =app-admin/gkrellm-2*
-SLOT=0
-SRC_URI=https://github.com/sainsaar/gkrellm2-cpupower/archive/0.1.6.tar.gz -> gkrellm2-cpupower-0.1.6.tar.gz
-_eclass_exported_funcs=pkg_postinst:- pkg_setup:gkrellm-plugin src_install:-
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	gkrellm-plugin	0c6887ede1f3cc3067a1d1acb8aff2e9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	8fec6b1eb195836560e70b66d98fb163
-_md5_=b714b874e08dadf6a514caf163767655
diff --git a/metadata/md5-cache/x11-plugins/gkrellm-cpupower-0.2 b/metadata/md5-cache/x11-plugins/gkrellm-cpupower-0.2-r1
index 337095b30fd7..21b71769c2f8 100644
--- a/metadata/md5-cache/x11-plugins/gkrellm-cpupower-0.2
+++ b/metadata/md5-cache/x11-plugins/gkrellm-cpupower-0.2-r1
@@ -5,9 +5,9 @@ EAPI=6
 HOMEPAGE=https://github.com/sainsaar/gkrellm2-cpupower/
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=app-admin/sudo sys-power/cpupower =app-admin/gkrellm-2*
+RDEPEND=app-admin/gkrellm[X] app-admin/sudo sys-power/cpupower =app-admin/gkrellm-2*
 SLOT=0
 SRC_URI=https://github.com/sainsaar/gkrellm2-cpupower/archive/0.2.tar.gz -> gkrellm2-cpupower-0.2.tar.gz
 _eclass_exported_funcs=pkg_postinst:- pkg_setup:gkrellm-plugin src_install:-
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	gkrellm-plugin	0c6887ede1f3cc3067a1d1acb8aff2e9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	8fec6b1eb195836560e70b66d98fb163
-_md5_=7c5ccefcde122e8c2aa91151c11b10fb
+_md5_=55ca5364544f2092ea1210b7263ef85c
diff --git a/metadata/md5-cache/x11-plugins/gkrellm-mailwatch-2.4.3-r1 b/metadata/md5-cache/x11-plugins/gkrellm-mailwatch-2.4.3-r2
index 0ed8460f223b..853513e6c558 100644
--- a/metadata/md5-cache/x11-plugins/gkrellm-mailwatch-2.4.3-r1
+++ b/metadata/md5-cache/x11-plugins/gkrellm-mailwatch-2.4.3-r2
@@ -1,13 +1,13 @@
-DEFINED_PHASES=compile install prepare setup
+DEFINED_PHASES=compile install setup
 DEPEND==app-admin/gkrellm-2* virtual/pkgconfig
 DESCRIPTION=A GKrellM2 plugin that shows the status of additional mail boxes
-EAPI=3
+EAPI=6
 HOMEPAGE=http://gkrellm.luon.net/mailwatch.php
 KEYWORDS=~alpha ~amd64 ~ppc ~sparc ~x86
 LICENSE=GPL-2
-RDEPEND==app-admin/gkrellm-2*
+RDEPEND=app-admin/gkrellm[X] =app-admin/gkrellm-2*
 SLOT=2
 SRC_URI=http://gkrellm.luon.net/files/gkrellm-mailwatch-2.4.3.tar.gz
-_eclass_exported_funcs=pkg_setup:gkrellm-plugin src_prepare:- src_compile:- src_install:gkrellm-plugin
+_eclass_exported_funcs=pkg_setup:gkrellm-plugin src_compile:- src_install:gkrellm-plugin
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	gkrellm-plugin	0c6887ede1f3cc3067a1d1acb8aff2e9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	8fec6b1eb195836560e70b66d98fb163
-_md5_=7808cf68fd56f56eacf52739c1820a19
+_md5_=d359a738360e3c7e7dc83081f9b1c997
diff --git a/metadata/md5-cache/x11-plugins/gkrellm-trayicons-1.03 b/metadata/md5-cache/x11-plugins/gkrellm-trayicons-1.03-r1
index bf8c202bc555..903113c46710 100644
--- a/metadata/md5-cache/x11-plugins/gkrellm-trayicons-1.03
+++ b/metadata/md5-cache/x11-plugins/gkrellm-trayicons-1.03-r1
@@ -5,9 +5,9 @@ EAPI=6
 HOMEPAGE=http://gkrellm.srcbox.net/Plugins.html
 KEYWORDS=amd64 ppc sparc x86
 LICENSE=GPL-2
-RDEPEND==app-admin/gkrellm-2*
+RDEPEND=app-admin/gkrellm[X] =app-admin/gkrellm-2*
 SLOT=0
 SRC_URI=mirror://gentoo/gkrellm-trayicons-1.03.tar.gz
 _eclass_exported_funcs=pkg_setup:gkrellm-plugin src_compile:- src_install:gkrellm-plugin
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	gkrellm-plugin	0c6887ede1f3cc3067a1d1acb8aff2e9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	8fec6b1eb195836560e70b66d98fb163
-_md5_=1ed6ec4f599b32977f3735cc4351e47f
+_md5_=e6b77815c930324acfc4d08e1053c4f7
diff --git a/metadata/md5-cache/x11-plugins/gkrellm-vaiobright-2.5-r1 b/metadata/md5-cache/x11-plugins/gkrellm-vaiobright-2.5-r2
index be434ef8e1db..39903fe0ffc3 100644
--- a/metadata/md5-cache/x11-plugins/gkrellm-vaiobright-2.5-r1
+++ b/metadata/md5-cache/x11-plugins/gkrellm-vaiobright-2.5-r2
@@ -1,13 +1,13 @@
-DEFINED_PHASES=install setup unpack
+DEFINED_PHASES=install setup
 DEPEND==app-admin/gkrellm-2* virtual/pkgconfig
 DESCRIPTION=Superslim VAIO LCD Brightness Control Plugin for Gkrellm
-EAPI=0
+EAPI=6
 HOMEPAGE=http://nerv-un.net/~dragorn/
-KEYWORDS=-* x86
+KEYWORDS=~amd64 x86
 LICENSE=GPL-2
-RDEPEND==app-admin/gkrellm-2*
+RDEPEND=app-admin/gkrellm[X] =app-admin/gkrellm-2*
 SLOT=2
 SRC_URI=http://nerv-un.net/~dragorn/code/vaiobright-2.5.tar.gz
-_eclass_exported_funcs=pkg_setup:gkrellm-plugin src_unpack:- src_install:gkrellm-plugin
+_eclass_exported_funcs=pkg_setup:gkrellm-plugin src_install:gkrellm-plugin
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	gkrellm-plugin	0c6887ede1f3cc3067a1d1acb8aff2e9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	8fec6b1eb195836560e70b66d98fb163
-_md5_=b33acfdbddea75491a82df860a82c2ba
+_md5_=61e7f7a7c46bd661760692d3ba51ffc2
diff --git a/metadata/md5-cache/x11-plugins/gkrellmoon-0.6-r1 b/metadata/md5-cache/x11-plugins/gkrellmoon-0.6-r2
index a8c4cb1785ee..6d9d63fb20b1 100644
--- a/metadata/md5-cache/x11-plugins/gkrellmoon-0.6-r1
+++ b/metadata/md5-cache/x11-plugins/gkrellmoon-0.6-r2
@@ -5,9 +5,9 @@ EAPI=6
 HOMEPAGE=http://gkrellmoon.sourceforge.net/
 KEYWORDS=alpha amd64 ppc sparc x86
 LICENSE=GPL-2
-RDEPEND=media-libs/imlib2 =app-admin/gkrellm-2*
+RDEPEND=media-libs/imlib2 app-admin/gkrellm[X] =app-admin/gkrellm-2*
 SLOT=2
 SRC_URI=mirror://sourceforge/gkrellmoon/gkrellmoon-0.6.tar.gz
 _eclass_exported_funcs=pkg_setup:gkrellm-plugin src_prepare:- src_compile:- src_install:gkrellm-plugin
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	gkrellm-plugin	0c6887ede1f3cc3067a1d1acb8aff2e9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	8fec6b1eb195836560e70b66d98fb163
-_md5_=9ddd82c8f89ceb2bc1e55ea54457b93e
+_md5_=96041879f8ec11638b15e28ac732b7b1
diff --git a/metadata/md5-cache/x11-plugins/gkrellmss-2.6 b/metadata/md5-cache/x11-plugins/gkrellmss-2.6
deleted file mode 100644
index a6b6818d7ec7..000000000000
--- a/metadata/md5-cache/x11-plugins/gkrellmss-2.6
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install setup
-DEPEND==sci-libs/fftw-2* media-libs/alsa-lib =app-admin/gkrellm-2* virtual/pkgconfig
-DESCRIPTION=A plugin for GKrellM2 that has a VU meter and a sound chart
-EAPI=5
-HOMEPAGE=http://members.dslextreme.com/users/billw/gkrellmss/gkrellmss.html
-IUSE=nls
-KEYWORDS=~alpha amd64 ppc sparc x86
-LICENSE=GPL-2
-RDEPEND==sci-libs/fftw-2* media-libs/alsa-lib =app-admin/gkrellm-2*
-SLOT=0
-SRC_URI=http://web.wt.net/~billw/gkrellmss/gkrellmss-2.6.tar.gz
-_eclass_exported_funcs=pkg_setup:gkrellm-plugin src_compile:- src_install:gkrellm-plugin
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	gkrellm-plugin	0c6887ede1f3cc3067a1d1acb8aff2e9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	8fec6b1eb195836560e70b66d98fb163
-_md5_=c69212c44dec64cb494eba5222f65c26
diff --git a/metadata/md5-cache/x11-plugins/gkrellmss-2.6-r1 b/metadata/md5-cache/x11-plugins/gkrellmss-2.6-r1
deleted file mode 100644
index 1f14ebbe9762..000000000000
--- a/metadata/md5-cache/x11-plugins/gkrellmss-2.6-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install setup
-DEPEND==sci-libs/fftw-3* media-libs/alsa-lib =app-admin/gkrellm-2* virtual/pkgconfig
-DESCRIPTION=A plugin for GKrellM2 that has a VU meter and a sound chart
-EAPI=5
-HOMEPAGE=http://members.dslextreme.com/users/billw/gkrellmss/gkrellmss.html
-IUSE=nls
-KEYWORDS=alpha amd64 ppc ~sparc x86
-LICENSE=GPL-2
-RDEPEND==sci-libs/fftw-3* media-libs/alsa-lib =app-admin/gkrellm-2*
-SLOT=0
-SRC_URI=http://web.wt.net/~billw/gkrellmss/gkrellmss-2.6.tar.gz
-_eclass_exported_funcs=pkg_setup:gkrellm-plugin src_compile:- src_install:gkrellm-plugin
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	gkrellm-plugin	0c6887ede1f3cc3067a1d1acb8aff2e9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	8fec6b1eb195836560e70b66d98fb163
-_md5_=fc87fa52e95230f7a3a668c414bab978
diff --git a/metadata/md5-cache/x11-plugins/gkrellmss-2.6-r3 b/metadata/md5-cache/x11-plugins/gkrellmss-2.6-r4
index 342b89498655..0c634a604802 100644
--- a/metadata/md5-cache/x11-plugins/gkrellmss-2.6-r3
+++ b/metadata/md5-cache/x11-plugins/gkrellmss-2.6-r4
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile install setup
-DEPEND==sci-libs/fftw-3* media-libs/alsa-lib =app-admin/gkrellm-2* virtual/pkgconfig
+DEPEND=app-admin/gkrellm[X] media-libs/alsa-lib sci-libs/fftw:3.0= =app-admin/gkrellm-2* 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
+KEYWORDS=~alpha amd64 ~ppc ~sparc x86
 LICENSE=GPL-2
-RDEPEND==sci-libs/fftw-3* media-libs/alsa-lib =app-admin/gkrellm-2*
+RDEPEND=app-admin/gkrellm[X] media-libs/alsa-lib sci-libs/fftw:3.0= =app-admin/gkrellm-2*
 SLOT=0
 SRC_URI=http://web.wt.net/~billw/gkrellmss/gkrellmss-2.6.tar.gz
 _eclass_exported_funcs=pkg_setup:gkrellm-plugin src_compile:- src_install:gkrellm-plugin
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	gkrellm-plugin	0c6887ede1f3cc3067a1d1acb8aff2e9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	8fec6b1eb195836560e70b66d98fb163
-_md5_=3b2113f168f7a7ccff754da46959548d
+_md5_=7576c43a7b4cbe3bf287af8ab1599a1c
diff --git a/metadata/md5-cache/x11-plugins/gkrellmwireless-2.0.3 b/metadata/md5-cache/x11-plugins/gkrellmwireless-2.0.3
deleted file mode 100644
index 0a5dd68c6b84..000000000000
--- a/metadata/md5-cache/x11-plugins/gkrellmwireless-2.0.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install setup
-DEPEND==app-admin/gkrellm-2* virtual/pkgconfig
-DESCRIPTION=A plugin for GKrellM that monitors your wireless network card
-EAPI=0
-HOMEPAGE=http://gkrellm.luon.net/gkrellmwireless.php
-KEYWORDS=amd64 ppc ~sparc x86
-LICENSE=GPL-2
-RDEPEND==app-admin/gkrellm-2*
-SLOT=2
-SRC_URI=http://gkrellm.luon.net/files/gkrellmwireless-2.0.3.tar.gz
-_eclass_exported_funcs=pkg_setup:gkrellm-plugin src_install:gkrellm-plugin
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	gkrellm-plugin	0c6887ede1f3cc3067a1d1acb8aff2e9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	8fec6b1eb195836560e70b66d98fb163
-_md5_=013a2a45c0598e62b6438278c0c7351e
diff --git a/metadata/md5-cache/x11-plugins/gkrellmwireless-2.0.3-r1 b/metadata/md5-cache/x11-plugins/gkrellmwireless-2.0.3-r2
index d2de27476b12..97f6fb90cdd8 100644
--- a/metadata/md5-cache/x11-plugins/gkrellmwireless-2.0.3-r1
+++ b/metadata/md5-cache/x11-plugins/gkrellmwireless-2.0.3-r2
@@ -1,13 +1,13 @@
 DEFINED_PHASES=install prepare setup
 DEPEND==app-admin/gkrellm-2* virtual/pkgconfig
 DESCRIPTION=A plugin for GKrellM that monitors your wireless network card
-EAPI=2
+EAPI=6
 HOMEPAGE=http://gkrellm.luon.net/gkrellmwireless.php
 KEYWORDS=amd64 ~ppc ~sparc x86
 LICENSE=GPL-2
-RDEPEND==app-admin/gkrellm-2*
+RDEPEND=app-admin/gkrellm[X] =app-admin/gkrellm-2*
 SLOT=2
 SRC_URI=http://gkrellm.luon.net/files/gkrellmwireless-2.0.3.tar.gz
 _eclass_exported_funcs=pkg_setup:gkrellm-plugin src_prepare:- src_install:gkrellm-plugin
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	gkrellm-plugin	0c6887ede1f3cc3067a1d1acb8aff2e9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	8fec6b1eb195836560e70b66d98fb163
-_md5_=d7e421f19fa09c84f1553a19a0d3f5a9
+_md5_=aa4f9c17426f87b689f1d7ea6fafa653
diff --git a/metadata/md5-cache/x11-plugins/gkrellshoot-0.4.4-r1 b/metadata/md5-cache/x11-plugins/gkrellshoot-0.4.4-r2
index 0ad448cb23e6..51ffc5438487 100644
--- a/metadata/md5-cache/x11-plugins/gkrellshoot-0.4.4-r1
+++ b/metadata/md5-cache/x11-plugins/gkrellshoot-0.4.4-r2
@@ -1,13 +1,13 @@
 DEFINED_PHASES=install setup
 DEPEND==app-admin/gkrellm-2* virtual/pkgconfig
 DESCRIPTION=GKrellm2 plugin to take screen shots and lock screen
-EAPI=4
+EAPI=6
 HOMEPAGE=http://gkrellshoot.sourceforge.net/
 KEYWORDS=alpha amd64 ppc sparc x86
 LICENSE=GPL-2
-RDEPEND=virtual/imagemagick-tools =app-admin/gkrellm-2*
+RDEPEND=app-admin/gkrellm[X] virtual/imagemagick-tools =app-admin/gkrellm-2*
 SLOT=2
 SRC_URI=mirror://sourceforge/gkrellshoot/gkrellshoot-0.4.4.tar.gz
 _eclass_exported_funcs=pkg_setup:gkrellm-plugin src_install:gkrellm-plugin
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	gkrellm-plugin	0c6887ede1f3cc3067a1d1acb8aff2e9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	8fec6b1eb195836560e70b66d98fb163
-_md5_=6c34191766ca7b1e4fe6008832e3a05b
+_md5_=47a79c4fc5378efcfaf8da0a9ad2b475
diff --git a/metadata/md5-cache/x11-plugins/gkrellstock-0.5-r1 b/metadata/md5-cache/x11-plugins/gkrellstock-0.5-r1
deleted file mode 100644
index 98cda3994b51..000000000000
--- a/metadata/md5-cache/x11-plugins/gkrellstock-0.5-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install prepare setup
-DEPEND=virtual/pkgconfig =app-admin/gkrellm-2* virtual/pkgconfig
-DESCRIPTION=Get Stock quotes plugin for Gkrellm2
-EAPI=5
-HOMEPAGE=http://gkrellstock.sourceforge.net/
-KEYWORDS=amd64 ppc x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/glib:2 x11-libs/gtk+:2 dev-perl/libwww-perl dev-perl/Finance-Quote =app-admin/gkrellm-2*
-SLOT=2
-SRC_URI=mirror://sourceforge/project/gkrellstock/GkrellM2.0%20Port/0.5/gkrellstock-0.5.tar.gz
-_eclass_exported_funcs=pkg_setup:gkrellm-plugin src_prepare:- src_compile:- src_install:-
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gkrellm-plugin	0c6887ede1f3cc3067a1d1acb8aff2e9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	8fec6b1eb195836560e70b66d98fb163
-_md5_=a9fdab84b46362a57abf272e6883bca4
diff --git a/metadata/md5-cache/x11-plugins/gkrellstock-0.5.1 b/metadata/md5-cache/x11-plugins/gkrellstock-0.5.1-r1
index d48cf42663dc..3495b056d26a 100644
--- a/metadata/md5-cache/x11-plugins/gkrellstock-0.5.1
+++ b/metadata/md5-cache/x11-plugins/gkrellstock-0.5.1-r1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile install prepare setup
 DEPEND=virtual/pkgconfig =app-admin/gkrellm-2* virtual/pkgconfig
 DESCRIPTION=Get Stock quotes plugin for Gkrellm2
-EAPI=5
+EAPI=6
 HOMEPAGE=http://gkrellstock.sourceforge.net/
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=amd64 ~ppc x86
 LICENSE=GPL-2
-RDEPEND=dev-libs/glib:2 x11-libs/gtk+:2 dev-perl/libwww-perl dev-perl/Finance-Quote =app-admin/gkrellm-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*
 SLOT=2
 SRC_URI=mirror://sourceforge/gkrellstock/gkrellstock-0.5.1.tar.gz
 _eclass_exported_funcs=pkg_setup:gkrellm-plugin src_prepare:- src_compile:- src_install:-
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gkrellm-plugin	0c6887ede1f3cc3067a1d1acb8aff2e9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	8fec6b1eb195836560e70b66d98fb163
-_md5_=59f98edbfa418c532b8d14ce8e330ee5
+_md5_=3f607f539ec50aaab0a90347d04a0695
diff --git a/metadata/md5-cache/x11-plugins/gkrelltop-2.2.13-r1 b/metadata/md5-cache/x11-plugins/gkrelltop-2.2.13-r2
index 1715da30431f..c3d44bfbd62f 100644
--- a/metadata/md5-cache/x11-plugins/gkrelltop-2.2.13-r1
+++ b/metadata/md5-cache/x11-plugins/gkrelltop-2.2.13-r2
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile install postinst prepare setup
-DEPEND=dev-libs/glib:2 x11-libs/gtk+:2 =app-admin/gkrellm-2* virtual/pkgconfig
+DEPEND=app-admin/gkrellm[X] dev-libs/glib:2 x11-libs/gtk+:2 =app-admin/gkrellm-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=dev-libs/glib:2 x11-libs/gtk+:2 =app-admin/gkrellm-2*
+RDEPEND=app-admin/gkrellm[X] dev-libs/glib:2 x11-libs/gtk+:2 =app-admin/gkrellm-2*
 SLOT=0
 SRC_URI=mirror://sourceforge/gkrelltop/gkrelltop_2.2.13.orig.tar.gz
 _eclass_exported_funcs=pkg_postinst:- pkg_setup:gkrellm-plugin src_prepare:- src_compile:- src_install:gkrellm-plugin
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	gkrellm-plugin	0c6887ede1f3cc3067a1d1acb8aff2e9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	8fec6b1eb195836560e70b66d98fb163
-_md5_=69c10e65fab010b0efa8675e6c40d122
+_md5_=dbdc9b82430eeea06f49144cea9bc4cf
diff --git a/metadata/md5-cache/x11-plugins/gkrellweather-2.0.8 b/metadata/md5-cache/x11-plugins/gkrellweather-2.0.8-r1
index 11995dc85b65..984e04f61efe 100644
--- a/metadata/md5-cache/x11-plugins/gkrellweather-2.0.8
+++ b/metadata/md5-cache/x11-plugins/gkrellweather-2.0.8-r1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile install prepare setup
 DEPEND=>=sys-apps/sed-4.0.5 virtual/pkgconfig =app-admin/gkrellm-2* virtual/pkgconfig
 DESCRIPTION=GKrellM2 Plugin that monitors a METAR station and displays weatherinfo
-EAPI=5
+EAPI=6
 HOMEPAGE=https://sites.google.com/site/makovick/gkrellm-plugins
-KEYWORDS=alpha amd64 ppc sparc x86
+KEYWORDS=~alpha amd64 ~ppc ~sparc x86
 LICENSE=GPL-2
-RDEPEND=>=dev-lang/perl-5.6.1 >=net-misc/wget-1.5.3 =app-admin/gkrellm-2*
+RDEPEND=app-admin/gkrellm[X] >=dev-lang/perl-5.6.1 >=net-misc/wget-1.5.3 =app-admin/gkrellm-2*
 SLOT=2
 SRC_URI=https://sites.google.com/site/makovick/projects/gkrellweather-2.0.8.tgz
 _eclass_exported_funcs=pkg_setup:gkrellm-plugin src_prepare:- src_compile:- src_install:-
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	flag-o-matic	61cad4fb5d800b29d484b27cb033f59b	gkrellm-plugin	0c6887ede1f3cc3067a1d1acb8aff2e9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	8fec6b1eb195836560e70b66d98fb163
-_md5_=d03a6d80a1d8c2f8cb1fd58698276b78
+_md5_=f6f8e929415573a5cf94adf487c553b8
diff --git a/metadata/md5-cache/x11-plugins/i8krellm-2.5-r1 b/metadata/md5-cache/x11-plugins/i8krellm-2.5-r1
deleted file mode 100644
index e3c132852455..000000000000
--- a/metadata/md5-cache/x11-plugins/i8krellm-2.5-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install prepare setup
-DEPEND=>=app-laptop/i8kutils-1.5 =app-admin/gkrellm-2* virtual/pkgconfig
-DESCRIPTION=GKrellM2 Plugin for the Dell Inspiron and Latitude notebooks
-EAPI=3
-HOMEPAGE=http://www.coding-zone.com/?page=i8krellm
-KEYWORDS=-* ~x86
-LICENSE=GPL-2
-RDEPEND=>=app-laptop/i8kutils-1.5 =app-admin/gkrellm-2*
-SLOT=0
-SRC_URI=http://www.coding-zone.com/i8krellm-2.5.tar.gz
-_eclass_exported_funcs=pkg_setup:gkrellm-plugin src_prepare:- src_install:gkrellm-plugin
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	gkrellm-plugin	0c6887ede1f3cc3067a1d1acb8aff2e9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	8fec6b1eb195836560e70b66d98fb163
-_md5_=50b6184fe420f4d246cb5fdbedc83986
diff --git a/metadata/md5-cache/x11-plugins/i8krellm-2.5 b/metadata/md5-cache/x11-plugins/i8krellm-2.5-r2
index 13543d033d53..5bd54080bea6 100644
--- a/metadata/md5-cache/x11-plugins/i8krellm-2.5
+++ b/metadata/md5-cache/x11-plugins/i8krellm-2.5-r2
@@ -1,13 +1,13 @@
 DEFINED_PHASES=install setup
-DEPEND=>=app-laptop/i8kutils-1.5 =app-admin/gkrellm-2* virtual/pkgconfig
+DEPEND=app-admin/gkrellm[X] >=app-laptop/i8kutils-1.5 =app-admin/gkrellm-2* virtual/pkgconfig
 DESCRIPTION=GKrellM2 Plugin for the Dell Inspiron and Latitude notebooks
-EAPI=0
+EAPI=6
 HOMEPAGE=http://www.coding-zone.com/?page=i8krellm
-KEYWORDS=x86 -ppc -sparc -alpha -mips -hppa
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
-RDEPEND=>=app-laptop/i8kutils-1.5 =app-admin/gkrellm-2*
+RDEPEND=app-admin/gkrellm[X] >=app-laptop/i8kutils-1.5 =app-admin/gkrellm-2*
 SLOT=0
 SRC_URI=http://www.coding-zone.com/i8krellm-2.5.tar.gz
 _eclass_exported_funcs=pkg_setup:gkrellm-plugin src_install:gkrellm-plugin
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	gkrellm-plugin	0c6887ede1f3cc3067a1d1acb8aff2e9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	8fec6b1eb195836560e70b66d98fb163
-_md5_=781e5d4bc9406df8a7ec59fd1f87c9c8
+_md5_=03765fcef946a4ea1e8bac99cd11fb93
diff --git a/metadata/pkg_desc_index b/metadata/pkg_desc_index
index 3a2e21f982c8..2ffb62ab3a0b 100644
--- a/metadata/pkg_desc_index
+++ b/metadata/pkg_desc_index
@@ -12928,7 +12928,7 @@ media-libs/esdl 1.0.1 1.2 1.3.1: Erlang bindings for the SDL library
 media-libs/exempi 2.2.1 2.4.2: Exempi is a port of the Adobe XMP SDK to work on UNIX
 media-libs/exiftool 10.55 10.59: Read and write meta information in image, audio and video files
 media-libs/faac 1.28-r4 1.29.2 1.29.3: Free MPEG-4 audio codecs by AudioCoding.com
-media-libs/faad2 2.7-r3 2.8.1: AAC audio decoding library
+media-libs/faad2 2.7-r3 2.8.1-r1: AAC audio decoding library
 media-libs/fdk-aac 0.1.3 0.1.5: Fraunhofer AAC codec library
 media-libs/ffmpegsource 2.23 9999: A libav/ffmpeg based source library for easy frame accurate access
 media-libs/fidlib 0.9.10 0.9.10-r1: Run-time filter design and execution library
@@ -19108,35 +19108,35 @@ x11-plugins/enigmail 1.9.6.1-r1 1.9.7 9999: Mozilla extension to provide GPG sup
 x11-plugins/epplets 0.12 0.14: Base files for Enlightenment epplets and some epplets
 x11-plugins/fsviewer 0.2.6 0.2.6-r1 0.2.6-r2: A file system viewer for Window Maker
 x11-plugins/gkrellaclock 0.3.4-r1: Nice analog clock for GKrellM2
-x11-plugins/gkrellfire 0.4.2 0.4.2-r1: CPU load flames for GKrellM 2
+x11-plugins/gkrellfire 0.4.2-r1: CPU load flames for GKrellM 2
 x11-plugins/gkrellflynn 0.8: A funny GKrellM2 load monitor (for Doom(tm) fans)
 x11-plugins/gkrellkam 2.0.0: an Image-Watcher-Plugin for GKrellM2
-x11-plugins/gkrellm-bgchanger 0.1.10 0.1.11 0.1.11-r1: Plugin for GKrellM2 to change your desktop background
-x11-plugins/gkrellm-bluez 0.2-r1: GKrellm plugin for monitoring bluetooth (Linux BlueZ) adapters
+x11-plugins/gkrellm-bgchanger 0.1.11-r2: Plugin for GKrellM2 to change your desktop background
+x11-plugins/gkrellm-bluez 0.2-r2: GKrellm plugin for monitoring bluetooth (Linux BlueZ) adapters
 x11-plugins/gkrellm-countdown 0.1.2-r1: A simple countdown clock for GKrellM2
-x11-plugins/gkrellm-cpupower 0.1.6-r1 0.2: A Gkrellm2 plugin for displaying and manipulating CPU frequency
+x11-plugins/gkrellm-cpupower 0.2-r1: A Gkrellm2 plugin for displaying and manipulating CPU frequency
 x11-plugins/gkrellm-imonc 0.2-r1: A GKrellM2 plugin to control a fli4l router
 x11-plugins/gkrellm-leds 0.8.2-r1: GKrellM2 plugin for monitoring keyboard LEDs
-x11-plugins/gkrellm-mailwatch 2.4.3-r1: A GKrellM2 plugin that shows the status of additional mail boxes
+x11-plugins/gkrellm-mailwatch 2.4.3-r2: A GKrellM2 plugin that shows the status of additional mail boxes
 x11-plugins/gkrellm-plugins 2.0: emerge this package to install all of the gkrellm plugins
 x11-plugins/gkrellm-radio 2.0.4: A minimalistic GKrellM2 plugin to control radio tuners
-x11-plugins/gkrellm-trayicons 1.03: Configurable Tray Icons for GKrellM
-x11-plugins/gkrellm-vaiobright 2.5-r1: Superslim VAIO LCD Brightness Control Plugin for Gkrellm
+x11-plugins/gkrellm-trayicons 1.03-r1: Configurable Tray Icons for GKrellM
+x11-plugins/gkrellm-vaiobright 2.5-r2: Superslim VAIO LCD Brightness Control Plugin for Gkrellm
 x11-plugins/gkrellm-volume 2.1.13-r2: A mixer control plugin for gkrellm
 x11-plugins/gkrellm-xkb 1.05-r1: XKB keyboard switcher for gkrellm2
 x11-plugins/gkrellmlaunch 0.5: A Program-Launcher Plugin for GKrellM2
-x11-plugins/gkrellmoon 0.6-r1: A GKrellM2 plugin of the famous wmMoonClock dockapp
-x11-plugins/gkrellmss 2.6 2.6-r1 2.6-r3: A plugin for GKrellM2 that has a VU meter and a sound chart
-x11-plugins/gkrellmwireless 2.0.3 2.0.3-r1: A plugin for GKrellM that monitors your wireless network card
-x11-plugins/gkrellshoot 0.4.4-r1: GKrellm2 plugin to take screen shots and lock screen
-x11-plugins/gkrellstock 0.5-r1 0.5.1: Get Stock quotes plugin for Gkrellm2
+x11-plugins/gkrellmoon 0.6-r2: A GKrellM2 plugin of the famous wmMoonClock dockapp
+x11-plugins/gkrellmss 2.6-r4: A plugin for GKrellM2 that has a VU meter and a sound chart
+x11-plugins/gkrellmwireless 2.0.3-r2: A plugin for GKrellM that monitors your wireless network card
+x11-plugins/gkrellshoot 0.4.4-r2: GKrellm2 plugin to take screen shots and lock screen
+x11-plugins/gkrellstock 0.5.1-r1: Get Stock quotes plugin for Gkrellm2
 x11-plugins/gkrellsun 1.0.0-r4: A GKrellM plugin that shows sunrise and sunset times
-x11-plugins/gkrelltop 2.2.13-r1: a GKrellM2 plugin which displays the top three processes
-x11-plugins/gkrellweather 2.0.8: GKrellM2 Plugin that monitors a METAR station and displays weatherinfo
+x11-plugins/gkrelltop 2.2.13-r2: a GKrellM2 plugin which displays the top three processes
+x11-plugins/gkrellweather 2.0.8-r1: GKrellM2 Plugin that monitors a METAR station and displays weatherinfo
 x11-plugins/gkwebmon 0.2-r2: A web monitor plugin for GKrellM2
 x11-plugins/guifications 2.16: Guifications is a graphical notification plugin for pidgin
 x11-plugins/hexchat-javascript 0.3.1 0.3.2: Javascript interface for HexChat
-x11-plugins/i8krellm 2.5 2.5-r1: GKrellM2 Plugin for the Dell Inspiron and Latitude notebooks
+x11-plugins/i8krellm 2.5-r2: GKrellM2 Plugin for the Dell Inspiron and Latitude notebooks
 x11-plugins/monto 0.1.1-r1: a simple manual device mounter (up to four devices)
 x11-plugins/pidgin-birthday-reminder 1.7 1.7-r1: Plugin for Pidgin that reminds you of your buddies birthdays
 x11-plugins/pidgin-bot-sentry 1.3.0: Bot Sentry is a Pidgin plugin to prevent Instant Message (IM) spam
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 8b83eae9563a..3b0f61945f04 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Wed, 26 Jul 2017 11:30:26 +0000
+Wed, 26 Jul 2017 11:58:00 +0000