[gentoo-commits] repo/gentoo:master commit in: x11-plugins/gkrellmlaunch/, x11-plugins/gkrellmlaunch/files/

[David Seifert]

commit:     d710e965c7156d4695d6e192c1e4a7350ad1f5d6
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Wed Jan  3 22:34:32 2018 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Thu Jan  4 09:15:38 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d710e965

x11-plugins/gkrellmlaunch: Eclass update

Package-Manager: Portage-2.3.19, Repoman-2.3.6

 .../files/gkrellmlaunch-0.5-makefile.patch            |  4 ++--
 x11-plugins/gkrellmlaunch/gkrellmlaunch-0.5.ebuild    | 19 +++++++++----------
 2 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/x11-plugins/gkrellmlaunch/files/gkrellmlaunch-0.5-makefile.patch b/x11-plugins/gkrellmlaunch/files/gkrellmlaunch-0.5-makefile.patch
index 31175b66483..8b0a4fee666 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 a0157f2e4b7..61650856846 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}"
 }