From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 6203715A7DA for ; Fri, 17 Mar 2023 22:04:46 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 93A3FE09C0; Fri, 17 Mar 2023 22:04:45 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 727ADE09C0 for ; Fri, 17 Mar 2023 22:04:45 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 9777A341333 for ; Fri, 17 Mar 2023 22:04:44 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 851F48E5 for ; Fri, 17 Mar 2023 22:04:42 +0000 (UTC) From: "David Seifert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "David Seifert" Message-ID: <1679090652.3282b1442b08c61562972fe867ed67c50ec2c682.soap@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: eclass/ X-VCS-Repository: repo/gentoo X-VCS-Files: eclass/db.eclass X-VCS-Directories: eclass/ X-VCS-Committer: soap X-VCS-Committer-Name: David Seifert X-VCS-Revision: 3282b1442b08c61562972fe867ed67c50ec2c682 X-VCS-Branch: master Date: Fri, 17 Mar 2023 22:04:42 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 8498a0bf-6c29-480c-a96f-c64b8b5fc2d5 X-Archives-Hash: a976e8077c2f44082b943bd34eaaef7a commit: 3282b1442b08c61562972fe867ed67c50ec2c682 Author: David Seifert gentoo org> AuthorDate: Fri Mar 17 22:04:12 2023 +0000 Commit: David Seifert gentoo org> CommitDate: Fri Mar 17 22:04:12 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3282b144 db.eclass: add EAPI whitelist Signed-off-by: David Seifert gentoo.org> eclass/db.eclass | 126 +++++++++++++++++++++++++------------------------------ 1 file changed, 57 insertions(+), 69 deletions(-) diff --git a/eclass/db.eclass b/eclass/db.eclass index 96669c6d8938..ce48ad17dd3a 100644 --- a/eclass/db.eclass +++ b/eclass/db.eclass @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: db.eclass @@ -6,19 +6,23 @@ # base-system@gentoo.org # @BLURB: Internal eclass used by sys-libs/db ebuilds -inherit eutils multilib multiprocessing +case ${EAPI} in + 7|8) ;; + *) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;; +esac -IUSE="doc test examples" +if [[ -z ${_DB_ECLASS} ]]; then +_DB_ECLASS=1 -EXPORT_FUNCTIONS src_test +inherit multilib multiprocessing -DEPEND="test? ( >=dev-lang/tcl-8.4 )" +IUSE="doc tcl test examples" +REQUIRED_USE="test? ( tcl )" -RDEPEND="" +BDEPEND="test? ( >=dev-lang/tcl-8.4 )" db_fix_so() { - has "${EAPI:-0}" 0 1 2 && ! use prefix && EROOT="${ROOT}" - LIB="${EROOT}/usr/$(get_libdir)" + local LIB="${EROOT}"/usr/$(get_libdir) cd "${LIB}" || die @@ -32,71 +36,53 @@ db_fix_so() { # now rebuild all the correct ones local ext for ext in so dylib a; do + local name for name in libdb libdb_{cxx,tcl,java,sql,stl}; do - target="$(find . -maxdepth 1 -type f -name "${name}-*.${ext}" |sort -V |tail -n 1)" - [[ -n "${target}" ]] && ln -sf ${target//.\//} ${name}.${ext} - done; - done; - - # db[23] gets some extra-special stuff - if [[ -f libdb1$(get_libname 2) ]]; then - ln -sf libdb1$(get_libname 2) libdb$(get_libname 2) - ln -sf libdb1$(get_libname 2) libdb1$(get_libname) - ln -sf libdb1$(get_libname 2) libdb-1$(get_libname) - fi - # what do we do if we ever get 3.3 ? - local i - for i in libdb libdb_{cxx,tcl,java,sql,stl}; do - if [[ -f $i-3.2$(get_libname) ]]; then - ln -sf $i-3.2$(get_libname) $i-3$(get_libname) - ln -sf $i-3.2$(get_libname) $i$(get_libname 3) - fi + target="$(find . -maxdepth 1 -type f -name "${name}-*.${ext}" | sort -V | tail -n 1)" + [[ -n ${target} ]] && ln -sf ${target//.\//} ${name}.${ext} + done done # do the same for headers now # but since there are only two of them, just overwrite them - cd "${EROOT}"/usr/include - target="$(find . -maxdepth 1 -type d -name 'db[0-9]*' | sort -V |cut -d/ -f2- | tail -n1)" - if [[ -n "${target}" ]] && [[ -e "${target}/db.h" ]] && ( ! [[ -e db.h ]] || [[ -h db.h ]] ); then + cd "${EROOT}"/usr/include || die + target="$(find . -maxdepth 1 -type d -name 'db[0-9]*' | sort -V | cut -d/ -f2- | tail -n1)" + if [[ -n ${target} && -e ${target}/db.h ]] && ( ! [[ -e db.h ]] || [[ -h db.h ]] ); then einfo "Creating db.h symlinks to ${target}" ln -sf "${target}"/db.h . ln -sf "${target}"/db_185.h . - elif [[ ! -e "${target}/db.h" ]]; then - if [[ -n "${target}" ]]; then + elif [[ ! -e ${target}/db.h ]]; then + if [[ -n ${target} ]]; then ewarn "Could not find ${target}/db.h" elif [[ -h db.h ]]; then einfo "Apparently you just removed the last instance of $PN. Removing the symlinks" - rm -f db.h db_185.h + rm -f db.h db_185.h || die fi fi } db_src_install_doc() { - has "${EAPI:-0}" 0 1 2 && ! use prefix && ED="${D}" # not everybody wants this wad of documentation as it is primarily API docs if use doc; then dodir /usr/share/doc/${PF}/html mv "${ED}"/usr/docs/* "${ED}"/usr/share/doc/${PF}/html/ || die - rm -rf "${ED}"/usr/docs + rm -rf "${ED}"/usr/docs || die else - rm -rf "${ED}"/usr/docs + rm -rf "${ED}"/usr/docs || die fi db_src_install_examples } db_src_install_examples() { - has "${EAPI:-0}" 0 1 2 && ! use prefix && ED="${D}" - if use examples ; then + if use examples; then local langs=( c cxx stl ) - [[ "${IUSE/java}" != "${IUSE}" ]] \ - && use java \ - && langs+=( java ) + in_iuse java && use java && langs+=( java ) local i - for i in ${langs[@]} ; do - destdir="/usr/share/doc/${PF}/" - src="${S}/../examples_${i}/" - if [[ -f "${src}" ]]; then + for i in ${langs[@]}; do + local destdir="/usr/share/doc/${PF}/" + local src="${S}/../examples_${i}/" + if [[ -f ${src} ]]; then dodir "${destdir}" cp -ra "${src}" "${ED}${destdir}/" || die fi @@ -105,13 +91,12 @@ db_src_install_examples() { } db_src_install_usrbinslot() { - has "${EAPI:-0}" 0 1 2 && ! use prefix && ED="${D}" # slot all program names to avoid overwriting local fname - for fname in "${ED}"/usr/bin/db* - do - dn="$(dirname "${fname}")" - bn="$(basename "${fname}")" + + for fname in "${ED}"/usr/bin/db*; do + local dn="$(dirname "${fname}")" + local bn="$(basename "${fname}")" bn="${bn/db/db${SLOT}}" mv "${fname}" "${dn}/${bn}" || \ die "Failed to rename ${fname} to ${dn}/${bn}" @@ -119,30 +104,28 @@ db_src_install_usrbinslot() { } db_src_install_headerslot() { - has "${EAPI:-0}" 0 1 2 && ! use prefix && ED="${D}" # install all headers in a slotted location dodir /usr/include/db${SLOT} mv "${ED}"/usr/include/*.h "${ED}"/usr/include/db${SLOT}/ || die } db_src_install_usrlibcleanup() { - has "${EAPI:-0}" 0 1 2 && ! use prefix && ED="${D}" - LIB="${ED}/usr/$(get_libdir)" + local LIB="${ED}"/usr/$(get_libdir) # Clean out the symlinks so that they will not be recorded in the # contents (bug #60732) - if [[ "${ED}" = "" ]]; then + if [[ -z ${ED} ]]; then die "Calling clean_links while \${ED} not defined" fi - if [[ -e "${LIB}"/libdb.a ]] && [[ ! -e "${LIB}"/libdb-${SLOT}.a ]]; then + if [[ -e "${LIB}"/libdb.a && ! -e "${LIB}"/libdb-${SLOT}.a ]]; then einfo "Moving libdb.a to a versioned name" - mv "${LIB}/libdb.a" "${LIB}/libdb-${SLOT}.a" || die + mv "${LIB}"/libdb.a "${LIB}"/libdb-${SLOT}.a || die fi - if [[ -e "${LIB}"/libdb_cxx.a ]] && [[ ! -e "${LIB}"/libdb_cxx-${SLOT}.a ]]; then + if [[ -e "${LIB}"/libdb_cxx.a && ! -e "${LIB}"/libdb_cxx-${SLOT}.a ]]; then einfo "Moving libdb_cxx.a to a versioned name" - mv "${LIB}/libdb_cxx.a" "${LIB}/libdb_cxx-${SLOT}.a" || die + mv "${LIB}"/libdb_cxx.a "${LIB}"/libdb_cxx-${SLOT}.a || die fi local soext=$(get_libname) @@ -154,11 +137,11 @@ db_src_install_usrlibcleanup() { rm -f \ "${ED}"/usr/include/{db,db_185}.h \ - "${LIB}"/libdb{,_{cxx,sql,stl,java,tcl}}.a + "${LIB}"/libdb{,_{cxx,sql,stl,java,tcl}}.a || die } db_src_test() { - if [[ $UID -eq 0 ]]; then + if [[ ${UID} -eq 0 ]]; then M="You must run the testsuite as non-root, skipping" ewarn "${M}" elog "${M}" @@ -170,34 +153,39 @@ db_src_test() { ewarn "This can take 6+ hours on modern machines" # Fix stuff that fails with relative paths, and upstream moving files # around... - local test_parallel='' t + local t test_parallel for t in \ "${S}"/test/parallel.tcl \ "${S}"/../test/parallel.tcl \ "${S}"/test/tcl/parallel.tcl \ "${S}"/../test/tcl/parallel.tcl \ ; do - [[ -f "${t}" ]] && test_parallel="${t}" && break + [[ -f ${t} ]] && test_parallel="${t}" && break done sed -ri \ -e '/regsub .test_path ./s,(regsub),#\1,g' \ -e '/regsub .src_root ./s,(regsub),#\1,g' \ -e '/regsub .tcl_utils ./s,(regsub),#\1,g' \ - "${test_parallel}" - cd "${S}" + "${test_parallel}" || die + cd "${S}" || die for t in \ ../test/test.tcl \ ../test/tcl/test.tcl \ ; do - [[ -f "${t}" ]] && testbase="${t}" && break + [[ -f ${t} ]] && testbase="${t}" && break done - echo "source ${t}" > testrunner.tcl - echo "run_parallel $(makeopts_jobs) run_std" >> testrunner.tcl - tclsh testrunner.tcl + cat > testrunner.tcl <<-EOF || die + source ${t} + run_parallel $(makeopts_jobs) run_std + EOF + + tclsh testrunner.tcl || die grep -Eqs '^FAIL' ALL.OUT* && die "Some tests failed, please see ${S}/ALL.OUT*" - else - eerror "You must have USE=tcl to run the sys-libs/db testsuite." fi } + +fi + +EXPORT_FUNCTIONS src_test