From b48e7407acca71b9391e04c358276b5fcee6fe3b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ulc?= Date: Wed, 21 Apr 2021 11:46:52 +0200 Subject: [PATCH] dev-java/aspectj: switched 1.9.6 to asm:9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Package-Manager: Portage-3.0.18, Repoman-3.0.3 Signed-off-by: Miroslav Šulc --- dev-java/aspectj/aspectj-1.9.6.ebuild | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dev-java/aspectj/aspectj-1.9.6.ebuild b/dev-java/aspectj/aspectj-1.9.6.ebuild index 6d2a4309c7596..a27323985b9f4 100644 --- a/dev-java/aspectj/aspectj-1.9.6.ebuild +++ b/dev-java/aspectj/aspectj-1.9.6.ebuild @@ -14,7 +14,7 @@ LICENSE="EPL-1.0" SLOT="0" KEYWORDS="~amd64 ~x86" -CDEPEND="dev-java/asm:7 +CDEPEND="dev-java/asm:9 dev-java/commons-logging:0" DEPEND="${CDEPEND} >=virtual/jdk-1.8:*" @@ -25,7 +25,7 @@ BDEPEND="app-arch/zip" S=${WORKDIR} JAVA_SRC_DIR="${S}/src" -JAVA_GENTOO_CLASSPATH="commons-logging,asm-7" +JAVA_GENTOO_CLASSPATH="commons-logging,asm-9" JAVA_ENCODING="iso8859-1" src_unpack() { @@ -41,5 +41,4 @@ src_prepare() { # 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 }