summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaweł Hajdan <phajdan.jr@gentoo.org>2013-07-24 16:23:01 +0000
committerPaweł Hajdan <phajdan.jr@gentoo.org>2013-07-24 16:23:01 +0000
commitb32e79ce054a355e3c4a7b1362fff4c89d4675ce (patch)
tree48ab6cbf5cce1cbe5c61d034329234fe10a67347 /dev-libs/re2
parentold (diff)
downloadhistorical-b32e79ce054a355e3c4a7b1362fff4c89d4675ce.tar.gz
historical-b32e79ce054a355e3c4a7b1362fff4c89d4675ce.tar.bz2
historical-b32e79ce054a355e3c4a7b1362fff4c89d4675ce.zip
Version bump. Fix tests (bug #443990 by flameeyes). Remove old.
Package-Manager: portage-2.1.12.2/cvs/Linux i686 Manifest-Sign-Key: 0x30427902
Diffstat (limited to 'dev-libs/re2')
-rw-r--r--dev-libs/re2/ChangeLog8
-rw-r--r--dev-libs/re2/Manifest14
-rw-r--r--dev-libs/re2/re2-0_p20130712.ebuild (renamed from dev-libs/re2/re2-0_p20121127.ebuild)31
3 files changed, 33 insertions, 20 deletions
diff --git a/dev-libs/re2/ChangeLog b/dev-libs/re2/ChangeLog
index 7790fb7daa4e..e8659b6694a6 100644
--- a/dev-libs/re2/ChangeLog
+++ b/dev-libs/re2/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for dev-libs/re2
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/re2/ChangeLog,v 1.8 2013/04/06 23:01:55 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/re2/ChangeLog,v 1.9 2013/07/24 16:22:53 phajdan.jr Exp $
+
+*re2-0_p20130712 (24 Jul 2013)
+
+ 24 Jul 2013; Pawel Hajdan jr <phajdan.jr@gentoo.org> -re2-0_p20121127.ebuild,
+ +re2-0_p20130712.ebuild:
+ Version bump. Fix tests (bug #443990 by flameeyes). Remove old.
*re2-0_p20130115-r1 (06 Apr 2013)
diff --git a/dev-libs/re2/Manifest b/dev-libs/re2/Manifest
index 241e7286585a..a99b0f2568b5 100644
--- a/dev-libs/re2/Manifest
+++ b/dev-libs/re2/Manifest
@@ -2,17 +2,17 @@
Hash: SHA256
AUX re2-symbols-r0.patch 261 SHA256 7db8997c9610ad4c1e5b7287bcbe005e1a29782a7e4988a6e71688a75ffb4951 SHA512 9f90010d802a017842c9d2a9a5c9cd5002dd4e24e318c13e3d79e8b4031f0cd0a6150257e217f4210ae4efa5e62e9c392dc3c3cd314f66849ed252e9eaabd05c WHIRLPOOL 86d0f59bec9f4073fa05879330348bce27901223201437eafb04dee15e51003bb19eceabbafa6bc594f3f5cbdad80f6946642b66c7e2a0e94223a58002b9b9ee
-DIST re2-20121127.tgz 1018992 SHA256 1f3940357d38ab949901a5c3177a2b40f82c314ed39f20892f1b56376c5edef0 SHA512 47822af8a6c85831e3df3ca3e32f8c47e0c8d9e9746c2ee42d98993e448c09fb9bb273ffe885b83b456f3477e3b290d1ba8e7ef4c7392e38c9829d577b9c0b59 WHIRLPOOL 27c5e07295b2a2074b55c601c69b56e7d92f5209dc2a74158d2756a42f7cdb4fbdf83d834850ea62ffeb6d0d0c087e02a519109f04ffe752a3bd392ef974a918
DIST re2-20130115.tgz 1020951 SHA256 a95d83ed8203817587f7cc368b6f7199d8a4b1558372c306b07201058b92e1fe SHA512 ef1378d89397bf594ece7817ef91171e467a3408046f769eca08beba900a0e70f652e7c4e3b667b3a9d5cef044b08ed74ef7d564ffb965ab75bb9a3964c9ab5a WHIRLPOOL 2cbf47b1816e35e5c7f359a310b4421ad635d1513167ffabf98db84397be800f8b98d4808705754f0e2db14bbeb0d62e47ac3abb385e299c503126a9f874daf5
-EBUILD re2-0_p20121127.ebuild 1215 SHA256 f62bff4e74077ac1576027a217deaf6215316ae7a5dfb14d168543a5383b9e9e SHA512 4f6b28a94dbd6c917c5b34194a14539885212ea9217953c7a2d2977f149f70c1caca50212215a51f88717c9151a1e18fbd1eca9b588f496f15c67804187cb162 WHIRLPOOL 8e80d9a079fe7dd26b1c456d21eb7bdefa1e516ab4431653443adf85e8486607937caeec06b507ef79ecdb8ccb6d36b65651d243b3191807a01b0e2bb3d1efd3
+DIST re2-20130712.tgz 1028311 SHA256 c30e43524280ebc2b9afa8c40ad477d0b2665bc81b663e9ae1b8b48e053af54b SHA512 910e7c7f5b3268746355c2e14dc6a4e32105207abcf8cb56b76fc554be41768e4e4a6b526c9335e95be0bb111025876b61ede1cfebcbec4a4062d53bb1448e08 WHIRLPOOL e5cf26a6c8586503c1639dd3f528cace8a4d7ca4c4ff97e08b12f45753ff67ad78656513658eabd678ac8ab88f1de5279960428fffe1b9e0535afdba44e7e8a3
EBUILD re2-0_p20130115-r1.ebuild 1333 SHA256 595ea395197703935cb060d60baf1813bec2c884738c50a7e173203942cef630 SHA512 20ef887086b9aa478086f44cf88bf4fe5e2f1deafb4e220bde740052acb847259404d439340a5ab623d8d85d17298344746919a41e6424097e465d3c506d0f29 WHIRLPOOL 88745ac3f8f21562699d5606481b4ec07d426674f4736dc3dc6db0c34a222d5c8ace89ab17432a952789cda01db03700c728317f284071d7fc57190fa669ad12
EBUILD re2-0_p20130115.ebuild 1206 SHA256 f1ef33738516b9a843270b302c238002c0a55c6edb0bcb3f6e2034c228cb612d SHA512 249ea0fe32ddba3081ae32da1629c5d56d47d523f54c8af234c5131c90d0b37ee532e2582cf28c9fb738bfa736bdc3338bf90c2ed101754cde67f4aa75512c50 WHIRLPOOL 26777dc71e23777ed7714841a2921ff63f756039dec97d2ea0ff1101c3e8d396add35305568962346e329c4c14fad6e02f12b9d34f5959a9446ac9559554ff1f
-MISC ChangeLog 1599 SHA256 b2c4f645db244a5d33157dad1ffa227f47507f2d4dd43e26fdbf08a442a6294c SHA512 09559310b913df632bb2df02e9374710ada49e6378c2b7324b06f9bda6f7817f56f4fad9397e8d69e634777f76ef08aa285d113398c952a5ca97c6628eca6609 WHIRLPOOL cbf87d03f4059e40e7e5b4b8acfb94cd280568ef1b11265f3e63d6eada31abf0c3f98718e061a9dbc7a2e4035837ce72c329b84ec86c7a14868adf501c6891cb
+EBUILD re2-0_p20130712.ebuild 1227 SHA256 a16aa6b90d58d05eaa234e01af62b49710f8ce1f8baab8cdd0edad6d7c11747c SHA512 be0999c5d4713ef2730d62bdc81527ee20b98c1e9bb1f8dbd61c5f8b885e429cd2f7c9b5b653dc67986f3ae44ff4c15af52f4835ce9b92622ff41ce0f7c30351 WHIRLPOOL 2a94bb26677305954648286ecde6f5af0d6e4e73aa5f16447f67f790b16b162514e6992e0e52b66dfe776f8541243ccd2b27f19131a547cf8532b9f457af0f1e
+MISC ChangeLog 1808 SHA256 bb8074bcd9515cc6c8bd69f80098e63843f54ed680f6452e2a06833fe98afab0 SHA512 78a113e92e1bc5420427351f5e107e1aff4fab5d21ed0b1d96dfc3ce7982036f235b4ae68e3127a47a0343c7c6c201d37768a2e41ee8d70b96026e171dbf1b1b WHIRLPOOL c118997164bb0d0ac013992382338a27d41a0197700d7c8cd44c5575b7230d1acb5c2dc058ae7e084cbc2027cba7441f058a8307c037dc838dc56c45f6ce1eca
MISC metadata.xml 162 SHA256 8a3ecdcf518f45ec4843398f9896c9b4d1c867ff2cf2851cf40b06f756f111e8 SHA512 51796fe7e55b73dbfbe4a6b5fd089f5e8e4d327ff67d4a267692dda38380df5048ea77e8f058c466ae17726af5f099a3240b0500d53e421d95acc583164d3fe9 WHIRLPOOL 279b6ed997fab0d4278c01814bdd067068bceff8d1ce9933087828ce7598513b5a809013c996a3b134da6072c698a87ae151cfb56407fd62ff465b165197f5bf
-----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
-iF4EAREIAAYFAlFgqWQACgkQC77qH+pIQ6RzmAEAneMy2qup+BOmY4ZS+tUHEK9I
-u+k/OrZdiWdBIA5FOukBAKRM+0A4cL5icxEHVrPLEH33hcvvy8CcVn0EgVi9sZi0
-=uojt
+iEYEAREIAAYFAlHv/2MACgkQuUQtlDBCeQI+EQCeNtn9LlulqyhOYSx/aG2pEM4k
+dcYAmgL8nK9bCWlxIGUin8ueVvyKQQsg
+=ls2n
-----END PGP SIGNATURE-----
diff --git a/dev-libs/re2/re2-0_p20121127.ebuild b/dev-libs/re2/re2-0_p20130712.ebuild
index ce24f3972918..42ee23d78769 100644
--- a/dev-libs/re2/re2-0_p20121127.ebuild
+++ b/dev-libs/re2/re2-0_p20130712.ebuild
@@ -1,10 +1,10 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/re2/re2-0_p20121127.ebuild,v 1.2 2013/02/25 21:07:13 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/re2/re2-0_p20130712.ebuild,v 1.1 2013/07/24 16:22:53 phajdan.jr Exp $
-EAPI=4
+EAPI=5
-inherit eutils multilib toolchain-funcs
+inherit eutils multilib multilib-build toolchain-funcs
DESCRIPTION="An efficent, principled regular expression library"
HOMEPAGE="http://code.google.com/p/re2/"
@@ -19,29 +19,36 @@ IUSE=""
S="${WORKDIR}/${PN}"
src_prepare() {
- # Fix problems with FilteredRE2 symbols not being exported.
- epatch "${FILESDIR}/${PN}-symbols-r0.patch"
+ multilib_copy_sources
}
-src_compile() {
- makeopts=(
+mymake() {
+ cd "${BUILD_DIR}" || die
+ local makeopts=(
AR="$(tc-getAR)"
CXX="$(tc-getCXX)"
CXXFLAGS="${CXXFLAGS} -pthread"
LDFLAGS="${LDFLAGS} -pthread"
NM="$(tc-getNM)"
)
- emake "${makeopts[@]}"
+ emake "${makeopts[@]}" "$@"
+}
+
+src_compile() {
+ multilib_foreach_abi mymake
}
src_test() {
- emake "${makeopts[@]}" shared-test
+ multilib_foreach_abi mymake static-test
}
src_install() {
- emake DESTDIR="${ED}" prefix=usr libdir=usr/$(get_libdir) install
- # TODO: the upstream should not build static library at all.
- rm "${ED}/usr/$(get_libdir)/libre2.a" || die
+ myinstall() {
+ cd "${BUILD_DIR}" || die
+ emake DESTDIR="${ED}" prefix=usr libdir=usr/$(get_libdir) install
+ multilib_check_headers
+ }
+ multilib_foreach_abi myinstall
dodoc AUTHORS CONTRIBUTORS README doc/syntax.txt
dohtml doc/syntax.html
}