diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2021-04-28 20:21:43 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2021-04-28 20:21:43 +0100 |
| commit | 40aaaa64e86ba6710bbeb31c4615a6ce80e75e11 (patch) | |
| tree | 758c221bad35c9288d0bd6df9c7dfc226728e52c /dev-java/aspectj | |
| parent | 8d5dbd847cbc704a6a06405856e94b461011afe3 (diff) | |
gentoo resync : 28.04.2021
Diffstat (limited to 'dev-java/aspectj')
| -rw-r--r-- | dev-java/aspectj/Manifest | 6 | ||||
| -rw-r--r-- | dev-java/aspectj/aspectj-1.9.6.ebuild (renamed from dev-java/aspectj/aspectj-1.7.3-r1.ebuild) | 32 | ||||
| -rw-r--r-- | dev-java/aspectj/metadata.xml | 4 |
3 files changed, 22 insertions, 20 deletions
diff --git a/dev-java/aspectj/Manifest b/dev-java/aspectj/Manifest index 4bc0800ec2f1..678134fc560a 100644 --- a/dev-java/aspectj/Manifest +++ b/dev-java/aspectj/Manifest @@ -1,5 +1,5 @@ -DIST aspectj-1.7.3.jar 7565941 BLAKE2B 8d3919ecae8bf190331a06644b8ba694b071b961d22e5b85e4f57b50c3ff27112e6c39b2644a400f64ca590d4de619aa1a86dd0d1ea59868499a6cff50709ecf SHA512 2297a11638c6519b50e1938341914c68c2841c7b7894081f3157ef3463fb29519d833d274e24b8da1203a7866b2e1296d67e0872dbaa2dd835b5520f5c0a7a71 DIST aspectj-1.7.4-src.jar 7570114 BLAKE2B caa942a2414c6f1b39b881bc5abad0cd4e718b231822833756493ce389207d1d855be36f74a4c58ad5f00f7acfcd5791b4ab8e151fd0e11ac497d4f68cab2eb0 SHA512 643d457fba4d58114ee09a37007f5cf5fd40f7ff196ffc69d371d1986cbf6930567ddffd3f1af625139619a0be386e1d9c7e30d267bf53b4286e2179735299bf -EBUILD aspectj-1.7.3-r1.ebuild 1271 BLAKE2B 7373ada5be09da47419417bc9e310bd07f7931a3eec3195b83594c40fffb6b4fa92dbf0b3b6a7eef33bad564e9f0978856042936b1ef84f00b273df19e210bbd SHA512 3f47fc35c451191c1b8ce57583d1b5d6126b0078e350616ff8dddcf83dbc5b659de3abd400ef08db7afc37efb133667a34f58418aa77079153639a9e5fd3696d +DIST aspectj-1.9.6-src.jar 8616829 BLAKE2B adc12e181b2584287dd149657f0505b2d3ba877aa3e8cea1f2fd827b4d05c24728f120798019f1679ebafe850a8e68fa3db1467ac080c27692d5f81d31aebd48 SHA512 f15416a3921ef614ab8068c8ff8277f0fd3c177e9b277ac471786953615f1fe81638b8d13d77ebfe0643fdf089ee3cd5e718d522d2e588989a42df775f2a0516 EBUILD aspectj-1.7.4.ebuild 1259 BLAKE2B 897ff1e5eaaec08f9ac8998174b2251265c1d43373fcdfe97e2def0ab06cbfce039e1080fcc459c0eecf3c11b3022ed2f5c131fb90ef63b41e663267dead0b00 SHA512 885778f6e1ab1c66118ba3756a5369e705c464869898866e73b032014c143310bdd790a7d9bba003fb50d574ec92330afc6d99f7ea66f0213e8abf6e627bef3c -MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253 +EBUILD aspectj-1.9.6.ebuild 1175 BLAKE2B a4358d0064da922e555af439a87d62e7150d655acdf6d2d93cf62f493e01ffc99b751ddde4a48e55b7be0579e34f34ded122ddf1dcdb8c04eb249c4f76a2c4d6 SHA512 d8cf226a8f39dfa6decbfd1a589ab2973cdff7315b0f6ba295d3aa5d270710a0b460f524d94d06937ca75c75405cb0dc55afb03678bc2953f92544cb353c6007 +MISC metadata.xml 382 BLAKE2B f2aa03e9e9411d65bfd57f63e9de032ba3f48f9ee80e2ca11e2b1ebea7c7223820c75d3e1516f07e94edf4328cd44a511005636f8bead11506b934513fcc8c5e SHA512 c4581ac985534be3aba02b312bcb54c36c358db73d91a449b72d19b3e7e743ad28d50f4bc6f08eb56409f8270b601f41b5f69f18d4a392937aac577bb5515a25 diff --git a/dev-java/aspectj/aspectj-1.7.3-r1.ebuild b/dev-java/aspectj/aspectj-1.9.6.ebuild index 316152059dfc..a27323985b9f 100644 --- a/dev-java/aspectj/aspectj-1.7.3-r1.ebuild +++ b/dev-java/aspectj/aspectj-1.9.6.ebuild @@ -1,46 +1,44 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="5" - +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="http://eclipse.org/aspectj/" -SRC_URI="http://www.eclipse.org/downloads/download.php?file=/tools/aspectj/aspectj-1.7.3-src.jar&r=1 -> ${P}.jar" +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:4 +CDEPEND="dev-java/asm:9 dev-java/commons-logging:0" +DEPEND="${CDEPEND} + >=virtual/jdk-1.8:*" +RDEPEND="${CDEPEND} + >=virtual/jre-1.8:*" +BDEPEND="app-arch/zip" -DEPEND=">=virtual/jdk-1.5 - app-arch/zip - ${CDEPEND}" -RDEPEND=">=virtual/jre-1.5 - ${CDEPEND}" - -S="${WORKDIR}" +S=${WORKDIR} JAVA_SRC_DIR="${S}/src" -JAVA_GENTOO_CLASSPATH="commons-logging,asm-4" +JAVA_GENTOO_CLASSPATH="commons-logging,asm-9" JAVA_ENCODING="iso8859-1" src_unpack() { default - unzip "${S}/aspectjweaver1.7.3-src.jar" -d "${S}/src/" || die + unzip "${S}"/aspectjweaver-${PV}-sources.jar -d "${S}"/src/ || die } -java_prepare() { +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 } diff --git a/dev-java/aspectj/metadata.xml b/dev-java/aspectj/metadata.xml index 952a4b9b605c..b1dd050ac0fa 100644 --- a/dev-java/aspectj/metadata.xml +++ b/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> |