Respect CFLAGS and LDFLAGS.

Package-Manager: portage-2.2_rc33/cvs/Linux i686

4 files changed, 51 insertions, 5 deletions

diff --git a/media-video/alevt/ChangeLog b/media-video/alevt/ChangeLog
index 728de95b404e..fd27cfcf3b06 100644
--- a/media-video/alevt/ChangeLog
+++ b/media-video/alevt/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/alevt
-# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/alevt/ChangeLog,v 1.29 2009/01/10 12:07:43 beandog Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/alevt/ChangeLog,v 1.30 2009/05/14 08:35:13 jer Exp $
+
+  14 May 2009; Jeroen Roovers <jer@gentoo.org> alevt-1.6.2.ebuild,
+  +files/alevt-1.6.2-respectflags.patch:
+  Respect CFLAGS and LDFLAGS.
 
 *alevt-1.6.2 (10 Jan 2009)
 
diff --git a/media-video/alevt/Manifest b/media-video/alevt/Manifest
index 8a0bff2408c2..af84b9a06845 100644
--- a/media-video/alevt/Manifest
+++ b/media-video/alevt/Manifest
@@ -3,12 +3,13 @@ AUX alevt-1.6.1-gentoo.diff 734 RMD160 3686fc92095ccb8a00d9714aca7a130956ae9e8f
 AUX alevt-1.6.1-respectflags.patch 1393 RMD160 331c947593704211f278d6e401a0b3e2b2556617 SHA1 1877d4c479e81888a6730020a01d86c077ad47c3 SHA256 34c0df3e80a5bf04f4d9127d3487f9de92bbfca3037cedd52214d1df2d94afce
 AUX alevt-1.6.1-v4l2.patch 1328 RMD160 0307eaa492a955f0c1acd4252316b15545d6d859 SHA1 6236f5dfc83211bb3285febc302c01f8be9eb61d SHA256 eb1ffed392f1b91e84d39fd9f3d9dc6312c900e988336583bd0a1c83b471b902
 AUX alevt-1.6.1-vbi.patch 219 RMD160 b6172f8382dbe7d0eadb9c731da59d26fd911568 SHA1 05134720ff0cb59c6e6cdfb44705702bb86ef730 SHA256 35bd7aa7f6b5bf975e17f3b2a003e008697d6f4f61d217e980bedd5ae89636ff
+AUX alevt-1.6.2-respectflags.patch 1178 RMD160 486b334cb1276d16c9265223022f03a81ff41078 SHA1 2bdce50ba3f2f084393e55d05156626e481cd6cb SHA256 92151dafd890b0a04cf2f7ac1631b7812406fb51d072b93c1d9c0e10aa3aa135
 DIST alevt-1.6.1.tar.gz 117731 RMD160 9c38525387140610c17fc474c87896aa74cb877d SHA1 0dffba71b911e79fce34a2e6aba9bf69c8a71d28 SHA256 38a3cf23afd48970ee2bc0c63d2152614082cefc7b5ab346c5f4cda22ea707b7
 DIST alevt-1.6.2.tar.gz 133234 RMD160 19bab54e5d5c22cd18d73229524ddc87636850ab SHA1 17f661a22f11f648215efd8d73e1b4dc4a06c5e2 SHA256 9347c2af4b528edec87df8a424ddccebcc252ca7a06f6b18310733cfa547e5f5
 DIST alevt-dvb.patch 55489 RMD160 5395099049854ff39c0bf6006a93116b0c1f3b35 SHA1 7c6bea5638f636b47758fdfe7d86c033db5919a8 SHA256 22c2c411096c04e1fa61f5486e3ddf3bf944e92ea452ab5c86f8580dd7020b84
 EBUILD alevt-1.6.1-r1.ebuild 1224 RMD160 08a6aa04101e4f84d6f93a726ea24e95bc5f0047 SHA1 af80d18a655fdeec663052ad9f52161daf4bf786 SHA256 c4dfd27cf4287ee06e92b991c38bd36ab9952f5124807c239634ba3e7769122b
 EBUILD alevt-1.6.1-r3.ebuild 1338 RMD160 928a6a58e6a6d877f6291283368c56501a0a33a9 SHA1 27ac9e0b3625250e9e6e170aa6878b7be59d445d SHA256 f2d983a0ae74506f8c7f7d52c17b0c1561b4f7176e056ab7827a59238a34c340
 EBUILD alevt-1.6.1-r4.ebuild 1379 RMD160 18bf8728143e2ce7485126ce1f597cd517258b4b SHA1 1b883c2e22bdc0d2d182171934910e7c7b8e1695 SHA256 54961c94ed623cdf2011ae5db0b91058f62ca8173996bd86f1b09d59f118022d
-EBUILD alevt-1.6.2.ebuild 994 RMD160 efb796e00bbe75be5d2ff96b5d4ce7bdbcb993e8 SHA1 51afe41570b3210ce7e7415fd6fad28cf0bda339 SHA256 604a00ee9b7bce1065db23a96058619f68c9b93924e30a51747cc6154e1053da
-MISC ChangeLog 4819 RMD160 a90e6dff705e09de790fff204c3bccc8b6229df4 SHA1 ea26cf2199dfb3f441adca9f458997324514936a SHA256 5f1263884078e77fe99ecdf3a0edbca5a3a518dad465a665200d9e1fc3f4d755
+EBUILD alevt-1.6.2.ebuild 1090 RMD160 7491f7d43579f5e56043fb8fc73ca25a8544602e SHA1 98b2659ecf23983b4b849b29d18f1353e347cbb1 SHA256 093f1ff3f47b769985f512586ab977066c96d9317c8b879fae7f43babbfd9901
+MISC ChangeLog 4954 RMD160 480460dd7ed7a78d5b2063838512983f7ca83242 SHA1 7694e162ee9b479d2872a8bfbb3d348f1ead2a3b SHA256 3abacb541528705cf8ad5c28461773d871211097a43063778d1dbe90c1c2943e
 MISC metadata.xml 161 RMD160 fee76f69ba822cd04301c58fa0c26ecaf8cc8fb9 SHA1 0aee2176f15a238a6d8fbbf83e4e0fd58653a3fa SHA256 82d33b3ca60662bc745d30d53bb20d04ea588d5aae556ed16efcacdcc37fd4bd
diff --git a/media-video/alevt/alevt-1.6.2.ebuild b/media-video/alevt/alevt-1.6.2.ebuild
index 8ed3431a5fe0..a0f2fbcdd2ec 100644
--- a/media-video/alevt/alevt-1.6.2.ebuild
+++ b/media-video/alevt/alevt-1.6.2.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/alevt/alevt-1.6.2.ebuild,v 1.1 2009/01/10 12:07:43 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/alevt/alevt-1.6.2.ebuild,v 1.2 2009/05/14 08:35:13 jer Exp $
+
+EAPI="2"
 
 inherit eutils toolchain-funcs flag-o-matic
 
@@ -19,6 +21,11 @@ RDEPEND="x11-libs/libX11
 DEPEND="${RDEPEND}
 	x11-proto/xproto"
 
+src_prepare() {
+	cp -va Makefile{,.orig}
+	epatch "${FILESDIR}"/${P}-respectflags.patch
+}
+
 src_compile() {
 	append-flags -fno-strict-aliasing
 	emake CC="$(tc-getCC)" || die
diff --git a/media-video/alevt/files/alevt-1.6.2-respectflags.patch b/media-video/alevt/files/alevt-1.6.2-respectflags.patch
new file mode 100644
index 000000000000..368b0ff614cd
--- /dev/null
+++ b/media-video/alevt/files/alevt-1.6.2-respectflags.patch
@@ -0,0 +1,34 @@
+--- alevt-1.6.2/Makefile.orig	2007-12-03 06:19:54.000000000 +0100
++++ alevt-1.6.2/Makefile	2009-05-14 10:17:39.000000000 +0200
+@@ -1,5 +1,4 @@
+ VER=1.6.2
+-OPT=-O2 -s -w
+ #OPT=-O -g
+ DEFS=-DWITH_PNG
+ FONT=vtxt
+@@ -11,7 +10,7 @@
+ # a smaller and thinner font
+ #FONT=neep9
+ 
+-CFLAGS=$(OPT) -DVERSION=\"$(VER)\" $(DEFS) -I$(USR_X11R6)/include
++CFLAGS += -DVERSION=\"$(VER)\" $(DEFS) -I$(USR_X11R6)/include
+ 
+ EXPOBJS=export.o exp-txt.o exp-html.o exp-gfx.o font.o
+ OBJS=main.o ui.o xio.o fdset.o vbi.o cache.o help.o edline.o search.o edit.o misc.o hamm.o lang.o $(EXPOBJS)
+@@ -25,13 +24,13 @@
+ all: alevt alevt-date alevt-cap alevt.1x alevt-date.1 alevt-cap.1
+ 
+ alevt: $(OBJS)
+-	$(CC) $(OPT) $(OBJS) -o alevt -L$(USR_X11R6)/lib -L$(USR_X11R6)/lib64 -lX11 $(EXPLIBS)
++	$(CC) $(CFLAGS) $(LDFLAGS) $(OBJS) -o alevt -L$(USR_X11R6)/lib -L$(USR_X11R6)/lib64 -lX11 $(EXPLIBS)
+ 
+ alevt-date: $(TOBJS)
+-	$(CC) $(OPT) $(TOBJS) -o alevt-date
++	$(CC) $(CFLAGS) $(LDFLAGS) $(TOBJS) -o alevt-date
+ 
+ alevt-cap: $(COBJS)
+-	$(CC) $(OPT) $(COBJS) -o alevt-cap $(EXPLIBS)
++	$(CC) $(CFLAGS) $(LDFLAGS) $(COBJS) -o alevt-cap $(EXPLIBS)
+ 
+ font.o: font1.xbm font2.xbm
+ fontsize.h: font1.xbm font2.xbm