gentoo resync : 28.04.2018

5 files changed, 23 insertions, 22 deletions

diff --git a/x11-plugins/Manifest.gz b/x11-plugins/Manifest.gz
index 11f76d7e33bd..0a66f1f91a0b 100644
--- a/x11-plugins/Manifest.gz
+++ b/x11-plugins/Manifest.gz
diff --git a/x11-plugins/asclock/Manifest b/x11-plugins/asclock/Manifest
index 35cb23a78dc9..c74e43d82e5d 100644
--- a/x11-plugins/asclock/Manifest
+++ b/x11-plugins/asclock/Manifest
@@ -1,4 +1,4 @@
 AUX asclock-gcc41.patch 1528 BLAKE2B ec7f3e2361f06bd995128234fc60ceb9e3998054912f78a954eb05a04f376d231a59eb6e9d583940694f01388f81b0f0c2e33a098a2032d5e3917e629421ab57 SHA512 73d5edb1c3b1a287c9f00ad35491994f5d51bf0d5df2d81c3d428da0ed53eb4a73c0da1fe979d7479df103164e440b8a3472e18306c9fc5f85fd313d29f34b0d
 DIST asclock-2.0.12.tar.gz 111858 BLAKE2B acc5e25c268f013c30e7c35e5f162246839b6ffdd049e041e47bd9eee5a9fd6f62b27bb5f8eec157a2b19f6a930f9084531d3c1a7e9cd19cdfdd4ba33005f952 SHA512 408c0cbd7d8c19e8cda450ed1e3e0857dd908768557221b5707bda4eaa56170899bb3ecbe1d9f487ad7cbe7ebe36019cfe7a19f58dae2b918fb1179d67a8bb0e
-EBUILD asclock-2.0.12-r2.ebuild 1532 BLAKE2B 2db9ae879a505a671a09632e600dc3bb7532e45df4a7ff657c0dfc1fa75bccc305de48680bc3b131ce1f1d11869f7f3ed6732a8b5fd3f3571887d799d6d8b55a SHA512 9922077c2696a212c1208aa2e9f10f2b022426b7130f055f15c7f354c5e182208df8584366ce50779939cffca785262418683a46897753b0485079d9eebd23ae
+EBUILD asclock-2.0.12-r3.ebuild 1493 BLAKE2B ab1352ae8a55301cad73f8e99742cd650110b3661ffceead965ad6bf3f0356262ec63000c9d3946afd71c3876092934aa9149b6d807faceb77b1fb8fce4708d2 SHA512 9cba90a2e51022f2c6a6981a6017650887fa20e530f5fe673854b6687bf35d4eda23ed36cb6dc89615fef0849494b9f99719cdff6cfab9f3602f89c2e4dd408f
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/x11-plugins/asclock/asclock-2.0.12-r2.ebuild b/x11-plugins/asclock/asclock-2.0.12-r3.ebuild
index e7b14ca2e97a..96b5e7d11f71 100644
--- a/x11-plugins/asclock/asclock-2.0.12-r2.ebuild
+++ b/x11-plugins/asclock/asclock-2.0.12-r3.ebuild
@@ -14,9 +14,7 @@ SLOT="0"
 KEYWORDS="amd64 ~mips ppc sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
 
 DEPEND="x11-libs/libXpm"
-RDEPEND="${DEPEND}
-	x11-proto/xextproto
-	x11-proto/xproto"
+RDEPEND="${DEPEND}"
 
 PATCHES=( "${FILESDIR}"/${PN}-gcc41.patch )
 
diff --git a/x11-plugins/gkrellm-plugins/Manifest b/x11-plugins/gkrellm-plugins/Manifest
index 47024a214059..7e3cd41840f4 100644
--- a/x11-plugins/gkrellm-plugins/Manifest
+++ b/x11-plugins/gkrellm-plugins/Manifest
@@ -1,2 +1,2 @@
-EBUILD gkrellm-plugins-2.0.ebuild 808 BLAKE2B 945d4765211f9477299f8f4fdf1bf08ecac584557f9db038ab8b4d954f046ad14b0863195d6319b9dde9e80a803aa64083077717c64b69a9305c9bf30cdb02ee SHA512 3bc252901f5826c63929e30216d016d0a3cd368f2f768821a52f85a88953203d0b2c077bbfb0246e23aff25fd12164e6ebe49948f3af110002b2e774dcb9e018
+EBUILD gkrellm-plugins-2.0.ebuild 805 BLAKE2B 0c92e4f791213e9a2b436e7060bf586e575a6455cf59bb257b413618c8fe2706b0b79aeba876bb67a872f451e15f41bd55b23d2a386c47d3bbf53ef88d489372 SHA512 452f5ee6e8cf661d2c246d8f7b587202b0aa147f142f29d9127dc2faac3a143a0302ce3767d31514dbc20cb54ecc3ebbb6c6e17c92c0012e34f8d641a312a6e7
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/x11-plugins/gkrellm-plugins/gkrellm-plugins-2.0.ebuild b/x11-plugins/gkrellm-plugins/gkrellm-plugins-2.0.ebuild
index af78e89de169..fc1bb55b84e2 100644
--- a/x11-plugins/gkrellm-plugins/gkrellm-plugins-2.0.ebuild
+++ b/x11-plugins/gkrellm-plugins/gkrellm-plugins-2.0.ebuild
@@ -1,8 +1,10 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=6
+
 DESCRIPTION="emerge this package to install all of the gkrellm plugins"
-HOMEPAGE="http://www.gkrellm.net/"
+HOMEPAGE="http://gkrellm.srcbox.net/"
 
 SLOT="0"
 LICENSE="GPL-2"
@@ -10,18 +12,19 @@ KEYWORDS="~ppc ~x86"
 IUSE="wifi"
 
 RDEPEND="!<app-admin/gkrellm-2
-		>=x11-plugins/gkrellaclock-0.3.2
-		x11-plugins/gkrellflynn
-		>=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"
+	>=x11-plugins/gkrellaclock-0.3.2
+	x11-plugins/gkrellflynn
+	>=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
+"