Fix grep locale (bug #532552). Fix building against sys-libs/ncurses[tinfo] (bug #457530). Respect AR. Clean up patch.

Package-Manager: portage-2.2.15/cvs/Linux x86_64
Manifest-Sign-Key: 0xA792A613

5 files changed, 59 insertions, 71 deletions

diff --git a/app-text/hnb/ChangeLog b/app-text/hnb/ChangeLog
index aa6400ac4894..0549fc389a2a 100644
--- a/app-text/hnb/ChangeLog
+++ b/app-text/hnb/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-text/hnb
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/hnb/ChangeLog,v 1.30 2014/08/10 18:23:24 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/hnb/ChangeLog,v 1.31 2014/12/14 13:20:08 jer Exp $
+
+  14 Dec 2014; Jeroen Roovers <jer@gentoo.org> hnb-1.9.18-r1.ebuild,
+  files/hnb-1.9.18-flags.patch, files/hnb-1.9.18-include.patch:
+  Fix grep locale (bug #532552). Fix building against sys-libs/ncurses[tinfo]
+  (bug #457530). Respect AR. Clean up patch.
 
   10 Aug 2014; Sergei Trofimovich <slyfox@gentoo.org> hnb-1.9.18-r1.ebuild:
   QA: drop trailing '.' from DESCRIPTION
diff --git a/app-text/hnb/Manifest b/app-text/hnb/Manifest
index af547a87b538..999ef177e734 100644
--- a/app-text/hnb/Manifest
+++ b/app-text/hnb/Manifest
@@ -1,16 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX hnb-1.9.18-flags.patch 3198 SHA256 d12d00d02bb9d493dc8ff06928406f72366115279b512d0fd93c101c84bbf487 SHA512 2d784bcc1c9fdf83564b9aaa3183c74a12a6ec5b520d3ebb7479775047f8b8df8b6d77041b276af15f026edec018fd4a19d128237e6a760fe3300db46d46baac WHIRLPOOL 027cf8881baa55906a4c2ddb505d29bf434d92cdffbcd9f62adf4e5321ed1872aa31afee7b7a711ae2545a3ac75014e1a06c260b20a735782025f90590c0f503
-AUX hnb-1.9.18-include.patch 339 SHA256 6ee944d5a6e866049e8e48318408f03447d24a8edd0513a3e276d13f34b69727 SHA512 cf61073ed691084572c08229199365c321d9acd22a47f79fb826ea4ebb8b2d29187400fe8b44cf9ea3ee4595fb7bd4f37f4a4432ed2bf214fb8a146f43b269b0 WHIRLPOOL d1a8483b1485c4bca36ce0383c926e32f697a717fec7bea144ac493176fb4a7c8970e6aac96f28685df49643390ed31880b866eecbfc6ee07c75024220907a37
+AUX hnb-1.9.18-flags.patch 2527 SHA256 f416fc5021b03b1229cfa3aa59ef5d0d19e44212a639219ef5ccac92886d6622 SHA512 672e8836a0766d0b922359572aff8319aa701a10863fb618bcd74c52980303d0e3158f3de7ca50cb05367296c7121c510a4e900d60721dee33b4e657a8a07e5a WHIRLPOOL e9449ed3f9743b1d9935bd36e0729ff73e2104e77d47348a9172e4f92f4fa08b9e9ffc8bec85d80b5428fc636be939802e3930b26e275902aa1566a82bf9908a
+AUX hnb-1.9.18-include.patch 244 SHA256 f16316a5f26ae4e279a3a9c275089b925065817dd7541aca4b56ff81c6cf71ed SHA512 5fa1b46221068885d9d2e2bde2f647c9f6756173af2f6568e4f32a00f64d6d753ed2aa2b841f7c1206afbd3d6af849bc374e8a29e84d2140c68cfa6627f4cb62 WHIRLPOOL 86702ebebca9133c308e6f6cbfe6f8cc4d37becd910adf774fa9e934e2d3667912a39c6f9673c38334c6742c25424492006dc8e0f22da9305261aa61beca579c
 DIST hnb-1.9.18.tar.gz 166043 SHA256 b9a1e567d904dc9d3eb262e4f6fd46a4494339452333c35d77e154c7b0d5031f SHA512 9919a5d6512b6da3d19cc8efbed21d4452a2f6a343a38758c36728f73415b6e8ad57e24ff3eec17eb4e1e53b458d579c165ae1ad906f5b75f2fd42897159a30f WHIRLPOOL 713bb592a3122e7fcaad0a6378134dbf6055d41004020bef4ddff0d1ac59ff596337b41b54792726cb170c8155ac4bf2ce4e9d0ebddb1ea5f403c0802e45330e
-EBUILD hnb-1.9.18-r1.ebuild 780 SHA256 ec270aeb958692634d6977726ecfb6d3dcc40d5e5f11c1d97e360627ea773bd1 SHA512 8961dfba7b96c085dce2c3c56da3a5073091bf589224aee84b9654e090c3b26f04f74ae83938089c2015f402efd88d63f131358f69751b5ad92df3096285d290 WHIRLPOOL 2dfb952c85bb0b09fdd8db2865afcd1fe7bfbe4d8f075539b764d4743ab3244bd485b9f24e8a28283ed467525337ce14b1587856acea7affc675c9630e068a8f
-MISC ChangeLog 3282 SHA256 06570002feff42ead4797c79bda860e5d56854966f41147d1c076bc205df16a8 SHA512 61cb0808005654bfc8c7fd906e285fa080ed249d796a3aec4ffe449d27b0b063c9c723e59e84489a399906aa1dcfedccf4c58a3bb3e7fe106f763ec283da7e79 WHIRLPOOL cc6c0392b164a37a578f5a8977ecd6c1c5a94bf13ff35c4c411e46da27175dfdf98f1b507af8d123434af24e2ba8fdc20a2a7c9ff1c41880909e1f7d0e44db5a
+EBUILD hnb-1.9.18-r1.ebuild 863 SHA256 6088b073ea5408132867547f5670f9cf3480bb74132100d94e1b4bf1e9e2b1ea SHA512 c9854971c958c293cdde0428f655df78addc8c5f3f7a17f5ec6e291a3b4c288b5427600e45e6a2acf47f4bcf9c08f3868ba54c763f12b692b3b1b43e5a789fdf WHIRLPOOL 79c8502ea72d5e2f416bde55e31f98c60051cfe096e2e5a6b2eee8d2e213b6bc09b43c969cbd6ab6f1253d77363c1fbfccd4571d5f6017fe6b282fc86c88f6ef
+MISC ChangeLog 3536 SHA256 e9d2c73e6fe4006de541ed40ae376507516db6648abe7ba3f30378e8af433bf2 SHA512 f626ff1e0848f29be4a32a9d878cfdc297804fe7cbf51f317b17ab9b1beb0b1f5e4542174b4fade62d9b304f34ef20b73cbdad365e09b35978a56362547fb249 WHIRLPOOL 9f089684174bdf7f0e5f160a96223166af64a44b5fb7bad6f532e3c890facecceb9a1b552d6aba1d651b7ae4e273bf19e1972528041adac7de7226e688391c1c
 MISC metadata.xml 495 SHA256 b76b6ba1bd8d39aec6c4ff2548ca7c83c4a1b7bd912cfa4a82e81b96d352d6be SHA512 d2170e4a720a423f0d103348363d4a939e5c9d9e2b44da6703b818436ac569629b69555868b5ad1279b0b3b933a50659994e0dbad6fed095c69ebd3c2fccadc6 WHIRLPOOL 6ab873a747a2e096ee197b011fe1c7e79b1ac4f5f9ecc54883efcf8828d9a89b5df54c49d7a7f31efe6bd3ee02ab8d17522f1b7a295e0d371a03715abd5f7fe4
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlPnuJ0ACgkQcaHudmEf86oAoACcDomrCW5M52vaXkaasj8+us5S
-yNEAn3RI6t7icdfjEhr8/IskicI0YvFg
-=RwST
+iEYEAREIAAYFAlSNjooACgkQVWmRsqeSphNZxwCfb9kpVQPSyqAGhxJo5lueUHh6
+ygEAn28oGjd9/lSPNi28NEJ5vRfbs+ZN
+=Fi1I
 -----END PGP SIGNATURE-----
diff --git a/app-text/hnb/files/hnb-1.9.18-flags.patch b/app-text/hnb/files/hnb-1.9.18-flags.patch
index 325ec1187103..4111b7078d70 100644
--- a/app-text/hnb/files/hnb-1.9.18-flags.patch
+++ b/app-text/hnb/files/hnb-1.9.18-flags.patch
@@ -1,5 +1,5 @@
---- ./hnb-1.9.18/Makefile.orig	2003-08-27 04:50:58.000000000 +0200
-+++ ./hnb-1.9.18/Makefile	2009-10-23 14:23:16.000000000 +0200
+--- a/Makefile
++++ b/Makefile
 @@ -1,19 +1,19 @@
  
  src/hnb: src/*.c src/*.h src/*.inc src/hnbrc.inc
@@ -24,43 +24,18 @@
  	echo -n "\"">src/hnbrc.inc
  	cat doc/hnbrc | util/asc2c >> src/hnbrc.inc
  	echo "\"">>src/hnbrc.inc
---- ./hnb-1.9.18/hnb-1.9.18/Makefile.orig	2003-08-27 04:50:58.000000000 +0200
-+++ ./hnb-1.9.18/hnb-1.9.18/Makefile	2009-10-23 14:23:16.000000000 +0200
-@@ -1,19 +1,19 @@
- 
- src/hnb: src/*.c src/*.h src/*.inc src/hnbrc.inc
--	(cd src;make)
-+	(cd src;$(MAKE))
- install: src/hnb
- 	install -D src/hnb /usr/local/bin/hnb
- 	install -D -m444 doc/hnb.1 /usr/local/man/man1/hnb.1
- clean:
--	(cd src;make clean)
--	(cd util;make clean)
-+	(cd src;$(MAKE) clean)
-+	(cd util;$(MAKE) clean)
- 	rm -f *~
- 
- rcupdate: updaterc
- updaterc: src/hnbrc.inc
- 
- src/hnbrc.inc: doc/hnbrc
--	(cd util;make)
-+	(cd util;$(MAKE))
- 	echo -n "\"">src/hnbrc.inc
- 	cat doc/hnbrc | util/asc2c >> src/hnbrc.inc
- 	echo "\"">>src/hnbrc.inc
---- ./hnb-1.9.18/src/Makefile.orig	2003-08-27 04:50:58.000000000 +0200
-+++ ./hnb-1.9.18/src/Makefile	2009-10-23 14:23:16.000000000 +0200
+--- a/src/Makefile
++++ b/src/Makefile
 @@ -1,5 +1,6 @@
- LIBS=-lncurses libcli/libcli.a
+-LIBS=-lncurses libcli/libcli.a
 -CFLAGS=-I.. -Ilibcli -DHAVE_CONFIG_H -Wall -pedantic -g
++LIBS=$(shell ${PKG_CONFIG} --libs ncurses) libcli/libcli.a
 +CFLAGS+=-Wall -pedantic
 +CPPFLAGS+=-I.. -Ilibcli -DHAVE_CONFIG_H
  
  CFILES=$(wildcard *.c)
  OBJS=$(patsubst %.c,%.o,$(CFILES))
-@@ -8,12 +9,12 @@
+@@ -8,22 +9,22 @@
  	$(CC) -c $(CFLAGS) $(CPPFLAGS) -o $@ $<
  
  hnb: libcli/libcli.a Makefile $(OBJS) init_subsystems.c *.h *.inc
@@ -72,11 +47,16 @@
 +	(cd libcli;$(MAKE) libcli.a)
  libcli/libcli_p.a: libcli/*.c
 -	(cd libcli;make libcli_p.a)
+-init_subsystems.c: *.c
 +	(cd libcli;$(MAKE) libcli_p.a)
- init_subsystems.c: *.c
++init_subsystems.c: $(CFILES)
  	echo "/* this file is autogenerated, do not edit */">init_subsystems.c
- 	cat *.c | grep "^\!init_" | sort | sed -e "s/^\!/void /g">>init_subsystems.c
-@@ -23,7 +24,7 @@
+-	cat *.c | grep "^\!init_" | sort | sed -e "s/^\!/void /g">>init_subsystems.c
++	cat $(CFILES) | grep "^\!init_" | sort | sed -e "s/^\!/void /g">>init_subsystems.c
+ 	echo "">>init_subsystems.c
+ 	echo "void init_subsystems(){">>init_subsystems.c
+-	cat *.c | grep "^\!init_" | sort | sed -e "s/^\!/ /g">>init_subsystems.c
++	cat $(CFILES) | grep "^\!init_" | sort | sed -e "s/^\!/ /g">>init_subsystems.c
  	echo "}">>init_subsystems.c
  clean:
  	rm -f xml_debug hnb $(OBJS) *~ cli_*.inc
@@ -85,22 +65,19 @@
  hnb_p: *.c libcli/libcli_p.a init_subsystems.c
  	$(CC) -o hnb_p *.c -pg -lncurses_p libcli/libcli_p.a -I.. -Ilibcli -DHAVE_CONFIG_H
  
---- ./hnb-1.9.18/src/libcli/Makefile.orig	2003-08-27 04:50:59.000000000 +0200
-+++ ./hnb-1.9.18/src/libcli/Makefile	2009-10-23 14:25:37.000000000 +0200
-@@ -1,5 +1,3 @@
--CFLAGS = -Wall
--
- OBJS = cli.o cli_history.o cli_tokenize.o
- 
- all: libcli.a libcli.so test-static test-shared 
-@@ -9,8 +7,8 @@
+--- a/src/libcli/Makefile
++++ b/src/libcli/Makefile
+@@ -7,11 +7,11 @@
+ clean:
+ 	rm -f *.o *.a *.so test-s* *~
  libcli.a: $(OBJS)
- 	ar rc libcli.a cli*.o
+-	ar rc libcli.a cli*.o
++	$(AR) rc libcli.a cli*.o
  libcli_p.a: 
--	$(CC) -pg -c cli.c
--	$(CC) -pg -c cli_history.c
-+	$(CC) -pg -c cli.c $(CFLAGS)
-+	$(CC) -pg -c cli_history.c $(CFLAGS)
- 	ar rcs libcli_p.a cli*.o
+ 	$(CC) -pg -c cli.c
+ 	$(CC) -pg -c cli_history.c
+-	ar rcs libcli_p.a cli*.o
++	$(AR) rcs libcli_p.a cli*.o
  libcli.so: $(OBJS)
  	$(CC) -shared cli*.o -o libcli.so $(CFLAGS) $(LIBS)
+ test-static: test.o libcli.a
diff --git a/app-text/hnb/files/hnb-1.9.18-include.patch b/app-text/hnb/files/hnb-1.9.18-include.patch
index 6c00386331d4..9ee57a351d51 100644
--- a/app-text/hnb/files/hnb-1.9.18-include.patch
+++ b/app-text/hnb/files/hnb-1.9.18-include.patch
@@ -1,5 +1,5 @@
---- hnb-1.9.18/src/expanded.c.orig	2003-08-27 04:50:59.000000000 +0200
-+++ hnb-1.9.18/src/expanded.c	2009-10-23 14:40:16.000000000 +0200
+--- a/src/expanded.c
++++ b/src/expanded.c
 @@ -18,9 +18,9 @@
   * Temple Place - Suite 330, Boston, MA 02111-1307, USA.
   */
diff --git a/app-text/hnb/hnb-1.9.18-r1.ebuild b/app-text/hnb/hnb-1.9.18-r1.ebuild
index 38c93eab8425..ec7f2efe77a9 100644
--- a/app-text/hnb/hnb-1.9.18-r1.ebuild
+++ b/app-text/hnb/hnb-1.9.18-r1.ebuild
@@ -1,30 +1,36 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/hnb/hnb-1.9.18-r1.ebuild,v 1.8 2014/08/10 18:23:24 slyfox Exp $
-
-EAPI="2"
+# $Header: /var/cvsroot/gentoo-x86/app-text/hnb/hnb-1.9.18-r1.ebuild,v 1.9 2014/12/14 13:20:08 jer Exp $
 
+EAPI=5
 inherit eutils toolchain-funcs
 
 DESCRIPTION="A program to organize many kinds of data in one place"
-SRC_URI="http://hnb.sourceforge.net/.files/${P}.tar.gz"
 HOMEPAGE="http://hnb.sourceforge.net/"
+SRC_URI="http://hnb.sourceforge.net/.files/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="amd64 ppc ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE=""
 
-DEPEND=""
 RDEPEND="sys-libs/ncurses"
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+"
 
 src_prepare() {
-	epatch "${FILESDIR}/${P}-flags.patch" "${FILESDIR}/${P}-include.patch"
-}
+	rm -r ${P} || die
+	rm src/cli_history.o || die
+
+	epatch \
+		"${FILESDIR}"/${P}-flags.patch \
+		"${FILESDIR}"/${P}-include.patch
+
+	tc-export AR CC PKG_CONFIG
 
-src_compile() {
-	tc-export CC
-	default_src_compile
+	# bug #532552
+	export LC_ALL=C
 }
 
 src_install() {