gentoo resync : 22.05.2018

10 files changed, 2 insertions, 496 deletions

diff --git a/dev-libs/liblognorm/Manifest b/dev-libs/liblognorm/Manifest
index 7d0ce2d9c18e..7f5068cb93b0 100644
--- a/dev-libs/liblognorm/Manifest
+++ b/dev-libs/liblognorm/Manifest
@@ -1,18 +1,5 @@
-AUX liblognorm-1.1.0-fix-enable-docs.patch 1556 BLAKE2B 166ccca572322ff903cd3bf9346d60ac904203b85f7c55c08ec87af7d8c7a6056feb3759f15088b42baf576a474450dffb025ec9a8de1c365929c1553235b9f1 SHA512 44cfc8201ed944888d1846a49faddd6a9056466338c368552bfbbf82f79e7cea8e220af9bc5715f1064cd27e9eae8f0ff5fe3eeb982e9443b3d0b88235aafb11
-AUX liblognorm-1.1.2-issue_135.patch 3662 BLAKE2B 263941380f1bd55cde83a5eca1628b4ba5226a7d32f8b8c98d107b44979bb9385d4b27f6fd14f5a4cb6ea693dcbdee0674bac89ad6950af7e757c9496b914e90 SHA512 212fb8bfc488e414703c7f6907540867ebea69e33d3aebc57e73d72dae3b4695d3423810bc6045e39541a92555e4b06ec16bfb074450e946c1a7ab4ed289076d
-AUX respect_CFLAGS.patch 436 BLAKE2B 86684eec9336fb1b88022a645931b85ec021064cce11fb720b13a6d59df19f33595bbbd1439ec5d1ed40ee36c46e5500071e137502551d059e345438771ba6cf SHA512 fe284d7bcee9cc094e5a213f16815e07ad08615ebdd6ea00d652d9f0d23aa23664b857ecda2877679878bea5bfb91f05ea0aa775d66e06e8a407c26b5fc784eb
-DIST liblognorm-1.1.0.tar.gz 499355 BLAKE2B 4cde6d42a3eb82b160722c64110e71d0962d1f590b6bf62a328af6cb71a36b6a608cac79a75e0e1f564b2423d5a8069282764158d08ce3d1294677e9f39717cd SHA512 f694d47c8e60871f0f3ce1fe8092b2596850beea618760c289d9cec6068fb8e8e260f4abb3faf20b931864d91ed18f640c65235fd693f6c67ce232fa11006107
-DIST liblognorm-1.1.2.tar.gz 547224 BLAKE2B babe23a73cfaf6275ac0bd81ed0248bdd600323d65bf152254a006533fe6bb1dd7fe1f270d4844985f587d76b61980bdca275b86b35e50d130b572e7d1886bb1 SHA512 d0dc206ac2f34174ec1a7e05ae4f84520ae67f49b5540bf9b957378418d6e32384fddd40aaa26dfbdec868a6e7d7a0b677af5201dcbf4f0d4b177934a260ff00
-DIST liblognorm-2.0.1.tar.gz 657390 BLAKE2B afdec1d1afbf0cfae7a317a4bdfd109457f3149dc3051d5497b23d9957092f37191fb6a0d58e50225d67b61d29e6be082977cb6a102d5a560f5f06cd7186c4e2 SHA512 557ba4180d764c04edabe6292a44f5340c5b1f7ac2390a4068711be4ad6da7429e651bc2230d6ff9cc6c58cd6a6c59149f20083de8cf4d8239d95f86db39565f
-DIST liblognorm-2.0.2.tar.gz 658976 BLAKE2B 44a928ca4d8934f9b6f0b81610315a7de1f0968d2d62fddf9e919699c2fa10d1bce94f0a46a40ff9bf6521ae7dc7a88440febd1b770af9dc3983d13e5a10e188 SHA512 7cb1e20c895859072b9d6f0b3c2dd89874192dce6d11878a4c3eb0b0d9f1691d97205a61290e9cd07deeaa71c58f5fb6a4c1f14bd206119d690cf84c107ccbe4
-DIST liblognorm-2.0.3.tar.gz 660680 BLAKE2B d5da4386026faae43dbcbe36aacc47687ef8636be2223a596a9915adee731535083016e5d680c9169cb8d4262a7f3d2342a9e6af566108a635f9d49fcf2cfec5 SHA512 8f343f3029c506a9c060b1b55e478da9ceedc1fbf27ca53a991ffbddb397383adfee2d79beb174a6c997599ee3c0fa4bbc9925fa850e5bf4f4d7b181ddae7cdb
 DIST liblognorm-2.0.4.tar.gz 665898 BLAKE2B 80bcd114d2be81f8eea847e699b7e8ade9ca37d4376f64af81bfaba1a440e1efbab579235aba775c46a9d011e930453d2c001de525577b7775784e7152b3e700 SHA512 3c7cbf0c8c320708615218009354d198ba0893632ca464a07270f59d137753dfc7ad6dae66b565660f14e9285f9c8964824d36070b1872b6c633589b4996ba02
 DIST liblognorm-2.0.5.tar.gz 667709 BLAKE2B 9f2a774c2378caa460a1f11e21570e719f83e782c5731a35921099b1b31397495ea2a4baebd489d186526eb2d011f2ab30d971713a8083c1ae02168d3f632ce8 SHA512 2b36fabfa8b751127d47f307833414d339ae43bad5b687ce6ac42a961021f9a515703ca0c4808e098ef49be3a943abdbf307f90995a2331c6e266167ef041d00
-EBUILD liblognorm-1.1.0.ebuild 913 BLAKE2B da42920deb4117d0fbbe75d8862ced70531ee98fa82a66d860e969ebd1f3f1976cd60193d210caefa56514eabb0ecb6707c837bacf438ba4df76296a153d56fe SHA512 3edc4121dbfbebe227c7647b94e66d92f36ae4af7fcb9c23216c531889a071531a0e32667ab734d35dcea8249e707660394d4be66d99059341e68347234d2f1f
-EBUILD liblognorm-1.1.2-r1.ebuild 1186 BLAKE2B e79b4b33ec87aca46385a1ed939de37e06656d0037699121f721be8267a9160dc8769ad389229039cbc3554d868592a8253a86588fa105acbe53f0cce2ed26f2 SHA512 eb5c1492462a0614bdf3b4673f6325d45ecb7da556b67d8b96d61ac673365e831caa22b17ff4964c3ce4463d8831ae38aea61dd231b8a33a76c9c0d4565109b4
-EBUILD liblognorm-2.0.1.ebuild 1487 BLAKE2B 0981917a8d99334a933cc7c1136029596e03bfa383347cef4114c19ce5ae79965272a4b75d587d4d072873f2b5527520f4a802f1fd1d7c2ae4d05fd2ae9403d9 SHA512 e773b83301151707eef61699d62b2b81581209dbea8e9b26df896452b1026fbc9c825472368c849c15de10a8a948ab75ff70b53fcb5dbe69836e4027997c2bea
-EBUILD liblognorm-2.0.2.ebuild 1487 BLAKE2B 0981917a8d99334a933cc7c1136029596e03bfa383347cef4114c19ce5ae79965272a4b75d587d4d072873f2b5527520f4a802f1fd1d7c2ae4d05fd2ae9403d9 SHA512 e773b83301151707eef61699d62b2b81581209dbea8e9b26df896452b1026fbc9c825472368c849c15de10a8a948ab75ff70b53fcb5dbe69836e4027997c2bea
-EBUILD liblognorm-2.0.3.ebuild 1495 BLAKE2B 3c1881695081f296d23235b0517840ce3930f2e470cf449f9bda426d16e90090c98a388e1d9e3b1fb8d74d6f45f3b6dffd2bc9ed6bf174c8efb212b9f29f1a2d SHA512 1c57e99573af96893554ae3d622c5a90b04b5bda5bd79c8588d883ded230be8173bf8c440b9a5e724bed4ec255639534c17b1636b376d7f454808cc5559c4552
-EBUILD liblognorm-2.0.4.ebuild 1495 BLAKE2B ff75d5c4c27e59a9a4a6661ea19e81ec5864884985aa29a318d7d393bbaec69683a6a357bb4cd9564daa477fea25ae8d46857f27f5dbbf3f8c54e1b115ecf8c1 SHA512 c46d2b9c1362c48700801d2c3def58b5ec8720b3c2591d36a5f9c2a28cb3de9359575f1f35f7fdaae6ad97985c8bfc0acf980abab400e3d532786332f8afd77b
+EBUILD liblognorm-2.0.4.ebuild 1494 BLAKE2B e650f9f6e067624d25834012df2b15c53290d36f49eaba52b020ef37eaf785f1e6c5c1c06dd4b4508535ef0c678fd6f51b0e0fad2d1a47d956dd742b474501c8 SHA512 7a525f0e554b45fe8087d6e9ef4949bedd50d81daf128aff6b0afbeeb64d9dac8d8cdc9e1c668a44b0ef09381067dce436a470f35dd81ccb4666ea7d5545e7a4
 EBUILD liblognorm-2.0.5.ebuild 1498 BLAKE2B 99ec1c29611a4407f361720320e1ce2a94fc6697dd01c09725ff923389c7a5cce0ef683a569c714c6b8ed354ddd0663d5f283de5e35a7f41d46de7f27acb0d04 SHA512 799d5896b1af758c3690a627496e6f55fade8d2fe9f504dd9060c193241ef94c37a287474dee8098cec09dac190bc664fc2600d8f1365ee11e86bc1316b8853a
 MISC metadata.xml 582 BLAKE2B 59408e460cb8208149a93cbe049867d8cc202272aea9cd113a7f282eeb6f57b967abf7379241c8dd987e58f66f1efb36c29809176db34cdb3b2127a5ebe02f0c SHA512 7df1432cf2ddfe55c6a449d0179b771652a051d75fa34b8d3ea42d201bc64b3b18b2410ace68c263f14eb692661846a25cb0220de43abcaef13401e87f1173e2
diff --git a/dev-libs/liblognorm/files/liblognorm-1.1.0-fix-enable-docs.patch b/dev-libs/liblognorm/files/liblognorm-1.1.0-fix-enable-docs.patch
deleted file mode 100644
index 3bffe5ec74f0..000000000000
--- a/dev-libs/liblognorm/files/liblognorm-1.1.0-fix-enable-docs.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-[PATCH] Turn --disable-docs into --enable-docs and make it work
-
-See upstream issue #16 for more details.
----
- configure.ac | 22 ++++++++++++++--------
- 1 file changed, 14 insertions(+), 8 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 547908c..26a2f96 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -96,15 +96,21 @@ fi
- 
- # docs (html) build settings
- AC_ARG_ENABLE(docs,
--	[AS_HELP_STRING([--disable-docs],[Disable building HTML docs (requires Sphinx)])],
--	[enable_docs="no"],
--	[enable_docs="yes"]
-+	[AS_HELP_STRING([--enable-docs],[Enable building HTML docs (requires Sphinx) @<:@default=no@:>@])],
-+	[case "${enableval}" in
-+		yes) enable_docs="yes" ;;
-+		no) enable_docs="no" ;;
-+		*) AC_MSG_ERROR(bad value ${enableval} for --enable-docs) ;;
-+	esac],
-+	[enable_docs="no"]
- )
--AC_CHECK_PROGS([SPHINXBUILD], [sphinx-build sphinx-build3 sphinx-build2], [no])
--AS_IF([test "$enable_docs" = "yes" -a "x$SPHINXBUILD" = xno],
--    [AC_MSG_ERROR([sphinx-build is required to build documentation, install it or try --disable-docs])]
--)
--AM_CONDITIONAL([ENABLE_DOCS], [test "$enable_docs" = yes])
-+if test "$enable_docs" = "yes"; then
-+	AC_CHECK_PROGS([SPHINXBUILD], [sphinx-build sphinx-build3 sphinx-build2], [no])
-+	if test "$SPHINXBUILD" = "no"; then
-+		AC_MSG_ERROR([sphinx-build is required to build documentation, install it or try --disable-docs])
-+	fi
-+fi
-+AM_CONDITIONAL([ENABLE_DOCS], [test "$enable_docs" = "yes"])
- 
- AC_ARG_ENABLE(testbench,
-         [AS_HELP_STRING([--enable-testbench],[testbench enabled @<:@default=no@:>@])],
diff --git a/dev-libs/liblognorm/files/liblognorm-1.1.2-issue_135.patch b/dev-libs/liblognorm/files/liblognorm-1.1.2-issue_135.patch
deleted file mode 100644
index 4b4a063cf180..000000000000
--- a/dev-libs/liblognorm/files/liblognorm-1.1.2-issue_135.patch
+++ /dev/null
@@ -1,110 +0,0 @@
-From 4b35ca1e6fff50f47eb5419b879b287f49dcf1d8 Mon Sep 17 00:00:00 2001
-From: Rainer Gerhards <rgerhards@adiscon.com>
-Date: Mon, 24 Aug 2015 09:05:52 +0200
-Subject: [PATCH] "fix": process last line if it misses the terminating LF
-
-This problem occurs with the very last line of a rulebase (at EOF).
-If it is not properly terminated (LF missing), it is silently ignored.
-Previous versions did obviously process lines in this case. While
-technically this is invalid input, we can't outrule that such rulebases
-exist. For example, they do in the rsyslog testbench, which made
-us aware of the problem (see https://github.com/rsyslog/rsyslog/issues/489 ).
-
-I think the proper way of addressing this is to process such lines without
-termination, as many other tools do as well.
-
-closes https://github.com/rsyslog/liblognorm/issues/135
----
- src/samp.c                   |  5 ++++-
- tests/Makefile.am            |  2 ++
- tests/field_mac48.sh         |  1 -
- tests/missing_line_ending.rb |  1 +
- tests/missing_line_ending.sh | 25 +++++++++++++++++++++++++
- 5 files changed, 32 insertions(+), 2 deletions(-)
- create mode 100644 tests/missing_line_ending.rb
- create mode 100755 tests/missing_line_ending.sh
-
-diff --git a/src/samp.c b/src/samp.c
-index ef57047..0a9ae0a 100644
---- a/src/samp.c
-+++ b/src/samp.c
-@@ -801,7 +801,10 @@ ln_sampRead(ln_ctx ctx, FILE *const __restrict__ repo, int *const __restrict__ i
- 		int c = fgetc(repo);
- 		if(c == EOF) {
- 			*isEof = 1;
--			goto done;
-+			if(i == 0)
-+				goto done;
-+			else
-+				done = 1; /* last line missing LF, still process it! */
- 		} else if(c == '\n') {
- 			++linenbr;
- 			if(!inParser && i != 0)
-diff --git a/tests/Makefile.am b/tests/Makefile.am
-index a3a3842..cfcf010 100644
---- a/tests/Makefile.am
-+++ b/tests/Makefile.am
-@@ -13,6 +13,7 @@ user_test_LDFLAGS = -no-install
- TESTS_SHELLSCRIPTS = \
- 	parser_whitespace.sh \
- 	parser_LF.sh \
-+	missing_line_ending.sh \
- 	field_hexnumber.sh \
- 	field_mac48.sh \
- 	field_name_value.sh \
-@@ -54,6 +55,7 @@ REGEXP_TESTS = \
- 	field_regex_while_regex_support_is_disabled.sh
- 
- EXTRA_DIST = exec.sh \
-+	missing_line_ending.rb \
- 	$(TESTS_SHELLSCRIPTS) \
- 	$(REGEXP_TESTS) \
- 	$(json_eq_self_sources) \
-diff --git a/tests/field_mac48.sh b/tests/field_mac48.sh
-index bd2898e..0f17166 100755
---- a/tests/field_mac48.sh
-+++ b/tests/field_mac48.sh
-@@ -21,4 +21,3 @@ assert_output_json_eq '{ "originalmsg": "f0:f6:1c:xf:cc:a2", "unparsed-data": "f
- 
- 
- cleanup_tmp_files
--
-diff --git a/tests/missing_line_ending.rb b/tests/missing_line_ending.rb
-new file mode 100644
-index 0000000..b252483
---- /dev/null
-+++ b/tests/missing_line_ending.rb
-@@ -0,0 +1 @@
-+rule=:%field:mac48%
-\ No newline at end of file
-diff --git a/tests/missing_line_ending.sh b/tests/missing_line_ending.sh
-new file mode 100755
-index 0000000..18f4d2c
---- /dev/null
-+++ b/tests/missing_line_ending.sh
-@@ -0,0 +1,25 @@
-+# added 2015-05-05 by Rainer Gerhards
-+# This file is part of the liblognorm project, released under ASL 2.0
-+. $srcdir/exec.sh
-+
-+test_def $0 "dmac48 syntax"
-+# we need to use a canned file, as we cannot easily reproduce the
-+# malformed lines
-+cp missing_line_ending.rb $(rulebase_file_name)
-+
-+execute 'f0:f6:1c:5f:cc:a2'
-+assert_output_json_eq '{"field": "f0:f6:1c:5f:cc:a2"}'
-+
-+execute 'f0-f6-1c-5f-cc-a2'
-+assert_output_json_eq '{"field": "f0-f6-1c-5f-cc-a2"}'
-+
-+# things that need to NOT match
-+
-+execute 'f0-f6:1c:5f:cc-a2'
-+assert_output_json_eq '{ "originalmsg": "f0-f6:1c:5f:cc-a2", "unparsed-data": "f0-f6:1c:5f:cc-a2" }'
-+
-+execute 'f0:f6:1c:xf:cc:a2'
-+assert_output_json_eq '{ "originalmsg": "f0:f6:1c:xf:cc:a2", "unparsed-data": "f0:f6:1c:xf:cc:a2" }'
-+
-+
-+#cleanup_tmp_files
diff --git a/dev-libs/liblognorm/files/respect_CFLAGS.patch b/dev-libs/liblognorm/files/respect_CFLAGS.patch
deleted file mode 100644
index 6e8d28099ee9..000000000000
--- a/dev-libs/liblognorm/files/respect_CFLAGS.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.ac.new	2014-03-20 10:56:14.777901140 +0200
-+++ configure.ac	2014-03-20 10:56:50.154143106 +0200
-@@ -12,7 +12,7 @@
- AC_PROG_CC
- AM_PROG_CC_C_O
- if test "$GCC" = "yes"
--then CFLAGS="$CFLAGS -W -Wall -Wformat-security -Wshadow -Wcast-align -Wpointer-arith -Wmissing-format-attribute -g"
-+then CFLAGS="$CFLAGS -W -Wall -Wformat-security -Wshadow -Wcast-align -Wpointer-arith -Wmissing-format-attribute"
- fi
- 
- AC_PROG_LIBTOOL
diff --git a/dev-libs/liblognorm/liblognorm-1.1.0.ebuild b/dev-libs/liblognorm/liblognorm-1.1.0.ebuild
deleted file mode 100644
index 061fec8a898a..000000000000
--- a/dev-libs/liblognorm/liblognorm-1.1.0.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-AUTOTOOLS_IN_SOURCE_BUILD=1
-AUTOTOOLS_AUTORECONF="yes"
-
-inherit autotools-utils
-
-DESCRIPTION="Fast samples-based log normalization library"
-HOMEPAGE="http://www.liblognorm.com"
-SRC_URI="http://www.liblognorm.com/files/download/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0/1"
-KEYWORDS="amd64 arm hppa x86 ~amd64-linux"
-IUSE="debug doc pcre static-libs test"
-
-RDEPEND="
-	>=dev-libs/libestr-0.1.3
-	>=dev-libs/json-c-0.11:=
-	pcre? ( >=dev-libs/libpcre-8.35 )
-"
-
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
-"
-
-DOCS=( ChangeLog )
-
-PATCHES=(
-	"${FILESDIR}"/respect_CFLAGS.patch
-	"${FILESDIR}"/${PN}-1.1.0-fix-enable-docs.patch
-)
-
-src_configure() {
-	local myeconfargs=(
-		$(use_enable debug)
-		$(use_enable doc docs)
-		$(use_enable pcre regexp)
-		$(use_enable test testbench)
-	)
-
-	autotools-utils_src_configure
-}
diff --git a/dev-libs/liblognorm/liblognorm-1.1.2-r1.ebuild b/dev-libs/liblognorm/liblognorm-1.1.2-r1.ebuild
deleted file mode 100644
index 8db2881ff389..000000000000
--- a/dev-libs/liblognorm/liblognorm-1.1.2-r1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-AUTOTOOLS_IN_SOURCE_BUILD=1
-AUTOTOOLS_AUTORECONF="yes"
-
-inherit autotools-utils
-
-DESCRIPTION="Fast samples-based log normalization library"
-HOMEPAGE="http://www.liblognorm.com"
-SRC_URI="http://www.liblognorm.com/files/download/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0/2"
-KEYWORDS="amd64 ~arm hppa x86 ~amd64-linux"
-IUSE="debug doc static-libs test"
-
-RDEPEND="
-	>=dev-libs/libestr-0.1.3
-	>=dev-libs/json-c-0.11:=
-"
-
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
-	doc? ( >=dev-python/sphinx-1.2.2 )
-"
-
-DOCS=( ChangeLog )
-
-PATCHES=(
-	"${FILESDIR}"/respect_CFLAGS.patch
-	"${FILESDIR}"/${PN}-1.1.2-issue_135.patch
-)
-
-src_configure() {
-	local myeconfargs=(
-		$(use_enable doc docs)
-		$(use_enable test testbench)
-		$(use_enable debug)
-		--disable-regexp
-	)
-
-	autotools-utils_src_configure
-}
-
-src_test() {
-	# When adding new tests via patches we have to make them executable
-	einfo "Adjusting permissions of test scripts ..."
-	find "${S}"/tests -type f -name '*.sh' \! -perm -111 -exec chmod a+x '{}' \; || \
-		die "Failed to adjust test scripts permission"
-
-	emake --jobs 1 check
-}
diff --git a/dev-libs/liblognorm/liblognorm-2.0.1.ebuild b/dev-libs/liblognorm/liblognorm-2.0.1.ebuild
deleted file mode 100644
index 8a15d6a6e447..000000000000
--- a/dev-libs/liblognorm/liblognorm-2.0.1.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit autotools
-
-DESCRIPTION="Fast samples-based log normalization library"
-HOMEPAGE="http://www.liblognorm.com"
-
-if [[ ${PV} == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/rsyslog/${PN}.git"
-
-	inherit git-r3
-else
-	SRC_URI="http://www.liblognorm.com/files/download/${P}.tar.gz"
-	KEYWORDS="amd64 arm hppa x86 ~amd64-linux"
-fi
-
-LICENSE="LGPL-2.1 Apache-2.0"
-SLOT="0/5.0.0"
-IUSE="debug doc static-libs test"
-
-RDEPEND="
-	>=dev-libs/libestr-0.1.3
-	>=dev-libs/libfastjson-0.99.2:=
-"
-
-DEPEND="
-	${RDEPEND}
-	>=sys-devel/autoconf-archive-2015.02.04
-	virtual/pkgconfig
-	doc? ( >=dev-python/sphinx-1.2.2 )
-"
-
-DOCS=( ChangeLog )
-
-src_prepare() {
-	default
-
-	eautoreconf
-}
-
-src_configure() {
-	# regexp disabled due to https://github.com/rsyslog/liblognorm/issues/143
-	local myeconfargs=(
-		--enable-compile-warnings=yes
-		--disable-Werror
-		$(use_enable doc docs)
-		$(use_enable test testbench)
-		$(use_enable debug)
-		$(use_enable static-libs static)
-		--disable-regexp
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_test() {
-	# When adding new tests via patches we have to make them executable
-	einfo "Adjusting permissions of test scripts ..."
-	find "${S}"/tests -type f -name '*.sh' \! -perm -111 -exec chmod a+x '{}' \; || \
-		die "Failed to adjust test scripts permission"
-
-	emake --jobs 1 check
-}
-
-src_install() {
-	default
-
-	find "${ED}"usr/lib* -name '*.la' -delete || die
-}
diff --git a/dev-libs/liblognorm/liblognorm-2.0.2.ebuild b/dev-libs/liblognorm/liblognorm-2.0.2.ebuild
deleted file mode 100644
index 8a15d6a6e447..000000000000
--- a/dev-libs/liblognorm/liblognorm-2.0.2.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit autotools
-
-DESCRIPTION="Fast samples-based log normalization library"
-HOMEPAGE="http://www.liblognorm.com"
-
-if [[ ${PV} == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/rsyslog/${PN}.git"
-
-	inherit git-r3
-else
-	SRC_URI="http://www.liblognorm.com/files/download/${P}.tar.gz"
-	KEYWORDS="amd64 arm hppa x86 ~amd64-linux"
-fi
-
-LICENSE="LGPL-2.1 Apache-2.0"
-SLOT="0/5.0.0"
-IUSE="debug doc static-libs test"
-
-RDEPEND="
-	>=dev-libs/libestr-0.1.3
-	>=dev-libs/libfastjson-0.99.2:=
-"
-
-DEPEND="
-	${RDEPEND}
-	>=sys-devel/autoconf-archive-2015.02.04
-	virtual/pkgconfig
-	doc? ( >=dev-python/sphinx-1.2.2 )
-"
-
-DOCS=( ChangeLog )
-
-src_prepare() {
-	default
-
-	eautoreconf
-}
-
-src_configure() {
-	# regexp disabled due to https://github.com/rsyslog/liblognorm/issues/143
-	local myeconfargs=(
-		--enable-compile-warnings=yes
-		--disable-Werror
-		$(use_enable doc docs)
-		$(use_enable test testbench)
-		$(use_enable debug)
-		$(use_enable static-libs static)
-		--disable-regexp
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_test() {
-	# When adding new tests via patches we have to make them executable
-	einfo "Adjusting permissions of test scripts ..."
-	find "${S}"/tests -type f -name '*.sh' \! -perm -111 -exec chmod a+x '{}' \; || \
-		die "Failed to adjust test scripts permission"
-
-	emake --jobs 1 check
-}
-
-src_install() {
-	default
-
-	find "${ED}"usr/lib* -name '*.la' -delete || die
-}
diff --git a/dev-libs/liblognorm/liblognorm-2.0.3.ebuild b/dev-libs/liblognorm/liblognorm-2.0.3.ebuild
deleted file mode 100644
index 4d1ce9af4f42..000000000000
--- a/dev-libs/liblognorm/liblognorm-2.0.3.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit autotools
-
-DESCRIPTION="Fast samples-based log normalization library"
-HOMEPAGE="http://www.liblognorm.com"
-
-if [[ ${PV} == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/rsyslog/${PN}.git"
-
-	inherit git-r3
-else
-	SRC_URI="http://www.liblognorm.com/files/download/${P}.tar.gz"
-	KEYWORDS="amd64 ~arm ~arm64 hppa x86 ~amd64-linux"
-fi
-
-LICENSE="LGPL-2.1 Apache-2.0"
-SLOT="0/5.1.0"
-IUSE="debug doc static-libs test"
-
-RDEPEND="
-	>=dev-libs/libestr-0.1.3
-	>=dev-libs/libfastjson-0.99.2:=
-"
-
-DEPEND="
-	${RDEPEND}
-	>=sys-devel/autoconf-archive-2015.02.04
-	virtual/pkgconfig
-	doc? ( >=dev-python/sphinx-1.2.2 )
-"
-
-DOCS=( ChangeLog )
-
-src_prepare() {
-	default
-
-	eautoreconf
-}
-
-src_configure() {
-	# regexp disabled due to https://github.com/rsyslog/liblognorm/issues/143
-	local myeconfargs=(
-		--enable-compile-warnings=yes
-		--disable-Werror
-		$(use_enable doc docs)
-		$(use_enable test testbench)
-		$(use_enable debug)
-		$(use_enable static-libs static)
-		--disable-regexp
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_test() {
-	# When adding new tests via patches we have to make them executable
-	einfo "Adjusting permissions of test scripts ..."
-	find "${S}"/tests -type f -name '*.sh' \! -perm -111 -exec chmod a+x '{}' \; || \
-		die "Failed to adjust test scripts permission"
-
-	emake --jobs 1 check
-}
-
-src_install() {
-	default
-
-	find "${ED}"usr/lib* -name '*.la' -delete || die
-}
diff --git a/dev-libs/liblognorm/liblognorm-2.0.4.ebuild b/dev-libs/liblognorm/liblognorm-2.0.4.ebuild
index d9bcb0231345..635f5f3f9c52 100644
--- a/dev-libs/liblognorm/liblognorm-2.0.4.ebuild
+++ b/dev-libs/liblognorm/liblognorm-2.0.4.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == "9999" ]]; then
 	inherit git-r3
 else
 	SRC_URI="http://www.liblognorm.com/files/download/${P}.tar.gz"
-	KEYWORDS="amd64 arm ~arm64 ~hppa x86 ~amd64-linux"
+	KEYWORDS="amd64 arm ~arm64 hppa x86 ~amd64-linux"
 fi
 
 LICENSE="LGPL-2.1 Apache-2.0"