diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2023-05-26 09:08:49 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2023-05-26 09:08:49 +0100 |
| commit | 720452fca3cdf447b4c65bc3bb363032a983309e (patch) | |
| tree | babdd1cb196da2b5da2e481505e2e492cb4fe458 /eclass | |
| parent | 5923f7107d7596f9ecb6a86b451105462668601c (diff) | |
gentoo auto-resync : 26:05:2023 - 09:08:49
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/Manifest.gz | bin | 37639 -> 37644 bytes | |||
| -rw-r--r-- | eclass/gstreamer-meson.eclass | 2 | ||||
| -rw-r--r-- | eclass/java-ant-2.eclass | 2 | ||||
| -rw-r--r-- | eclass/java-pkg-simple.eclass | 3 |
4 files changed, 3 insertions, 4 deletions
diff --git a/eclass/Manifest.gz b/eclass/Manifest.gz Binary files differindex ae2cf9ae6352..090d034a5824 100644 --- a/eclass/Manifest.gz +++ b/eclass/Manifest.gz diff --git a/eclass/gstreamer-meson.eclass b/eclass/gstreamer-meson.eclass index a4fb4b1a2028..570254270e6d 100644 --- a/eclass/gstreamer-meson.eclass +++ b/eclass/gstreamer-meson.eclass @@ -209,8 +209,6 @@ if [[ "${PN}" != "${GST_ORG_MODULE}" ]]; then # Export multilib phases used for split builds. multilib_src_install_all() { gstreamer_multilib_src_install_all; } else - local extra_deps="" - IUSE="nls test" RESTRICT="!test? ( test )" if [[ "${PN}" != "gstreamer" ]]; then diff --git a/eclass/java-ant-2.eclass b/eclass/java-ant-2.eclass index 3b4a71a402ed..2513ded70a30 100644 --- a/eclass/java-ant-2.eclass +++ b/eclass/java-ant-2.eclass @@ -59,7 +59,6 @@ if [[ -z "${JAVA_ANT_DISABLE_ANT_CORE_DEP}" ]]; then fi # add ant tasks specified in WANT_ANT_TASKS to DEPEND -local ANT_TASKS_DEPEND; ANT_TASKS_DEPEND="$(java-pkg_ant-tasks-depend)" # check that java-pkg_ant-tasks-depend didn't fail if [[ $? != 0 ]]; then @@ -72,6 +71,7 @@ fi JAVA_ANT_E_DEPEND="${JAVA_ANT_E_DEPEND} ${ANT_TASKS_DEPEND} dev-java/javatoolkit" +unset ANT_TASKS_DEPEND # this eclass must be inherited after java-pkg-2 or java-pkg-opt-2 # if it's java-pkg-opt-2, ant dependencies are pulled based on USE flag diff --git a/eclass/java-pkg-simple.eclass b/eclass/java-pkg-simple.eclass index 929ce68c6c07..77038c708256 100644 --- a/eclass/java-pkg-simple.eclass +++ b/eclass/java-pkg-simple.eclass @@ -36,7 +36,7 @@ S="${WORKDIR}" # handle dependencies for testing frameworks if has test ${JAVA_PKG_IUSE}; then - local test_deps + test_deps= for framework in ${JAVA_TESTING_FRAMEWORKS}; do case ${framework} in junit) @@ -51,6 +51,7 @@ if has test ${JAVA_PKG_IUSE}; then esac done [[ ${test_deps} ]] && DEPEND="test? ( ${test_deps} )" + unset test_deps fi # @ECLASS_VARIABLE: JAVA_GENTOO_CLASSPATH |