commit: 9916796c05f54114c272a13c17505f522efef506
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:25 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9916796c
x11-plugins/gkrellmwireless: Eclass update
Package-Manager: Portage-2.3.19, Repoman-2.3.6
.../gkrellmwireless-2.0.3-fix-build-system.patch | 26 ++++++++++++++++++++++
.../gkrellmwireless-2.0.3-r2.ebuild | 22 +++++++++---------
2 files changed, 37 insertions(+), 11 deletions(-)
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 00000000000..eb821e9b2de
--- /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 85fd1b16079..d3956e0aa0d 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
}
