[gentoo-commits] repo/gentoo:master commit in: sys-devel/libtool/

[Lars Wendler]

commit:     3adcb70b61ab17eb97771d49778d5b7103fe760b
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 26 07:57:51 2018 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Mon Mar 26 07:57:51 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3adcb70b

sys-devel/libtool: Bump live ebuild to EAPI-6.

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 sys-devel/libtool/libtool-9999.ebuild | 29 ++++++++++++++++++-----------
 1 file changed, 18 insertions(+), 11 deletions(-)

diff --git a/sys-devel/libtool/libtool-9999.ebuild 
b/sys-devel/libtool/libtool-9999.ebuild
index 13af7fa0f51..db8bd168cfd 100644
--- a/sys-devel/libtool/libtool-9999.ebuild
+++ b/sys-devel/libtool/libtool-9999.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=6
 
 LIBTOOLIZE="true" #225559
 WANT_LIBTOOL="none"
-inherit autotools epatch epunt-cxx multilib unpacker prefix
+inherit autotools epunt-cxx multilib unpacker prefix
 
 if [[ ${PV} == "9999" ]] ; then
        EGIT_REPO_URI="git://git.savannah.gnu.org/${PN}.git
@@ -33,23 +33,30 @@ DEPEND="${RDEPEND}
        app-arch/xz-utils"
 [[ ${PV} == "9999" ]] && DEPEND+=" sys-apps/help2man"
 
+PATCHES=(
+       "${FILESDIR}"/${PN}-2.4.3-use-linux-version-in-fbsd.patch #109105
+       "${FILESDIR}"/${PN}-2.4.6-mint.patch
+       "${FILESDIR}"/${PN}-2.2.6a-darwin-module-bundle.patch
+       "${FILESDIR}"/${PN}-2.4.6-darwin-use-linux-version.patch
+)
+
 src_unpack() {
        if [[ ${PV} == "9999" ]] ; then
                git-r3_src_unpack
-               cd "${S}"
-               ./bootstrap || die
        else
                unpacker_src_unpack
        fi
 }
 
 src_prepare() {
+       if [[ "${PV}" = 9999 ]] ; then
+               ./bootstrap || die
+       fi
+
        use vanilla && return 0
 
-       epatch "${FILESDIR}"/${PN}-2.4.3-use-linux-version-in-fbsd.patch #109105
-       epatch "${FILESDIR}"/${PN}-2.4.6-mint.patch
-       epatch "${FILESDIR}"/${PN}-2.2.6a-darwin-module-bundle.patch
-       epatch "${FILESDIR}"/${PN}-2.4.6-darwin-use-linux-version.patch
+       default
+
        if use prefix ; then
                # seems that libtool has to know about EPREFIX a little bit
                # better, since it fails to find prefix paths to search libs
@@ -58,7 +65,7 @@ src_prepare() {
                # (argh...). This could also be fixed by making the gcc wrapper
                # return the correct result for -print-search-dirs (doesn't
                # include prefix dirs ...).
-               epatch "${FILESDIR}"/${PN}-2.2.10-eprefix.patch
+               eapply "${FILESDIR}"/${PN}-2.2.10-eprefix.patch
                eprefixify m4/libtool.m4
        fi
        pushd libltdl >/dev/null
@@ -79,10 +86,10 @@ src_configure() {
        # to find a bash shell.  if /bin/sh is bash, it uses that.  this can
        # cause problems for people who switch /bin/sh on the fly to other
        # shells, so just force libtool to use /bin/bash all the time.
-       export CONFIG_SHELL=$(type -P bash)
+       export CONFIG_SHELL="$(type -P bash)"
 
        # Do not bother hardcoding the full path to sed.  Just rely on $PATH. 
#574550
-       export ac_cv_path_SED=$(basename "$(type -P sed)")
+       export ac_cv_path_SED="$(basename "$(type -P sed)")"
 
        local myconf
        [[ ${CHOST} == *-darwin* ]] && myconf="--program-prefix=g"