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

[Fabian Groffen]

commit:     c2e644a316368ec1965e2be96f9f2f811288409f
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 20 14:17:51 2016 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Tue Dec 20 14:17:51 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c2e644a3

dev-libs/gmp: add Prefix support

Package-Manager: portage-2.3.0

 dev-libs/gmp/gmp-6.1.2.ebuild | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/dev-libs/gmp/gmp-6.1.2.ebuild b/dev-libs/gmp/gmp-6.1.2.ebuild
index 48abb3c..5d10200 100644
--- a/dev-libs/gmp/gmp-6.1.2.ebuild
+++ b/dev-libs/gmp/gmp-6.1.2.ebuild
@@ -18,7 +18,7 @@ SRC_URI="ftp://ftp.gmplib.org/pub/${MY_P}/${MY_P}.tar.xz
 LICENSE="|| ( LGPL-3+ GPL-2+ )"
 # The subslot reflects the C & C++ SONAMEs.
 SLOT="0/10.4"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 
~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 
~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-aix ~x64-freebsd 
~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux 
~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris 
~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="+asm doc cxx pgo static-libs"
 
 DEPEND="sys-devel/m4
@@ -43,8 +43,8 @@ src_prepare() {
        # So, to avoid patching the source constantly, wrap things up.
        mv configure configure.wrapped || die
        cat <<-\EOF > configure
-       #!/bin/sh
-       exec env ABI="${GMPABI}" "$0.wrapped" "$@"
+       #!/usr/bin/env sh
+       exec env ABI="${GMPABI}" "${CONFIG_SHELL}" "$0.wrapped" "$@"
        EOF
        # Patches to original configure might have lost the +x bit.
        chmod a+rx configure{,.wrapped}
@@ -65,6 +65,11 @@ multilib_src_configure() {
        esac
        export GMPABI
 
+       #367719
+       if [[ ${CHOST} == *-mint* ]]; then
+               filter-flags -O?
+       fi
+
        tc-export CC
        ECONF_SOURCE="${S}" econf \
                --localstatedir="${EPREFIX}"/var/state/gmp \
@@ -97,9 +102,9 @@ multilib_src_install() {
        emake DESTDIR="${D}" install
 
        # should be a standalone lib
-       rm -f "${D}"/usr/$(get_libdir)/libgmp.la
+       rm -f "${ED}"/usr/$(get_libdir)/libgmp.la
        # this requires libgmp
-       local la="${D}/usr/$(get_libdir)/libgmpxx.la"
+       local la="${ED}/usr/$(get_libdir)/libgmpxx.la"
        use static-libs \
                && sed -i 's:/[^ ]*/libgmp.la:-lgmp:' "${la}" \
                || rm -f "${la}"
@@ -107,5 +112,5 @@ multilib_src_install() {
 
 multilib_src_install_all() {
        einstalldocs
-       use doc && cp "${DISTDIR}"/gmp-man-${MY_PV}.pdf 
"${D}"/usr/share/doc/${PF}/
+       use doc && cp "${DISTDIR}"/gmp-man-${MY_PV}.pdf 
"${ED}"/usr/share/doc/${PF}/
 }