[gentoo-commits] repo/gentoo:master commit in: dev-java/aspectj/

["Sam James" <sam@gentoo.org>]

commit:     20d3cca399a6e7c539802db54feabe96c4898a6b
Author:     Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Fri Jul 30 20:50:40 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Nov 13 10:31:47 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=20d3cca3

dev-java/aspectj: bump to 1.9.7

adds bcel-verifier which is needed for testing dev-java/asm:3
provides aspectjweaver.jar and aspectjrt.jar
Bug: https://bugs.gentoo.org/784275

Package-Manager: Portage-3.0.20, Repoman-3.0.2
Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/21913
Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-java/aspectj/Manifest             |  1 +
 dev-java/aspectj/aspectj-1.9.7.ebuild | 79 +++++++++++++++++++++++++++++++++++
 2 files changed, 80 insertions(+)

diff --git a/dev-java/aspectj/Manifest b/dev-java/aspectj/Manifest
index 84ea2060825..ee90a3a8539 100644
--- a/dev-java/aspectj/Manifest
+++ b/dev-java/aspectj/Manifest
@@ -1 +1,2 @@
 DIST aspectj-1.9.6-src.jar 8616829 BLAKE2B adc12e181b2584287dd149657f0505b2d3ba877aa3e8cea1f2fd827b4d05c24728f120798019f1679ebafe850a8e68fa3db1467ac080c27692d5f81d31aebd48 SHA512 f15416a3921ef614ab8068c8ff8277f0fd3c177e9b277ac471786953615f1fe81638b8d13d77ebfe0643fdf089ee3cd5e718d522d2e588989a42df775f2a0516
+DIST aspectj-1.9.7.tar.gz 26472044 BLAKE2B a66605845e188903d50566df658fe636b8feb980bbafdc3b4c3e73e46558b24e4bbaf931790012266ac62bff70c3139f0034dafc7de4622827c0f09d4d626efa SHA512 5db2122d95e78056752bbca9adee72c0fa634963b4ea6979c0b75a9cc58b5ef4cf88b79ad640920363ebe7855311bedfa7e30eaba378274a0eebc31557dd57e7

diff --git a/dev-java/aspectj/aspectj-1.9.7.ebuild b/dev-java/aspectj/aspectj-1.9.7.ebuild
new file mode 100644
index 00000000000..92f77bf5bec
--- /dev/null
+++ b/dev-java/aspectj/aspectj-1.9.7.ebuild
@@ -0,0 +1,79 @@
+# 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://github.com/eclipse/org.aspectj/archive/refs/tags/V${PV//./_}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="EPL-1.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+CDEPEND="dev-java/asm:9
+	dev-java/commons-logging:0
+	dev-java/ant-apache-regexp:0"
+DEPEND="${CDEPEND}
+	>=virtual/jdk-1.8:*"
+RDEPEND="${CDEPEND}
+	>=virtual/jre-1.8:*"
+BDEPEND="app-arch/zip"
+
+S=${WORKDIR}/org.${P//./_}
+
+JAVA_GENTOO_CLASSPATH_EXTRA="aspectjweaver.jar"
+JAVA_GENTOO_CLASSPATH="commons-logging,asm-9,ant-apache-regexp"
+JAVA_ENCODING="iso8859-1"
+
+src_compile() {
+	JAVA_SRC_DIR=( {asm,bcel-builder,bridge,loadtime,org.aspectj.matcher,runtime,util,weaver}/src/main/java )
+	JAVA_RESOURCE_DIRS=( {bridge,org.aspectj.matcher,weaver}/src/main/resources )
+	JAVA_JAR_FILENAME="aspectjweaver.jar"
+	java-pkg-simple_src_compile
+	rm -rf target || die
+
+	JAVA_SRC_DIR=( runtime/src/main )
+	JAVA_JAR_FILENAME="aspectjrt.jar"
+	java-pkg-simple_src_compile
+	zip -d aspectjrt.jar *.dtd org/aspectj/{bridge,weaver}/* || die
+	rm -rf target || die
+
+	# package org.eclipse.core.resources does not exist
+	# package org.eclipse.core.runtime does not exist
+#	JAVA_SRC_DIR=( org/aspectj/{ajde,ajdt,apache,asm,bridge,internal,lang,org,runtime,tools,util,weaver} )
+#	JAVA_JAR_FILENAME="aspectjtools.jar"
+#	java-pkg-simple_src_compile
+
+	# bcel-verifier is needed for testing dev-java/asm:3
+	# should go away once aspectjtools.jar can be built (included there)
+	JAVA_SRC_DIR=( bcel-builder/verifier-src )
+	JAVA_JAR_FILENAME="bcel-verifier.jar"
+	java-pkg-simple_src_compile
+	rm -rf target || die
+
+	# once again for javadocs
+	if use doc; then
+		JAVA_SRC_DIR=( {asm,bcel-builder,bridge,loadtime,org.aspectj.matcher,runtime,util,weaver}/src/main/java )
+		JAVA_JAR_FILENAME="ignoreme.jar"
+		java-pkg-simple_src_compile
+	fi
+}
+
+src_install() {
+	java-pkg_dojar "aspectjweaver.jar"
+	java-pkg_dojar "aspectjrt.jar"
+#	java-pkg_dojar "aspectjtools.jar"
+	java-pkg_dojar "bcel-verifier.jar"
+
+	if use doc; then
+		java-pkg_dojavadoc target/api
+	fi
+
+	if use source; then
+		java-pkg_dosrc "org"
+	fi
+}