From 838d9e7dba43dd512675f45c57e315a8ec69eb87 Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Wed, 2 Mar 2022 18:37:55 +0100 Subject: [PATCH] eclass/db-use: Sync with gentoo It's from gentoo commit 52acf58202ee276674745962306d6cb00223f5e2. --- .../portage-stable/eclass/db-use.eclass | 24 ++++++++++++------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/sdk_container/src/third_party/portage-stable/eclass/db-use.eclass b/sdk_container/src/third_party/portage-stable/eclass/db-use.eclass index 83ae94799c..55e72286fd 100644 --- a/sdk_container/src/third_party/portage-stable/eclass/db-use.eclass +++ b/sdk_container/src/third_party/portage-stable/eclass/db-use.eclass @@ -1,13 +1,24 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2022 Gentoo Authors # 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 + +# @ECLASS: db-use.eclass +# @MAINTAINER: +# maintainer-needed@gentoo.org +# @AUTHOR: +# Paul de Vrieze +# @SUPPORTED_EAPIS: 5 6 7 8 +# @BLURB: This is a common location for functions that aid the use of sys-libs/db +# @DESCRIPTION: +# This eclass is designed to provide helpful functions for depending on +# sys-libs/db. # 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 ;; +case ${EAPI} in + 5|6) inherit eapi7-ver ;& # fallthrough + 7|8) inherit multilib ;; + *) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;; esac #Convert a version to a db slot @@ -30,7 +41,6 @@ db_ver_to_slot() { #Find the version that correspond to the given atom db_findver() { - has "${EAPI:-0}" 0 1 2 && ! use prefix && EPREFIX= if [ $# -ne 1 ]; then eerror "Function db_findver needs one argument" >&2 eerror "args given:" >&2 @@ -58,7 +68,6 @@ db_findver() { # to test for, it will aim to find the library corresponding to it. db_includedir() { - has "${EAPI:-0}" 0 1 2 && ! use prefix && EPREFIX= if [ $# -eq 0 ]; then VER="$(db_findver sys-libs/db)" || return 1 VER="$(db_ver_to_slot "$VER")" @@ -92,7 +101,6 @@ db_includedir() { # packages to test for, it will aim to find the library corresponding to it. db_libname() { - has "${EAPI:-0}" 0 1 2 && ! use prefix && EPREFIX= if [ $# -eq 0 ]; then VER="$(db_findver sys-libs/db)" || return 1 if [ -e "${EPREFIX}/usr/$(get_libdir)/libdb-${VER}$(get_libname)" ]; then