gentoo resync : 14.07.2018

8 files changed, 185 insertions, 0 deletions

diff --git a/app-admin/ccze/Manifest b/app-admin/ccze/Manifest
new file mode 100644
index 000000000000..c36ebec0626a
--- /dev/null
+++ b/app-admin/ccze/Manifest
@@ -0,0 +1,8 @@
+AUX ccze-0.2.1-tinfo.patch 369 BLAKE2B 2bd1d6046a5c7def5dbf1903dfde695da135554ccfcc410fd15bdd87aa1a440fd42289f7c00ac612378d333ba9da886a8860cf93cc485b5a08cc4a14830bf480 SHA512 8dd3d7a66807782fef49119e380eec9230d4d0708ef8b20cb9606740015f96f024b22967fae348bc59b3334a3b110dc1cacc8792a9a3402ddfdf600ccd71a62d
+AUX ccze-fbsd.patch 531 BLAKE2B ef16b94b4c1a94a3385b3b21c6c1fc51a463769de06f65cbb918c3e29f28b2a5c41618c6a38b2db4b696373e880f3cb4fbcb648516b5eb7c4722cd85ab3ba685 SHA512 c94926f907b054b84df8c1887183fc44024d4a4b4e9cb4a91ce34adf25857cc30d9572673a3869fa1affacda047fa30f9d73ba198cdebecf40ae86b5fc9dceec
+AUX ccze-ldflags.patch 424 BLAKE2B a769c1c617b7f421a0cac4cdb3141169eca8a0e23fd384b4bac702a2f84c15643e2a780eed2b706540a88b8c881227592caf588d1278148dbf8cec8e55dd3847 SHA512 7dff2e235acc665abcc3ed35744776e60a336b45cafbd80e3f4707f61d3746821e63949e73c32ee4fc5ca43b5639a816c42bb5e0b08912a7c617744dff39ec07
+AUX ccze-segfault.patch 660 BLAKE2B 863fa14c8ded2df423b0ff5cd9936ccb390b11d3b0dfa396d515e9a85e411c9f9f7f3ba76f04c4ba04ccc19cc43594f4d304b54cb2155ef44ef08c9c00d4b691 SHA512 e8ebdbc8293b4d765d683bbdd222c0af3aaf0668ea8376ed830efac3cdb4a99dfc75dda6e59b95e7a36b7ab4fc521a9a1937e4ab9a48218acc76d2b02844b900
+DIST ccze-0.2.1.tar.gz 139795 BLAKE2B 112e3968ca00bdb9ebda91b30a697f4422935755b3bf33d47c0a8800f3d05e371a4ca4db0ef52f10e5cba1c537ee3f666479103dc88a30f270c76268fece5cb6 SHA512 1704da8d4c97a3403a57d7841db8a6e4ba6116e401f91d9ecf1b1371cc18b40641e5665c9414740d6a523874be6b6527f5c0d4f3a3796c7b96ed83192146b2b7
+EBUILD ccze-0.2.1-r3.ebuild 946 BLAKE2B a10072f19126232ed62677066e2acb0805a34492a902ad8cb5e0d03a1f39647b8572fc7444d116be0ebe5a01b199926921d0c7db8d15bc4327debda761c4470e SHA512 2aba3653cce66c2a95a960b0cbdcd7cf24e60b6340fe2f5b03cd2d0fe98fd5f52be1ae6691b184b594d6377f442b136fb0b95459fb4b2634658c62ca3c5a1b59
+EBUILD ccze-0.2.1-r4.ebuild 942 BLAKE2B 8a340fd17cf7205c9e9559e4a4ebeb7f09631326024494f13de8bf4c5233c4ab9b6f44285bd9259d0c8ea29b8ee84a3ba5003b4e80ceed8ba4f96d6d5f5a1dc8 SHA512 89175fcd5e332bfca5bafa3106b0e39b0cd786038d748faaa745e13eafc4d2a69d5bc6a08d4302eb5e0acea84265cab67f69ea148470b56d659103815cb4dddd
+MISC metadata.xml 492 BLAKE2B a2658f32b8d62f60965cb71d66e3bc90c4d0aa03d4e53bca596de964c63bcd0b157b9e407ca91f789457731bf62d0d4b504376917acdf2f95b76a63bc513c29e SHA512 96d871b02eee0348e6d62f01bd25deca9044248f0f495be24fc8cadd30c16ef933a285e250f58d58b47f64eec8f964de2ef243617f66266a655cb83f02acd8d8
diff --git a/app-admin/ccze/ccze-0.2.1-r3.ebuild b/app-admin/ccze/ccze-0.2.1-r3.ebuild
new file mode 100644
index 000000000000..94fa5efed7b1
--- /dev/null
+++ b/app-admin/ccze/ccze-0.2.1-r3.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit fixheadtails autotools eutils toolchain-funcs
+
+DESCRIPTION="A flexible and fast logfile colorizer"
+HOMEPAGE="https://dev.gentoo.org/~joker/ccze/ccze.txt"
+SRC_URI="mirror://gentoo/${P}.tar.gz"
+
+RESTRICT="test"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~arm ppc x86 ~x86-fbsd"
+IUSE=""
+
+DEPEND="dev-libs/libpcre
+	sys-libs/ncurses:0="
+
+RDEPEND="${DEPEND}"
+
+DOCS=( AUTHORS ChangeLog ChangeLog-0.1 NEWS THANKS README FAQ )
+
+src_prepare() {
+
+	epatch "${FILESDIR}"/ccze-fbsd.patch
+	epatch "${FILESDIR}"/ccze-segfault.patch
+	epatch "${FILESDIR}"/ccze-ldflags.patch
+	epatch "${FILESDIR}"/${P}-tinfo.patch
+
+	# GCC 4.x fixes
+	sed -e 's/-Wswitch -Wmulticharacter/-Wswitch/' \
+	    -i src/Makefile.in || die
+	sed -e '/AC_CHECK_TYPE(error_t, int)/d' \
+	    -i configure.ac || die
+
+	eautoreconf
+
+	ht_fix_file Rules.mk.in
+
+	tc-export CC
+}
diff --git a/app-admin/ccze/ccze-0.2.1-r4.ebuild b/app-admin/ccze/ccze-0.2.1-r4.ebuild
new file mode 100644
index 000000000000..e2677e5eeb1f
--- /dev/null
+++ b/app-admin/ccze/ccze-0.2.1-r4.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit fixheadtails autotools eutils toolchain-funcs
+
+DESCRIPTION="A flexible and fast logfile colorizer"
+HOMEPAGE="https://dev.gentoo.org/~joker/ccze/ccze.txt"
+SRC_URI="mirror://gentoo/${P}.tar.gz"
+
+RESTRICT="test"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~x86 ~x86-fbsd"
+IUSE=""
+
+DEPEND="dev-libs/libpcre
+	sys-libs/ncurses:0="
+
+RDEPEND="${DEPEND}"
+
+DOCS=( AUTHORS ChangeLog ChangeLog-0.1 NEWS THANKS README FAQ )
+
+PATCHES=(
+	"${FILESDIR}"/ccze-fbsd.patch
+	"${FILESDIR}"/ccze-segfault.patch
+	"${FILESDIR}"/ccze-ldflags.patch
+	"${FILESDIR}"/${P}-tinfo.patch
+)
+
+src_prepare() {
+	default
+
+	# GCC 4.x fixes
+	sed -e 's/-Wswitch -Wmulticharacter/-Wswitch/' \
+	    -i src/Makefile.in || die
+	sed -e '/AC_CHECK_TYPE(error_t, int)/d' \
+	    -i configure.ac || die
+
+	eautoreconf
+
+	ht_fix_file Rules.mk.in
+
+	tc-export CC
+}
diff --git a/app-admin/ccze/files/ccze-0.2.1-tinfo.patch b/app-admin/ccze/files/ccze-0.2.1-tinfo.patch
new file mode 100644
index 000000000000..d0d7550e3337
--- /dev/null
+++ b/app-admin/ccze/files/ccze-0.2.1-tinfo.patch
@@ -0,0 +1,10 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -100,6 +100,7 @@
+ 		strndup strstr])
+ 
+ AC_CHECK_LIB(ncurses, initscr, [], [AC_ERROR(NCurses library not found)])
++AC_SEARCH_LIBS(stdscr, tinfo,,[AC_ERROR([Cannot find a library providing stdscr])])
+ AC_CHECK_FUNC(dlopen, [], [AC_CHECK_LIB(dl, dlopen)])
+ AC_CHECK_FUNC(getopt_long, [], [AC_CHECK_LIB(gnugetopt, getopt_long)])
+ 
diff --git a/app-admin/ccze/files/ccze-fbsd.patch b/app-admin/ccze/files/ccze-fbsd.patch
new file mode 100644
index 000000000000..ae694e0e4423
--- /dev/null
+++ b/app-admin/ccze/files/ccze-fbsd.patch
@@ -0,0 +1,25 @@
+--- a/src/ccze-compat.h
++++ b/src/ccze-compat.h
+@@ -29,6 +29,11 @@
+ #include <stddef.h>
+ #include <stdio.h>
+ 
++# ifndef __error_t_defined
++typedef int error_t;
++#  define __error_t_defined     1
++# endif
++
+ #ifndef HAVE_STRNDUP
+ char *strndup (const char *s, size_t size);
+ #endif
+--- a/src/ccze-compat.c
++++ b/src/ccze-compat.c
+@@ -275,7 +275,7 @@
+ 		char **valuep)
+ {
+   int i = getsubopt (optionp, tokens, valuep);
+-#if HAVE_SUBOPTARg
++#if HAVE_SUBOPTARG
+   if (!*valuep && suboptarg)
+     *valuep = strdup (suboptarg);
+ #endif
diff --git a/app-admin/ccze/files/ccze-ldflags.patch b/app-admin/ccze/files/ccze-ldflags.patch
new file mode 100644
index 000000000000..4f8c8f207209
--- /dev/null
+++ b/app-admin/ccze/files/ccze-ldflags.patch
@@ -0,0 +1,11 @@
+--- a/src/Makefile.in
++++ b/src/Makefile.in
+@@ -75,7 +75,7 @@
+ ${PROGRAM}: ${OBJECTS} ${PLUGIN_SOBJS}
+ 	${CC} -rdynamic ${ALL_CFLAGS} -o $@ $^ ${ALL_LDFLAGS}
+ ccze-dump ccze-cssdump: %: %.o ccze-compat.o ccze-color.c
+-	${CC} ${ALL_CFLAGS} -o $@ $@.o ccze-compat.o
++	${CC} ${ALL_CFLAGS} ${ALL_LDFLAGS} -o $@ $@.o ccze-compat.o
+ ccze-builtins.c: Makefile
+ 	echo '#include <ccze.h>' >$@
+ 	echo '#include "ccze-private.h"' >>$@
diff --git a/app-admin/ccze/files/ccze-segfault.patch b/app-admin/ccze/files/ccze-segfault.patch
new file mode 100644
index 000000000000..5bdd823e4120
--- /dev/null
+++ b/app-admin/ccze/files/ccze-segfault.patch
@@ -0,0 +1,29 @@
+--- a/src/ccze.c
++++ b/src/ccze.c
+@@ -209,7 +209,7 @@
+ 	}
+       break;
+     case 'a':
+-      plugin = strtok (optarg, "=");
++      plugin = strtok (arg, "=");
+       value = strtok (NULL, "\n");
+       ccze_plugin_argv_set (plugin, value);
+       break;
+@@ -249,7 +249,7 @@
+       ccze_config.remfac = 1;
+       break;
+     case 'm':
+-      subopts = optarg;
++      subopts = arg;
+       while (*subopts != '\0')
+ 	{
+ 	  switch (getsubopt (&subopts, m_subopts, &value))
+@@ -273,7 +273,7 @@
+ 	}
+       break;
+     case 'o':
+-      subopts = optarg;
++      subopts = arg;
+       while (*subopts != '\0')
+ 	{
+ 	  switch (getsubopt (&subopts, o_subopts, &value))
diff --git a/app-admin/ccze/metadata.xml b/app-admin/ccze/metadata.xml
new file mode 100644
index 000000000000..49a6829d2fd1
--- /dev/null
+++ b/app-admin/ccze/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+<longdescription>
+ CCZE is my C port of RASZi's colorize, with a set of bug fixes and enhancements.
+ It uses PCRE to do the matching, and NCurses for the output. The goal was to
+ create a log coloriser, that is fast and light on resources. Also, being extensible
+ via plug-ins is an important feature too. 
+</longdescription>
+</pkgmetadata>