gentoo resync : 04.01.2018

3 files changed, 58 insertions, 19 deletions

diff --git a/x11-plugins/gkrelltop/Manifest b/x11-plugins/gkrelltop/Manifest
index 631a64009c76..7ac4c4734535 100644
--- a/x11-plugins/gkrelltop/Manifest
+++ b/x11-plugins/gkrelltop/Manifest
@@ -1,3 +1,4 @@
+AUX gkrelltop-2.2.13-fix-build-system.patch 1088 BLAKE2B 8b8b00fde60ace4fc98848eb436224419f7ec1a13a5da232a28081ecb47825be039aa9a515768478d1bc0fb7114ba040929d9ac05edcbd78bcd0b24562e824fc SHA512 d53dcd1cce67b6b18c5e6ab3cf679a16510cfb8f811d90f47315a5d2161364ee47f1c975c85b26886145c40a95ef7c77a944a0056ada470c176d8791b2b0f2b0
 DIST gkrelltop_2.2.13.orig.tar.gz 49023 BLAKE2B d2857b6d73fca2a2933f4bcaa207dbf34f9bbc2bb9de922d564a865d2238b91d9bbcfbdf5753d7976d941d9ba98c9e7b81812018a2d9d1ac07984e26c3317382 SHA512 9479c5b860833671451b6fb8583e741b1ac755ed76b7e73dffd65d13d30d0b5da1916436901642f738e0d72f8c8696f4dea9c041a203e76d309f2782acf7024e
-EBUILD gkrelltop-2.2.13-r2.ebuild 939 BLAKE2B aa190c276939299c575972af2ef103ed135392984e924a7f3c84ef0f0659c843b9042337c6ad5192454c8c738416fcd350f4a4ead11c5cc131c22c6c6e70a942 SHA512 ad91724a6f4fa17fec3261d92e7bd371fc86c3f989f7e6542836b4933f9ccf6b815c965713699d1d0d3771dc63db7112b7d8177c294f1106b739df6bf8af6294
+EBUILD gkrelltop-2.2.13-r2.ebuild 935 BLAKE2B 2f4384122d72c42171fdebf30dbade57b25dec2ae06db47a5d9eb383c6a2df952a7f37b72788e085651343ca652b87c6e9cb713f570cfa9012ad963960780d33 SHA512 cefad0c4db70c8fd3b7d29e8a8588858d7ebed7d9976e0c07f0046ebc67ed2f1b4dd061b984883989487bc2a8ce7391467463b693dc400348b7a0571743054bc
 MISC metadata.xml 246 BLAKE2B 272c861c71ad2484ff839452b7fff0877f2c464023dffe073ea29271be932a439027031c8811fb34f5e98b61f5fb54045268ed619feb3d0b54361a1b33dddeba SHA512 51eb6bcc872b3c8eecd9ea2eb00437bdcf70db3a550becc013752a793ffd9ef05c37c760af1151c37c15dd5565fd3376b7485f761ed42efc87adc05b390bcb27
diff --git a/x11-plugins/gkrelltop/files/gkrelltop-2.2.13-fix-build-system.patch b/x11-plugins/gkrelltop/files/gkrelltop-2.2.13-fix-build-system.patch
new file mode 100644
index 000000000000..9eaa9cc3d4e8
--- /dev/null
+++ b/x11-plugins/gkrelltop/files/gkrelltop-2.2.13-fix-build-system.patch
@@ -0,0 +1,41 @@
+--- a/Makefile
++++ b/Makefile
+@@ -45,11 +45,10 @@
+ # Parameters for gkrellm version 2.*
+ CFLAGS2 = -g -D$(OSFLAG) -DGKRELLM2 -fPIC -Wall `pkg-config gtk+-2.0 --cflags`
+ LIBS =  
+-CC=/usr/bin/gcc $(CFLAGS2)
++CC += $(CFLAGS) $(CFLAGS2)
+ 
+ else 
+ # Parameters for gkrellm version 1.*
+-CC=/usr/bin/cc
+ CFLAGS = -D$(OSFLAG) -Wall -fPIC `gtk-config --cflags` `imlib-config --cflags-gdk` 
+ LIBS=
+ 
+@@ -78,7 +77,7 @@
+ ifeq ($(INSTALLDIRD),)
+ 	INSTALLDIRD=$(HOME)/.gkrellm2/plugins-gkrellmd
+ endif
+-CCD=/usr/bin/gcc $(CFLAGSD)
++CCD = $(CC) $(CFLAGS) $(CFLAGSD)
+ OBJD = gkrelltopd.o top_three.o
+ 
+ DUMMY_VAR := $(shell ./configure $(CONFIGURE_ARGS))
+@@ -100,14 +99,14 @@
+ warn: ; $(WARN)
+ 
+ $(GKRELLTOP): $(OBJ) warn
+-	$(CC)  -shared $(OBJ) -o $(GKRELLTOP) 
++	$(CC)  $(LDFLAGS) -shared $(OBJ) -o $(GKRELLTOP) 
+ 
+ # Compile gkrelltopd.so server plugin
+ server: $(GKRELLTOPD) warn
+ 	@echo ""
+ 
+ $(GKRELLTOPD): $(OBJD) 
+-	$(CCD)  $(LIBSD) -shared $(OBJD) -o $(GKRELLTOPD)
++	$(CCD)  $(LIBSD) $(LDFLAGS) -shared $(OBJD) -o $(GKRELLTOPD)
+ 
+ gkrelltop.o: gkrelltop.c
+ 	$(CC) -c gkrelltop.c -o gkrelltop.o
diff --git a/x11-plugins/gkrelltop/gkrelltop-2.2.13-r2.ebuild b/x11-plugins/gkrelltop/gkrelltop-2.2.13-r2.ebuild
index 4e6349415d03..059b7d824e5b 100644
--- a/x11-plugins/gkrelltop/gkrelltop-2.2.13-r2.ebuild
+++ b/x11-plugins/gkrelltop/gkrelltop-2.2.13-r2.ebuild
@@ -1,41 +1,38 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
+
 inherit gkrellm-plugin toolchain-funcs
 
 DESCRIPTION="a GKrellM2 plugin which displays the top three processes"
 SRC_URI="mirror://sourceforge/${PN}/${PN}_${PV}.orig.tar.gz"
 HOMEPAGE="https://sourceforge.net/projects/gkrelltop"
 
-SLOT="0"
 LICENSE="GPL-2"
+SLOT="0"
 KEYWORDS="amd64 ppc x86"
 IUSE="X"
 
-PLUGIN_SERVER_SO=gkrelltopd.so
-PLUGIN_SO=gkrelltop.so
-
-S="${WORKDIR}/${P}.orig"
-
 RDEPEND="
-	app-admin/gkrellm[X]
+	app-admin/gkrellm:2[X]
 	dev-libs/glib:2
-	x11-libs/gtk+:2
-"
+	x11-libs/gtk+:2"
 DEPEND="${RDEPEND}"
 
-src_prepare() {
-	sed -i \
-		-e "s:/usr/bin/gcc:$(tc-getCC) \$(CFLAGS):" \
-		-e 's/-shared/$(LDFLAGS) &/' \
-		Makefile || die
-	default
+S=${WORKDIR}/${P}.orig
+PATCHES=( "${FILESDIR}"/${PN}-2.2.13-fix-build-system.patch )
+
+PLUGIN_SERVER_SO=( gkrelltopd$(get_modname) )
+PLUGIN_SO=( gkrelltop$(get_modname) )
+
+src_configure() {
+	tc-export CC
 }
 
 src_compile() {
-	use X || TARGET="server"
-	emake ${TARGET}
+	use X || local target="server"
+	emake ${target}
 }
 
 pkg_postinst() {