diff options
| author |   Volkmar W. Pogatzki <gentoo@pogatzki.net> | 2023-02-17 09:52:52 +0100 |
|---|---|---|
| committer |   Miroslav Šulc <fordfrog@gentoo.org> | 2023-02-17 14:47:50 +0100 |
| commit | 2e6ef25805e608c9eaeb44e7ba7bdd13dfcee65b (patch) | |
| tree | a9d2e9ebd412286755dc8bbf4a2d42d8cfc38f53 /eclass | |
| parent | app-text/crqt-ng: remove old version (diff) | |
| download | gentoo-2e6ef25805e608c9eaeb44e7ba7bdd13dfcee65b.tar.gz gentoo-2e6ef25805e608c9eaeb44e7ba7bdd13dfcee65b.tar.bz2 gentoo-2e6ef25805e608c9eaeb44e7ba7bdd13dfcee65b.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>
Signed-off-by: Miroslav Šulc <fordfrog@gentoo.org>
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/java-utils-2.eclass | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/eclass/java-utils-2.eclass b/eclass/java-utils-2.eclass index ef72635cd965..2ccf337b191d 100644 --- a/eclass/java-utils-2.eclass +++ b/eclass/java-utils-2.eclass @@ -1933,7 +1933,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:-0} in + [678]) eapply_user ;; + *) default_src_prepare ;; + esac # Check for files in JAVA_RM_FILES array. if [[ ${JAVA_RM_FILES[@]} ]]; then |