| Summary: | java-pkg-2.eclass: java-pkg-2_src_prepare does not apply patches which ends up in a awkward code | ||
|---|---|---|---|
| Product: | Gentoo Linux | Reporter: | Miroslav Šulc <fordfrog> |
| Component: | Eclasses | Assignee: | Java team <java> |
| Status: | IN_PROGRESS --- | ||
| Severity: | enhancement | CC: | ezzieyguywuf, gentoo, mmk, sam |
| Priority: | Normal | Keywords: | PullRequest |
| Version: | unspecified | ||
| Hardware: | All | ||
| OS: | Linux | ||
| See Also: |
https://github.com/gentoo/gentoo/pull/29626 https://github.com/gentoo/gentoo/pull/34897 |
||
| Whiteboard: | |||
| Package list: | Runtime testing required: | --- | |
|
Description
Miroslav Šulc
2021-04-06 13:17:24 UTC
*** Bug 728814 has been marked as a duplicate of this bug. *** The bug has been referenced in the following commit(s): https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2e6ef25805e608c9eaeb44e7ba7bdd13dfcee65b commit 2e6ef25805e608c9eaeb44e7ba7bdd13dfcee65b Author: Volkmar W. Pogatzki <gentoo@pogatzki.net> AuthorDate: 2023-02-17 08:52:52 +0000 Commit: Miroslav Šulc <fordfrog@gentoo.org> CommitDate: 2023-02-17 13:47:50 +0000 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> eclass/java-utils-2.eclass | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) It looks like https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2e6ef25805e608c9eaeb44e7ba7bdd13dfcee65b got reverted by https://gitweb.gentoo.org/repo/gentoo.git/commit/eclass/java-utils-2.eclass?id=0654db51f6cb70a48000a9af771859f42ed54ef8 Setting status CONFIRMED. The bug has been referenced in the following commit(s): https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f007377cffdcdc04c349494481be5dc01ce313f9 commit f007377cffdcdc04c349494481be5dc01ce313f9 Author: Volkmar W. Pogatzki <gentoo@pogatzki.net> AuthorDate: 2023-02-17 08:52:52 +0000 Commit: Florian Schmaus <flow@gentoo.org> CommitDate: 2024-01-20 10:08:07 +0000 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> eclass/java-utils-2.eclass | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) |