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

[Sam James]

commit:     5c888a952dc942822d48a87fae24d36146b9fa87
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 29 08:36:30 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Oct 29 08:48:50 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5c888a95

dev-libs/gmp: use 6.2.1 docs (not 6.2.0) as they're released now

Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-libs/gmp/Manifest            |  2 +-
 dev-libs/gmp/gmp-6.2.1-r1.ebuild | 23 ++++++++++++++---------
 2 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/dev-libs/gmp/Manifest b/dev-libs/gmp/Manifest
index 60d06efdb2e..4db6b7b9674 100644
--- a/dev-libs/gmp/Manifest
+++ b/dev-libs/gmp/Manifest
@@ -1,2 +1,2 @@
 DIST gmp-6.2.1.tar.xz 2027316 BLAKE2B 
c0d85f175392a50cfa01bc6b0a312b235946ad8b4f6f84f6dabd33d7a6f2cc75c9b0e1e33057be07750bfa0145b7c4cf3b6188a5be6ca9d7271ec2276c84ebcb
 SHA512 
c99be0950a1d05a0297d65641dd35b75b74466f7bf03c9e8a99895a3b2f9a0856cd17887738fa51cf7499781b65c049769271cbcb77d057d2e9f1ec52e07dd84
-DIST gmp-man-6.2.0.pdf 828998 BLAKE2B 
0bf56bf0a6f1aac0e1fb9a5a37552f846a2d4a01bfd3f5b5c531d42a9afc48c19552e08971785805f59e3f2a5fd89e3f986f841dca2e340813596cfd76574e61
 SHA512 
25d129efedd329cd2d4535557c6912191f587bfd8ef028618b4ca6199ec7bf7a9ae862e7f5e5b5448c86888452a39fc7bf95cf9c18311858dd1aa9ae1c716239
+DIST gmp-man-6.2.1.pdf 827583 BLAKE2B 
9aa25457a3c488e37cc7d54d825253ab749a3780919570579b319cf607001de50b212ca387b70213abcc5ab428b4525bdb9cd8ae932798a2d7928da98ce3f353
 SHA512 
f2d9d02e97975355ef490e921fedc94fb7687c3661eec8fa2e94a1622b6e59b17b3879eb3ec1f2df8edac100f727175144d107f4c49c602b773c43bc9e91dbcb

diff --git a/dev-libs/gmp/gmp-6.2.1-r1.ebuild b/dev-libs/gmp/gmp-6.2.1-r1.ebuild
index 46b021bec16..2b5f277c706 100644
--- a/dev-libs/gmp/gmp-6.2.1-r1.ebuild
+++ b/dev-libs/gmp/gmp-6.2.1-r1.ebuild
@@ -7,8 +7,8 @@ inherit flag-o-matic libtool multilib-minimal toolchain-funcs
 
 MY_PV=${PV/_p*}
 MY_PV=${MY_PV/_/-}
-MANUAL_PV=$MY_PV
-MANUAL_PV=6.2.0 # 6.2.1 manual is not ready yet
+MANUAL_PV=${MY_PV}
+MANUAL_PV=6.2.1
 MY_P=${PN}-${MY_PV}
 PLEVEL=${PV/*p}
 DESCRIPTION="Library for arbitrary-precision arithmetic on different type of 
numbers"
@@ -40,10 +40,10 @@ PATCHES=(
 src_prepare() {
        default
 
-       # note: we cannot run autotools here as gcc depends on this package
+       # We cannot run autotools here as gcc depends on this package
        elibtoolize
 
-       # https://bugs.gentoo.org/536894
+       # bug #536894
        if [[ ${CHOST} == *-darwin* ]] ; then
                eapply "${FILESDIR}"/${PN}-6.1.2-gcc-apple-4.0.1.patch
        fi
@@ -55,6 +55,7 @@ src_prepare() {
        #!/usr/bin/env sh
        exec env ABI="${GMPABI}" "$0.wrapped" "$@"
        EOF
+
        # Patches to original configure might have lost the +x bit.
        chmod a+rx configure{,.wrapped} || die
 }
@@ -74,14 +75,15 @@ multilib_src_configure() {
        esac
        export GMPABI
 
-       #367719
+       # bug #367719
        if [[ ${CHOST} == *-mint* ]]; then
                filter-flags -O?
        fi
 
+       tc-export CC
+
        # --with-pic forces static libraries to be built as PIC
        # and without TEXTRELs. musl does not support TEXTRELs: bug #707332
-       tc-export CC
        ECONF_SOURCE="${S}" econf \
                CC_FOR_BUILD="$(tc-getBUILD_CC)" \
                --localstatedir="${EPREFIX}"/var/state/gmp \
@@ -95,11 +97,14 @@ multilib_src_configure() {
 multilib_src_install() {
        emake DESTDIR="${D}" install
 
-       # should be a standalone lib
+       # Should be a standalone lib
        rm -f "${ED}"/usr/$(get_libdir)/libgmp.la
-       # this requires libgmp
+
+       # This requires libgmp
        local la="${ED}/usr/$(get_libdir)/libgmpxx.la"
-       use static-libs || rm -f "${la}"
+       if ! use static-libs ; then
+               rm -f "${la}"
+       fi
 }
 
 multilib_src_install_all() {