1 |
commit: 9916796c05f54114c272a13c17505f522efef506 |
2 |
Author: David Seifert <soap <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Jan 3 22:34:32 2018 +0000 |
4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Jan 4 09:15:25 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9916796c |
7 |
|
8 |
x11-plugins/gkrellmwireless: Eclass update |
9 |
|
10 |
Package-Manager: Portage-2.3.19, Repoman-2.3.6 |
11 |
|
12 |
.../gkrellmwireless-2.0.3-fix-build-system.patch | 26 ++++++++++++++++++++++ |
13 |
.../gkrellmwireless-2.0.3-r2.ebuild | 22 +++++++++--------- |
14 |
2 files changed, 37 insertions(+), 11 deletions(-) |
15 |
|
16 |
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 |
17 |
new file mode 100644 |
18 |
index 00000000000..eb821e9b2de |
19 |
--- /dev/null |
20 |
+++ b/x11-plugins/gkrellmwireless/files/gkrellmwireless-2.0.3-fix-build-system.patch |
21 |
@@ -0,0 +1,26 @@ |
22 |
+--- a/Makefile |
23 |
++++ b/Makefile |
24 |
+@@ -16,12 +16,11 @@ |
25 |
+ GTK_CFLAGS = `$(GTK_CONFIG) --cflags` |
26 |
+ GTK_LIB = `$(GTK_CONFIG) --libs` |
27 |
+ |
28 |
+-FLAGS = -O2 -Wall -fPIC $(GTK_CFLAGS) $(GKRELLM_INCLUDE) |
29 |
++CFLAGS += -Wall -fPIC |
30 |
++CPPFLAGS += $(GTK_CFLAGS) $(GKRELLM_INCLUDE) |
31 |
+ LIBS = $(GTK_LIB) |
32 |
+ LFLAGS = -shared |
33 |
+ |
34 |
+-CC = gcc $(CFLAGS) $(FLAGS) |
35 |
+- |
36 |
+ OBJS = wireless.o |
37 |
+ |
38 |
+ PLUGIN_DIR = /usr/lib/gkrellm2/plugins |
39 |
+@@ -32,7 +31,7 @@ |
40 |
+ all: wireless.so |
41 |
+ |
42 |
+ wireless.so: $(OBJS) |
43 |
+- $(CC) $(OBJS) -o wireless.so $(LFLAGS) $(LIBS) |
44 |
++ $(CC) $(LDFLAGS) $^ -o $@ $(LFLAGS) $(LIBS) |
45 |
+ |
46 |
+ clean: |
47 |
+ rm -f *.o core *.so* *.bak *~ |
48 |
|
49 |
diff --git a/x11-plugins/gkrellmwireless/gkrellmwireless-2.0.3-r2.ebuild b/x11-plugins/gkrellmwireless/gkrellmwireless-2.0.3-r2.ebuild |
50 |
index 85fd1b16079..d3956e0aa0d 100644 |
51 |
--- a/x11-plugins/gkrellmwireless/gkrellmwireless-2.0.3-r2.ebuild |
52 |
+++ b/x11-plugins/gkrellmwireless/gkrellmwireless-2.0.3-r2.ebuild |
53 |
@@ -1,27 +1,27 @@ |
54 |
-# Copyright 1999-2017 Gentoo Foundation |
55 |
+# Copyright 1999-2018 Gentoo Foundation |
56 |
# Distributed under the terms of the GNU General Public License v2 |
57 |
|
58 |
EAPI=6 |
59 |
+ |
60 |
inherit gkrellm-plugin toolchain-funcs |
61 |
|
62 |
-S="${WORKDIR}/${PN}" |
63 |
DESCRIPTION="A plugin for GKrellM that monitors your wireless network card" |
64 |
SRC_URI="http://gkrellm.luon.net/files/${P}.tar.gz" |
65 |
HOMEPAGE="http://gkrellm.luon.net/gkrellmwireless.php" |
66 |
|
67 |
-SLOT="2" |
68 |
LICENSE="GPL-2" |
69 |
+SLOT="2" |
70 |
KEYWORDS="amd64 ~ppc ~sparc x86" |
71 |
IUSE="" |
72 |
|
73 |
-RDEPEND="app-admin/gkrellm[X]" |
74 |
+RDEPEND="app-admin/gkrellm:2[X]" |
75 |
+DEPEND="${RDEPEND}" |
76 |
+ |
77 |
+S=${WORKDIR}/${PN} |
78 |
+PATCHES=( "${FILESDIR}"/${PN}-2.0.3-fix-build-system.patch ) |
79 |
|
80 |
-PLUGIN_SO=wireless.so |
81 |
+PLUGIN_SO=( wireless$(get_modname) ) |
82 |
|
83 |
-src_prepare() { |
84 |
- default |
85 |
- sed -i \ |
86 |
- -e '/^CC =/s:gcc $(CFLAGS) $(FLAGS):'"$(tc-getCC)"' $(FLAGS) $(CFLAGS):' \ |
87 |
- -e '/-o wireless.so/s: : $(LDFLAGS) :' \ |
88 |
- Makefile || die |
89 |
+src_configure() { |
90 |
+ tc-export CC |
91 |
} |