diff options
| author |   Volkmar W. Pogatzki <gentoo@pogatzki.net> | 2023-02-17 09:52:52 +0100 |
|---|---|---|
| committer |   Florian Schmaus <flow@gentoo.org> | 2024-01-20 11:08:07 +0100 |
| commit | f007377cffdcdc04c349494481be5dc01ce313f9 (patch) | |
| tree | 7a05c6441b6be2a4c8f63b2d71779eab016a1da2 /eclass/java-utils-2.eclass | |
| parent | dev-python/pandas: Bump to 2.2.0 (diff) | |
| download | gentoo-f007377cffdcdc04c349494481be5dc01ce313f9.tar.gz gentoo-f007377cffdcdc04c349494481be5dc01ce313f9.tar.bz2 gentoo-f007377cffdcdc04c349494481be5dc01ce313f9.zip | |
java-utils-2.eclass: default to default_src_prepare for future EAPI
Presently patches from a PATCHES array are not getting applied unless
"default" or "eapply_user" is set in the ebuild. In cases where nothing
else needs to be prepared it still needs src_prepare in the ebuild
src_prepare() {
default
}
With this change, starting from EAPI 9 this will no longer be needed. In
cases where any other changes are done in the prepare phase it would only
need java-pkg-2_src_prepare be added:
src_prepare() {
java-pkg-2_src_prepare
cp, rm, mv, sed or other changes
}
Bug: https://bugs.gentoo.org/780585
Signed-off-by: Volkmar W. Pogatzki <gentoo@pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/34897
Signed-off-by: Florian Schmaus <flow@gentoo.org>
Diffstat (limited to 'eclass/java-utils-2.eclass')
| -rw-r--r-- | eclass/java-utils-2.eclass | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/eclass/java-utils-2.eclass b/eclass/java-utils-2.eclass index 31f7932a16fd..47123287ce70 100644 --- a/eclass/java-utils-2.eclass +++ b/eclass/java-utils-2.eclass @@ -1,4 +1,4 @@ -# Copyright 2004-2023 Gentoo Authors +# Copyright 2004-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: java-utils-2.eclass @@ -1972,7 +1972,10 @@ etestng() { # src_prepare Searches for bundled jars # Don't call directly, but via java-pkg-2_src_prepare! java-utils-2_src_prepare() { - eapply_user + case ${EAPI} in + [678]) eapply_user ;; + *) default_src_prepare ;; + esac # Check for files in JAVA_RM_FILES array. if [[ ${JAVA_RM_FILES[@]} ]]; then |