dev-java/aspectj: bump to 1.9.6

Closes: https://bugs.gentoo.org/601608
Bug: https://bugs.gentoo.org/784275

Package-Manager: Portage-3.0.17, Repoman-3.0.2
Signed-off-by: Volkmar W. Pogatzki <gentoo@pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/20484
Signed-off-by: Miroslav Šulc <fordfrog@gentoo.org>

dev-java/aspectj/Manifest

@@ -1 +1,2 @@
 DIST aspectj-1.7.4-src.jar 7570114 BLAKE2B caa942a2414c6f1b39b881bc5abad0cd4e718b231822833756493ce389207d1d855be36f74a4c58ad5f00f7acfcd5791b4ab8e151fd0e11ac497d4f68cab2eb0 SHA512 643d457fba4d58114ee09a37007f5cf5fd40f7ff196ffc69d371d1986cbf6930567ddffd3f1af625139619a0be386e1d9c7e30d267bf53b4286e2179735299bf
+DIST aspectj-1.9.6-src.jar 8616829 BLAKE2B adc12e181b2584287dd149657f0505b2d3ba877aa3e8cea1f2fd827b4d05c24728f120798019f1679ebafe850a8e68fa3db1467ac080c27692d5f81d31aebd48 SHA512 f15416a3921ef614ab8068c8ff8277f0fd3c177e9b277ac471786953615f1fe81638b8d13d77ebfe0643fdf089ee3cd5e718d522d2e588989a42df775f2a0516

dev-java/aspectj/aspectj-1.9.6.ebuild

@@ -0,0 +1,45 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="A seamless aspect-oriented extension to the Java programming language"
+HOMEPAGE="https://eclipse.org/aspectj/"
+SRC_URI="https://www.eclipse.org/downloads/download.php?file=/tools/${PN}/${P}-src.jar&r=1 -> ${P}-src.jar"
+
+LICENSE="EPL-1.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+CDEPEND="dev-java/asm:7
+	dev-java/commons-logging:0"
+DEPEND="${CDEPEND}
+	>=virtual/jdk-1.8:*"
+RDEPEND="${CDEPEND}
+	>=virtual/jre-1.8:*"
+BDEPEND="app-arch/zip"
+
+S=${WORKDIR}
+
+JAVA_SRC_DIR="${S}/src"
+JAVA_GENTOO_CLASSPATH="commons-logging,asm-7"
+JAVA_ENCODING="iso8859-1"
+
+src_unpack() {
+	default
+	unzip "${S}"/aspectjweaver-${PV}-sources.jar -d "${S}"/src/ || die
+}
+
+src_prepare() {
+	default
+
+	# needs part of BEA JRockit to compile
+	rm "${S}"/src/org/aspectj/weaver/loadtime/JRockitAgent.java || die
+	# aspectj uses a renamed version of asm:4
+	find -name "*.java" -exec sed -i -e 's/import aj.org.objectweb.asm./import org.objectweb.asm./g' {} \; || die
+	mkdir -p "${S}"/target/classes/org/aspectj/weaver/ || die
+#	cp -vr "${S}"/src/org/aspectj/weaver/*.properties "${S}"/target/classes/org/aspectj/weaver/ || die
+}

dev-java/aspectj/metadata.xml

@@ -5,4 +5,8 @@
 		<email>java@gentoo.org</email>
 		<name>Java</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">eclipse/org.aspectj</remote-id>
+		<bugs-to>https://www.eclipse.org/aspectj/bugs.php</bugs-to>
+	</upstream>
 </pkgmetadata>