gentoo resync : 16.09.2020

5 files changed, 8 insertions, 147 deletions

diff --git a/dev-libs/re2/Manifest b/dev-libs/re2/Manifest
index d7338bd05926..83ea921b2080 100644
--- a/dev-libs/re2/Manifest
+++ b/dev-libs/re2/Manifest
@@ -1,12 +1,7 @@
-AUX 0.2020.05.01-test-memory-budget.patch 1104 BLAKE2B 0f661f83d0adbe9c0932f01f6751ed64a00e4669e6c4a865a52484b85fff352b000cfcf798147fbe9c950f8792381b93f40c7913fde824b0bde8596ccfd2ed8b SHA512 28cb8aba6e9d74e8e63e93e4d76f85f0580ca87d70e45f15f8fa7f4fd06523c0c41b7fb50523c69c4f0fdd3691cbffb0683787cac902c1f39350c0f62ec48da2
-DIST re2-2019-12-01.tar.gz 391450 BLAKE2B 2069b496d494771d09d2ce289cc3cd45ea99fda17ca044f09ebeddae85c6fb2cabcb34403a8364d179591f7f3d8ad4e39191c1034aa70c8a16f5d439357330ba SHA512 cfbce00a8462644177c2792cdcd1115fdd17dae9454f6148764bf22c4f364002c6d561f4f407564f6925b78fa8a252d6a3b02bfa8a63f347e6b3d33034ec2d77
-DIST re2-2020-04-01.tar.gz 402511 BLAKE2B ce3f17037a3a09867036e651d62bd9f004b7ed7c6813b4530059659e794a7a7a3ad17d6ee35b5456302d627a0524fc78151b60ed9c546c1baab699231554a0dd SHA512 b3f2ec675fbc2ab18fc4de7b8c077f110010fd4a7502eea3d802d3706681b523db551edd80c2ff188457169471899084a6b21937154ab2288ee9ac123a2b7014
-DIST re2-2020-05-01.tar.gz 402569 BLAKE2B da94442ad8fa965ce8e38f19184579a033a65fd2cdd7769e2e2f2fdb590cd79adf275e94a8aa4ca6924c4b7879441ba7632cc492daa67d41cebeead67af6fc65 SHA512 76ab9b63a7de3de1dbde599e9fd35cf94de26f2f3c2a85e3befa0026decc95620fac65c7bcbfa3729efbfe6b1b418d77d733bd27496b54c649ac2918652aaaac
 DIST re2-2020-06-01.tar.gz 403203 BLAKE2B 46270c39fdb9eda127752e97e5dfea24a6cb9ddc32bfc298e123eb29609a003fd1a7a3591e760944ec36721ee1981f9bdbbc0b04d596764922e6bbc3daa9159c SHA512 8592a5409cb087c3188023746a4121bd58972a7a21bae98022af587f6191b3096bbb5d379e622ea853ff3373c76972fb61f331354550715c9a7e77d08fba6f3c
 DIST re2-2020-07-06.tar.gz 404055 BLAKE2B 1dca93ec928ef508aa30c44889d3f451acdf1f4430dc62b05c256790cb755e30ec5fac6aca23d44ad57eb61b0971437529bf63fb89b4bd7bf1937748046e61a9 SHA512 5ff5b0fa80d28a5c1cd56e42de4392899347e083c8eedb79282763b8967d301e0d287223e2b1a140cc30f7420a4a1aed5d7be0b68e8f5d2e8813ab4bfa64c103
-EBUILD re2-0.2019.12.01.ebuild 1352 BLAKE2B 4e8b259399c02b16f7cb0ba21aba52e43c629362846f2dba1cd47cb18006938cd1b1e6943c29b64cc19581f4b0607f2478700939eb0caa0573471b3fe8db1180 SHA512 93e6743627fe5aeb06b6dbfeae132237ffd32a40c1eb1532f21dc500206f49e1620aa7a3cbd887b4e70c4023535639ada9a638d2f6c68656725dacfbeca8d932
-EBUILD re2-0.2020.04.01.ebuild 1339 BLAKE2B 5809792c1217f49d50811a794686b0bb74faa93933dfad7a19067595434457e1fed2809414011b8d7039ec1768318a6c43a7f70e9eb1d1c23208f1874f9d0164 SHA512 98ab674b62c8b9a8389d39d9fde1d97de275a5b64b868b33ac0b49023d7351a9b5ca39280fb1b2a318aa01cbbc4aaa8db17f4d760223d7c471bb3b8f36ab9c14
-EBUILD re2-0.2020.05.01.ebuild 1409 BLAKE2B 96121133cd77e4281427640ba7f39d920c4fcd9b66b60495ea4c725cd24aed5e9c6f331d2489ef8d6eb5c0b189bc482277837220c672e55f6ca1fcfeb82d3382 SHA512 bbfaed2bae84fe323a111c95015d6a4385a403c185f7b919e078fc1d57d90554f7f6a3325e94f7166a45ebd13a2f9d0dca1864a3ed1aac3bc7be9bb690af8647
+DIST re2-2020-08-01.tar.gz 404076 BLAKE2B 063c3e78cf4983d214309a93a234d864d5ad3acc63ca40befb0b78604ea1406676eb85c34489f3baf74afc0f05ea46482bd7400eb485cd1951feaf4c1429b21c SHA512 1ae261155a1eb96606788eb736faa4dc3240d85f47e3b4c412a4f85f7e4cc69f7c7cbab98397aaf725def1cbc9c5da2c679cfb5573a442d60897740766ae2967
 EBUILD re2-0.2020.06.01.ebuild 1345 BLAKE2B ac8742ad050636bcf8ed1cf04f08dedd105db7f28366da9e55976d2935d63544ecf3077f093794670caee6784ed082446f9b032f4a2ae836c92265f9d7fbbff1 SHA512 422480e4547f33c0827f43a248f9ed331f5ad8e7bd7ec60c96f1f396609bf4f6fb4ed8fe4be3eb3b0e687fdb2fdbb3c8d45b13a5400cb91fe79563372533c375
 EBUILD re2-0.2020.07.06.ebuild 1349 BLAKE2B fe65773026c5209e22cd94c9a1c2153ea5cccb39b1343c45471b01d4aac88cb39673a63a99ca1abf9fb9e1bc3859d9815f81a11e583cf64096e754cf1e63bede SHA512 9e646e078f73598a321893431ca6b1c1cb4652ae6d42ffa6da693b964740a0502e0a9d357f1ea1b06d70aa2fbcbb2140a8019253fe9af4bd1b407079d030033d
+EBUILD re2-0.2020.08.01.ebuild 1349 BLAKE2B fe65773026c5209e22cd94c9a1c2153ea5cccb39b1343c45471b01d4aac88cb39673a63a99ca1abf9fb9e1bc3859d9815f81a11e583cf64096e754cf1e63bede SHA512 9e646e078f73598a321893431ca6b1c1cb4652ae6d42ffa6da693b964740a0502e0a9d357f1ea1b06d70aa2fbcbb2140a8019253fe9af4bd1b407079d030033d
 MISC metadata.xml 471 BLAKE2B d5263d5aa06995cb4abacde849d1f7d970a7c365654fc25c4e4fd9c423f9a99f21e86f60abd8bb50bcba08aed799f510353e6baf23b42299c294b77f95d657fd SHA512 7534d637458ea189e20f259c9f039629f9b5fc738750d8d6e1050163aa147ec447d38ed93df98cedc71510be3fc5949c9084f63da86c12bdfd0c109122a001a8
diff --git a/dev-libs/re2/files/0.2020.05.01-test-memory-budget.patch b/dev-libs/re2/files/0.2020.05.01-test-memory-budget.patch
deleted file mode 100644
index 3e62934153c1..000000000000
--- a/dev-libs/re2/files/0.2020.05.01-test-memory-budget.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From bde1ea09550a61b4a092cdf0e3ba8dca4200947a Mon Sep 17 00:00:00 2001
-From: Paul Wankadia <junyer@google.com>
-Date: Sun, 10 May 2020 07:12:35 -0700
-Subject: [PATCH] Lower the memory budget in TestCompile.InsufficientMemory.
-
-Fixes #256.
-
-Change-Id: I975c5f6f7a12dc86fedc0f3ab35f16295c18a7e8
-Reviewed-on: https://code-review.googlesource.com/c/re2/+/56150
-Reviewed-by: Paul Wankadia <junyer@google.com>
----
- re2/testing/compile_test.cc | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/re2/testing/compile_test.cc b/re2/testing/compile_test.cc
-index 4598aa64..2096e2f0 100644
---- a/re2/testing/compile_test.cc
-+++ b/re2/testing/compile_test.cc
-@@ -236,7 +236,7 @@ TEST(TestCompile, InsufficientMemory) {
-       "^(?P<name1>[^\\s]+)\\s+(?P<name2>[^\\s]+)\\s+(?P<name3>.+)$",
-       Regexp::LikePerl, NULL);
-   EXPECT_TRUE(re != NULL);
--  Prog* prog = re->CompileToProg(920);
-+  Prog* prog = re->CompileToProg(850);
-   // If the memory budget has been exhausted, compilation should fail
-   // and return NULL instead of trying to do anything with NoMatch().
-   EXPECT_TRUE(prog == NULL);
diff --git a/dev-libs/re2/re2-0.2019.12.01.ebuild b/dev-libs/re2/re2-0.2019.12.01.ebuild
deleted file mode 100644
index 0bc9c4a592bd..000000000000
--- a/dev-libs/re2/re2-0.2019.12.01.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit multilib-minimal toolchain-funcs
-
-# Different date format used upstream.
-RE2_VER=${PV#0.}
-RE2_VER=${RE2_VER//./-}
-
-DESCRIPTION="An efficient, principled regular expression library"
-HOMEPAGE="https://github.com/google/re2"
-SRC_URI="https://github.com/google/re2/archive/${RE2_VER}.tar.gz -> re2-${RE2_VER}.tar.gz"
-
-LICENSE="BSD"
-# NOTE: Always run libre2 through abi-compliance-checker!
-# https://abi-laboratory.pro/tracker/timeline/re2/
-SONAME="gentoo-2019-01-01"
-SLOT="0/${SONAME}"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc x86"
-IUSE="icu"
-
-RDEPEND="icu? ( dev-libs/icu:0=[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}"
-BDEPEND="icu? ( virtual/pkgconfig )"
-
-S="${WORKDIR}/re2-${RE2_VER}"
-
-DOCS=( AUTHORS CONTRIBUTORS README doc/syntax.txt )
-HTML_DOCS=( doc/syntax.html )
-
-src_prepare() {
-	default
-	grep -qv '^SONAME=0$' Makefile || die "Check SONAME in Makefile"
-	if use icu; then
-		sed -i -e 's:^# \(\(CC\|LD\)ICU=.*\):\1:' Makefile || die
-	fi
-	multilib_copy_sources
-}
-
-src_configure() {
-	tc-export AR CXX NM
-}
-
-multilib_src_compile() {
-	emake SONAME="${SONAME}"
-}
-
-multilib_src_install() {
-	emake SONAME="${SONAME}" DESTDIR="${D}" prefix="${EPREFIX}/usr" libdir="\$(exec_prefix)/$(get_libdir)" install
-}
diff --git a/dev-libs/re2/re2-0.2020.05.01.ebuild b/dev-libs/re2/re2-0.2020.05.01.ebuild
deleted file mode 100644
index aca5fc3509c4..000000000000
--- a/dev-libs/re2/re2-0.2020.05.01.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit multilib-minimal toolchain-funcs
-
-# Different date format used upstream.
-RE2_VER=${PV#0.}
-RE2_VER=${RE2_VER//./-}
-
-DESCRIPTION="An efficient, principled regular expression library"
-HOMEPAGE="https://github.com/google/re2"
-SRC_URI="https://github.com/google/re2/archive/${RE2_VER}.tar.gz -> re2-${RE2_VER}.tar.gz"
-
-LICENSE="BSD"
-# NOTE: Always run libre2 through abi-compliance-checker!
-# https://abi-laboratory.pro/tracker/timeline/re2/
-SONAME="7"
-SLOT="0/${SONAME}"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc x86"
-IUSE="icu"
-
-RDEPEND="icu? ( dev-libs/icu:0=[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}"
-BDEPEND="icu? ( virtual/pkgconfig )"
-
-S="${WORKDIR}/re2-${RE2_VER}"
-
-DOCS=( AUTHORS CONTRIBUTORS README doc/syntax.txt )
-HTML_DOCS=( doc/syntax.html )
-
-src_prepare() {
-	local PATCHES=(
-		"${FILESDIR}"/0.2020.05.01-test-memory-budget.patch
-	)
-	default
-	grep -q "^SONAME=${SONAME}\$" Makefile || die "SONAME mismatch"
-	if use icu; then
-		sed -i -e 's:^# \(\(CC\|LD\)ICU=.*\):\1:' Makefile || die
-	fi
-	multilib_copy_sources
-}
-
-src_configure() {
-	tc-export AR CXX NM
-}
-
-multilib_src_compile() {
-	emake SONAME="${SONAME}"
-}
-
-multilib_src_install() {
-	emake SONAME="${SONAME}" DESTDIR="${D}" prefix="${EPREFIX}/usr" libdir="\$(exec_prefix)/$(get_libdir)" install
-}
diff --git a/dev-libs/re2/re2-0.2020.04.01.ebuild b/dev-libs/re2/re2-0.2020.08.01.ebuild
index ef410cbb6a44..adf595f07b8b 100644
--- a/dev-libs/re2/re2-0.2020.04.01.ebuild
+++ b/dev-libs/re2/re2-0.2020.08.01.ebuild
@@ -16,14 +16,14 @@ SRC_URI="https://github.com/google/re2/archive/${RE2_VER}.tar.gz -> re2-${RE2_VE
 LICENSE="BSD"
 # NOTE: Always run libre2 through abi-compliance-checker!
 # https://abi-laboratory.pro/tracker/timeline/re2/
-SONAME="6"
+SONAME="8"
 SLOT="0/${SONAME}"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
 IUSE="icu"
 
-RDEPEND="icu? ( dev-libs/icu:0=[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}"
 BDEPEND="icu? ( virtual/pkgconfig )"
+DEPEND="icu? ( dev-libs/icu:0=[${MULTILIB_USEDEP}] )"
+RDEPEND="${DEPEND}"
 
 S="${WORKDIR}/re2-${RE2_VER}"
 
@@ -40,13 +40,13 @@ src_prepare() {
 }
 
 src_configure() {
-	tc-export AR CXX NM
+	tc-export AR CXX
 }
 
 multilib_src_compile() {
-	emake SONAME="${SONAME}"
+	emake SONAME="${SONAME}" shared
 }
 
 multilib_src_install() {
-	emake SONAME="${SONAME}" DESTDIR="${D}" prefix="${EPREFIX}/usr" libdir="\$(exec_prefix)/$(get_libdir)" install
+	emake SONAME="${SONAME}" DESTDIR="${D}" prefix="${EPREFIX}/usr" libdir="\$(exec_prefix)/$(get_libdir)" shared-install
 }