Respect CFLAGS and LDFLAGS.

(Portage version: 2.2_rc33/cvs/Linux i686)

3 files changed, 48 insertions, 3 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/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