commit: 86416d2c4bf1f28e6b8e68b052347a8683b2adad Author: Brian Evans <grknight <AT> gentoo <DOT> org> AuthorDate: Fri Aug 24 17:02:44 2018 +0000 Commit: Brian Evans <grknight <AT> gentoo <DOT> org> CommitDate: Mon Aug 27 13:12:35 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=86416d2c
eclass: db-use - Update to eapi7-ver This is a very simple eclass which only calls these functions from eclasses: ver_cut (EAPI 0-6) get_libdir (EAPI 0-5) get_libname (ALL EAPI) I see no little reason to place die statements for unknown EAPIs. Just changing the eclasses to better suit the latest EAPI should be OK. Signed-off-by: Brian Evans <grknight <AT> gentoo.org> eclass/db-use.eclass | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/eclass/db-use.eclass b/eclass/db-use.eclass index 35f11df034a..83ae94799ca 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: [email protected] -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"
