summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Gilbert <floppym@gentoo.org>2014-05-04 16:05:10 +0000
committerMike Gilbert <floppym@gentoo.org>2014-05-04 16:05:10 +0000
commitb8ebe2376adc908b669bba9b5d9ffff990614fe8 (patch)
treea13d0285f0bb8243fd4ebcd166bcdaa397e6f667 /dev-libs/re2
parentadd ~arm, bug #509082 (diff)
downloadgentoo-2-b8ebe2376adc908b669bba9b5d9ffff990614fe8.tar.gz
gentoo-2-b8ebe2376adc908b669bba9b5d9ffff990614fe8.tar.bz2
gentoo-2-b8ebe2376adc908b669bba9b5d9ffff990614fe8.zip
Convert to multilib-minimal.
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 0BBEEA1FEA4843A4)
Diffstat (limited to 'dev-libs/re2')
-rw-r--r--dev-libs/re2/ChangeLog7
-rw-r--r--dev-libs/re2/re2-0_p20130712.ebuild27
2 files changed, 17 insertions, 17 deletions
diff --git a/dev-libs/re2/ChangeLog b/dev-libs/re2/ChangeLog
index 8dfda0d5bc82..988b4aa3a31b 100644
--- a/dev-libs/re2/ChangeLog
+++ b/dev-libs/re2/ChangeLog
@@ -1,6 +1,9 @@
# 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.10 2013/09/22 23:39:45 phajdan.jr Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/re2/ChangeLog,v 1.11 2014/05/04 16:05:10 floppym Exp $
+
+ 04 May 2014; Mike Gilbert <floppym@gentoo.org> re2-0_p20130712.ebuild:
+ Convert to multilib-minimal.
22 Sep 2013; Pawel Hajdan jr <phajdan.jr@gentoo.org>
+files/re2-compile-r0.patch, re2-0_p20130712.ebuild:
diff --git a/dev-libs/re2/re2-0_p20130712.ebuild b/dev-libs/re2/re2-0_p20130712.ebuild
index 94c1c274c149..fe5c17f27036 100644
--- a/dev-libs/re2/re2-0_p20130712.ebuild
+++ b/dev-libs/re2/re2-0_p20130712.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/re2/re2-0_p20130712.ebuild,v 1.2 2013/09/22 23:39:45 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/re2/re2-0_p20130712.ebuild,v 1.3 2014/05/04 16:05:10 floppym Exp $
EAPI=5
-inherit eutils multilib multilib-build toolchain-funcs
+inherit eutils multilib multilib-minimal toolchain-funcs
DESCRIPTION="An efficent, principled regular expression library"
HOMEPAGE="http://code.google.com/p/re2/"
@@ -24,7 +24,6 @@ src_prepare() {
}
mymake() {
- cd "${BUILD_DIR}" || die
local makeopts=(
AR="$(tc-getAR)"
CXX="$(tc-getCXX)"
@@ -35,21 +34,19 @@ mymake() {
emake "${makeopts[@]}" "$@"
}
-src_compile() {
- multilib_foreach_abi mymake
+multilib_src_compile() {
+ mymake
}
-src_test() {
- multilib_foreach_abi mymake static-test
+multilib_src_test() {
+ mymake static-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
+multilib_src_install() {
+ emake DESTDIR="${ED}" prefix=usr libdir=usr/$(get_libdir) install
+}
+
+multilib_src_install_all() {
dodoc AUTHORS CONTRIBUTORS README doc/syntax.txt
dohtml doc/syntax.html
}