summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Gilbert <floppym@gentoo.org>2013-04-06 23:01:57 +0000
committerMike Gilbert <floppym@gentoo.org>2013-04-06 23:01:57 +0000
commit02f32fc16cc01717a511392415ebb1cae84ffb88 (patch)
tree13384c8931041155d634e0ae26ead3367b26dd2c /dev-libs/re2
parentClean up old revision (diff)
downloadhistorical-02f32fc16cc01717a511392415ebb1cae84ffb88.tar.gz
historical-02f32fc16cc01717a511392415ebb1cae84ffb88.tar.bz2
historical-02f32fc16cc01717a511392415ebb1cae84ffb88.zip
Add multilib support and install the static library as requested by Alex Efros in bug 464806. Thanks for the patch, even if I didn't use it.
Package-Manager: portage-2.2.0_alpha171/cvs/Linux x86_64 Manifest-Sign-Key: 0x0BBEEA1FEA4843A4
Diffstat (limited to 'dev-libs/re2')
-rw-r--r--dev-libs/re2/ChangeLog8
-rw-r--r--dev-libs/re2/Manifest19
-rw-r--r--dev-libs/re2/re2-0_p20130115-r1.ebuild56
3 files changed, 68 insertions, 15 deletions
diff --git a/dev-libs/re2/ChangeLog b/dev-libs/re2/ChangeLog
index 077580bd7c12..7790fb7daa4e 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.7 2013/04/04 20:16:33 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/re2/ChangeLog,v 1.8 2013/04/06 23:01:55 floppym Exp $
+
+*re2-0_p20130115-r1 (06 Apr 2013)
+
+ 06 Apr 2013; Mike Gilbert <floppym@gentoo.org> +re2-0_p20130115-r1.ebuild:
+ Add multilib support and install the static library as requested by Alex Efros
+ in bug 464806. Thanks for the patch, even if I didn't use it.
04 Apr 2013; Agostino Sarubbo <ago@gentoo.org> re2-0_p20130115.ebuild:
Stable for x86, wrt bug #463426
diff --git a/dev-libs/re2/Manifest b/dev-libs/re2/Manifest
index 5f8bea47aad0..241e7286585a 100644
--- a/dev-libs/re2/Manifest
+++ b/dev-libs/re2/Manifest
@@ -5,23 +5,14 @@ AUX re2-symbols-r0.patch 261 SHA256 7db8997c9610ad4c1e5b7287bcbe005e1a29782a7e49
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
+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 1337 SHA256 69337f8fd5e52e20b19a406dbbe0c32667f6e9fee9060158166b22fd2e743ef3 SHA512 d7339d4d91c417ebc111b764885cd7344884bde3e324059c53a88eb888138f211aec9be73f4755bfdf5807d2dc0d872d2e368db953927ed3643a4e70b2b14595 WHIRLPOOL 1ec2888be8743a76ff9242e16cf92d14084c75d1c507b4cdb51e32a642daff795d0bb8b9d904f9efb5fd476e620c4713bfa8170ffc1bfedeb2fae928eeccef5e
+MISC ChangeLog 1599 SHA256 b2c4f645db244a5d33157dad1ffa227f47507f2d4dd43e26fdbf08a442a6294c SHA512 09559310b913df632bb2df02e9374710ada49e6378c2b7324b06f9bda6f7817f56f4fad9397e8d69e634777f76ef08aa285d113398c952a5ca97c6628eca6609 WHIRLPOOL cbf87d03f4059e40e7e5b4b8acfb94cd280568ef1b11265f3e63d6eada31abf0c3f98718e061a9dbc7a2e4035837ce72c329b84ec86c7a14868adf501c6891cb
MISC metadata.xml 162 SHA256 8a3ecdcf518f45ec4843398f9896c9b4d1c867ff2cf2851cf40b06f756f111e8 SHA512 51796fe7e55b73dbfbe4a6b5fd089f5e8e4d327ff67d4a267692dda38380df5048ea77e8f058c466ae17726af5f099a3240b0500d53e421d95acc583164d3fe9 WHIRLPOOL 279b6ed997fab0d4278c01814bdd067068bceff8d1ce9933087828ce7598513b5a809013c996a3b134da6072c698a87ae151cfb56407fd62ff465b165197f5bf
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.19 (GNU/Linux)
-iQIcBAEBCAAGBQJRXd+iAAoJELp701BxlEWf2GcP+wRwwIHl/ESLc6nVDy0NSr2A
-lK83/tSBXUOOXhexyk0aI2oqEazcRrrrmd/I8+urfpLP5iA6UK46xyH5qU6W0bAE
-2v7/30++M1zu69s9FlPZgnJX7PQMU+qwYr5KhdX8IqlotaEGTKuOdKv9X6332bL1
-e7DcPU2R5Qx59vJYNuzgBa6W5xEfdlXZ4GzAxBtJubnRD+JHjf+qCwOvCUyzlBQr
-ogyZs/rTpkt2030KY1qmlLqtCNvytDiyEtT5GYT2iu371c0J8GWqg1eiiz+EE13F
-HvaM3/Fp6i1MLM6oqZSRzZnaj2BWQcPNjJ76ME+CSV4DWI+ZGFPUMzMP6c8Z5lYS
-7SD6f5rjcTWWJugf1a1HZy/VkJtw8FK2UnPA5Q7uX9ZQPssFu1r7omLotHbG0mqn
-aAtLPG+14R3SVLL/mvZbx8AfmswTp8Vi25WeiRLyICFWDadOOEa8UY48fwgChQ6p
-YSXHidH5tQDg5W9HDZxrUA7sclUG2ZC92P2U597ue3thFJG0ItCnC/9DpCoev/P2
-9xbuFPMXk7ncgyy3hycVaMOHB6l60sQ8QX8AMrOezbVGlisV9EKehBkStQHm4OUq
-BURfbFxkBjXeYUQJzYOI76X2mxIT03hvp8lllml/kvJr1XYmZvresXXcn/BVjlpq
-4P90t52zRIPfi9x7WpUz
-=WTDT
+iF4EAREIAAYFAlFgqWQACgkQC77qH+pIQ6RzmAEAneMy2qup+BOmY4ZS+tUHEK9I
+u+k/OrZdiWdBIA5FOukBAKRM+0A4cL5icxEHVrPLEH33hcvvy8CcVn0EgVi9sZi0
+=uojt
-----END PGP SIGNATURE-----
diff --git a/dev-libs/re2/re2-0_p20130115-r1.ebuild b/dev-libs/re2/re2-0_p20130115-r1.ebuild
new file mode 100644
index 000000000000..ff51245f71dd
--- /dev/null
+++ b/dev-libs/re2/re2-0_p20130115-r1.ebuild
@@ -0,0 +1,56 @@
+# 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_p20130115-r1.ebuild,v 1.1 2013/04/06 23:01:55 floppym Exp $
+
+EAPI=5
+
+inherit eutils multilib multilib-build toolchain-funcs
+
+DESCRIPTION="An efficent, principled regular expression library"
+HOMEPAGE="http://code.google.com/p/re2/"
+SRC_URI="http://re2.googlecode.com/files/${PN}-${PV##*_p}.tgz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+# TODO: the directory in the tarball should really be versioned.
+S="${WORKDIR}/${PN}"
+
+src_prepare() {
+ # Fix problems with FilteredRE2 symbols not being exported.
+ epatch "${FILESDIR}/${PN}-symbols-r0.patch"
+ multilib_copy_sources
+}
+
+mymake() {
+ cd "${BUILD_DIR}" || die
+ local makeopts=(
+ AR="$(tc-getAR)"
+ CXX="$(tc-getCXX)"
+ CXXFLAGS="${CXXFLAGS} -pthread"
+ LDFLAGS="${LDFLAGS} -pthread"
+ NM="$(tc-getNM)"
+ )
+ emake "${makeopts[@]}" "$@"
+}
+
+src_compile() {
+ multilib_foreach_abi mymake
+}
+
+src_test() {
+ multilib_foreach_abi mymake shared-test
+}
+
+src_install() {
+ 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
+}