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

Package-Manager: portage-2.1.6.13/cvs/Linux i686

4 files changed, 78 insertions, 26 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/Manifest b/media-gfx/zgv/Manifest
index fa5ba762d892..d061b633499f 100644
--- a/media-gfx/zgv/Manifest
+++ b/media-gfx/zgv/Manifest
@@ -1,15 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+AUX zgv-5.9-Makefile-QA.patch 1906 RMD160 36c6d8daa89e46e40024025d699b413efca33473 SHA1 9aedbafd2b9c901cca6b915b43e4479271377c02 SHA256 5979a006a7a54f999afc3cfeb7f2a3c6b4bc4ed7c28a7854055df58abe72e492
 AUX zgv-5.9-cmyk-yccl-fix.diff 1554 RMD160 c7b9c9c4f1bfda5e7b49d4ced5da75e2de974953 SHA1 1e161341030ab69feba9926693e7e97bd8aaecad SHA256 17291c05c6d67c32b5bfc1c4afd0756bc8e168567c7a8e965a2befb20b18689c
 DIST zgv-5.9.tar.gz 395525 RMD160 1d1c47c77adc732c581d9db1189243a94c510586 SHA1 e29b81bb51401376b43397de3857e8ed846a7cad SHA256 92e5d848fb51a77dc0ebb0ab383c1499c23aaff01f5445e9b0d75e067a8a64ba
-EBUILD zgv-5.9.ebuild 1215 RMD160 c459821a9e1d93bced0e25408673fd325d2b6b56 SHA1 29847aae0a973c5b984d76d2e9d42f9eb13d4ae9 SHA256 307d7d41542d5174e1eb49399495cbbb5266dde2706cdf575bf4720aac3e96a7
-MISC ChangeLog 2270 RMD160 ab2f4ded10dae31a15ecfb3a8b1d4bf86724a49a SHA1 55811c239add8660ed86c868073efc0389a4c99d SHA256 835bf694dd6511ac2b9d22515cec35dad3e8372bfe175b0f40a3580f819c824e
+EBUILD zgv-5.9.ebuild 1242 RMD160 63120f27ec36266c583acc3f72f8c004dfbc8b9e SHA1 f8f05bda442a5c347982b21f8f70be0d0a1cc336 SHA256 19ef94ced056bd2ca707e876ec1eb9d5d2b2cf6f4bc832fc4760408c3eb24601
+MISC ChangeLog 2486 RMD160 e53e869d073c56f5bfd3add799c84ee9a4748559 SHA1 fd8b5e5d639653df34898951d5cb20a43b0873de SHA256 45a1aa7548585cb17b58482cbe1001303fe648ae3bccc5b982d96a5f806624e8
 MISC metadata.xml 290 RMD160 b9b86283c09349c8827faef7d3ef5f724a248e77 SHA1 ae1c8e62d75c94ff50b8a5391afb6008460963aa SHA256 380e26e9262298b9cb31e863a9ab641f6fbdc8c50bda2cf2e47fd399f9cb5e85
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAko9d4wACgkQAiZjviIA2Xg/XgCgqHxCcMvIpT+o52jdd6Z5VNbV
-VE4An0EIds0VFYSm9oOarm+FNrAcmrzD
-=Sfhx
------END PGP SIGNATURE-----
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