From 423d21dcfee183cc4b04d29c1621615e8c30f834 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Thu, 4 Jan 2018 18:55:01 +0000
Subject: gentoo resync : 04.01.2018

---
 x11-plugins/gkrellmwireless/Manifest               |  3 ++-
 .../gkrellmwireless-2.0.3-fix-build-system.patch   | 26 ++++++++++++++++++++++
 .../gkrellmwireless-2.0.3-r2.ebuild                | 22 +++++++++---------
 3 files changed, 39 insertions(+), 12 deletions(-)
 create mode 100644 x11-plugins/gkrellmwireless/files/gkrellmwireless-2.0.3-fix-build-system.patch

(limited to 'x11-plugins/gkrellmwireless')

diff --git a/x11-plugins/gkrellmwireless/Manifest b/x11-plugins/gkrellmwireless/Manifest
index 7905b7a07be8..d28e4648018e 100644
--- a/x11-plugins/gkrellmwireless/Manifest
+++ b/x11-plugins/gkrellmwireless/Manifest
@@ -1,3 +1,4 @@
+AUX gkrellmwireless-2.0.3-fix-build-system.patch 581 BLAKE2B faba9c577d0bb7f72458999481e9181933fa0103e2e55a6d06122dcf9546c2a9e269153962bab7bc0177a9b1eb1bf2f6e6651b3110038361550b46e6e592faae SHA512 0e4725e1550487d9305f2f2500c12401558e9a1509852276fa3f7e49a516459f70e189c15a25a6320d24b77decba9749184e0a5a39ccc43ccd17f5e1392f0f96
 DIST gkrellmwireless-2.0.3.tar.gz 9557 BLAKE2B 74ad963540597bddadc8a8e110ad441a2341a36b10f8620c392179909fe4582d973f51a4f0ffc2fc552ae1917e1c70373992a3801c9e1fec1f162194749e788c SHA512 7d005502bd65ea16f589f94fba38e67dffec69974177d4e7b83bf50d805e431d64a8cd0795f21547100487a9cb4ed7c01883514cb2d66165f0a7b8aa91162ab1
-EBUILD gkrellmwireless-2.0.3-r2.ebuild 657 BLAKE2B 860e7306281e7de33215a4bf97fc558e3786b505730f312f9a5abdebdda0b19c260165deff76e9a8d20fb457ad30a281aa94d21c06e44763bfb2f9689f917bf2 SHA512 2275521078b61627da62607553b2b2f932d033bd3687ebc3cbd82d52bc1eea6954065e27d5c4c55f59cf17e3bf3133e45805eda2e529d93d432c6310c3325950
+EBUILD gkrellmwireless-2.0.3-r2.ebuild 614 BLAKE2B 18a2f5c9340c822ba4e472c49450fd6a6a0a308734611ef25496f11062a7a2fd43037a472085ce4c4046481700b5fdb69be869b02b0f407917ac955403a06f26 SHA512 da99081aa86502cb811ce6467b9b5f09704114651a0b895b053c9954a69fe4d87292e7a8bfd5ad028e954654b82e48a47cc8fcff722cf6f7a69fecac3d2a537d
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/x11-plugins/gkrellmwireless/files/gkrellmwireless-2.0.3-fix-build-system.patch b/x11-plugins/gkrellmwireless/files/gkrellmwireless-2.0.3-fix-build-system.patch
new file mode 100644
index 000000000000..eb821e9b2de0
--- /dev/null
+++ b/x11-plugins/gkrellmwireless/files/gkrellmwireless-2.0.3-fix-build-system.patch
@@ -0,0 +1,26 @@
+--- a/Makefile
++++ b/Makefile
+@@ -16,12 +16,11 @@
+ GTK_CFLAGS = `$(GTK_CONFIG) --cflags` 
+ GTK_LIB = `$(GTK_CONFIG) --libs`
+ 
+-FLAGS = -O2 -Wall -fPIC $(GTK_CFLAGS) $(GKRELLM_INCLUDE)
++CFLAGS += -Wall -fPIC
++CPPFLAGS += $(GTK_CFLAGS) $(GKRELLM_INCLUDE)
+ LIBS = $(GTK_LIB)
+ LFLAGS = -shared
+ 
+-CC = gcc $(CFLAGS) $(FLAGS)
+-
+ OBJS = wireless.o
+ 
+ PLUGIN_DIR = /usr/lib/gkrellm2/plugins
+@@ -32,7 +31,7 @@
+ all:	wireless.so
+ 
+ wireless.so: $(OBJS)
+-	$(CC) $(OBJS) -o wireless.so $(LFLAGS) $(LIBS)
++	$(CC) $(LDFLAGS) $^ -o $@ $(LFLAGS) $(LIBS)
+ 
+ clean:
+ 	rm -f *.o core *.so* *.bak *~
diff --git a/x11-plugins/gkrellmwireless/gkrellmwireless-2.0.3-r2.ebuild b/x11-plugins/gkrellmwireless/gkrellmwireless-2.0.3-r2.ebuild
index 85fd1b160794..d3956e0aa0d0 100644
--- a/x11-plugins/gkrellmwireless/gkrellmwireless-2.0.3-r2.ebuild
+++ b/x11-plugins/gkrellmwireless/gkrellmwireless-2.0.3-r2.ebuild
@@ -1,27 +1,27 @@
-# 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
 
-S="${WORKDIR}/${PN}"
 DESCRIPTION="A plugin for GKrellM that monitors your wireless network card"
 SRC_URI="http://gkrellm.luon.net/files/${P}.tar.gz"
 HOMEPAGE="http://gkrellm.luon.net/gkrellmwireless.php"
 
-SLOT="2"
 LICENSE="GPL-2"
+SLOT="2"
 KEYWORDS="amd64 ~ppc ~sparc x86"
 IUSE=""
 
-RDEPEND="app-admin/gkrellm[X]"
+RDEPEND="app-admin/gkrellm:2[X]"
+DEPEND="${RDEPEND}"
+
+S=${WORKDIR}/${PN}
+PATCHES=( "${FILESDIR}"/${PN}-2.0.3-fix-build-system.patch )
 
-PLUGIN_SO=wireless.so
+PLUGIN_SO=( wireless$(get_modname) )
 
-src_prepare() {
-	default
-	sed -i \
-		-e '/^CC =/s:gcc $(CFLAGS) $(FLAGS):'"$(tc-getCC)"' $(FLAGS) $(CFLAGS):' \
-		-e '/-o wireless.so/s: : $(LDFLAGS) :' \
-		Makefile || die
+src_configure() {
+	tc-export CC
 }
-- 
cgit v1.2.3