commit: 7b25d9653f562a75ea7da7f7002bbea507193aa5 Author: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache <DOT> Org> AuthorDate: Fri Sep 4 08:00:00 2020 +0000 Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> CommitDate: Sat Sep 5 02:02:42 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7b25d965
dev-libs/re2: Delete old versions (<0.2020.06.01). Signed-off-by: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache.Org> Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org> dev-libs/re2/Manifest | 3 -- .../files/0.2020.05.01-test-memory-budget.patch | 27 ----------- dev-libs/re2/re2-0.2019.12.01.ebuild | 52 -------------------- dev-libs/re2/re2-0.2020.04.01.ebuild | 52 -------------------- dev-libs/re2/re2-0.2020.05.01.ebuild | 55 ---------------------- 5 files changed, 189 deletions(-) diff --git a/dev-libs/re2/Manifest b/dev-libs/re2/Manifest index 60f6f3e8389..c4f509f017c 100644 --- a/dev-libs/re2/Manifest +++ b/dev-libs/re2/Manifest @@ -1,6 +1,3 @@ -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 DIST re2-2020-08-01.tar.gz 404076 BLAKE2B 063c3e78cf4983d214309a93a234d864d5ad3acc63ca40befb0b78604ea1406676eb85c34489f3baf74afc0f05ea46482bd7400eb485cd1951feaf4c1429b21c SHA512 1ae261155a1eb96606788eb736faa4dc3240d85f47e3b4c412a4f85f7e4cc69f7c7cbab98397aaf725def1cbc9c5da2c679cfb5573a442d60897740766ae2967 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 3e62934153c..00000000000 --- 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 <jun...@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 <jun...@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 0bc9c4a592b..00000000000 --- 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.04.01.ebuild b/dev-libs/re2/re2-0.2020.04.01.ebuild deleted file mode 100644 index ef410cbb6a4..00000000000 --- a/dev-libs/re2/re2-0.2020.04.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="6" -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 -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.05.01.ebuild b/dev-libs/re2/re2-0.2020.05.01.ebuild deleted file mode 100644 index aca5fc3509c..00000000000 --- 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 -}
