diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2018-08-29 20:19:23 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2018-08-29 20:19:23 +0100 |
| commit | 12bb627384ddfd47382b9f1b6464481a58d01ebb (patch) | |
| tree | f9760c04ccd4fcd7de214e2acd5b0e43fb530aa9 /eclass | |
| parent | 5fdd950c7ae03e12746a45c86d85861beaacc846 (diff) | |
gentoo resync : 29.08.2018
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/Manifest.gz | bin | 37772 -> 37772 bytes | |||
| -rw-r--r-- | eclass/db-use.eclass | 10 | ||||
| -rw-r--r-- | eclass/unpacker.eclass | 2 | ||||
| -rw-r--r-- | eclass/waf-utils.eclass | 2 |
4 files changed, 9 insertions, 5 deletions
diff --git a/eclass/Manifest.gz b/eclass/Manifest.gz Binary files differindex 9dfdf8e6bf6f..c203efdbf10d 100644 --- a/eclass/Manifest.gz +++ b/eclass/Manifest.gz diff --git a/eclass/db-use.eclass b/eclass/db-use.eclass index 35f11df034a2..83ae94799ca7 100644 --- a/eclass/db-use.eclass +++ b/eclass/db-use.eclass @@ -1,10 +1,14 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # This is a common location for functions that aid the use of sys-libs/db # # Bugs: maintainer-needed@gentoo.org -inherit versionator multilib +# multilib is used for get_libname in all EAPI +case "${EAPI:-0}" in + 0|1|2|3|4|5|6) inherit eapi7-ver multilib ;; + *) inherit multilib ;; +esac #Convert a version to a db slot db_ver_to_slot() { @@ -38,7 +42,7 @@ db_findver() { fi PKG="$(best_version $1)" - VER="$(get_version_component_range 1-2 "${PKG/*db-/}")" + VER="$(ver_cut 1-2 "${PKG/*db-/}")" if [ -d "${EPREFIX}"/usr/include/db$(db_ver_to_slot "$VER") ]; then #einfo "Found db version ${VER}" >&2 echo -n "$VER" diff --git a/eclass/unpacker.eclass b/eclass/unpacker.eclass index c2c69dbc7d6b..41aa3ef43da7 100644 --- a/eclass/unpacker.eclass +++ b/eclass/unpacker.eclass @@ -202,7 +202,7 @@ unpack_makeself() { skip=`grep -a ^offset= "${src}" | awk '{print $3}'` (( skip++ )) ;; - 2.1.4|2.1.5|2.1.6|2.2.0) + 2.1.4|2.1.5|2.1.6|2.2.0|2.4.0) skip=$(grep -a offset=.*head.*wc "${src}" | awk '{print $3}' | head -n 1) skip=$(head -n ${skip} "${src}" | wc -c) exe="dd" diff --git a/eclass/waf-utils.eclass b/eclass/waf-utils.eclass index d3e52fc463dd..4d02483a927e 100644 --- a/eclass/waf-utils.eclass +++ b/eclass/waf-utils.eclass @@ -99,7 +99,7 @@ waf-utils_src_configure() { waf-utils_src_compile() { debug-print-function ${FUNCNAME} "$@" local _mywafconfig - [[ "${WAF_VERBOSE}" ]] && _mywafconfig="--verbose" + [[ ${WAF_VERBOSE} == ON ]] && _mywafconfig="--verbose" local jobs="--jobs=$(makeopts_jobs)" echo "\"${WAF_BINARY}\" build ${_mywafconfig} ${jobs}" |