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/db-use.eclass | |
parent | 5fdd950c7ae03e12746a45c86d85861beaacc846 (diff) |
gentoo resync : 29.08.2018
Diffstat (limited to 'eclass/db-use.eclass')
-rw-r--r-- | eclass/db-use.eclass | 10 |
1 files changed, 7 insertions, 3 deletions
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" |