gentoo resync : 04.01.2018

3 files changed, 13 insertions, 14 deletions

diff --git a/x11-plugins/gkrellmlaunch/Manifest b/x11-plugins/gkrellmlaunch/Manifest
index 4b848779f3d5..4dc85bbcb845 100644
--- a/x11-plugins/gkrellmlaunch/Manifest
+++ b/x11-plugins/gkrellmlaunch/Manifest
@@ -1,4 +1,4 @@
-AUX gkrellmlaunch-0.5-makefile.patch 808 BLAKE2B 84a213bd4476b1739b78e69f0453833b62fe0088d4bff02f21a63791b1dedda565a08866ab5e90d9c66931b98caad02dfea3b36e8f138b16f8085ec8ce99506d SHA512 d9ec682a5502933ceec00104a745aa4b2a5cccea83dff3b144f7439241b544f42b16836286e1fba6c846dee2e9b7491cb7fa5a0ee181f8a396ac89f5af75842d
+AUX gkrellmlaunch-0.5-makefile.patch 736 BLAKE2B fef75b45fe35864a6d39c7c521c270d15593a391272984a10a0a268c417c6dc8faf9a79f8276dcba030c8904abf086302625598c0ce3e3a6c27190fe7a36f2c0 SHA512 8222a135c201cca99d9d7a03aa583f1a731e2d9ae7f131b3dcc22edc47f3d2cd6b1e751571f9f74fa0140380b099b7dec98d471a3a6de1f7240c8460721c3175
 DIST gkrellmlaunch-0.5.tar.gz 22035 BLAKE2B 444dbd76c4bba420d7bd9977f2ce25b9d0260168ea6a730d1fd009eaa0ea064804028c2103efee3afe58b928d858475886fd90c6d77e5a03b3c97ab8bd8c79d2 SHA512 be3a6df6a1648a61103d389dcea24454a142d64b1192156787b42546c485ed592dca916394e46bc0413110a90fa1f4e952fef077e9014274e74610efe8573693
-EBUILD gkrellmlaunch-0.5.ebuild 569 BLAKE2B 6aa0163947c8c90141f4e33bd322b4c0ed28570db2434395ab86b026e8921ee78056b0a1c0c1bfa99e3ba0d9ce883bbb5a0b219408d3b8433a20b49fcde72deb SHA512 6cf38719472a82e32a46bd588ccea53b39582934f59947579ab7f1d9280e0b68d199bcd1e8b753bb44b6d229e1397f29761a0eaffc052a1af49ea27e37acf5ee
+EBUILD gkrellmlaunch-0.5.ebuild 551 BLAKE2B 3856e10ac6c6aa347b3451f1be699cd27266429e589994f06d39b91c4bf6b50db0c335925943e95c2a5c5add82a4af1d1195de1aa3e006ad2f85b4513643eefc SHA512 faa6603b5cd1d252bdcf6c40aafec51cd31fe445090f0e424dc4fd1104b21a5bb344a5ca14afce73ddb1b7e9d7642d7737c95f34d7d4c533ab756c8f0724593f
 MISC metadata.xml 250 BLAKE2B c21f7fe322719d9662f74d1c9224b5cbe19f1b8acf9c5919b1d2e26fbd0842c4bbdd105bad93b71ceec935109313f2ec84a9cb99af192d18c490a82b085ebc26 SHA512 bcd323e882e3cb34e2c52c42aacb692ad55c6c398839b9c77a41a7790fcba8ad82308f3fa1249ffb47499cd6e2762fe152d205d0bb608426049c5e3a51ada8c1
diff --git a/x11-plugins/gkrellmlaunch/files/gkrellmlaunch-0.5-makefile.patch b/x11-plugins/gkrellmlaunch/files/gkrellmlaunch-0.5-makefile.patch
index 31175b664837..8b0a4fee6669 100644
--- a/x11-plugins/gkrellmlaunch/files/gkrellmlaunch-0.5-makefile.patch
+++ b/x11-plugins/gkrellmlaunch/files/gkrellmlaunch-0.5-makefile.patch
@@ -1,5 +1,5 @@
---- Makefile	2002-09-26 15:56:06.000000000 +0200
-+++ Makefile_new	2013-03-15 17:26:19.398383410 +0100
+--- a/Makefile
++++ b/Makefile
 @@ -4,21 +4,25 @@
  GTK_LIB = `pkg-config gtk+-2.0 --libs`
  
diff --git a/x11-plugins/gkrellmlaunch/gkrellmlaunch-0.5.ebuild b/x11-plugins/gkrellmlaunch/gkrellmlaunch-0.5.ebuild
index a0157f2e4b71..616508568460 100644
--- a/x11-plugins/gkrellmlaunch/gkrellmlaunch-0.5.ebuild
+++ b/x11-plugins/gkrellmlaunch/gkrellmlaunch-0.5.ebuild
@@ -1,25 +1,24 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit eutils gkrellm-plugin toolchain-funcs
+EAPI=6
+
+inherit gkrellm-plugin toolchain-funcs
 
 DESCRIPTION="A Program-Launcher Plugin for GKrellM2"
 SRC_URI="mirror://sourceforge/gkrellmlaunch/${P}.tar.gz"
 HOMEPAGE="http://gkrellmlaunch.sourceforge.net/"
-IUSE=""
 
-SLOT="2"
 LICENSE="GPL-2"
+SLOT="2"
 KEYWORDS="x86 ppc sparc alpha amd64"
+IUSE=""
 
-RDEPEND="app-admin/gkrellm[X]"
+RDEPEND="app-admin/gkrellm:2[X]"
 DEPEND="${RDEPEND}"
 
-src_prepare() {
-	epatch "${FILESDIR}/${P}-makefile.patch"
-}
+PATCHES=( "${FILESDIR}"/${P}-makefile.patch )
 
 src_compile() {
-	emake LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)"
+	emake CC="$(tc-getCC)" LDFLAGS="${LDFLAGS}"
 }