gentoo resync : 04.01.2018

3 files changed, 11 insertions, 11 deletions

diff --git a/x11-plugins/gkrellflynn/Manifest b/x11-plugins/gkrellflynn/Manifest
index 03d0792bb908..7dadf64445ad 100644
--- a/x11-plugins/gkrellflynn/Manifest
+++ b/x11-plugins/gkrellflynn/Manifest
@@ -1,4 +1,4 @@
-AUX gkrellflynn-0.8-makefile.patch 1003 BLAKE2B b3d265ab44140635043b3daf3d5499f81d9ebf8b2bdedac63ae2b2223c36bedf52d2a1245105ab32ef116fbc42d0bffbf33689f5b7033034c45fdaae20af0ebf SHA512 0bf88e97955076c5b2495331f7e3022d8a997eb3b0c8c42c123d830809679e8db086099b3dca5df4d7a833287b95501269eb0cfb903822dc75bebb6269529d10
+AUX gkrellflynn-0.8-makefile.patch 931 BLAKE2B 6cd8037d5645014247768991448a61259413f955b10fbf34c191eb729b52aef806bd40d254510befc2cc8edc55dd69d8afe2f499120f567d1e237cce19d7ed86 SHA512 20936480ac1129fe5d4cd5ac0bdfe00dfa137e27e2fbbe1e7f60aeead5c450f9a7fbf6e344bb7505b160fd63bb49b03bed29de21098eb2699ed45b832aa1ab9e
 DIST gkrellflynn-0.8.tar.gz 26722 BLAKE2B 92c11c57181ec800b6b4dd34fe26d20cb6160b668d3a8a0f0fdf5a67126a691993aac3673283fb3fcec811afc25cfa847dc96b1d13edade891e589c8687f9ef7 SHA512 36c643adcfb1ecb994eb6c2bb590225df1f268e885508ede28ea8b9760bdca33bfb48821d356ce0c56e38be5f7b16ad7062bc191e8a77aef1c792bd02da2f366
-EBUILD gkrellflynn-0.8.ebuild 625 BLAKE2B 52f3a4260acccf6da2483a1f218af7fdaf32b9d5b640a8582060b315b5fdf2284cadb599fb4f03ab52ba0dd7ea19522fa5ad2ca0d0245e634386cf56f681e6f8 SHA512 7ffdceca6155d684a3a1639d4b8369c314a54913167df1c7e0c9b5b0df12484e0553983820fa40edd43933c850fa10ec7aad2a14d3e2661f59527cb92b3ec0ef
+EBUILD gkrellflynn-0.8.ebuild 607 BLAKE2B a78d48bf1795416dd596339315bcd081aa131425e3241a60437658fed4e10eada0fbf5f9597506b10f297a02410869ca1960ae7f31ee45997c750e5458352d74 SHA512 d71e5e559607a82f870f1916c47e6d49af8db4d4035f197b2d5ad87e815cbb60be2f2e27f8fe9b0c2516ea51a8f0448364a61f2ace981779914c6f8eec3a3f52
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/x11-plugins/gkrellflynn/files/gkrellflynn-0.8-makefile.patch b/x11-plugins/gkrellflynn/files/gkrellflynn-0.8-makefile.patch
index 0b539fa6635f..bcfef8b8f824 100644
--- a/x11-plugins/gkrellflynn/files/gkrellflynn-0.8-makefile.patch
+++ b/x11-plugins/gkrellflynn/files/gkrellflynn-0.8-makefile.patch
@@ -1,5 +1,5 @@
---- Makefile	2002-05-07 10:04:49.000000000 +0200
-+++ Makefile_new	2013-03-12 21:10:15.888656809 +0100
+--- a/Makefile
++++ b/Makefile
 @@ -3,11 +3,10 @@
  #
  # updated for gkrellm2.0
diff --git a/x11-plugins/gkrellflynn/gkrellflynn-0.8.ebuild b/x11-plugins/gkrellflynn/gkrellflynn-0.8.ebuild
index e0014a4bc095..10c704f676c6 100644
--- a/x11-plugins/gkrellflynn/gkrellflynn-0.8.ebuild
+++ b/x11-plugins/gkrellflynn/gkrellflynn-0.8.ebuild
@@ -1,23 +1,23 @@
-# 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
 
 HOMEPAGE="http://bax.comlab.uni-rostock.de/en/projects/flynn.html"
 SRC_URI="http://bax.comlab.uni-rostock.de/fileadmin/downloads/${P}.tar.gz"
 DESCRIPTION="A funny GKrellM2 load monitor (for Doom(tm) fans)"
+
 KEYWORDS="alpha amd64 ppc sparc x86"
 SLOT="0"
 LICENSE="GPL-2"
 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 CC="$(tc-getCC)" LDFLAGS="${LDFLAGS}" gkrellm2