[gentoo-commits] repo/gentoo:master commit in: dev-libs/boehm-gc/

[David Seifert]

commit:     a0dc3491f9924262a600533744150277899fb521
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Wed May 10 20:41:03 2017 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Wed May 10 22:35:41 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a0dc3491

dev-libs/boehm-gc: Make multilib compatible

Bug: https://bugs.gentoo.org/show_bug.cgi?id=617788
Package-Manager: Portage-2.3.5, Repoman-2.3.2

 dev-libs/boehm-gc/boehm-gc-7.6.0.ebuild | 28 ++++++++++++++++------------
 1 file changed, 16 insertions(+), 12 deletions(-)

diff --git a/dev-libs/boehm-gc/boehm-gc-7.6.0.ebuild 
b/dev-libs/boehm-gc/boehm-gc-7.6.0.ebuild
index 1f62ca853c4..cab00ef0303 100644
--- a/dev-libs/boehm-gc/boehm-gc-7.6.0.ebuild
+++ b/dev-libs/boehm-gc/boehm-gc-7.6.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-inherit ltprune
+inherit multilib-minimal
 
 MY_P="gc-${PV}"
 
@@ -16,35 +16,39 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 
~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos 
~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="cxx static-libs threads"
 
-DEPEND=">=dev-libs/libatomic_ops-7.4
+DEPEND="
+       >=dev-libs/libatomic_ops-7.4[${MULTILIB_USEDEP}]
        virtual/pkgconfig"
 
 S="${WORKDIR}/${MY_P}"
 
-src_configure() {
+multilib_src_configure() {
        local config=(
                --with-libatomic-ops
                $(use_enable cxx cplusplus)
                $(use_enable static-libs static)
                $(use threads || echo --disable-threads)
        )
-       econf "${config[@]}"
+
+       ECONF_SOURCE=${S} econf "${config[@]}"
 }
 
-src_compile() {
+multilib_src_compile() {
        # Workaround build errors. #574566
        use ia64 && emake src/ia64_save_regs_in_stack.lo
        use sparc && emake src/sparc_mach_dep.lo
        default
 }
 
-src_install() {
-       default
-       use static-libs || prune_libtool_files
+multilib_src_install_all() {
+       local HTML_DOCS=( doc/*.html )
+       einstalldocs
+       dodoc doc/README{.environment,.linux,.macros}
+
+       rm -r "${ED%/}"/usr/share/gc || die
+
+       # package provides .pc files
+       find "${D}" -name '*.la' -delete || die
 
-       rm -r "${ED}"/usr/share/gc || die
-       dodoc README.QUICK doc/README{.environment,.linux,.macros}
-       docinto html
-       dodoc doc/*.html
        newman doc/gc.man GC_malloc.1
 }