Respect user FLAGS wrt bug 321311

(Portage version: 2.2_rc67/cvs/Linux x86_64)

3 files changed, 62 insertions, 12 deletions

diff --git a/media-tv/v4l2-ctl/ChangeLog b/media-tv/v4l2-ctl/ChangeLog
index c08fe6b1640e..00ca9addb249 100644
--- a/media-tv/v4l2-ctl/ChangeLog
+++ b/media-tv/v4l2-ctl/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-tv/v4l2-ctl
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/v4l2-ctl/ChangeLog,v 1.1 2010/05/21 01:51:35 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/v4l2-ctl/ChangeLog,v 1.2 2010/08/09 07:47:21 xarthisius Exp $
+
+  09 Aug 2010; Kacper Kowalik <xarthisius@gentoo.org> v4l2-ctl-1.4.0.ebuild,
+  +files/v4l2-ctl-1.4.0-QA.patch:
+  Respect user FLAGS wrt bug 321311
 
 *v4l2-ctl-1.4.0 (21 May 2010)
 
diff --git a/media-tv/v4l2-ctl/files/v4l2-ctl-1.4.0-QA.patch b/media-tv/v4l2-ctl/files/v4l2-ctl-1.4.0-QA.patch
new file mode 100644
index 000000000000..cc0cb5ec407b
--- /dev/null
+++ b/media-tv/v4l2-ctl/files/v4l2-ctl-1.4.0-QA.patch
@@ -0,0 +1,44 @@
+Respect user {CC,CXX,LD}FLAGS, fix linking order
+
+http://bugs.gentoo.org/show_bug.cgi?id=321311
+
+--- utils/Makefile
++++ utils/Makefile
+@@ -16,30 +16,30 @@
+ 
+ HEADERS := linux/ivtv.h linux/ivtvfb.h
+ 
+-CFLAGS = -D_GNU_SOURCE -O2 -Wall -g -I.
+-CXXFLAGS = $(CFLAGS)
++CFLAGS   += -D_GNU_SOURCE -I.
++CXXFLAGS += -D_GNU_SOURCE -I.
+ 
+ all:: $(EXES)
+ 	$(MAKE) CFLAGS="$(CFLAGS)" -C ivtv-tune
+ 	$(MAKE) CFLAGS="$(CFLAGS)" -C cx25840ctl
+ 
+ ivtv-ctl: ivtv-ctl.o
+-	$(CC) -lm -o $@ $^
++	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ -lm
+ 
+ v4l2-ctl: v4l2-ctl.o
+-	$(CXX) -lm -o $@ $^
++	$(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@ $^ -lm
+ 
+ v4l2-dbg: v4l2-dbg.o v4l2-driverids.o v4l2-chipids.o
+-	$(CXX) -lm -o $@ $^
++	$(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@ $^ -lm
+ 
+ ivtvplay: ivtvplay.cc
+-	$(CXX) $(CXXFLAGS) -lm -lpthread -o $@ $^
++	$(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@ $^ -lm -lpthread
+ 
+ encoder.o: encoder.c
+ 	$(CC) $(CFLAGS) -DVIDEO_PORT=0 -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -c $^
+ 
+ ivtv-encoder: enc_mindex.o enc_chann.o encoder.o
+-	$(CC) -lpthread -o $@ $^
++	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ -lpthread
+ 
+ install: all
+ 	install -d $(DESTDIR)/$(HDRDIR)
diff --git a/media-tv/v4l2-ctl/v4l2-ctl-1.4.0.ebuild b/media-tv/v4l2-ctl/v4l2-ctl-1.4.0.ebuild
index 1c2691653009..c8a158d1f8b4 100644
--- a/media-tv/v4l2-ctl/v4l2-ctl-1.4.0.ebuild
+++ b/media-tv/v4l2-ctl/v4l2-ctl-1.4.0.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/v4l2-ctl/v4l2-ctl-1.4.0.ebuild,v 1.1 2010/05/21 01:51:35 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/v4l2-ctl/v4l2-ctl-1.4.0.ebuild,v 1.2 2010/08/09 07:47:21 xarthisius Exp $
 
 EAPI=2
 
-MY_PN="ivtv-utils"
-MY_P="${MY_PN}-${PV}"
+MY_PN=ivtv-utils
+MY_P=${MY_PN}-${PV}
 
-inherit eutils
+inherit eutils toolchain-funcs
 
 DESCRIPTION="Small utlility to access and change settings on V4L2 devices"
 HOMEPAGE="http://www.ivtvdriver.org"
@@ -18,16 +18,18 @@ KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
 DEPEND="!<media-tv/ivtv-utils-1.4.0-r1"
 
-S="${WORKDIR}/${MY_P}"
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-QA.patch
+}
 
 src_compile() {
-	cd "${S}"/utils
-	emake v4l2-ctl
+	tc-export CXX CC
+	emake -C utils v4l2-ctl || die
 }
 
 src_install() {
-	cd "${S}"
-	dobin "utils/v4l2-ctl"
-
-	dodoc doc/README.utils
+	dobin utils/v4l2-ctl || die
+	dodoc doc/README.utils || die
 }