[gentoo-commits] repo/gentoo:master commit in: eclass/

[Alexis Ballier]

commit:     2c347c1cb7a917fc6a2f506ba992072a708ed081
Author:     Yuta Satoh <nigoro.dev <AT> gmail <DOT> com>
AuthorDate: Mon Sep 18 11:32:03 2017 +0000
Commit:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Mon Oct  2 08:56:06 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2c347c1c

eclass/freebsd.eclass: use install.sh when upgrading.

 eclass/freebsd.eclass | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/eclass/freebsd.eclass b/eclass/freebsd.eclass
index 64d28f9d483..7c89d953c4b 100644
--- a/eclass/freebsd.eclass
+++ b/eclass/freebsd.eclass
@@ -182,7 +182,7 @@ freebsd_src_unpack() {
                        local tarball="freebsd-src-${MY_PV}.tar.xz"
                        local topdir="usr/src/"
                        local extractlist=()
-                       for i in ${EXTRACTONLY} ; do
+                       for i in ${EXTRACTONLY} tools/ ; do
                                extractlist+=( ${topdir}${i} )
                        done
                        ebegin "Unpacking parts of ${tarball} to ${WORKDIR}"
@@ -210,8 +210,9 @@ freebsd_src_unpack() {
                export INSTALL_LINK="ln -f"
                export INSTALL_SYMLINK="ln -fs"
        fi
-       if version_is_at_least 11.0 ${RV} ; then
-               export RSYMLINK=" -l s"
+       # An older version of install command doesn't support the -T option.
+       if version_is_at_least 11.0 ${RV} && ! has_version 
">=sys-freebsd/freebsd-ubin-${RV}" ; then
+               export INSTALL="sh ${WORKDIR}/tools/install.sh"
        fi
 
        # If CC=clang, we should use clang-cpp instead of cpp. #478810, #595878