gentoo resync : 04.01.2018

3 files changed, 18 insertions, 17 deletions

diff --git a/x11-plugins/gkrellkam/Manifest b/x11-plugins/gkrellkam/Manifest
index 0668f41ddc00..4c524c8983cb 100644
--- a/x11-plugins/gkrellkam/Manifest
+++ b/x11-plugins/gkrellkam/Manifest
@@ -1,4 +1,4 @@
-AUX gkrellkam-2.0.0-makefile.patch 736 BLAKE2B cc877ccf0220c828eacc2d878727596b562cd0a434ed0decc996acf1d39e9cc46c5888bc2ddadbf1805af0b8979b22d75bc15caf9ea189cae0e29b5ac3a8c6be SHA512 2f1e9d506bdd56413ef3dd15c3525adb2dc33ddf3304bbb7c0a64e38a027f5aa3e79304448fd301eef8aa031630b8d45d295a01ff3c0a16cff51b1ed8bbfddf3
+AUX gkrellkam-2.0.0-makefile.patch 664 BLAKE2B 314b6971723bd4342aa4640d685eecf3e247d43849d3d9d05fc8acfbf8c4eb5f0a04d35eb054bd5d35103d195c3f4e3486469023234414fd8070921fa2d36acd SHA512 0bd0cfb320119eb32019616f4e52a1c821116b6abfd0b0d45c7fa06a642cb980fd6f0e62769388885691e5a4ecb06d812541b7b7b6ac37c9dd2042fdc6fd3898
 DIST gkrellkam_2.0.0.tar.gz 27028 BLAKE2B 4bdfb89e2aa0f9001fbaedacb095e868497564612982cd3743547e1070bfbf173be5a441339d32e1be5146a511b840f6fd9a5450edad641895630d33eb5eb554 SHA512 a5a5d0a41de37b006c42150f0388ba573c968679f3f15c6b1d4837361d136cb529c2152723382e99bb46a76be5f1bde641137cea22e07a502402560dcd18699f
-EBUILD gkrellkam-2.0.0.ebuild 717 BLAKE2B e97027adc0c19cfb0b616cae83f4fb12d5a554d11a5cdfc011dd6c6cf3d266645ac6cc327a5aba44c63cf5d01f5a0a30ac1828fe786f70873cfec53faa85fcb6 SHA512 67affe4426f96d539ceab1005a9a05e8fb1fb47b5f5bc31b2e59b5a0cff17587e154cf44e42b6907d3fcc7b21d45205ce01d7cda4b2958d0e642834b86453a51
+EBUILD gkrellkam-2.0.0.ebuild 727 BLAKE2B 5c5d974bc32d77be8ca77b25a972bf0f7244e5c8ee4fae6ffb3aa9ec6f434edfdb862ee56253cdd5f55206800e9bb489fcbb888b20194dba466dd8e17b3f4dd0 SHA512 28cd394ce263b45f79f1c13efbb581c3c63789a8ec94dc759813c6019f69d7407c1cf71b348252dc1d788a23d7978fbd3621736bdb9b1bf848fc33940266b8a1
 MISC metadata.xml 246 BLAKE2B 02e03e5f94e8a28286db77b20493789bcaa67239d0fe35342b11f2372957c07f2164cb8ebc6c4f200d648ec650e1cc60e6a9d206aeb33ada5ac150523b704692 SHA512 d2f8e92a8d448540a85d35b296a7946560b91b984662eb6a955180874cc4219b7ac35294da7384525d59e743808beec95ffbf6aa343cb9304a4e7179b136276e
diff --git a/x11-plugins/gkrellkam/files/gkrellkam-2.0.0-makefile.patch b/x11-plugins/gkrellkam/files/gkrellkam-2.0.0-makefile.patch
index 83178b4b0ff8..f897f4102b6c 100644
--- a/x11-plugins/gkrellkam/files/gkrellkam-2.0.0-makefile.patch
+++ b/x11-plugins/gkrellkam/files/gkrellkam-2.0.0-makefile.patch
@@ -1,5 +1,5 @@
---- Makefile	2002-10-23 18:36:20.000000000 +0200
-+++ Makefile_new	2013-03-16 14:02:42.979029588 +0100
+--- a/Makefile
++++ b/Makefile
 @@ -12,10 +12,10 @@
  # This should point to the GKrellM headers
  GKRELLM_HDRS = /usr/include
diff --git a/x11-plugins/gkrellkam/gkrellkam-2.0.0.ebuild b/x11-plugins/gkrellkam/gkrellkam-2.0.0.ebuild
index ae3ad974d5de..bbb98a017154 100644
--- a/x11-plugins/gkrellkam/gkrellkam-2.0.0.ebuild
+++ b/x11-plugins/gkrellkam/gkrellkam-2.0.0.ebuild
@@ -1,35 +1,36 @@
-# Copyright 1999-2014 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
 
 MY_P=${P/-/_}
 
 DESCRIPTION="an Image-Watcher-Plugin for GKrellM2"
 SRC_URI="mirror://sourceforge/gkrellkam/${MY_P}.tar.gz"
 HOMEPAGE="http://gkrellkam.sourceforge.net"
+
 LICENSE="GPL-2"
 SLOT="0"
-IUSE=""
 KEYWORDS="x86 ppc sparc alpha amd64"
+IUSE=""
 
-RDEPEND="net-misc/wget
-	 app-admin/gkrellm[X]"
+RDEPEND="
+	 app-admin/gkrellm:2[X]
+	 net-misc/wget"
 DEPEND="${RDEPEND}"
 
-PLUGIN_SO=gkrellkam2.so
-PLUGIN_DOCS="example.list"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-makefile.patch
-}
+PATCHES=( "${FILESDIR}"/${P}-makefile.patch )
 
 src_compile() {
 	emake CC="$(tc-getCC)" LDFLAGS="${LDFLAGS}"
 }
 
-src_install () {
+src_install() {
+	local PLUGIN_SO=( ${PN}2$(get_modname) )
+	local PLUGIN_DOCS=( example.list )
+
 	gkrellm-plugin_src_install
 	doman gkrellkam-list.5
 }