Respecting CC, LD, AR, RANLIB variables, bug #243972, Fixing pre-stripped files, bug #255833 , Fixing man page location bug #255835 , Respecting CFLAGS and LDFLAGS , Now builds in ~amd64 , thanks to Diego E.

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

6 files changed, 68 insertions, 32 deletions

diff --git a/dev-util/biew/ChangeLog b/dev-util/biew/ChangeLog
index bde739ae9c49..ded01b64f654 100644
--- a/dev-util/biew/ChangeLog
+++ b/dev-util/biew/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for dev-util/biew
-# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/biew/ChangeLog,v 1.24 2008/12/26 08:07:23 wormo Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/biew/ChangeLog,v 1.25 2009/08/25 18:40:37 vostorga Exp $
+
+  25 Aug 2009; Víctor Ostorga <vostorga@gentoo.org> biew-5.7.0.ebuild,
+  +files/biew-570-configure.patch, -files/biew-570-configure-gpm.patch,
+  files/biew-570-makefile.patch:
+  Respecting CC, LD, AR, RANLIB variables, bug #243972
+  Fixing pre-stripped files, bug #255833
+  Fixing man page location, patch thanks to Sandro Bonazzola and Wim Muskee
+  bug #255835 
+  Respecting CFLAGS and LDFLAGS
+  Now builds in ~amd64 , thanks to Diego E." Flameeyes" Pettenò
+  <flameeyes@gmail.com>
 
 *biew-5.7.0 (26 Dec 2008)
 
diff --git a/dev-util/biew/Manifest b/dev-util/biew/Manifest
index b9175f912b4c..b69aa35a4488 100644
--- a/dev-util/biew/Manifest
+++ b/dev-util/biew/Manifest
@@ -1,10 +1,10 @@
 AUX biew-562-lvalue-casts.patch 5531 RMD160 fd994fa1c4104023b1644a5a8cb53adbafe4b7cf SHA1 b579bbfc6fb8e3a6d8e572e6dc5b16caf7597415 SHA256 1a9090cd036ee0c32d4e36a8db6fd10238e6011d0daf579041a3079912dad5c3
-AUX biew-570-configure-gpm.patch 438 RMD160 babcf41509c96a687edc49054be1c365b5bb35f5 SHA1 9b97afde5558a7605f6351571cacd048e6c88d01 SHA256 e68e00503e0d9ecc743f0cfeb0a165de1073f9344a7019fa91aee62097519659
-AUX biew-570-makefile.patch 1470 RMD160 ad57982ba052fa1b99393aa5a4d0cbd2eab9dc74 SHA1 b275ab43972ccd4c90069a597d231f7aa107e7e5 SHA256 4e01be131af03bcca368dd5a6504a88181d1b8ee411c479661ac30f5536a3015
+AUX biew-570-configure.patch 1154 RMD160 edca8e96e0e826bea883958c9397173ed230f2b9 SHA1 48e59cbf46e56d7b67aa7a34829c78a4dc97ed30 SHA256 932edf14885c13620a51c2af103363e9dc8d456f110e7ae7d3af959e367e66af
+AUX biew-570-makefile.patch 1792 RMD160 8dd4d75448dcb4ba062a3454bebaa15e901fffbd SHA1 4cc83629fc03555a16d78e5116752871bc7b5dde SHA256 d40cfacb2aafc68153c43f1090ee3163ef5395e630d26a47d895b256be989642
 DIST biew-570.tar.bz2 734263 RMD160 c9b27528f3d23016cb5050bc01eeeb6585c02956 SHA1 5f3207cc713a8e0d665df1c1335764dc94463049 SHA256 5cc56bfe1951f7a66989cf0dd342e71c8600942b6ac05fece2f95aff6353248c
 DIST biew562.tar.bz2 594367 RMD160 413f2c72a70056adbebd5e79d541201d6e3b27cb SHA1 44435c0815a59d38c9a6c74d09c0f495e71e23fe SHA256 82263fdd9f9854a9326889b8d4e138c0dba3f08460922d4683f659873313e46a
 EBUILD biew-5.6.2-r1.ebuild 1678 RMD160 4ecc7326e5121e8c3e4777521764a793caff2215 SHA1 aed4077ff37825f68de95d12a5499afdeadc7ba3 SHA256 8d84058f77c8afcdf3a54a37a2f7ac612561a112909838a730abccf3bd7bbf42
 EBUILD biew-5.6.2.ebuild 1555 RMD160 ad7c69643c772863741c8d18042b03043856a3f2 SHA1 6a5099cc03f7e54ee76ea2456d0e984ffaa32d79 SHA256 91590f47083f4d6d23761c79e22f719c4c1a9fd18104ab57906e19819525023f
-EBUILD biew-5.7.0.ebuild 1321 RMD160 8a6de85c20b6b07e0cf79abc316edd8697359933 SHA1 ce3b7c0ca32c0fdfadbac79b2dd92ed9b84007e6 SHA256 32cd25edc001b1495a60a6a7175e8d596c9895274bcf3fe7c76c6abed3567968
-MISC ChangeLog 3111 RMD160 0b76cbb893b511ebb5b123743f65ad482da76bc1 SHA1 04d2f2a48fb7e4fa651d663077a02954e224e119 SHA256 9907971bdf8e2f1375bdb8095a8da15be0e562e6608bf1c86d0d323e4e582d27
+EBUILD biew-5.7.0.ebuild 1565 RMD160 368a4704b0076489b88a2f0398cedcacb16494a2 SHA1 b94fd831a5fc9a2364167a40cc249059692b59c4 SHA256 54a94dc90e10b55e9a66ac20606d2b42bfd34307085db482ca934a9807e73fad
+MISC ChangeLog 3600 RMD160 ba9d7095451f2af6956a37a8f64cb9e239fe0ad2 SHA1 a77eac901246ff018e9e43c39f0633931c1b29dd SHA256 e4e975c03fe8a53cbfee281f9df6cc8ecc0c2993e85f8069057be204a4c2a1e4
 MISC metadata.xml 233 RMD160 d81ec1a0582856aeac5ef3bfec5c80d9850216f6 SHA1 9b94f113e7f382076b1749c2a856e409c96cade3 SHA256 dce03f6cdd96135caf3c971a5ca4a8c916f44532fe8cfb6df88b7bdade407e8b
diff --git a/dev-util/biew/biew-5.7.0.ebuild b/dev-util/biew/biew-5.7.0.ebuild
index a864013a6abc..1544f2448494 100644
--- a/dev-util/biew/biew-5.7.0.ebuild
+++ b/dev-util/biew/biew-5.7.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/biew/biew-5.7.0.ebuild,v 1.1 2008/12/26 08:07:23 wormo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/biew/biew-5.7.0.ebuild,v 1.2 2009/08/25 18:40:37 vostorga Exp $
 
-inherit eutils
+inherit eutils toolchain-funcs flag-o-matic
 
 DESCRIPTION="A portable viewer of binary files, hexadecimal and disassembler modes."
 HOMEPAGE="http://biew.sourceforge.net"
@@ -27,7 +27,7 @@ S=${WORKDIR}/${PN}-${PV//./}
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
-	epatch "${FILESDIR}"/biew-570-configure-gpm.patch
+	epatch "${FILESDIR}"/biew-570-configure.patch
 	epatch "${FILESDIR}"/biew-570-makefile.patch
 }
 
@@ -41,8 +41,13 @@ src_compile() {
 	fi
 	export _gpm=${enable_gpm}
 
-	econf
-	emake
+	append-flags -D_GNU_SOURCE
+
+	econf --cc="$(tc-getCC)" --ld="$(tc-getCC)" \
+		--ar="$(tc-getAR) -rcu" --ranlib="$(tc-getRANLIB)" \
+		--enable-debug
+	emake HOST_CFLAGS="${CFLAGS}" HOST_LDFLAGS="${LDFLAGS}" \
+		|| die "make failed"
 	for i in doc/*.ru doc/file_id.diz doc/biew_ru.txt doc/biew_en.txt
 	do
 		if iconv -f cp866 -t utf-8 "$i" > "$i.conv"
diff --git a/dev-util/biew/files/biew-570-configure-gpm.patch b/dev-util/biew/files/biew-570-configure-gpm.patch
deleted file mode 100644
index 61497f80ca89..000000000000
--- a/dev-util/biew/files/biew-570-configure-gpm.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- configure.old	2008-12-24 13:26:59.000000000 -0800
-+++ configure	2008-12-24 13:34:00.000000000 -0800
-@@ -478,8 +478,11 @@
- 	#include <gpm.h>
- 	int main(void) {return 0;}
- EOF
--	_gpm=no
--	cc_check -lgpm && _gpm=yes
-+	# _gpm may be forced from command line
-+	if test -z "$_gpm" ; then
-+	    _gpm=no
-+	    cc_check -lgpm && _gpm=yes
-+	fi
- 	if test "$_gpm" = yes ; then
- 	    _cdefos="-DHAVE_MOUSE $_cdefos"
- 	    _oslibs="-lgpm $_oslibs"
diff --git a/dev-util/biew/files/biew-570-configure.patch b/dev-util/biew/files/biew-570-configure.patch
new file mode 100644
index 000000000000..428e7d31e7aa
--- /dev/null
+++ b/dev-util/biew/files/biew-570-configure.patch
@@ -0,0 +1,31 @@
+diff -NrU5 biew-570.original/configure biew-570/configure
+--- biew-570.original/configure	2009-08-25 16:18:03.000000000 -0600
++++ biew-570/configure	2009-08-25 16:54:17.000000000 -0600
+@@ -467,21 +467,24 @@
+     qnxnto)
+ 	_cdefos="-D__QNX6__ -D__UNIX__ -D__OS_NAME__='\"QNX6\"' -D__OS__=\"qnxnto\" -U__QNX__ -U__NTO__ -D_VT100_ -DHAVE_TERMINAL_OUT=1 -D__DISABLE_MMF -DPREFIX=\"$_prefix\" $_cdefos"
+ 	_oslibs="-lncurses $_oslibs"
+ 	;;
+     linux)
+-        if test $_ld=gcc ; then
++        if test $_ld = gcc -o $_ld = x86_64-pc-linux-gnu-gcc -o $_ld = i686-pc-linux-gnu-gcc; then
+             _osldef="-m32 $_osldef"
+         fi
+ 	_cdefos="-D__LINUX__ -D__UNIX__ -D__OS_NAME__='\"Linux\"' -D__OS__=\"linux\" -Ulinux -D_VT100_ -DHAVE_TERMINAL_OUT=1 -DPREFIX=\"$_prefix\" $_cdefos"
+ echocheck "gpm.h"
+ 	cat > $TMPC << EOF
+ 	#include <gpm.h>
+ 	int main(void) {return 0;}
+ EOF
+-	_gpm=no
+-	cc_check -lgpm && _gpm=yes
++	# _gpm may be forced from command line
++	if test -z "$_gpm" ; then
++	    _gpm=no
++	    cc_check -lgpm && _gpm=yes
++	fi
+ 	if test "$_gpm" = yes ; then
+ 	    _cdefos="-DHAVE_MOUSE $_cdefos"
+ 	    _oslibs="-lgpm $_oslibs"
+ 	fi
+ echores "$_gpm"
diff --git a/dev-util/biew/files/biew-570-makefile.patch b/dev-util/biew/files/biew-570-makefile.patch
index eda929ba33d1..8943da94744d 100644
--- a/dev-util/biew/files/biew-570-makefile.patch
+++ b/dev-util/biew/files/biew-570-makefile.patch
@@ -1,6 +1,9 @@
---- makefile.orig	2008-12-21 12:33:37.001959467 +0100
-+++ makefile	2008-12-21 12:38:56.925669582 +0100
-@@ -271,16 +271,16 @@
+diff -NrU5 biew-570.original/makefile biew-570/makefile
+--- biew-570.original/makefile	2009-08-25 18:45:37.000000000 -0600
++++ biew-570/makefile	2009-08-25 18:47:01.000000000 -0600
+@@ -269,20 +269,20 @@
+ 	@echo "*** installation. Please download 'fileutils' from ftp://ftp.gnu.org and"
+ 	@echo "*** install them to have possibility perform autiomatic installation"
  	@echo "*** of this project" 
  	@exit 1
  endif
@@ -15,7 +18,7 @@
 -	$(INSTALL) -D -c -m 644 bin_rc/xlt/russian/*.xlt $(DATADIR)/xlt/russian
 -	$(INSTALL) -D -c -m 644 bin_rc/xlt/*.xlt bin_rc/xlt/readme $(DATADIR)/xlt
 +	$(INSTALL) -D -m 755 $(TARGET) $(DESTDIR)$(PREFIX)/bin/$(TARGET)
-+	$(INSTALL) -D -c -m 644 doc/biew.1 $(DESTDIR)$(PREFIX)/man/man1/biew.1
++	$(INSTALL) -D -c -m 644 doc/biew.1 $(DESTDIR)$(DATADIR)/man/man1/biew.1
 +	$(INSTALL) -D -c -m 644 bin_rc/biew.hlp $(DESTDIR)$(DATADIR)/biew.hlp
 +	mkdir --parents $(DESTDIR)$(DATADIR)/skn
 +	$(INSTALL) -D -c -m 644 bin_rc/skn/*.skn $(DESTDIR)$(DATADIR)/skn
@@ -27,3 +30,5 @@
  uninstall:
  	$(RM) $(PREFIX)/bin/$(TARGET)
  	$(RM) $(DATADIR)/skn/*
+ 	rmdir -p --ignore-fail-on-non-empty $(DATADIR)/skn
+ 	$(RM) $(DATADIR)/syntax/*