Version bump. Fix tests (bug #443990 by flameeyes). Remove old.

(Portage version: 2.1.12.2/cvs/Linux i686, signed Manifest commit with key 30427902)

2 files changed, 26 insertions, 13 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/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
 }