gentoo resync : 11.05.2021

3 files changed, 2 insertions, 49 deletions

diff --git a/dev-java/aspectj/Manifest b/dev-java/aspectj/Manifest
index 50a0b142682c..3e3870b459c1 100644
--- a/dev-java/aspectj/Manifest
+++ b/dev-java/aspectj/Manifest
@@ -1,5 +1,3 @@
-DIST aspectj-1.7.4-src.jar 7570114 BLAKE2B caa942a2414c6f1b39b881bc5abad0cd4e718b231822833756493ce389207d1d855be36f74a4c58ad5f00f7acfcd5791b4ab8e151fd0e11ac497d4f68cab2eb0 SHA512 643d457fba4d58114ee09a37007f5cf5fd40f7ff196ffc69d371d1986cbf6930567ddffd3f1af625139619a0be386e1d9c7e30d267bf53b4286e2179735299bf
 DIST aspectj-1.9.6-src.jar 8616829 BLAKE2B adc12e181b2584287dd149657f0505b2d3ba877aa3e8cea1f2fd827b4d05c24728f120798019f1679ebafe850a8e68fa3db1467ac080c27692d5f81d31aebd48 SHA512 f15416a3921ef614ab8068c8ff8277f0fd3c177e9b277ac471786953615f1fe81638b8d13d77ebfe0643fdf089ee3cd5e718d522d2e588989a42df775f2a0516
-EBUILD aspectj-1.7.4.ebuild 1259 BLAKE2B 897ff1e5eaaec08f9ac8998174b2251265c1d43373fcdfe97e2def0ab06cbfce039e1080fcc459c0eecf3c11b3022ed2f5c131fb90ef63b41e663267dead0b00 SHA512 885778f6e1ab1c66118ba3756a5369e705c464869898866e73b032014c143310bdd790a7d9bba003fb50d574ec92330afc6d99f7ea66f0213e8abf6e627bef3c
-EBUILD aspectj-1.9.6.ebuild 1174 BLAKE2B 17ae90141631e398d05186512bfbb3a1f0a71d30f2d2ce2689147760b5c5fc675d0053e49b8e00ed7025a0b64276b924a6c6719dc4a83ad399996d35855c0098 SHA512 1c4eee056643286c019d3cc70dbe07ce4133443dc41dd5e2673e5e23696346af21ffce3dc8d14158ac6ddccd070062191a44d275e0176f933ee4e60ff0bf2058
+EBUILD aspectj-1.9.6.ebuild 1173 BLAKE2B 4c8d8cbce69324c37f5063c541a0908c8e329ddb89514358dff7a864038ebea551defce25fe001a05718d8021b4159e686fcb566b1a2a485ff0f553c089a8fd8 SHA512 6817518bc3776e7df086c81155c3d8d03dc135dd3bbc4ac3f598d1cade97c3f403aebeb4c7194a556b4e721d406debeb4b4b0e0e94726cacbb33bd262d7b7819
 MISC metadata.xml 382 BLAKE2B f2aa03e9e9411d65bfd57f63e9de032ba3f48f9ee80e2ca11e2b1ebea7c7223820c75d3e1516f07e94edf4328cd44a511005636f8bead11506b934513fcc8c5e SHA512 c4581ac985534be3aba02b312bcb54c36c358db73d91a449b72d19b3e7e743ad28d50f4bc6f08eb56409f8270b601f41b5f69f18d4a392937aac577bb5515a25
diff --git a/dev-java/aspectj/aspectj-1.7.4.ebuild b/dev-java/aspectj/aspectj-1.7.4.ebuild
deleted file mode 100644
index 4a9e2ff58cd1..000000000000
--- a/dev-java/aspectj/aspectj-1.7.4.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="A seamless aspect-oriented extension to the Java programming language"
-HOMEPAGE="http://eclipse.org/aspectj/"
-SRC_URI="http://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:4
-	dev-java/commons-logging:0"
-DEPEND="${CDEPEND}
-	app-arch/zip
-	>=virtual/jdk-1.5"
-RDEPEND="${CDEPEND}
-	>=virtual/jre-1.5"
-
-S=${WORKDIR}
-
-JAVA_SRC_DIR="${S}/src"
-JAVA_GENTOO_CLASSPATH="commons-logging,asm-4"
-JAVA_ENCODING="iso8859-1"
-
-src_unpack() {
-	default
-	unzip "${S}"/aspectjweaver${PV}-src.jar -d "${S}"/src/ || die
-}
-
-java_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
-}
diff --git a/dev-java/aspectj/aspectj-1.9.6.ebuild b/dev-java/aspectj/aspectj-1.9.6.ebuild
index 8c7f6df2776b..b1bc3636c59f 100644
--- a/dev-java/aspectj/aspectj-1.9.6.ebuild
+++ b/dev-java/aspectj/aspectj-1.9.6.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://www.eclipse.org/downloads/download.php?file=/tools/${PN}/${P}-s
 
 LICENSE="EPL-1.0"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 CDEPEND="dev-java/asm:9
 	dev-java/commons-logging:0"