From 5e41a38157bb40e8513e8e34426e85faba672fe7 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 14 Jun 2024 00:09:04 +0100 Subject: gentoo auto-resync : 14:06:2024 - 00:09:04 --- eclass/Manifest.gz | Bin 39073 -> 39070 bytes eclass/ecm.eclass | 3 ++- eclass/java-vm-2.eclass | 4 ++-- eclass/rebar.eclass | 19 ++++++++----------- eclass/tests/Makefile | 10 ++++++---- eclass/tests/rebar_fix_include_path.sh | 8 ++++++-- eclass/tests/rebar_remove_deps.sh | 4 ++-- eclass/tests/rebar_set_vsn.sh | 4 ++-- eclass/tests/savedconfig.sh | 22 ++++++++++++++-------- eclass/tree-sitter-grammar.eclass | 1 - 10 files changed, 42 insertions(+), 33 deletions(-) (limited to 'eclass') diff --git a/eclass/Manifest.gz b/eclass/Manifest.gz index c18826eac202..d536810fc928 100644 Binary files a/eclass/Manifest.gz and b/eclass/Manifest.gz differ diff --git a/eclass/ecm.eclass b/eclass/ecm.eclass index d36b11ebd5e8..518f913815be 100644 --- a/eclass/ecm.eclass +++ b/eclass/ecm.eclass @@ -277,14 +277,15 @@ BDEPEND+=" dev-libs/libpcre2:* >=kde-frameworks/extra-cmake-modules-${KFMIN}:* " -RDEPEND+=" >=kde-frameworks/kf-env-4" if [[ ${ECM_TEST} != false ]]; then IUSE+=" test" RESTRICT+=" !test? ( test )" fi if [[ ${_KFSLOT} == 6 ]]; then + RDEPEND+=" >=kde-frameworks/kf-env-6" COMMONDEPEND+=" dev-qt/qtbase:${_KFSLOT}" else + RDEPEND+=" >=kde-frameworks/kf-env-4" COMMONDEPEND+=" dev-qt/qtcore:${_KFSLOT}" if [[ ${ECM_TEST} != false ]]; then DEPEND+=" test? ( dev-qt/qttest:5 )" diff --git a/eclass/java-vm-2.eclass b/eclass/java-vm-2.eclass index e5d3159f2854..c7a207ae24f7 100644 --- a/eclass/java-vm-2.eclass +++ b/eclass/java-vm-2.eclass @@ -4,14 +4,14 @@ # @ECLASS: java-vm-2.eclass # @MAINTAINER: # java@gentoo.org -# @SUPPORTED_EAPIS: 7 8 +# @SUPPORTED_EAPIS: 8 # @BLURB: Java Virtual Machine eclass # @DESCRIPTION: # This eclass provides functionality which assists with installing # virtual machines, and ensures that they are recognized by java-config. case ${EAPI} in - 7|8) ;; + 8) ;; *) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;; esac diff --git a/eclass/rebar.eclass b/eclass/rebar.eclass index c1a3aca67b54..97638c761814 100644 --- a/eclass/rebar.eclass +++ b/eclass/rebar.eclass @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: rebar.eclass @@ -6,7 +6,7 @@ # maintainer-needed@gentoo.org # @AUTHOR: # Amadeusz Żołnowski -# @SUPPORTED_EAPIS: 6 7 8 +# @SUPPORTED_EAPIS: 7 8 # @BLURB: Build Erlang/OTP projects using dev-util/rebar. # @DESCRIPTION: # An eclass providing functions to build Erlang/OTP projects using @@ -20,7 +20,7 @@ # installation in a generic way for Erlang/OTP structured projects. case ${EAPI} in - 6|7|8) ;; + 7|8) ;; *) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;; esac @@ -33,9 +33,6 @@ BDEPEND=" dev-util/rebar:0 >=sys-apps/gawk-4.1 " -if [[ ${EAPI} == 6 ]]; then - DEPEND+=" ${BDEPEND}" -fi # @ECLASS_VARIABLE: REBAR_APP_SRC # @DESCRIPTION: @@ -63,7 +60,7 @@ _rebar_find_dep() { local p local result - pushd "${EPREFIX}/$(get_erl_libs)" >/dev/null || return 1 + pushd "${EPREFIX}$(get_erl_libs)" >/dev/null || return 1 for p in ${pn} ${pn}-*; do if [[ -d ${p} ]]; then # Ensure there's at most one matching. @@ -102,7 +99,7 @@ erebar() { (( $# > 0 )) || die "erebar: at least one target is required" - local -x ERL_LIBS="${EPREFIX}/$(get_erl_libs)" + local -x ERL_LIBS="${EPREFIX}$(get_erl_libs)" [[ ${1} == eunit ]] && local -x ERL_LIBS="." rebar -v skip_deps=true "$@" || die -n "rebar $@ failed" @@ -123,7 +120,7 @@ rebar_fix_include_path() { local pn="${1}" local rebar_config="${2:-rebar.config}" - local erl_libs="${EPREFIX}/$(get_erl_libs)" + local erl_libs="${EPREFIX}$(get_erl_libs)" local p p="$(_rebar_find_dep "${pn}")" \ @@ -212,7 +209,7 @@ rebar_src_prepare() { rebar_src_configure() { debug-print-function ${FUNCNAME} "${@}" - local -x ERL_LIBS="${EPREFIX}/$(get_erl_libs)" + local -x ERL_LIBS="${EPREFIX}$(get_erl_libs)" default } @@ -252,7 +249,7 @@ rebar_src_install() { [[ -d bin ]] && for bin in bin/*; do dobin "$bin"; done if [[ -d priv ]]; then - cp -pR priv "${ED%/}/${dest}/" || die "failed to install priv/" + cp -pR priv "${ED}${dest}/" || die "failed to install priv/" fi einstalldocs diff --git a/eclass/tests/Makefile b/eclass/tests/Makefile index ee4a454912c3..99e824dea86d 100644 --- a/eclass/tests/Makefile +++ b/eclass/tests/Makefile @@ -1,19 +1,21 @@ SH_FILES := $(wildcard *.sh) -TEST_FILES := $(filter-out tests-common.sh, $(SH_FILES)) +TEST_FILES := $(filter-out tests-common.sh version-funcs.sh, $(SH_FILES)) TEST_OK_FILES := $(patsubst %.sh, .%.sh.ok,$ $(TEST_FILES)) +# !!! _All_ recipe lines for each target will be provided to a single +# !!! invocation of the shell. +.ONESHELL: + # We cache a successful test result if the testfile itself did not # change (%.sh) and the contents of the eclass/ directory did not # change (.eclasssum). .%.sh.ok: %.sh .eclasssum - ./$< - touch $@ + ./$< && touch $@ .PHONY: test test: $(TEST_OK_FILES) .PHONY: force -.ONESHELL: .eclasssum: SHELL = /bin/bash .eclasssum: force set -euo pipefail diff --git a/eclass/tests/rebar_fix_include_path.sh b/eclass/tests/rebar_fix_include_path.sh index 339633e91e3a..46c5712104b1 100755 --- a/eclass/tests/rebar_fix_include_path.sh +++ b/eclass/tests/rebar_fix_include_path.sh @@ -1,16 +1,20 @@ #!/bin/bash -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 source tests-common.sh || exit -EAPI=6 +EAPI=8 inherit rebar EPREFIX="${tmpdir}/fakeroot" S="${WORKDIR}/${P}" +get_libdir() { + echo lib +} + setup() { mkdir -p "${S}" || die diff --git a/eclass/tests/rebar_remove_deps.sh b/eclass/tests/rebar_remove_deps.sh index b544a3078dbb..e2717b59eaf9 100755 --- a/eclass/tests/rebar_remove_deps.sh +++ b/eclass/tests/rebar_remove_deps.sh @@ -1,10 +1,10 @@ #!/bin/bash -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 source tests-common.sh || exit -EAPI=6 +EAPI=8 inherit rebar diff --git a/eclass/tests/rebar_set_vsn.sh b/eclass/tests/rebar_set_vsn.sh index c828732b0079..6cc4600695a6 100755 --- a/eclass/tests/rebar_set_vsn.sh +++ b/eclass/tests/rebar_set_vsn.sh @@ -1,10 +1,10 @@ #!/bin/bash -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 source tests-common.sh || exit -EAPI=6 +EAPI=8 inherit rebar diff --git a/eclass/tests/savedconfig.sh b/eclass/tests/savedconfig.sh index 16645fc05854..ad03ce2d2d94 100755 --- a/eclass/tests/savedconfig.sh +++ b/eclass/tests/savedconfig.sh @@ -1,5 +1,5 @@ #!/bin/bash -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -18,7 +18,13 @@ quiet() { sc() { EBUILD_PHASE=install quiet save_config "$@" ; } rc() { EBUILD_PHASE=prepare quiet restore_config "$@" ; } -cleanup() { rm -rf "${ED}"/* "${T}"/* "${WORKDIR}"/* ; } +cleanup() { + # make sure that these variables exist + [[ -n ${ED} && -n ${T} && -n ${WORKDIR} ]] \ + || { die "${FUNCNAME[0]}: undefined variable"; exit 1; } + rm -rf "${ED}"/* "${T}"/* "${WORKDIR}"/* +} + test-it() { local ret=0 tbegin "$@" @@ -26,7 +32,7 @@ test-it() { : $(( ret |= $? )) pushd "${WORKDIR}" >/dev/null : $(( ret |= $? )) - test + test_sc : $(( ret |= $? )) popd >/dev/null : $(( ret |= $? )) @@ -34,21 +40,21 @@ test-it() { cleanup } -test() { +test_sc() { touch f || return 1 sc f || return 1 [[ -f ${ED}/etc/portage/savedconfig/${CATEGORY}/${PF} ]] } test-it "simple save_config" -test() { +test_sc() { touch a b c || return 1 sc a b c || return 1 [[ -d ${ED}/etc/portage/savedconfig/${CATEGORY}/${PF} ]] } test-it "multi save_config" -test() { +test_sc() { mkdir dir || return 1 touch dir/{a,b,c} || return 1 sc dir || return 1 @@ -58,14 +64,14 @@ test-it "dir save_config" PORTAGE_CONFIGROOT=${D} -test() { +test_sc() { echo "ggg" > f || return 1 rc f || return 1 [[ $( f || return 1 rc f || return 1 [[ $( -# Nick Sarnie # Arthur Zamarin # @AUTHOR: # Matthew Smith -- cgit v1.2.3