1 |
commit: bf5e766c3cc6509c0ea8fd9c7a8c1aabda363155 |
2 |
Author: Pacho Ramos <pacho <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Aug 25 12:43:23 2016 +0000 |
4 |
Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Aug 25 12:53:54 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bf5e766c |
7 |
|
8 |
x11-plugins/gkrellm-radio: Respect LDFLAGS and fix dependencies (#340138 by Michael Mair-Keimberger (iamnr3)) |
9 |
|
10 |
Package-Manager: portage-2.3.0 |
11 |
|
12 |
.../files/gkrellm-radio-2.0.4-makefile.patch | 22 ++++++++++++++++++++++ |
13 |
.../gkrellm-radio/gkrellm-radio-2.0.4.ebuild | 21 +++++++++++++-------- |
14 |
2 files changed, 35 insertions(+), 8 deletions(-) |
15 |
|
16 |
diff --git a/x11-plugins/gkrellm-radio/files/gkrellm-radio-2.0.4-makefile.patch b/x11-plugins/gkrellm-radio/files/gkrellm-radio-2.0.4-makefile.patch |
17 |
new file mode 100644 |
18 |
index 00000000..a5fcabf |
19 |
--- /dev/null |
20 |
+++ b/x11-plugins/gkrellm-radio/files/gkrellm-radio-2.0.4-makefile.patch |
21 |
@@ -0,0 +1,22 @@ |
22 |
+--- a/Makefile 2003-09-20 13:02:15.000000000 +0200 |
23 |
++++ b/Makefile_new 2013-03-16 14:38:19.122375762 +0100 |
24 |
+@@ -9,8 +9,8 @@ |
25 |
+ |
26 |
+ DISTFILES=gkrellm_radio.c radio.c radio.h videodev.h README Makefile CHANGES |
27 |
+ |
28 |
+-CC=gcc |
29 |
+-LDFLAGS= |
30 |
++CC=$(CC) |
31 |
++LDFLAGS=$(LDFLAGS) |
32 |
+ OBJS=gkrellm_radio.o radio.o |
33 |
+ PLUGIN_DIR ?= /usr/local/lib/gkrellm2/plugins |
34 |
+ INSTALL = install -c |
35 |
+@@ -35,7 +35,7 @@ |
36 |
+ export PACKAGE LOCALEDIR |
37 |
+ |
38 |
+ radio.so: $(OBJS) |
39 |
+- $(CC) -shared -Wl -o radio.so $(OBJS) $(LDFLAGS) |
40 |
++ $(CC) -shared -o radio.so $(OBJS) $(LDFLAGS) |
41 |
+ (cd po && ${MAKE} all ) |
42 |
+ |
43 |
+ %.o: %.c |
44 |
|
45 |
diff --git a/x11-plugins/gkrellm-radio/gkrellm-radio-2.0.4.ebuild b/x11-plugins/gkrellm-radio/gkrellm-radio-2.0.4.ebuild |
46 |
index b1e09da..f3a86c9 100644 |
47 |
--- a/x11-plugins/gkrellm-radio/gkrellm-radio-2.0.4.ebuild |
48 |
+++ b/x11-plugins/gkrellm-radio/gkrellm-radio-2.0.4.ebuild |
49 |
@@ -1,25 +1,30 @@ |
50 |
-# Copyright 1999-2014 Gentoo Foundation |
51 |
+# Copyright 1999-2016 Gentoo Foundation |
52 |
# Distributed under the terms of the GNU General Public License v2 |
53 |
# $Id$ |
54 |
|
55 |
-inherit gkrellm-plugin |
56 |
+EAPI=6 |
57 |
+inherit gkrellm-plugin toolchain-funcs |
58 |
|
59 |
-IUSE="lirc" |
60 |
- |
61 |
-S=${WORKDIR}/${PN} |
62 |
DESCRIPTION="A minimalistic GKrellM2 plugin to control radio tuners" |
63 |
SRC_URI="http://gkrellm.luon.net/files/${P}.tar.gz" |
64 |
HOMEPAGE="http://gkrellm.luon.net/gkrellm-radio.php" |
65 |
|
66 |
DEPEND="lirc? ( app-misc/lirc )" |
67 |
+RDEPEND="${DEPEND} |
68 |
+ app-admin/gkrellm[X] |
69 |
+" |
70 |
|
71 |
+IUSE="lirc" |
72 |
SLOT="2" |
73 |
LICENSE="GPL-2" |
74 |
-KEYWORDS="ppc sparc x86" |
75 |
+KEYWORDS="~amd64 ppc sparc x86" |
76 |
+ |
77 |
+PLUGIN_SO="radio.so" |
78 |
+S="${WORKDIR}/${PN}" |
79 |
|
80 |
-PLUGIN_SO=radio.so |
81 |
+PATCHES=( "${FILESDIR}"/${P}-makefile.patch ) |
82 |
|
83 |
src_compile() { |
84 |
use lirc && myconf="${myconf} WITH_LIRC=1" |
85 |
- emake ${myconf} || die |
86 |
+ emake CC="$(tc-getCC)" LDFLAGS="${LDFLAGS}" ${myconf} |
87 |
} |