1 |
commit: b48e7407acca71b9391e04c358276b5fcee6fe3b |
2 |
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Apr 21 09:46:52 2021 +0000 |
4 |
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Apr 21 09:47:21 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b48e7407 |
7 |
|
8 |
dev-java/aspectj: switched 1.9.6 to asm:9 |
9 |
|
10 |
Package-Manager: Portage-3.0.18, Repoman-3.0.3 |
11 |
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org> |
12 |
|
13 |
dev-java/aspectj/aspectj-1.9.6.ebuild | 5 ++--- |
14 |
1 file changed, 2 insertions(+), 3 deletions(-) |
15 |
|
16 |
diff --git a/dev-java/aspectj/aspectj-1.9.6.ebuild b/dev-java/aspectj/aspectj-1.9.6.ebuild |
17 |
index 6d2a4309c75..a27323985b9 100644 |
18 |
--- a/dev-java/aspectj/aspectj-1.9.6.ebuild |
19 |
+++ b/dev-java/aspectj/aspectj-1.9.6.ebuild |
20 |
@@ -14,7 +14,7 @@ LICENSE="EPL-1.0" |
21 |
SLOT="0" |
22 |
KEYWORDS="~amd64 ~x86" |
23 |
|
24 |
-CDEPEND="dev-java/asm:7 |
25 |
+CDEPEND="dev-java/asm:9 |
26 |
dev-java/commons-logging:0" |
27 |
DEPEND="${CDEPEND} |
28 |
>=virtual/jdk-1.8:*" |
29 |
@@ -25,7 +25,7 @@ BDEPEND="app-arch/zip" |
30 |
S=${WORKDIR} |
31 |
|
32 |
JAVA_SRC_DIR="${S}/src" |
33 |
-JAVA_GENTOO_CLASSPATH="commons-logging,asm-7" |
34 |
+JAVA_GENTOO_CLASSPATH="commons-logging,asm-9" |
35 |
JAVA_ENCODING="iso8859-1" |
36 |
|
37 |
src_unpack() { |
38 |
@@ -41,5 +41,4 @@ src_prepare() { |
39 |
# aspectj uses a renamed version of asm:4 |
40 |
find -name "*.java" -exec sed -i -e 's/import aj.org.objectweb.asm./import org.objectweb.asm./g' {} \; || die |
41 |
mkdir -p "${S}"/target/classes/org/aspectj/weaver/ || die |
42 |
-# cp -vr "${S}"/src/org/aspectj/weaver/*.properties "${S}"/target/classes/org/aspectj/weaver/ || die |
43 |
} |