From bf5e766c3cc6509c0ea8fd9c7a8c1aabda363155 Mon Sep 17 00:00:00 2001 From: Pacho Ramos Date: Thu, 25 Aug 2016 14:43:23 +0200 Subject: x11-plugins/gkrellm-radio: Respect LDFLAGS and fix dependencies (#340138 by Michael Mair-Keimberger (iamnr3)) Package-Manager: portage-2.3.0 --- .../files/gkrellm-radio-2.0.4-makefile.patch | 22 ++++++++++++++++++++++ .../gkrellm-radio/gkrellm-radio-2.0.4.ebuild | 21 +++++++++++++-------- 2 files changed, 35 insertions(+), 8 deletions(-) create mode 100644 x11-plugins/gkrellm-radio/files/gkrellm-radio-2.0.4-makefile.patch (limited to 'x11-plugins/gkrellm-radio') 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 new file mode 100644 index 000000000000..a5fcabfea07b --- /dev/null +++ b/x11-plugins/gkrellm-radio/files/gkrellm-radio-2.0.4-makefile.patch @@ -0,0 +1,22 @@ +--- a/Makefile 2003-09-20 13:02:15.000000000 +0200 ++++ b/Makefile_new 2013-03-16 14:38:19.122375762 +0100 +@@ -9,8 +9,8 @@ + + DISTFILES=gkrellm_radio.c radio.c radio.h videodev.h README Makefile CHANGES + +-CC=gcc +-LDFLAGS= ++CC=$(CC) ++LDFLAGS=$(LDFLAGS) + OBJS=gkrellm_radio.o radio.o + PLUGIN_DIR ?= /usr/local/lib/gkrellm2/plugins + INSTALL = install -c +@@ -35,7 +35,7 @@ + export PACKAGE LOCALEDIR + + radio.so: $(OBJS) +- $(CC) -shared -Wl -o radio.so $(OBJS) $(LDFLAGS) ++ $(CC) -shared -o radio.so $(OBJS) $(LDFLAGS) + (cd po && ${MAKE} all ) + + %.o: %.c diff --git a/x11-plugins/gkrellm-radio/gkrellm-radio-2.0.4.ebuild b/x11-plugins/gkrellm-radio/gkrellm-radio-2.0.4.ebuild index b1e09da0c03d..f3a86c9d01bf 100644 --- a/x11-plugins/gkrellm-radio/gkrellm-radio-2.0.4.ebuild +++ b/x11-plugins/gkrellm-radio/gkrellm-radio-2.0.4.ebuild @@ -1,25 +1,30 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ -inherit gkrellm-plugin +EAPI=6 +inherit gkrellm-plugin toolchain-funcs -IUSE="lirc" - -S=${WORKDIR}/${PN} DESCRIPTION="A minimalistic GKrellM2 plugin to control radio tuners" SRC_URI="http://gkrellm.luon.net/files/${P}.tar.gz" HOMEPAGE="http://gkrellm.luon.net/gkrellm-radio.php" DEPEND="lirc? ( app-misc/lirc )" +RDEPEND="${DEPEND} + app-admin/gkrellm[X] +" +IUSE="lirc" SLOT="2" LICENSE="GPL-2" -KEYWORDS="ppc sparc x86" +KEYWORDS="~amd64 ppc sparc x86" + +PLUGIN_SO="radio.so" +S="${WORKDIR}/${PN}" -PLUGIN_SO=radio.so +PATCHES=( "${FILESDIR}"/${P}-makefile.patch ) src_compile() { use lirc && myconf="${myconf} WITH_LIRC=1" - emake ${myconf} || die + emake CC="$(tc-getCC)" LDFLAGS="${LDFLAGS}" ${myconf} } -- cgit v1.2.3-65-gdbad