gentoo resync : 15.01.2020

5 files changed, 4 insertions, 175 deletions

diff --git a/dev-libs/librelp/Manifest b/dev-libs/librelp/Manifest
index 70278578e620..b8935eed7110 100644
--- a/dev-libs/librelp/Manifest
+++ b/dev-libs/librelp/Manifest
@@ -1,8 +1,3 @@
-AUX librelp-1.3.0-dummyclient.py-Py3-compatibility.patch 857 BLAKE2B 7729a27955c40dccf7f86c426e8bcb28ff00b65dd35c0be6100c48c42308e6948d3f9cc2d52915d462829abb42a7df60c88d29cca978904c3743f93951a91cc8 SHA512 a7d855f97c271ea324a10f3dae5251d1c74d91c9685e5dbb1b55a4895b260151326dcc42400d63949a3fc4e14e82dbdf43a9b4efefe18afaba4415964c45e72b
-DIST librelp-1.2.18.tar.gz 506766 BLAKE2B 939bd2279e03a6431fbdfb787aa3d62b3f622ec3248dfc7c0a0a141294c27319081092a624c328374cdba0cbd51659301a77ad41bed27ba13f47601f7a607944 SHA512 7193438238b7019e7a4944d6d900a1fa5a369ff8a6b97a6dca7e82b6637c0f391ec3554eeeaa285881457cb2abe72fa1a893244ec9a36cc9d2e2592d58c5462a
-DIST librelp-1.3.0.tar.gz 514470 BLAKE2B 3e8d844d3cccd4c148036191f376ba49b3851a2c7e95361bb31a1a172ca0813caa96eb3753b2285a2547c85e073de3237a749bc64fc0fead69ab170656dcb200 SHA512 6e60398c68a78f4b4202a697e144f1516ff3bbb32192f745b52c77d107954febf8cb31d2e166efa96c00122f6807860ecd01084f1d3d4005336f2cb75e6461c9
 DIST librelp-1.4.0.tar.gz 519235 BLAKE2B 9c1e52cc9f666e75f261db65f45e3d954afa033cac59f93394c30ba99ed772d71b2882bdbb9bed696e57ed99805d47e57fd5e331cc3bc3850c5f15041a0d70d0 SHA512 92d01a51b4ee3c66d1f65d2e26f214646d72b41a8411ab700fe5f9f30f805ef98dec962526ef95c8d8428bf7398d38f656c919f95a3e49382adc745ef9eb4239
-EBUILD librelp-1.2.18.ebuild 1240 BLAKE2B 1e5c2a3c09963f3ccb25da31ba90e2cd0ca2ebfa0de68903656fa9727f3b56f1c44dbbb59d2ecf23e913ba0fbfd42cc821826f72b786bd54da66a06032c00ed0 SHA512 772112ff4a073d526c0054a211e11d295641f7583c84716019d007ba2e33654adc4f639d40be6e54ad4d23b4028aa85c039624138550360b20a0e9fb21ef3752
-EBUILD librelp-1.3.0.ebuild 1483 BLAKE2B 668859d6c0a0604e5bf7171b4801b6b8e678379e04b5fd6ae95620dda676905bc320e82b9212b0a6baa5f15ee920625695eddc2c8a1d2575ab1c3439cecf24a5 SHA512 11dbb4bc5b1a0495753b2c264d1b5094903d93acabef402c4022f523666b80862f0a277acc39a0c27fdc2b36ee89d2d964420e3edb8642fd031c4b97f13f1acb
-EBUILD librelp-1.4.0.ebuild 1412 BLAKE2B 58cffd61d12097598bf49ba1289e43167cf5ea8c6327381e011b6f4f71ed7976c42e2f2a6304aa2b71d3ca01f872bd1964d9ced27532f037ab8530ee6528fce5 SHA512 fa257b87409fc6159bd349d9400df7c8181acb617ebd86d3298647f8230f3235b4c50448cefd06d0dc233f2699f58c26ac0d40dc1dc87b44f7bc1c72db1844f0
+EBUILD librelp-1.4.0.ebuild 1409 BLAKE2B 56e8e417025698416c1c04d3a1bb99d3a588483d7256b66ffee11d999dbe90e7d6a86d14afab952877e8ff2135a11ce68db4bcf30180df75b902df903ebca327 SHA512 9b69b3b1a806a6e407ef2bc92a725617aa02b4ef8914418ac7b730c732fbf0fbddaa6c95fa22ee82447e8a587924a3542b0859e9891692cc0183b72e2c2e6d86
 MISC metadata.xml 392 BLAKE2B f8320c59b6d3f84ff3e9b782f77d785aa001c5f45dd54afcd0cf726cfc070c076fcebb99313612e58acf6f275900e0641a2fa9bb1151eca0561bae9087e2c5a7 SHA512 d286592d19517966bab79c3bb232ee02a8028b15602fcb6c12edf1523158d07298c33328a808f065de074f701778f9c2fea436d3924a67c2635c911a9e7f15a4
diff --git a/dev-libs/librelp/files/librelp-1.3.0-dummyclient.py-Py3-compatibility.patch b/dev-libs/librelp/files/librelp-1.3.0-dummyclient.py-Py3-compatibility.patch
deleted file mode 100644
index 99ac9887f739..000000000000
--- a/dev-libs/librelp/files/librelp-1.3.0-dummyclient.py-Py3-compatibility.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 93c7ab4284f0609abab7cf2f9b8bdefe21fe0038 Mon Sep 17 00:00:00 2001
-From: Thomas Deutschmann <whissi@whissi.de>
-Date: Tue, 11 Dec 2018 16:50:12 +0100
-Subject: [PATCH] tests: make dummyclient.py compatible with Python2 and
- Python3
-
-Closes: https://github.com/rsyslog/librelp/issues/163
----
- tests/dummyclient.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/tests/dummyclient.py b/tests/dummyclient.py
-index 6f99c79..8b0041e 100755
---- a/tests/dummyclient.py
-+++ b/tests/dummyclient.py
-@@ -4,7 +4,7 @@
- import os
- 
- port = int(os.environ['TESTPORT'])
--print "dummyclient info: opening and closing port " + str(port) + " without sending data"
-+print("dummyclient info: opening and closing port " + str(port) + " without sending data")
- s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
- s.connect(("127.0.0.1", port))
- s.close()
diff --git a/dev-libs/librelp/librelp-1.2.18.ebuild b/dev-libs/librelp/librelp-1.2.18.ebuild
deleted file mode 100644
index fd69546976e4..000000000000
--- a/dev-libs/librelp/librelp-1.2.18.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit autotools
-
-DESCRIPTION="An easy to use library for the RELP protocol"
-HOMEPAGE="http://www.librelp.com/"
-SRC_URI="http://download.rsyslog.com/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3+ doc? ( FDL-1.3 )"
-
-# subslot = soname version
-SLOT="0/0.4.0"
-
-KEYWORDS="amd64 arm ~arm64 hppa sparc x86"
-IUSE="debug doc +ssl +gnutls libressl openssl static-libs"
-REQUIRED_USE="ssl? ( ^^ ( gnutls openssl ) )"
-
-RDEPEND="
-	ssl? (
-		gnutls? ( >=net-libs/gnutls-3.3.17.1:0= )
-		openssl? (
-			!libressl? ( dev-libs/openssl:0= )
-			libressl? ( dev-libs/libressl:0= )
-		)
-	)"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_prepare() {
-	sed -i \
-		-e 's/ -g"/"/g' \
-		configure.ac || die "sed failed"
-
-	default
-
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		--disable-valgrind
-		$(use_enable debug)
-		$(use_enable gnutls tls)
-		$(use_enable openssl tls-openssl)
-		$(use_enable static-libs static)
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_test() {
-	emake -j1 check
-}
-
-src_install() {
-	local DOCS=( ChangeLog )
-	use doc && local HTML_DOCS=( doc/relp.html )
-	default
-
-	if ! use static-libs; then
-		find "${D}" -name '*.la' -delete || die
-	fi
-}
diff --git a/dev-libs/librelp/librelp-1.3.0.ebuild b/dev-libs/librelp/librelp-1.3.0.ebuild
deleted file mode 100644
index 9ce8c653d49f..000000000000
--- a/dev-libs/librelp/librelp-1.3.0.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
-
-inherit autotools python-any-r1
-
-DESCRIPTION="An easy to use library for the RELP protocol"
-HOMEPAGE="http://www.librelp.com/"
-SRC_URI="http://download.rsyslog.com/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3+ doc? ( FDL-1.3 )"
-
-# subslot = soname version
-SLOT="0/0.4.0"
-
-KEYWORDS="amd64 arm ~arm64 hppa ~sparc x86"
-IUSE="debug doc +ssl +gnutls libressl openssl static-libs test"
-REQUIRED_USE="ssl? ( ^^ ( gnutls openssl ) )"
-
-RDEPEND="
-	ssl? (
-		gnutls? ( >=net-libs/gnutls-3.3.17.1:0= )
-		openssl? (
-			!libressl? ( dev-libs/openssl:0= )
-			libressl? ( dev-libs/libressl:0= )
-		)
-	)"
-DEPEND="${RDEPEND}
-	test? ( ${PYTHON_DEPS} )
-	virtual/pkgconfig"
-
-RESTRICT="!test? ( test )"
-
-PATCHES=( "${FILESDIR}"/${P}-dummyclient.py-Py3-compatibility.patch )
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	sed -i \
-		-e 's/ -g"/"/g' \
-		configure.ac || die "sed failed"
-
-	default
-
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		--disable-valgrind
-		$(use_enable debug)
-		$(use_enable gnutls tls)
-		$(use_enable openssl tls-openssl)
-		$(use_enable static-libs static)
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_test() {
-	emake -j1 check
-}
-
-src_install() {
-	local DOCS=( ChangeLog )
-	use doc && local HTML_DOCS=( doc/relp.html )
-	default
-
-	if ! use static-libs; then
-		find "${D}" -name '*.la' -delete || die
-	fi
-}
diff --git a/dev-libs/librelp/librelp-1.4.0.ebuild b/dev-libs/librelp/librelp-1.4.0.ebuild
index 0df8b6e02be9..3bfd7307720d 100644
--- a/dev-libs/librelp/librelp-1.4.0.ebuild
+++ b/dev-libs/librelp/librelp-1.4.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit autotools python-any-r1
 
@@ -15,7 +15,7 @@ LICENSE="GPL-3+ doc? ( FDL-1.3 )"
 # subslot = soname version
 SLOT="0/0.5.0"
 
-KEYWORDS="amd64 arm ~arm64 hppa ~sparc x86"
+KEYWORDS="amd64 arm ~arm64 hppa sparc x86"
 IUSE="debug doc +ssl +gnutls libressl openssl static-libs test"
 REQUIRED_USE="ssl? ( ^^ ( gnutls openssl ) )"