* [gentoo-commits] repo/gentoo:master commit in: dev-libs/re2/, dev-libs/re2/files/
@ 2016-05-08 17:31 Mike Gilbert
0 siblings, 0 replies; 2+ messages in thread
From: Mike Gilbert @ 2016-05-08 17:31 UTC (permalink / raw
To: gentoo-commits
commit: 0621475511838acdff08eee20f5d33a99b349c0a
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Sun May 8 16:18:47 2016 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Sun May 8 17:31:28 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=06214755
dev-libs/re2: bump to 2016-05-01
Closes: https://github.com/gentoo/gentoo/pull/1213
Package-Manager: portage-2.2.28_p97
dev-libs/re2/Manifest | 1 +
dev-libs/re2/files/0.2016.05.01-pkgconfig.patch | 47 +++++++++++++++++++++++++
dev-libs/re2/re2-0.2016.05.01.ebuild | 47 +++++++++++++++++++++++++
3 files changed, 95 insertions(+)
diff --git a/dev-libs/re2/Manifest b/dev-libs/re2/Manifest
index 9abfb96..f6b3c6f 100644
--- a/dev-libs/re2/Manifest
+++ b/dev-libs/re2/Manifest
@@ -1,3 +1,4 @@
DIST re2-20130115.tgz 1020951 SHA256 a95d83ed8203817587f7cc368b6f7199d8a4b1558372c306b07201058b92e1fe SHA512 ef1378d89397bf594ece7817ef91171e467a3408046f769eca08beba900a0e70f652e7c4e3b667b3a9d5cef044b08ed74ef7d564ffb965ab75bb9a3964c9ab5a WHIRLPOOL 2cbf47b1816e35e5c7f359a310b4421ad635d1513167ffabf98db84397be800f8b98d4808705754f0e2db14bbeb0d62e47ac3abb385e299c503126a9f874daf5
DIST re2-20130712.tgz 1028311 SHA256 c30e43524280ebc2b9afa8c40ad477d0b2665bc81b663e9ae1b8b48e053af54b SHA512 910e7c7f5b3268746355c2e14dc6a4e32105207abcf8cb56b76fc554be41768e4e4a6b526c9335e95be0bb111025876b61ede1cfebcbec4a4062d53bb1448e08 WHIRLPOOL e5cf26a6c8586503c1639dd3f528cace8a4d7ca4c4ff97e08b12f45753ff67ad78656513658eabd678ac8ab88f1de5279960428fffe1b9e0535afdba44e7e8a3
DIST re2-20140304.tgz 1050493 SHA256 0bffd1a57de2f4b218ca0f77d8850bfd59c82944a98256c6edba25260e0196a7 SHA512 a426e8d69d2c7614087990180539c5b1aa2c544dee14b144098f810b76b6062d7de9efaf1e90e83c61c8e4382a066201862d09965f1a6a9f86e2912011ad9d40 WHIRLPOOL d998a6dd9edac52fe0c4ed7e895940380d9b67220711d68aed02294c8f65a644a59f77bddce116ccf79860c633046fa2b5060ef45d5cb5ea5bc0c1965cdce052
+DIST re2-2016-05-01.tar.gz 399509 SHA256 d9d13f0ea4e1c6628b1cb85eeee284d4fdd4948da94b1f205096254927092e3d SHA512 6d37ab1eae51a73f60d3c8280ea1162c420638363f0eb1313d7c2d5cee65a5abd4c2927da1a53572afbcb7d07fac2993a7e54c6cbc85e24aaae93c46dab19b14 WHIRLPOOL b601349800341d213b01219cf2171873be551488c71c2c06fbab1da27c20719fca12e0cfac30ac4e8ed0eb062a445b4c008491fd0e379f629434e0c9b4649a7e
diff --git a/dev-libs/re2/files/0.2016.05.01-pkgconfig.patch b/dev-libs/re2/files/0.2016.05.01-pkgconfig.patch
new file mode 100644
index 0000000..e4148a6
--- /dev/null
+++ b/dev-libs/re2/files/0.2016.05.01-pkgconfig.patch
@@ -0,0 +1,47 @@
+From 7dc941862819398db2ac4ae4239c8ed05431f928 Mon Sep 17 00:00:00 2001
+From: Mike Gilbert <floppym@gentoo.org>
+Date: Sun, 8 May 2016 11:54:00 -0400
+Subject: [PATCH] Substitute includedir and libdir in re2.pc
+
+---
+ Makefile | 5 ++++-
+ re2.pc => re2.pc.in | 5 ++---
+ 2 files changed, 6 insertions(+), 4 deletions(-)
+ rename re2.pc => re2.pc.in (71%)
+
+diff --git a/Makefile b/Makefile
+index d0e2090..4a8d8a6 100644
+--- a/Makefile
++++ b/Makefile
+@@ -273,7 +273,10 @@ 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
++ sed -e "s#@prefix@#$(prefix)#" \
++ -e "s#@includedir@#$(includedir)#" \
++ -e "s#@libdir@#$(libdir)#" \
++ re2.pc.in >$(DESTDIR)$(libdir)/pkgconfig/re2.pc
+
+ testinstall: static-testinstall shared-testinstall
+ @echo
+diff --git a/re2.pc b/re2.pc.in
+similarity index 71%
+rename from re2.pc
+rename to re2.pc.in
+index 91ba181..a04a70a 100644
+--- a/re2.pc
++++ b/re2.pc.in
+@@ -1,7 +1,6 @@
+ prefix=@prefix@
+-exec_prefix=${prefix}
+-includedir=${prefix}/include
+-libdir=${exec_prefix}/lib
++includedir=@includedir@
++libdir=@libdir@
+
+ Name: re2
+ Description: RE2 is a fast, safe, thread-friendly regular expression engine.
+--
+2.8.2
+
diff --git a/dev-libs/re2/re2-0.2016.05.01.ebuild b/dev-libs/re2/re2-0.2016.05.01.ebuild
new file mode 100644
index 0000000..b3f944c
--- /dev/null
+++ b/dev-libs/re2/re2-0.2016.05.01.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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://www.github.com/google/re2/"
+SRC_URI="https://www.github.com/google/re2/archive/${RE2_VER}.tar.gz -> ${PN}-${RE2_VER}.tar.gz"
+
+LICENSE="BSD"
+# NOTE: Always run libre2 through abi-compliance-checker!
+SLOT="0/0.2016.05.01"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="icu"
+
+RDEPEND="icu? ( dev-libs/icu:0= )"
+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
+}
^ permalink raw reply related [flat|nested] 2+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-libs/re2/, dev-libs/re2/files/
@ 2020-09-05 2:04 Mike Gilbert
0 siblings, 0 replies; 2+ messages in thread
From: Mike Gilbert @ 2020-09-05 2:04 UTC (permalink / raw
To: gentoo-commits
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 <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 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
-}
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-09-05 2:04 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-05-08 17:31 [gentoo-commits] repo/gentoo:master commit in: dev-libs/re2/, dev-libs/re2/files/ Mike Gilbert
-- strict thread matches above, loose matches on Subject: below --
2020-09-05 2:04 Mike Gilbert
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox