10 files changed, 8 insertions, 385 deletions
diff --git a/dev-libs/re2/Manifest b/dev-libs/re2/Manifest
index e2671ea8db07..e9fc7435bda6 100644
--- a/dev-libs/re2/Manifest
+++ b/dev-libs/re2/Manifest
@@ -1,18 +1,5 @@
-AUX 0.2016.05.01-pkgconfig.patch 1890 BLAKE2B 3fc4c7f0d6a847bbfe8b137a0140b6805c2b9d4cf40ca401ad949c34e3879a74c24a87d174941cc456434172617b3e0a10fa70cdb79a1e35f9b5c023af8cd7d8 SHA512 d6a620aedc647a7894543ced2ee64b4467ab873f0c41966dc22973d603fd35187e86578b866a54e6ffd16c4b9132f4455fcd333d715331d2f7df9bcc48b9be1c
-DIST re2-2016-05-01.tar.gz 399509 BLAKE2B ec7676da99493bb2be56bd661f8f3bd57b123bbdc1f6cc5ccd294a17d819b75f9f505b247e86368735a454417f5df8aa4027c20f0fce129625c14caa166a97ad SHA512 6d37ab1eae51a73f60d3c8280ea1162c420638363f0eb1313d7c2d5cee65a5abd4c2927da1a53572afbcb7d07fac2993a7e54c6cbc85e24aaae93c46dab19b14
-DIST re2-2016-11-01.tar.gz 379816 BLAKE2B 251c45684fa4f3f85e0138c6f788f7a35fbc2ad8766f6a9bc0daf7305ac2140a1102602cf8843242f7a311ec09bf4fe516b605e39e8c857aa2f475783085c231 SHA512 1be7d2551737cb9dc1031dac9335f82dfb58f3612bdb745bf6c5121334bf8689bb0564b751c23e4c002478cc46cc237ce4da294090adb983b0c1db25a9fac0a7
-DIST re2-2017-03-01.tar.gz 382241 BLAKE2B 0a034267f435386b1bfc1680c98aabf4d18dac40cbce3c5a5705cb6a383d54f81b90e22fdd0f16220434eca2eb1c6a5d28ae7e903cdca2397bbc6c10c11ac703 SHA512 566a3ff6598fc9b26dcabe175efa48becd38459185d6bb86b3abb1856a3e7b0f9b5e302594b1ac4817dcb5968920df43d23279a6cff2a74b6b0c174dc9379f88
-DIST re2-2018-04-01.tar.gz 389724 BLAKE2B 629d5cf82a465dfd2d50a3761f0b6504dba6309e5a2605a6f1fde20cae7e7cbb7bef6703abc12161891cb14e7308db3d18b25e575d3ffd8bbdd5cfba6f067983 SHA512 862d9bcb574ea986b1497d6c079104a0cf27b418a6ec8c24047f0d43ede2c8f7f0bdc6a3ccddaeb746f0d821e3e7fd701f438d7fed101db969785c4b344e0462
-DIST re2-2018-10-01.tar.gz 391254 BLAKE2B 297b9abef94fb3ad95e35bb7ff642a5d47b5bc20b1bc3544c76f8a91ec5b9812a1fad1cd5c6a7d4b7c24baaf15302602e8d1b483bdfc6d1246bf268620a9440e SHA512 91e400856137d16c6319e310dab99b4baa74c0bcf634c97464fccdf4092ffc8e1d5ee2a6714b8114719e2dd92e962d5e970ce1b360a3644a8b395d8fb47431be
-DIST re2-2019-08-01.tar.gz 390891 BLAKE2B c663efc729e8cec6f40a29c1c0ca2eeb59e3323ae1adb60b55d017d15d048ac1e329990bf33fac56037b2b03cbe710ec95073a4adc93300a8ae282d4f7e970d8 SHA512 e2b8f121f29b9afa5ae3c8f29811a010289279a9edb3761e27b44d903a85b80720a3a59388a4ad75fb687ee1343d25b5a59cdee42282eed30f5fc48b59c70c97
-DIST re2-2019-09-01.tar.gz 391069 BLAKE2B 79c6985996286bb615079352d4ceb9a10a8fc5a13b496afed8ec6f9cb1b016106bec1ef379789be6bcbee13cc252ae88c301735c4152efe234ed30d88336dccc SHA512 df446a7a00f3e8cd3f09c746ad41a6f58af3da88ab31cf8e2498d26e240bbe1f557f462fb6b10a818c3e00e02ec19dc60ce29eb6c4d61781aeb9b96b4c4e5af9
 DIST re2-2019-12-01.tar.gz 391450 BLAKE2B 2069b496d494771d09d2ce289cc3cd45ea99fda17ca044f09ebeddae85c6fb2cabcb34403a8364d179591f7f3d8ad4e39191c1034aa70c8a16f5d439357330ba SHA512 cfbce00a8462644177c2792cdcd1115fdd17dae9454f6148764bf22c4f364002c6d561f4f407564f6925b78fa8a252d6a3b02bfa8a63f347e6b3d33034ec2d77
-EBUILD re2-0.2016.05.01.ebuild 1202 BLAKE2B 0594d59305793044b9fed2d0570a6c68c5384e0a1f38481fcbdcdf4cb3073484dc660a22f7adfdc977bf1a200cb24f27120b94e87f4319178e196b57ccb59fda SHA512 1bc1f823a2927bb76e2793933d6048ddb93f829464ba8d9d9c0850dc08889026c8e27250e5922b5aa7bdcfe74d7bd0a4be1f59433065141dd7cfaacc6c6c25ac
-EBUILD re2-0.2016.11.01-r1.ebuild 1305 BLAKE2B 8bc950fb1337eeb4f811b3a3a7435b28dce8ec9dad238095a2b19457eced7585ddf64e32844e7970e50b87f3fb913f5dcc9d7529094055e4e1a299ed75950c75 SHA512 a5ef7207e94fc73bcbc4fdd809fa3ed580c9ec0880e073124986a4bdbca7e726be0c122fe7b6f384db8a0ca654645c9fadfb16e3f035e78a1c74e6bca80850c9
-EBUILD re2-0.2017.03.01.ebuild 1305 BLAKE2B 8de6b4e1d07af2677a77755753ff474d818373c0be13008c326972de4cb02b949eb923b1c0353dc0130753d563f6deef1fc54104d32bbcc2c16f676c3afa27ad SHA512 bda266f9e96eec73858ad9c7e0f91f327c216e3d6044bd07abf58dfdf822313e6e7f7b9129b852e0b1ca4ae2bc8ad9c4a38e89e200bac433efd180fc2e7abf60
-EBUILD re2-0.2018.04.01.ebuild 1306 BLAKE2B dcfd4db7dfd17f0ffbab32c96f605ff815933859635e6296570a5783d03b02b221f560ccce8582e2635614f29c379f34e2b375480c06e0d14fe114aa43a15d2b SHA512 c4af6a5638e487c3ce981649ef8ccb30dbf4cf59cd21f06dfef2af8ac0bfa69eb13d11bb9b64b9d575adf15d84fd57163a37dc439abb15086924aad6b54a821d
-EBUILD re2-0.2018.10.01.ebuild 1345 BLAKE2B efa3dbca54f7d8916ef63e41091daecd85d829a0641877fb82e0ad9251d179a247c5fc69127945a7aad4537d83da7cb93abc1576e223f1bb83527187cffa2795 SHA512 d3c6e9cff14639ab4e8ac01e90e896cdc671898f718444009e32750fb392b35836e87e3a2394b55313d58b652cd6b1822a49211dd3159f7fc867c3dcce6815a1
-EBUILD re2-0.2019.08.01.ebuild 1349 BLAKE2B f661f3d4e88cc5c99cf82d8b802343e4a74fa977b3aabf032212dc968cd9d1b7619b8214fce8394a1469d64fe58bf487babe0a2bafdf9fca5a81500fa5dd8e1f SHA512 6d1e8d8a9241017af2e080b5dad79fa1d710f0f07e48e39d48186cf78af4ec1e0c08eaf246f45474494d881018f7596c29b51e296ea8319665c9d4973f64f1dc
-EBUILD re2-0.2019.09.01.ebuild 1349 BLAKE2B f661f3d4e88cc5c99cf82d8b802343e4a74fa977b3aabf032212dc968cd9d1b7619b8214fce8394a1469d64fe58bf487babe0a2bafdf9fca5a81500fa5dd8e1f SHA512 6d1e8d8a9241017af2e080b5dad79fa1d710f0f07e48e39d48186cf78af4ec1e0c08eaf246f45474494d881018f7596c29b51e296ea8319665c9d4973f64f1dc
-EBUILD re2-0.2019.12.01.ebuild 1346 BLAKE2B 4f33270da11833d2a60e0bc24989ee71c1778b32944967364fac738dbb4008b5d13c1db01225d048f057a4ab6be99cdfd1a8cfc59abc7ad758ec5c784562a77d SHA512 0c250c68ea4381bd6f82a562c694aa23c91665a3e161419ce313fa220f294e4df71d974a289f1e6120826bb6c8cf266f19095d9cd59e21b17bf9c2b1ef1a1999
+DIST re2-2020-04-01.tar.gz 402511 BLAKE2B ce3f17037a3a09867036e651d62bd9f004b7ed7c6813b4530059659e794a7a7a3ad17d6ee35b5456302d627a0524fc78151b60ed9c546c1baab699231554a0dd SHA512 b3f2ec675fbc2ab18fc4de7b8c077f110010fd4a7502eea3d802d3706681b523db551edd80c2ff188457169471899084a6b21937154ab2288ee9ac123a2b7014
+EBUILD re2-0.2019.12.01.ebuild 1352 BLAKE2B 4e8b259399c02b16f7cb0ba21aba52e43c629362846f2dba1cd47cb18006938cd1b1e6943c29b64cc19581f4b0607f2478700939eb0caa0573471b3fe8db1180 SHA512 93e6743627fe5aeb06b6dbfeae132237ffd32a40c1eb1532f21dc500206f49e1620aa7a3cbd887b4e70c4023535639ada9a638d2f6c68656725dacfbeca8d932
+EBUILD re2-0.2020.04.01.ebuild 1339 BLAKE2B 5809792c1217f49d50811a794686b0bb74faa93933dfad7a19067595434457e1fed2809414011b8d7039ec1768318a6c43a7f70e9eb1d1c23208f1874f9d0164 SHA512 98ab674b62c8b9a8389d39d9fde1d97de275a5b64b868b33ac0b49023d7351a9b5ca39280fb1b2a318aa01cbbc4aaa8db17f4d760223d7c471bb3b8f36ab9c14
 MISC metadata.xml 471 BLAKE2B d5263d5aa06995cb4abacde849d1f7d970a7c365654fc25c4e4fd9c423f9a99f21e86f60abd8bb50bcba08aed799f510353e6baf23b42299c294b77f95d657fd SHA512 7534d637458ea189e20f259c9f039629f9b5fc738750d8d6e1050163aa147ec447d38ed93df98cedc71510be3fc5949c9084f63da86c12bdfd0c109122a001a8
diff --git a/dev-libs/re2/files/0.2016.05.01-pkgconfig.patch b/dev-libs/re2/files/0.2016.05.01-pkgconfig.patch
deleted file mode 100644
index 46ec7ca619eb..000000000000
--- a/dev-libs/re2/files/0.2016.05.01-pkgconfig.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From ac62674fa16b5a086f02dd208667ba65e22ec09d Mon Sep 17 00:00:00 2001
-From: Paul Wankadia <junyer@google.com>
-Date: Mon, 9 May 2016 14:42:37 +1000
-Subject: [PATCH] Plumb more variables from Makefile to re2.pc.
-
-Change-Id: I35509c273b0bd90242db127121c71be1f628c06f
-Reviewed-on: https://code-review.googlesource.com/4710
-Reviewed-by: Paul Wankadia <junyer@google.com>
----
- Makefile | 8 +++++---
- re2.pc   | 6 +++---
- 2 files changed, 8 insertions(+), 6 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index d0e2090..411e551 100644
---- a/Makefile
-+++ b/Makefile
-@@ -28,11 +28,9 @@ NMFLAGS?=-p
- # http://www.gnu.org/prep/standards/standards.html
- prefix=/usr/local
- exec_prefix=$(prefix)
--bindir=$(exec_prefix)/bin
- includedir=$(prefix)/include
- libdir=$(exec_prefix)/lib
- INSTALL=install
--INSTALL_PROGRAM=$(INSTALL)
- INSTALL_DATA=$(INSTALL) -m 644
- 
- # ABI version
-@@ -273,7 +271,11 @@ install: obj/libre2.a obj/so/libre2.$(SOEXT)
- 	$(INSTALL) obj/so/libre2.$(SOEXT) $(DESTDIR)$(libdir)/libre2.$(SOEXTVER00)
- 	ln -sf libre2.$(SOEXTVER00) $(DESTDIR)$(libdir)/libre2.$(SOEXTVER)
- 	ln -sf libre2.$(SOEXTVER00) $(DESTDIR)$(libdir)/libre2.$(SOEXT)
--	sed -e "s#@prefix@#${prefix}#" re2.pc >$(DESTDIR)$(libdir)/pkgconfig/re2.pc
-+	$(INSTALL_DATA) re2.pc $(DESTDIR)$(libdir)/pkgconfig/re2.pc
-+	sed -i \
-+	  -e "s#@prefix@#${prefix}#" -e "s#@exec_prefix@#${exec_prefix}#" \
-+	  -e "s#@includedir@#${includedir}#" -e "s#@libdir@#${libdir}#" \
-+	  $(DESTDIR)$(libdir)/pkgconfig/re2.pc
- 
- testinstall: static-testinstall shared-testinstall
- 	@echo
-diff --git a/re2.pc b/re2.pc
-index 91ba181..d66cf51 100644
---- a/re2.pc
-+++ b/re2.pc
-@@ -1,7 +1,7 @@
- prefix=@prefix@
--exec_prefix=${prefix}
--includedir=${prefix}/include
--libdir=${exec_prefix}/lib
-+exec_prefix=@exec_prefix@
-+includedir=@includedir@
-+libdir=@libdir@
- 
- Name: re2
- Description: RE2 is a fast, safe, thread-friendly regular expression engine.
diff --git a/dev-libs/re2/re2-0.2016.05.01.ebuild b/dev-libs/re2/re2-0.2016.05.01.ebuild
deleted file mode 100644
index eb2660d59bd3..000000000000
--- a/dev-libs/re2/re2-0.2016.05.01.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit multilib-minimal toolchain-funcs
-
-# Different date format used upstream.
-RE2_VER=${PV#0.}
-RE2_VER=${RE2_VER//./-}
-
-DESCRIPTION="An efficent, principled regular expression library"
-HOMEPAGE="https://github.com/google/re2"
-SRC_URI="https://github.com/google/re2/archive/${RE2_VER}.tar.gz -> ${PN}-${RE2_VER}.tar.gz"
-
-LICENSE="BSD"
-# NOTE: Always run libre2 through abi-compliance-checker!
-# https://abi-laboratory.pro/tracker/timeline/re2/
-SLOT="0/0.2016.05.01"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE="icu"
-
-RDEPEND="icu? ( dev-libs/icu:0=[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
-	icu? ( virtual/pkgconfig )"
-
-S="${WORKDIR}/${PN}-${RE2_VER}"
-
-PATCHES=( "${FILESDIR}/${PV}-pkgconfig.patch" )
-DOCS=( "AUTHORS" "CONTRIBUTORS" "README" "doc/syntax.txt" )
-HTML_DOCS=( "doc/syntax.html" )
-
-src_prepare() {
-	default
-	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_install() {
-	emake DESTDIR="${D}" prefix="${EPREFIX}/usr" libdir="\$(exec_prefix)/$(get_libdir)" install
-}
diff --git a/dev-libs/re2/re2-0.2016.11.01-r1.ebuild b/dev-libs/re2/re2-0.2016.11.01-r1.ebuild
deleted file mode 100644
index e5a491a41c76..000000000000
--- a/dev-libs/re2/re2-0.2016.11.01-r1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit multilib-minimal toolchain-funcs
-
-# Different date format used upstream.
-RE2_VER=${PV#0.}
-RE2_VER=${RE2_VER//./-}
-
-DESCRIPTION="An efficent, 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-2016-09-01"
-SLOT="0/${SONAME}"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="icu"
-
-RDEPEND="icu? ( dev-libs/icu:0=[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
-	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.2017.03.01.ebuild b/dev-libs/re2/re2-0.2017.03.01.ebuild
deleted file mode 100644
index 0410c18f841f..000000000000
--- a/dev-libs/re2/re2-0.2017.03.01.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit multilib-minimal toolchain-funcs
-
-# Different date format used upstream.
-RE2_VER=${PV#0.}
-RE2_VER=${RE2_VER//./-}
-
-DESCRIPTION="An efficent, 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-2017-03-01"
-SLOT="0/${SONAME}"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="icu"
-
-RDEPEND="icu? ( dev-libs/icu:0=[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
-	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.2018.04.01.ebuild b/dev-libs/re2/re2-0.2018.04.01.ebuild
deleted file mode 100644
index a8253f099304..000000000000
--- a/dev-libs/re2/re2-0.2018.04.01.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-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-2017-03-01"
-SLOT="0/${SONAME}"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="icu"
-
-RDEPEND="icu? ( dev-libs/icu:0=[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
-	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.2019.08.01.ebuild b/dev-libs/re2/re2-0.2019.08.01.ebuild
deleted file mode 100644
index 697b91bfc42a..000000000000
--- a/dev-libs/re2/re2-0.2019.08.01.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2019 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="~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.2019.09.01.ebuild b/dev-libs/re2/re2-0.2019.09.01.ebuild
deleted file mode 100644
index 697b91bfc42a..000000000000
--- a/dev-libs/re2/re2-0.2019.09.01.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2019 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="~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.2019.12.01.ebuild b/dev-libs/re2/re2-0.2019.12.01.ebuild
index e160a28429ed..0bc9c4a592bd 100644
--- a/dev-libs/re2/re2-0.2019.12.01.ebuild
+++ b/dev-libs/re2/re2-0.2019.12.01.ebuild
@@ -18,7 +18,7 @@ LICENSE="BSD"
 # https://abi-laboratory.pro/tracker/timeline/re2/
 SONAME="gentoo-2019-01-01"
 SLOT="0/${SONAME}"
-KEYWORDS="amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc x86"
 IUSE="icu"
 
 RDEPEND="icu? ( dev-libs/icu:0=[${MULTILIB_USEDEP}] )"
diff --git a/dev-libs/re2/re2-0.2018.10.01.ebuild b/dev-libs/re2/re2-0.2020.04.01.ebuild
index 8e3f95ed048d..ef410cbb6a44 100644
--- a/dev-libs/re2/re2-0.2018.10.01.ebuild
+++ b/dev-libs/re2/re2-0.2020.04.01.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -16,9 +16,9 @@ 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="gentoo-2017-03-01"
+SONAME="6"
 SLOT="0/${SONAME}"
-KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
 IUSE="icu"
 
 RDEPEND="icu? ( dev-libs/icu:0=[${MULTILIB_USEDEP}] )"
@@ -32,7 +32,7 @@ HTML_DOCS=( doc/syntax.html )
 
 src_prepare() {
 	default
-	grep -qv '^SONAME=0$' Makefile || die "Check SONAME in Makefile"
+	grep -q "^SONAME=${SONAME}\$" Makefile || die "SONAME mismatch"
 	if use icu; then
 		sed -i -e 's:^# \(\(CC\|LD\)ICU=.*\):\1:' Makefile || die
 	fi