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/aspectj/
Date: Wed, 21 Apr 2021 09:47:30
Message-Id: 1618998440.bbd9b0b3f46288849f0140971189310df9229e86.fordfrog@gentoo
1 commit: bbd9b0b3f46288849f0140971189310df9229e86
2 Author: Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
3 AuthorDate: Wed Apr 21 06:58:56 2021 +0000
4 Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
5 CommitDate: Wed Apr 21 09:47:20 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bbd9b0b3
7
8 dev-java/aspectj: bump to 1.9.6
9
10 Closes: https://bugs.gentoo.org/601608
11 Bug: https://bugs.gentoo.org/784275
12
13 Package-Manager: Portage-3.0.17, Repoman-3.0.2
14 Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
15 Closes: https://github.com/gentoo/gentoo/pull/20484
16 Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
17
18 dev-java/aspectj/Manifest | 1 +
19 dev-java/aspectj/aspectj-1.9.6.ebuild | 45 +++++++++++++++++++++++++++++++++++
20 dev-java/aspectj/metadata.xml | 4 ++++
21 3 files changed, 50 insertions(+)
22
23 diff --git a/dev-java/aspectj/Manifest b/dev-java/aspectj/Manifest
24 index 28f35ff720d..0549cb00930 100644
25 --- a/dev-java/aspectj/Manifest
26 +++ b/dev-java/aspectj/Manifest
27 @@ -1 +1,2 @@
28 DIST aspectj-1.7.4-src.jar 7570114 BLAKE2B caa942a2414c6f1b39b881bc5abad0cd4e718b231822833756493ce389207d1d855be36f74a4c58ad5f00f7acfcd5791b4ab8e151fd0e11ac497d4f68cab2eb0 SHA512 643d457fba4d58114ee09a37007f5cf5fd40f7ff196ffc69d371d1986cbf6930567ddffd3f1af625139619a0be386e1d9c7e30d267bf53b4286e2179735299bf
29 +DIST aspectj-1.9.6-src.jar 8616829 BLAKE2B adc12e181b2584287dd149657f0505b2d3ba877aa3e8cea1f2fd827b4d05c24728f120798019f1679ebafe850a8e68fa3db1467ac080c27692d5f81d31aebd48 SHA512 f15416a3921ef614ab8068c8ff8277f0fd3c177e9b277ac471786953615f1fe81638b8d13d77ebfe0643fdf089ee3cd5e718d522d2e588989a42df775f2a0516
30
31 diff --git a/dev-java/aspectj/aspectj-1.9.6.ebuild b/dev-java/aspectj/aspectj-1.9.6.ebuild
32 new file mode 100644
33 index 00000000000..6d2a4309c75
34 --- /dev/null
35 +++ b/dev-java/aspectj/aspectj-1.9.6.ebuild
36 @@ -0,0 +1,45 @@
37 +# Copyright 1999-2021 Gentoo Authors
38 +# Distributed under the terms of the GNU General Public License v2
39 +
40 +EAPI=7
41 +JAVA_PKG_IUSE="doc source"
42 +
43 +inherit java-pkg-2 java-pkg-simple
44 +
45 +DESCRIPTION="A seamless aspect-oriented extension to the Java programming language"
46 +HOMEPAGE="https://eclipse.org/aspectj/"
47 +SRC_URI="https://www.eclipse.org/downloads/download.php?file=/tools/${PN}/${P}-src.jar&r=1 -> ${P}-src.jar"
48 +
49 +LICENSE="EPL-1.0"
50 +SLOT="0"
51 +KEYWORDS="~amd64 ~x86"
52 +
53 +CDEPEND="dev-java/asm:7
54 + dev-java/commons-logging:0"
55 +DEPEND="${CDEPEND}
56 + >=virtual/jdk-1.8:*"
57 +RDEPEND="${CDEPEND}
58 + >=virtual/jre-1.8:*"
59 +BDEPEND="app-arch/zip"
60 +
61 +S=${WORKDIR}
62 +
63 +JAVA_SRC_DIR="${S}/src"
64 +JAVA_GENTOO_CLASSPATH="commons-logging,asm-7"
65 +JAVA_ENCODING="iso8859-1"
66 +
67 +src_unpack() {
68 + default
69 + unzip "${S}"/aspectjweaver-${PV}-sources.jar -d "${S}"/src/ || die
70 +}
71 +
72 +src_prepare() {
73 + default
74 +
75 + # needs part of BEA JRockit to compile
76 + rm "${S}"/src/org/aspectj/weaver/loadtime/JRockitAgent.java || die
77 + # aspectj uses a renamed version of asm:4
78 + find -name "*.java" -exec sed -i -e 's/import aj.org.objectweb.asm./import org.objectweb.asm./g' {} \; || die
79 + mkdir -p "${S}"/target/classes/org/aspectj/weaver/ || die
80 +# cp -vr "${S}"/src/org/aspectj/weaver/*.properties "${S}"/target/classes/org/aspectj/weaver/ || die
81 +}
82
83 diff --git a/dev-java/aspectj/metadata.xml b/dev-java/aspectj/metadata.xml
84 index 952a4b9b605..b1dd050ac0f 100644
85 --- a/dev-java/aspectj/metadata.xml
86 +++ b/dev-java/aspectj/metadata.xml
87 @@ -5,4 +5,8 @@
88 <email>java@g.o</email>
89 <name>Java</name>
90 </maintainer>
91 + <upstream>
92 + <remote-id type="github">eclipse/org.aspectj</remote-id>
93 + <bugs-to>https://www.eclipse.org/aspectj/bugs.php</bugs-to>
94 + </upstream>
95 </pkgmetadata>