gentoo resync : 14.07.2018

6 files changed, 167 insertions, 0 deletions

diff --git a/app-text/hnb/Manifest b/app-text/hnb/Manifest
new file mode 100644
index 000000000000..2e4e83202df6
--- /dev/null
+++ b/app-text/hnb/Manifest
@@ -0,0 +1,6 @@
+AUX hnb-1.9.18-flags.patch 2527 BLAKE2B cdfd66a4907d3431bb704f4f4b922543b2793cf6a1156e54ec363279a8771ab819340c6537522004f362371a7e410a4d68eff8dd1cb9881d0996969b9abc705f SHA512 672e8836a0766d0b922359572aff8319aa701a10863fb618bcd74c52980303d0e3158f3de7ca50cb05367296c7121c510a4e900d60721dee33b4e657a8a07e5a
+AUX hnb-1.9.18-include.patch 244 BLAKE2B 68ca79ccfd2f3b282d0d0f2ab7f633caf82b1a7e7c67b403a766db7a45365dd3f3ff0d25dd4d2ab496eebef4044688045f54e0e1f723b721616b34a59968c775 SHA512 5fa1b46221068885d9d2e2bde2f647c9f6756173af2f6568e4f32a00f64d6d753ed2aa2b841f7c1206afbd3d6af849bc374e8a29e84d2140c68cfa6627f4cb62
+AUX hnb-1.9.18-printf.patch 216 BLAKE2B 446e1d5338509fd67726c663c68ee5dda70d20777ebc6344224377acf36edfc6b57e60c7490a059991a7fa08e3c0e4b928f55f012e0b3e580bf14686cde50490 SHA512 2638a268020ca55619be92921698e82d540b1f7bf75af3014339ae7e5f674e9f28e3618bd195f0e946f5276c0c2464e2336883db90af2036d2b356f1c9680e53
+DIST hnb-1.9.18.tar.gz 166043 BLAKE2B 9d4257a4b76fb1458ed5df2743997bdfa416faad9ac328693a636250c0f3c8bf9fe6244436c36a4c5efaec254da1d89afb5e5d1afc8c438309851091530a43cc SHA512 9919a5d6512b6da3d19cc8efbed21d4452a2f6a343a38758c36728f73415b6e8ad57e24ff3eec17eb4e1e53b458d579c165ae1ad906f5b75f2fd42897159a30f
+EBUILD hnb-1.9.18-r1.ebuild 794 BLAKE2B 3b834f83848265dd3137dfc8c0c2ece75f9c5c734a6bf6242d7ff2285f5d11ca1ecb5b550066dd392b3399fc04137eb4f40997f48f8241727496743f67f83ee0 SHA512 642fde554203fa300e8b883a8580a85207d0ad34e4c5382f90ca5f79f9152a8c8bdcfb376b7211ecf6f0618fb7eb0b79e277cb04c75ca9c39054b927afa8a833
+MISC metadata.xml 521 BLAKE2B 763dfba52975b9c55ad9b91ff304dc5555d60e4d425f0349fdb8ca475368956b941ab0a771019943628836fc2a7c68ffc63b329922b6249c04891084fb5bd53f SHA512 109d368df00aef9bb47380f20afb9695a877425a557ff188d16c37037160c6342cd6533f858ca224d197ce1b4c21e7b456584753de264e412d0b22a3cb16d903
diff --git a/app-text/hnb/files/hnb-1.9.18-flags.patch b/app-text/hnb/files/hnb-1.9.18-flags.patch
new file mode 100644
index 000000000000..4111b7078d70
--- /dev/null
+++ b/app-text/hnb/files/hnb-1.9.18-flags.patch
@@ -0,0 +1,83 @@
+--- a/Makefile
++++ b/Makefile
+@@ -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
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -1,5 +1,6 @@
+-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,22 +9,22 @@
+ 	$(CC) -c $(CFLAGS) $(CPPFLAGS) -o $@ $<
+ 
+ hnb: libcli/libcli.a Makefile $(OBJS) init_subsystems.c *.h *.inc
+-	$(CC) -o hnb $(OBJS) $(LIBS) $(CFLAGS)
++	$(CC) -o hnb $(OBJS) $(LIBS) $(CFLAGS) $(LDFLAGS)
+ #	strip hnb
+ libcli/libcli.a: libcli/*.c
+-	(cd libcli;make libcli.a)
++	(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: $(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
++	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
+-	(cd libcli;make clean)
++	(cd libcli;$(MAKE) clean)
+ 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
+ 
+--- 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
+ libcli_p.a: 
+ 	$(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
new file mode 100644
index 000000000000..9ee57a351d51
--- /dev/null
+++ b/app-text/hnb/files/hnb-1.9.18-include.patch
@@ -0,0 +1,13 @@
+--- a/src/expanded.c
++++ b/src/expanded.c
+@@ -18,9 +18,9 @@
+  * Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+  */
+ 
++#include <string.h>
+ #include "tree.h"
+ #include "cli.h"
+-#define NULL 0
+ 
+ #include "evilloop.h"
+ #include "ctype.h"
diff --git a/app-text/hnb/files/hnb-1.9.18-printf.patch b/app-text/hnb/files/hnb-1.9.18-printf.patch
new file mode 100644
index 000000000000..d8ac27efb643
--- /dev/null
+++ b/app-text/hnb/files/hnb-1.9.18-printf.patch
@@ -0,0 +1,11 @@
+--- a/src/libcli/cli.c
++++ b/src/libcli/cli.c
+@@ -57,7 +57,7 @@
+ 				wp=word;
+ 				*wp='\0';
+ 			} else {
+-				printf(tbuf);printf("\n");
++				printf("%s\n", tbuf);
+ 				bp=tbuf;
+ 				*bp='\0';
+ 				strcpy(bp,word);
diff --git a/app-text/hnb/hnb-1.9.18-r1.ebuild b/app-text/hnb/hnb-1.9.18-r1.ebuild
new file mode 100644
index 000000000000..a38796bc73be
--- /dev/null
+++ b/app-text/hnb/hnb-1.9.18-r1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils toolchain-funcs
+
+DESCRIPTION="A program to organize many kinds of data in one place"
+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"
+
+RDEPEND="sys-libs/ncurses"
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	rm -r ${P} || die
+	rm src/cli_history.o || die
+
+	epatch \
+		"${FILESDIR}"/${P}-flags.patch \
+		"${FILESDIR}"/${P}-include.patch \
+		"${FILESDIR}"/${P}-printf.patch
+
+	tc-export AR CC PKG_CONFIG
+
+	# bug #532552
+	export LC_ALL=C
+}
+
+src_install() {
+	dodoc README doc/hnbrc
+	doman doc/hnb.1
+	dobin src/hnb
+}
diff --git a/app-text/hnb/metadata.xml b/app-text/hnb/metadata.xml
new file mode 100644
index 000000000000..b426f3b5f745
--- /dev/null
+++ b/app-text/hnb/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<!-- maintainer-needed -->
+	<longdescription>
+		hnb is a program to organize many kinds of data in one place, including
+		addresses, TODO lists, ideas, book reviews, brainstorming, speech
+		outlines, etc. It stores data in XML format, and is capable of native
+		export to ASCII and HTML.
+	</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">hnb</remote-id>
+	</upstream>
+</pkgmetadata>