Gentoo Archives: gentoo-commits

From: "Miroslav Šulc" <fordfrog@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-java/jakarta-activation/
Date: Fri, 09 Jul 2021 12:54:56
Message-Id: 1625835278.286401c631ff8ea6ae71d7272fcf56b98b42ee42.fordfrog@gentoo
1 commit: 286401c631ff8ea6ae71d7272fcf56b98b42ee42
2 Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
3 AuthorDate: Fri Jul 9 12:54:38 2021 +0000
4 Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
5 CommitDate: Fri Jul 9 12:54:38 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=286401c6
7
8 dev-java/jakarta-activation: cleanup + comments
9
10 Package-Manager: Portage-3.0.20, Repoman-3.0.3
11 Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
12
13 .../jakarta-activation/jakarta-activation-1.2.2.ebuild | 14 ++++++--------
14 1 file changed, 6 insertions(+), 8 deletions(-)
15
16 diff --git a/dev-java/jakarta-activation/jakarta-activation-1.2.2.ebuild b/dev-java/jakarta-activation/jakarta-activation-1.2.2.ebuild
17 index a4376b8ad43..6c2ae11e3b0 100644
18 --- a/dev-java/jakarta-activation/jakarta-activation-1.2.2.ebuild
19 +++ b/dev-java/jakarta-activation/jakarta-activation-1.2.2.ebuild
20 @@ -43,13 +43,11 @@ src_prepare() {
21
22 src_compile() {
23 java-pkg-simple_src_compile
24 - # we remove API classes from the api
25 - zip -d ${PN}.jar "javax/*" || die "Failed to remove implementation classes"
26 -}
27
28 -src_install() {
29 - default
30 - # we remove the API sources so that they don't land in sources
31 -# rm -fr ${JAVA_SRC_DIR}/javax || "Failed to delete implementation sources"
32 - java-pkg-simple_src_install
33 + # we remove API classes from the jar file
34 + # removing javax sources in src_prepare does not work - compilation fails with:
35 + # src/main/java/module-info.java:12: error: package is empty or does not exist: javax.activation
36 + # exports javax.activation;
37 +
38 + zip -d ${PN}.jar "javax/*" || die "Failed to remove API classes"
39 }