Fixing pre-stripped files bug #255870, Respecting CC variable, Respecting LDFLAGS, Fixing repoman warnings

(Portage version: 2.1.6.13/cvs/Linux i686)

3 files changed, 75 insertions, 14 deletions

diff --git a/media-gfx/zgv/ChangeLog b/media-gfx/zgv/ChangeLog
index fdcbf6a409e2..709a4ed2e7b9 100644
--- a/media-gfx/zgv/ChangeLog
+++ b/media-gfx/zgv/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-gfx/zgv
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/zgv/ChangeLog,v 1.16 2009/06/20 23:57:58 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/zgv/ChangeLog,v 1.17 2009/09/28 15:55:19 vostorga Exp $
+
+  28 Sep 2009; Víctor Ostorga <vostorga@gentoo.org> zgv-5.9.ebuild,
+  +files/zgv-5.9-Makefile-QA.patch:
+  Fixing pre-stripped files bug #255870, Respecting CC variable, Respecting
+  LDFLAGS, Fixing repoman warnings
 
   20 Jun 2009; Diego E. Pettenò <flameeyes@gentoo.org>
   -files/zgv-5.7-gcc3.patch, -files/zgv-5.8-integer-overflow-fix.diff:
diff --git a/media-gfx/zgv/files/zgv-5.9-Makefile-QA.patch b/media-gfx/zgv/files/zgv-5.9-Makefile-QA.patch
new file mode 100644
index 000000000000..e4569547d175
--- /dev/null
+++ b/media-gfx/zgv/files/zgv-5.9-Makefile-QA.patch
@@ -0,0 +1,56 @@
+diff -NrU5 zgv-5.9.original/src/Makefile zgv-5.9/src/Makefile
+--- zgv-5.9.original/src/Makefile	2009-09-28 15:31:29.000000000 -0600
++++ zgv-5.9/src/Makefile	2009-09-28 15:56:26.000000000 -0600
+@@ -45,11 +45,11 @@
+ 	readbmp.o readtga.o readpng.o readpcx.o \
+ 	readxvpic.o readmrf.o readxbm.o readxpm.o \
+ 	modesel.o readpcd.o readtiff.o readprf.o zgv_io.o
+ 
+ zgv: $(ZGV_OBJS)
+-	$(CC) $(CFLAGS) -o zgv $(ZGV_OBJS) $(ZGV_LIBS)
++	$(CC) $(CFLAGS) $(LDFLAGS) -o zgv $(ZGV_OBJS) $(ZGV_LIBS)
+ 
+ bdf2h: bdf2h.o
+ 	$(CC) $(CFLAGS) -o bdf2h bdf2h.o
+ 
+ install-info: install-info.c
+@@ -59,28 +59,28 @@
+ # installation. Not nice to put this in the install target,
+ # but it's likely to cause problems if I don't.
+ # 
+ install: all
+ 	@if [ "$(BACKEND)" = SVGALIB ]; then \
+-	  echo $(RM) /usr/bin/zgv; \
+-	  $(RM) /usr/bin/zgv; \
+-	  echo install -m 4755 -o root -g root -s zgv $(BINDIR); \
+-	  install -m 4755 -o root -g root -s zgv $(BINDIR); \
++	  echo echo /usr/bin/zgv; \
++	  echo /usr/bin/zgv; \
++	  echo install -m 0755 -o root -g root zgv $(BINDIR); \
++	  install -m 0755 -o root -g root zgv $(BINDIR); \
+ 	fi
+ 	@if [ "$(BACKEND)" = SDL ]; then \
+-	  echo $(RM) /usr/bin/zgv-sdl; \
+-	  $(RM) /usr/bin/zgv-sdl; \
+-	  echo install -m 755 -s zgv $(BINDIR)/zgv-sdl; \
+-	  install -m 755 -s zgv $(BINDIR)/zgv-sdl; \
++	  echo echo /usr/bin/zgv-sdl; \
++	  echo /usr/bin/zgv-sdl; \
++	  echo install -m 755 zgv $(BINDIR)/zgv-sdl; \
++	  install -m 755 zgv $(BINDIR)/zgv-sdl; \
+ 	fi
+ 
+ uninstall:
+-	$(RM) $(BINDIR)/zgv $(BINDIR)/zgv-sdl
++	echo $(BINDIR)/zgv $(BINDIR)/zgv-sdl
+ 
+ clean:
+-	$(RM) *.o *~ zgv bdf2h fontbmps.h install-info
+-	$(RM) rcfile_opt.h rcfile_var.h rcfile_short.h
++	echo *.o *~ zgv bdf2h fontbmps.h install-info
++	echo rcfile_opt.h rcfile_var.h rcfile_short.h
+ 
+ # Dependancies
+ 3deffects.o: 3deffects.c 3deffects.h font.h readnbkey.h zgv.h \
+  rc_config.h rcfile.h mousecur.h rbmenu.h
+ bdf2h.o: bdf2h.c
diff --git a/media-gfx/zgv/zgv-5.9.ebuild b/media-gfx/zgv/zgv-5.9.ebuild
index c8ebdfe84a28..cc1264197102 100644
--- a/media-gfx/zgv/zgv-5.9.ebuild
+++ b/media-gfx/zgv/zgv-5.9.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/zgv/zgv-5.9.ebuild,v 1.2 2006/06/01 01:02:18 halcy0n Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/zgv/zgv-5.9.ebuild,v 1.3 2009/09/28 15:55:19 vostorga Exp $
 
-inherit eutils
+inherit eutils toolchain-funcs
 
 DESCRIPTION="A svgalib console image viewer"
 HOMEPAGE="http://www.svgalib.org/rus/zgv/"
@@ -19,31 +19,31 @@ DEPEND=">=media-libs/svgalib-1.4.2
 	>=media-libs/tiff-3.5.5
 	>=sys-libs/zlib-1.1.4
 	sys-apps/gawk"
+RDEPEND="${DEPEND}"
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
+	cd "${S}"
 	sed -i "/^CFLAGS=/s:=.*:=${CFLAGS}:" config.mk
-	sed -i "s:4755:0755:" src/Makefile
-	sed -i -e 's:$(RM):echo:' src/Makefile
 	sed -i -e 's:$(RM):echo:' doc/Makefile
-	epatch ${FILESDIR}/zgv-5.9-cmyk-yccl-fix.diff
+	epatch "${FILESDIR}"/${P}-Makefile-QA.patch
+	epatch "${FILESDIR}"/zgv-5.9-cmyk-yccl-fix.diff
 }
 
 src_compile() {
-	emake || die
+	emake CC="$(tc-getCC)" || die
 }
 
 src_install() {
 	dodir /usr/bin /usr/share/info /usr/share/man/man1
-	make PREFIX=${D}/usr \
-		INFODIR=${D}/usr/share/info \
-		MANDIR=${D}/usr/share/man/man1 \
+	make PREFIX="${D}"/usr \
+		INFODIR="${D}"/usr/share/info \
+		MANDIR="${D}"/usr/share/man/man1 \
 		install || die
-	dodoc AUTHORS COPYING ChangeLog INSTALL NEWS README* SECURITY TODO
+	dodoc AUTHORS ChangeLog INSTALL NEWS README* SECURITY TODO
 
 	# Fix info files
-	cd ${D}/usr/share/info
+	cd "${D}"/usr/share/info
 	rm dir*
 	mv zgv zgv.info
 	for i in 1 2 3 4 ; do