gentoo resync : 25.08.2020

3 files changed, 2 insertions, 67 deletions

diff --git a/dev-libs/tre/Manifest b/dev-libs/tre/Manifest
index 639dd72dc066..e6bafcbb2ec7 100644
--- a/dev-libs/tre/Manifest
+++ b/dev-libs/tre/Manifest
@@ -1,6 +1,5 @@
 AUX 0.8.0-CVE-2016-8559.patch 2658 BLAKE2B 12a7d12d35e2d61457fbb9e368cfa738bad74ac490ce4ffa59d1494d879d9db481b89b0e3ef3a2a4601b8280ff8f1c54f4ccdc00716a904bff291923c4aaa02c SHA512 9f45299ccd21cc4e78946ad22963d4505e9cd430f49f275fbb742696029530e7e6eb848b0ae4bf55bb5e2a2ee77d3cf272b02e2a6a2ba7c3bd69f68816e300b2
 AUX 0.8.0-pkgcfg.patch 420 BLAKE2B 6b04ff4db2abc5dffdbca50bcbbe20974fdaa24ab25875f2538eca5af42921a729550e7ea5188225d3d73661e9ba05b96ff345fb4d931130ba4255b14c3944d2 SHA512 a6e4713aa0f9619abe256e9e1ea7c5bc8cbeb9ed173dd856972af70612ac435206e2b294ca5947e93223c17de875ba2620bf57949332b19ecff9965e2ee1a9e6
 DIST tre-0.8.0.tar.bz2 380714 BLAKE2B b2af6e805e9e19fd69debf2f881ddfb591317f69db4e29a04e1899eb69100b8ac7744f86fa438530509ca2ee8aa1d346d416c6391f13247cd9398f4c59c2ed85 SHA512 db7465993e0d25eee8e52f974427b8a040234cf0f017769eb94ee88bc6261821336aad7f762bfa82db7e2212d8449bc221592586f061c528a59a550773cbc263
-EBUILD tre-0.8.0-r1.ebuild 1412 BLAKE2B 5910c54dd847e5ced32abba2c747abcb86c73701332650aa2d937b5470a78bc00be5eaed6cfeb63346b0af0cac702a7baea357ed2dd53aa2c2d600501991fcaa SHA512 ecc2906825000bab1e1286282e445f3da63d36b8896086ba5212646c727300a0c133edfb04a221385b0dc3173156029993aa63f26b43c69d79f78a0ef3aa8d2e
-EBUILD tre-0.8.0-r2.ebuild 1455 BLAKE2B 681ff4583cc680620528c77556aba91a077e2502bb9f0c02fec1c95b1f90d2a6e855d1a86f8c7884bc0cf51143dee91acaba418599aca7e16489c321305c5085 SHA512 51afcd8965a0d723b3d8a52539e190ceab59db5ce2b98c47ad932c549fc98545b8f926990b9ed7db6e7f64eeac013d80693c898bd4e61300c4f2da175f5ac945
+EBUILD tre-0.8.0-r2.ebuild 1454 BLAKE2B 95bd25dbcb07107500ef0de52c942e08e8c0031f8d40327508fcc24cad81108363e8311dc0cad66a07f0d54b53a073eaffdae928445aceac9ae88ea804ae8ae6 SHA512 9f2f38f70562649863608633b0d96ec4c21968eb8e20ccfc9404a57f5f0520e165bf00aa1343270531277a30171606d4c7648e231e4c6f28342908bfeaef30f3
 MISC metadata.xml 353 BLAKE2B 0346462595f8f9a38758ce0817e787b87b35b329aef65d2921214d32bd9313023f006ee2ab31084a03a2f8a8ecf1d556dd11f190ac2467ebcd061bc144b977e4 SHA512 907b341e747fb9d7ba7b76f300d373284a21a59e3d649275c4a53ac681177f94e9d0d9f56b15365008262b2aba91236d9ac5623387313c7b74b65b2b70871d3b
diff --git a/dev-libs/tre/tre-0.8.0-r1.ebuild b/dev-libs/tre/tre-0.8.0-r1.ebuild
deleted file mode 100644
index 63e4a0a6414f..000000000000
--- a/dev-libs/tre/tre-0.8.0-r1.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit multilib
-
-DESCRIPTION="Lightweight, robust, and efficient POSIX compliant regexp matching library"
-HOMEPAGE="https://laurikari.net/tre/ https://github.com/laurikari/tre/"
-SRC_URI="https://laurikari.net/tre/${P}.tar.bz2"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="nls static-libs"
-
-RDEPEND="
-	!app-text/agrep
-	!dev-ruby/amatch
-	!app-misc/glimpse"
-
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )"
-
-PATCHES=( "${FILESDIR}/${PV}-pkgcfg.patch" )
-
-src_prepare() {
-	default
-}
-
-src_configure() {
-	econf \
-		--enable-agrep \
-		--enable-system-abi \
-		$(use_enable nls) \
-		$(use_enable static-libs static)
-}
-
-src_test() {
-	if locale -a | grep -iq en_US.iso88591; then
-		emake -j1 check
-	else
-		ewarn "If you like to run the test,"
-		ewarn "please make sure en_US.ISO-8859-1 is installed."
-		die "en_US.ISO-8859-1 locale is missing"
-	fi
-}
-
-src_install() {
-	local HTML_DOCS=( doc/*.{css,html} )
-
-	default
-
-	# 626480
-	mv "${ED%/}"/usr/bin/agrep{,-tre}$(get_exeext) || die
-}
-
-pkg_postinst() {
-	ewarn "app-misc/glimpse, app-text/agrep and this package all provide agrep."
-	ewarn "If this causes any unforeseen incompatibilities please file a bug"
-	ewarn "on https://bugs.gentoo.org."
-}
diff --git a/dev-libs/tre/tre-0.8.0-r2.ebuild b/dev-libs/tre/tre-0.8.0-r2.ebuild
index aad4e57c4865..734f35f78699 100644
--- a/dev-libs/tre/tre-0.8.0-r2.ebuild
+++ b/dev-libs/tre/tre-0.8.0-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://laurikari.net/tre/${P}.tar.bz2"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="nls static-libs"
 
 RDEPEND="