gentoo resync : 13.11.2021

2 files changed, 81 insertions, 0 deletions

diff --git a/dev-java/aspectj/Manifest b/dev-java/aspectj/Manifest
index 1eceda11620c..f3364501c391 100644
--- a/dev-java/aspectj/Manifest
+++ b/dev-java/aspectj/Manifest
@@ -1,3 +1,5 @@
 DIST aspectj-1.9.6-src.jar 8616829 BLAKE2B adc12e181b2584287dd149657f0505b2d3ba877aa3e8cea1f2fd827b4d05c24728f120798019f1679ebafe850a8e68fa3db1467ac080c27692d5f81d31aebd48 SHA512 f15416a3921ef614ab8068c8ff8277f0fd3c177e9b277ac471786953615f1fe81638b8d13d77ebfe0643fdf089ee3cd5e718d522d2e588989a42df775f2a0516
+DIST aspectj-1.9.7.tar.gz 26472044 BLAKE2B a66605845e188903d50566df658fe636b8feb980bbafdc3b4c3e73e46558b24e4bbaf931790012266ac62bff70c3139f0034dafc7de4622827c0f09d4d626efa SHA512 5db2122d95e78056752bbca9adee72c0fa634963b4ea6979c0b75a9cc58b5ef4cf88b79ad640920363ebe7855311bedfa7e30eaba378274a0eebc31557dd57e7
 EBUILD aspectj-1.9.6.ebuild 1173 BLAKE2B 4c8d8cbce69324c37f5063c541a0908c8e329ddb89514358dff7a864038ebea551defce25fe001a05718d8021b4159e686fcb566b1a2a485ff0f553c089a8fd8 SHA512 6817518bc3776e7df086c81155c3d8d03dc135dd3bbc4ac3f598d1cade97c3f403aebeb4c7194a556b4e721d406debeb4b4b0e0e94726cacbb33bd262d7b7819
+EBUILD aspectj-1.9.7.ebuild 2315 BLAKE2B 5240251e776248d9933bc7c62808f84158cf6359b8225ae54b4fc9d98e3cf2eefe898386f9dc528626a1f26e36cf463753d6238ff42a5a96c75271be61877053 SHA512 bb7ecee75fb607bfcbc2c8103839d9311d00a9915e7bd01db8dd251e70a3626aeddc5e01ad98f3fb1e04d0f026bf6cdc3acc7800f0f597e8e43b25758cea880e
 MISC metadata.xml 383 BLAKE2B c149ffc9749aead74e303a161c98d052328b8e5a7fc5c7f81f4ca7ff51ba6a5ba6d3456131ddb53d8d6339c211646f689f8712021485fec300f29d83952fe606 SHA512 33d9e6df4103d1fd3f10dcd95780325178b8cdebe4f747ae1983239fc8273c1a5461c7a763a9447556e3fb9641af000789235aefb5933698590f340865c2b161
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 000000000000..92f77bf5becd
--- /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
+}