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

2024-01-17 Thread Miroslav Šulc 
commit: 96ebc7668078e276d7f4c520081c8d1e44438843
Author: Volkmar W. Pogatzki  pogatzki  net>
AuthorDate: Sun Jan  7 17:12:37 2024 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Wed Jan 17 09:39:41 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=96ebc766

dev-java/aspectj: depend on jakarta-regexp

Changes dependency from ant-apache-regexp to jakarta-regexp which
provides the needed org.apache.regexp without using an ant-task.

This change is needed fur upcoming >=dev-java/ant-1.10.14 in order to
avoid a cyclic dependency.

Signed-off-by: Volkmar W. Pogatzki  pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/34814
Signed-off-by: Miroslav Šulc  gentoo.org>

 .../aspectj/{aspectj-1.9.7.ebuild => aspectj-1.9.7-r1.ebuild}  | 10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/dev-java/aspectj/aspectj-1.9.7.ebuild 
b/dev-java/aspectj/aspectj-1.9.7-r1.ebuild
similarity index 89%
rename from dev-java/aspectj/aspectj-1.9.7.ebuild
rename to dev-java/aspectj/aspectj-1.9.7-r1.ebuild
index 4f7ef2231ed2..e3b7c408c182 100644
--- a/dev-java/aspectj/aspectj-1.9.7.ebuild
+++ b/dev-java/aspectj/aspectj-1.9.7-r1.ebuild
@@ -1,14 +1,14 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 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"
+SRC_URI="https://github.com/eclipse-aspectj/aspectj/archive/V${PV//./_}.tar.gz 
-> ${P}.tar.gz"
 
 LICENSE="EPL-1.0"
 SLOT="0"
@@ -16,7 +16,7 @@ KEYWORDS="amd64 x86"
 
 CDEPEND="dev-java/asm:9
dev-java/commons-logging:0
-   dev-java/ant-apache-regexp:0"
+   dev-java/jakarta-regexp:1.4"
 DEPEND="${CDEPEND}
>=virtual/jdk-1.8:*"
 RDEPEND="${CDEPEND}
@@ -26,7 +26,7 @@ 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_GENTOO_CLASSPATH="commons-logging,asm-9,jakarta-regexp-1.4"
 JAVA_ENCODING="iso8859-1"
 
 src_compile() {

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

2024-01-10 Thread Miroslav Šulc 
commit: d783b09473d69b991e4bfd34c2651bed872330fd
Author: Volkmar W. Pogatzki  pogatzki  net>
AuthorDate: Sun Jan  7 17:21:00 2024 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Wed Jan 10 08:43:46 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d783b094

dev-java/aspectj: update upstream metadata

Signed-off-by: Volkmar W. Pogatzki  pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/34700
Signed-off-by: Miroslav Šulc  gentoo.org>

 dev-java/aspectj/metadata.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-java/aspectj/metadata.xml b/dev-java/aspectj/metadata.xml
index 5c762e7860f2..32a6a916de1c 100644
--- a/dev-java/aspectj/metadata.xml
+++ b/dev-java/aspectj/metadata.xml
@@ -6,7 +6,7 @@
Java


-   eclipse/org.aspectj
-   https://www.eclipse.org/aspectj/bugs.php
+   
https://github.com/eclipse-aspectj/aspectj/issues
+   eclipse-aspectj/aspectj

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

2021-12-14 Thread Miroslav Šulc 
commit: bd788a650a4df4766773f5825dabb4d1a0d49709
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Tue Dec 14 08:06:17 2021 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Tue Dec 14 08:06:17 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bd788a65

dev-java/aspectj: removed obsolete 1.9.6

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Miroslav Šulc  gentoo.org>

 dev-java/aspectj/Manifest |  1 -
 dev-java/aspectj/aspectj-1.9.6.ebuild | 44 ---
 2 files changed, 45 deletions(-)

diff --git a/dev-java/aspectj/Manifest b/dev-java/aspectj/Manifest
index ee90a3a85393..e373999baeaf 100644
--- a/dev-java/aspectj/Manifest
+++ b/dev-java/aspectj/Manifest
@@ -1,2 +1 @@
-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.6.ebuild 
b/dev-java/aspectj/aspectj-1.9.6.ebuild
deleted file mode 100644
index b1bc3636c59f..
--- a/dev-java/aspectj/aspectj-1.9.6.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# 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://www.eclipse.org/downloads/download.php?file=/tools/${PN}/${P}-src.jar=1
 -> ${P}-src.jar"
-
-LICENSE="EPL-1.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-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"
-
-S=${WORKDIR}
-
-JAVA_SRC_DIR="${S}/src"
-JAVA_GENTOO_CLASSPATH="commons-logging,asm-9"
-JAVA_ENCODING="iso8859-1"
-
-src_unpack() {
-   default
-   unzip "${S}"/aspectjweaver-${PV}-sources.jar -d "${S}"/src/ || die
-}
-
-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
-}

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

2021-12-14 Thread Jakov Smolić 
commit: 3ef0a6d1a63a327cbdc270b9242d63bfb159a86e
Author: Jakov Smolić  gentoo  org>
AuthorDate: Tue Dec 14 08:00:17 2021 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Tue Dec 14 08:00:17 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3ef0a6d1

dev-java/aspectj: Stabilize 1.9.7 x86, #829136

Signed-off-by: Jakov Smolić  gentoo.org>

 dev-java/aspectj/aspectj-1.9.7.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/aspectj/aspectj-1.9.7.ebuild 
b/dev-java/aspectj/aspectj-1.9.7.ebuild
index 92f77bf5becd..8fcb8aa6ca75 100644
--- a/dev-java/aspectj/aspectj-1.9.7.ebuild
+++ b/dev-java/aspectj/aspectj-1.9.7.ebuild
@@ -12,7 +12,7 @@ 
SRC_URI="https://github.com/eclipse/org.aspectj/archive/refs/tags/V${PV//./_}.ta
 
 LICENSE="EPL-1.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 
 CDEPEND="dev-java/asm:9
dev-java/commons-logging:0

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

2021-12-14 Thread Jakov Smolić 
commit: 9c10f5704ff4f74bb854ac103c18c6e767cf9910
Author: Jakov Smolić  gentoo  org>
AuthorDate: Tue Dec 14 08:00:31 2021 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Tue Dec 14 08:00:31 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9c10f570

dev-java/aspectj: Stabilize 1.9.7 amd64, #829136

Signed-off-by: Jakov Smolić  gentoo.org>

 dev-java/aspectj/aspectj-1.9.7.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/aspectj/aspectj-1.9.7.ebuild 
b/dev-java/aspectj/aspectj-1.9.7.ebuild
index 8fcb8aa6ca75..4f7ef2231ed2 100644
--- a/dev-java/aspectj/aspectj-1.9.7.ebuild
+++ b/dev-java/aspectj/aspectj-1.9.7.ebuild
@@ -12,7 +12,7 @@ 
SRC_URI="https://github.com/eclipse/org.aspectj/archive/refs/tags/V${PV//./_}.ta
 
 LICENSE="EPL-1.0"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 
 CDEPEND="dev-java/asm:9
dev-java/commons-logging:0

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

2021-11-13 Thread Sam James 
commit: 20d3cca399a6e7c539802db54feabe96c4898a6b
Author: Volkmar W. Pogatzki  pogatzki  net>
AuthorDate: Fri Jul 30 20:50:40 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Nov 13 10:31:47 2021 +
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  pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/21913
Signed-off-by: Sam James  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 000..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
+}

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

2021-05-09 Thread Miroslav Šulc 
commit: 7305cc4e8519f59c6fa9e3a67ebf0757714c95b3
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Sun May  9 10:00:12 2021 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Sun May  9 10:00:12 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7305cc4e

dev-java/aspectj: removed obsolete 1.7.4

Bug: https://bugs.gentoo.org/784350
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Miroslav Šulc  gentoo.org>

 dev-java/aspectj/Manifest |  1 -
 dev-java/aspectj/aspectj-1.7.4.ebuild | 45 ---
 2 files changed, 46 deletions(-)

diff --git a/dev-java/aspectj/Manifest b/dev-java/aspectj/Manifest
index 0549cb00930..84ea2060825 100644
--- a/dev-java/aspectj/Manifest
+++ b/dev-java/aspectj/Manifest
@@ -1,2 +1 @@
-DIST aspectj-1.7.4-src.jar 7570114 BLAKE2B 
caa942a2414c6f1b39b881bc5abad0cd4e718b231822833756493ce389207d1d855be36f74a4c58ad5f00f7acfcd5791b4ab8e151fd0e11ac497d4f68cab2eb0
 SHA512 
643d457fba4d58114ee09a37007f5cf5fd40f7ff196ffc69d371d1986cbf6930567ddffd3f1af625139619a0be386e1d9c7e30d267bf53b4286e2179735299bf
 DIST aspectj-1.9.6-src.jar 8616829 BLAKE2B 
adc12e181b2584287dd149657f0505b2d3ba877aa3e8cea1f2fd827b4d05c24728f120798019f1679ebafe850a8e68fa3db1467ac080c27692d5f81d31aebd48
 SHA512 
f15416a3921ef614ab8068c8ff8277f0fd3c177e9b277ac471786953615f1fe81638b8d13d77ebfe0643fdf089ee3cd5e718d522d2e588989a42df775f2a0516

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 4a9e2ff58cd..000
--- 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=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
-}

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

2021-05-09 Thread Agostino Sarubbo 
commit: 3c330d3a7a74e2e561b21d8f6c126821d463b4fd
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Sun May  9 09:16:43 2021 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Sun May  9 09:16:43 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3c330d3a

dev-java/aspectj: x86 stable wrt bug #784350

Package-Manager: Portage-3.0.13, Repoman-3.0.2
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 dev-java/aspectj/aspectj-1.9.6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/aspectj/aspectj-1.9.6.ebuild 
b/dev-java/aspectj/aspectj-1.9.6.ebuild
index 8c7f6df2776..b1bc3636c59 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"

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

2021-05-01 Thread Agostino Sarubbo 
commit: 9aa84ddb336849b74c10084af73dce7d044d0f01
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Sat May  1 18:18:00 2021 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Sat May  1 18:19:46 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9aa84ddb

dev-java/aspectj: amd64 stable wrt bug #784350

Package-Manager: Portage-3.0.13, Repoman-3.0.2
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 dev-java/aspectj/aspectj-1.9.6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/aspectj/aspectj-1.9.6.ebuild 
b/dev-java/aspectj/aspectj-1.9.6.ebuild
index a27323985b9..8c7f6df2776 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"

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

2021-04-21 Thread Miroslav Šulc 
commit: bbd9b0b3f46288849f0140971189310df9229e86
Author: Volkmar W. Pogatzki  pogatzki  net>
AuthorDate: Wed Apr 21 06:58:56 2021 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Wed Apr 21 09:47:20 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bbd9b0b3

dev-java/aspectj: bump to 1.9.6

Closes: https://bugs.gentoo.org/601608
Bug: https://bugs.gentoo.org/784275

Package-Manager: Portage-3.0.17, Repoman-3.0.2
Signed-off-by: Volkmar W. Pogatzki  pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/20484
Signed-off-by: Miroslav Šulc  gentoo.org>

 dev-java/aspectj/Manifest |  1 +
 dev-java/aspectj/aspectj-1.9.6.ebuild | 45 +++
 dev-java/aspectj/metadata.xml |  4 
 3 files changed, 50 insertions(+)

diff --git a/dev-java/aspectj/Manifest b/dev-java/aspectj/Manifest
index 28f35ff720d..0549cb00930 100644
--- a/dev-java/aspectj/Manifest
+++ b/dev-java/aspectj/Manifest
@@ -1 +1,2 @@
 DIST aspectj-1.7.4-src.jar 7570114 BLAKE2B 
caa942a2414c6f1b39b881bc5abad0cd4e718b231822833756493ce389207d1d855be36f74a4c58ad5f00f7acfcd5791b4ab8e151fd0e11ac497d4f68cab2eb0
 SHA512 
643d457fba4d58114ee09a37007f5cf5fd40f7ff196ffc69d371d1986cbf6930567ddffd3f1af625139619a0be386e1d9c7e30d267bf53b4286e2179735299bf
+DIST aspectj-1.9.6-src.jar 8616829 BLAKE2B 
adc12e181b2584287dd149657f0505b2d3ba877aa3e8cea1f2fd827b4d05c24728f120798019f1679ebafe850a8e68fa3db1467ac080c27692d5f81d31aebd48
 SHA512 
f15416a3921ef614ab8068c8ff8277f0fd3c177e9b277ac471786953615f1fe81638b8d13d77ebfe0643fdf089ee3cd5e718d522d2e588989a42df775f2a0516

diff --git a/dev-java/aspectj/aspectj-1.9.6.ebuild 
b/dev-java/aspectj/aspectj-1.9.6.ebuild
new file mode 100644
index 000..6d2a4309c75
--- /dev/null
+++ b/dev-java/aspectj/aspectj-1.9.6.ebuild
@@ -0,0 +1,45 @@
+# 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://www.eclipse.org/downloads/download.php?file=/tools/${PN}/${P}-src.jar=1
 -> ${P}-src.jar"
+
+LICENSE="EPL-1.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+CDEPEND="dev-java/asm:7
+   dev-java/commons-logging:0"
+DEPEND="${CDEPEND}
+   >=virtual/jdk-1.8:*"
+RDEPEND="${CDEPEND}
+   >=virtual/jre-1.8:*"
+BDEPEND="app-arch/zip"
+
+S=${WORKDIR}
+
+JAVA_SRC_DIR="${S}/src"
+JAVA_GENTOO_CLASSPATH="commons-logging,asm-7"
+JAVA_ENCODING="iso8859-1"
+
+src_unpack() {
+   default
+   unzip "${S}"/aspectjweaver-${PV}-sources.jar -d "${S}"/src/ || die
+}
+
+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 952a4b9b605..b1dd050ac0f 100644
--- a/dev-java/aspectj/metadata.xml
+++ b/dev-java/aspectj/metadata.xml
@@ -5,4 +5,8 @@
j...@gentoo.org
Java

+   
+   eclipse/org.aspectj
+   https://www.eclipse.org/aspectj/bugs.php
+

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

2021-04-21 Thread Miroslav Šulc 
commit: b48e7407acca71b9391e04c358276b5fcee6fe3b
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Wed Apr 21 09:46:52 2021 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Wed Apr 21 09:47:21 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b48e7407

dev-java/aspectj: switched 1.9.6 to asm:9

Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Miroslav Šulc  gentoo.org>

 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 6d2a4309c75..a27323985b9 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
 }

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

2021-04-21 Thread Miroslav Šulc 
commit: 9f3dcd8036e0c98cd43f98147e3729d8edd413db
Author: Volkmar W. Pogatzki  pogatzki  net>
AuthorDate: Wed Apr 21 06:01:46 2021 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Wed Apr 21 08:19:45 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9f3dcd80

dev-java/aspectj: remove obsolete

Bug: https://bugs.gentoo.org/show_bug.cgi?id=784350
Package-Manager: Portage-3.0.17, Repoman-3.0.2
Signed-off-by: Volkmar W. Pogatzki  pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/20481
Signed-off-by: Miroslav Šulc  gentoo.org>

 dev-java/aspectj/Manifest|  1 -
 dev-java/aspectj/aspectj-1.7.3-r1.ebuild | 46 
 2 files changed, 47 deletions(-)

diff --git a/dev-java/aspectj/Manifest b/dev-java/aspectj/Manifest
index 2167b7b831b..28f35ff720d 100644
--- a/dev-java/aspectj/Manifest
+++ b/dev-java/aspectj/Manifest
@@ -1,2 +1 @@
-DIST aspectj-1.7.3.jar 7565941 BLAKE2B 
8d3919ecae8bf190331a06644b8ba694b071b961d22e5b85e4f57b50c3ff27112e6c39b2644a400f64ca590d4de619aa1a86dd0d1ea59868499a6cff50709ecf
 SHA512 
2297a11638c6519b50e1938341914c68c2841c7b7894081f3157ef3463fb29519d833d274e24b8da1203a7866b2e1296d67e0872dbaa2dd835b5520f5c0a7a71
 DIST aspectj-1.7.4-src.jar 7570114 BLAKE2B 
caa942a2414c6f1b39b881bc5abad0cd4e718b231822833756493ce389207d1d855be36f74a4c58ad5f00f7acfcd5791b4ab8e151fd0e11ac497d4f68cab2eb0
 SHA512 
643d457fba4d58114ee09a37007f5cf5fd40f7ff196ffc69d371d1986cbf6930567ddffd3f1af625139619a0be386e1d9c7e30d267bf53b4286e2179735299bf

diff --git a/dev-java/aspectj/aspectj-1.7.3-r1.ebuild 
b/dev-java/aspectj/aspectj-1.7.3-r1.ebuild
deleted file mode 100644
index 14b9dcd39d2..000
--- a/dev-java/aspectj/aspectj-1.7.3-r1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# 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/aspectj/${P}-src.jar=1
 -> ${P}.jar"
-
-LICENSE="EPL-1.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-CDEPEND="dev-java/asm:4
-   dev-java/commons-logging:0"
-
-DEPEND=">=virtual/jdk-1.5
-   app-arch/zip
-   ${CDEPEND}"
-RDEPEND=">=virtual/jre-1.5
-   ${CDEPEND}"
-
-S="${WORKDIR}"
-
-JAVA_SRC_DIR="${S}/src"
-JAVA_GENTOO_CLASSPATH="commons-logging,asm-4"
-JAVA_ENCODING="iso8859-1"
-
-src_unpack() {
-   default
-   unzip "${S}/aspectjweaver1.7.3-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
-}

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

2021-04-14 Thread Sam James 
commit: 4bd0b543c65a0229d0adae17d5526356d2f6447d
Author: Sam James  gentoo  org>
AuthorDate: Thu Apr 15 05:29:56 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Apr 15 05:29:56 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4bd0b543

dev-java/aspectj: fix static PV in SRC_URI in 1.7.3-r1

Signed-off-by: Sam James  gentoo.org>

 dev-java/aspectj/aspectj-1.7.3-r1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-java/aspectj/aspectj-1.7.3-r1.ebuild 
b/dev-java/aspectj/aspectj-1.7.3-r1.ebuild
index 316152059df..14b9dcd39d2 100644
--- a/dev-java/aspectj/aspectj-1.7.3-r1.ebuild
+++ b/dev-java/aspectj/aspectj-1.7.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -9,7 +9,7 @@ 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=1
 -> ${P}.jar"
+SRC_URI="http://www.eclipse.org/downloads/download.php?file=/tools/aspectj/${P}-src.jar=1
 -> ${P}.jar"
 
 LICENSE="EPL-1.0"
 SLOT="0"