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

2022-10-04 Thread Florian Schmaus 
commit: 7d9aaa700b43a52211495505b56c4387c2cc99db
Author: Volkmar W. Pogatzki  pogatzki  net>
AuthorDate: Sat Sep 10 22:42:55 2022 +
Commit: Florian Schmaus  gentoo  org>
CommitDate: Tue Oct  4 09:38:38 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7d9aaa70

dev-java/felix-framework: new package, add 7.0.5

Signed-off-by: Volkmar W. Pogatzki  pogatzki.net>
Signed-off-by: Florian Schmaus  gentoo.org>

 dev-java/felix-framework/Manifest  |   1 +
 .../felix-framework/felix-framework-7.0.5.ebuild   | 106 +
 dev-java/felix-framework/metadata.xml  |  12 +++
 3 files changed, 119 insertions(+)

diff --git a/dev-java/felix-framework/Manifest 
b/dev-java/felix-framework/Manifest
new file mode 100644
index ..7c129e4b6fc7
--- /dev/null
+++ b/dev-java/felix-framework/Manifest
@@ -0,0 +1 @@
+DIST felix-framework-7.0.5.tar.gz 505118 BLAKE2B 
3652d46dfb4c9c5b43b159450b81ad896483fb2df40165d7e7b8bbd718c8e3297163065474bd10f3858ff7fc2646134ed470e34ede8eeb5efc05cec75f1a7aec
 SHA512 
58fa96500fed827c348a47ac8672aeb4e5b94bfd681c4cde610b3a453fd2abfe2d631742281a192c76718ee83fc4c30980a5179926ff3bc7b8ea649ef07f34a3

diff --git a/dev-java/felix-framework/felix-framework-7.0.5.ebuild 
b/dev-java/felix-framework/felix-framework-7.0.5.ebuild
new file mode 100644
index ..e80a2eac3786
--- /dev/null
+++ b/dev-java/felix-framework/felix-framework-7.0.5.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Skeleton command:
+# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri 
mirror://apache/felix/org.apache.felix.framework-7.0.5-source-release.tar.gz 
--slot 0 --keywords "~amd64" --ebuild felix-framework-7.0.5.ebuild
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="org.apache.felix:org.apache.felix.framework:7.0.5"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Implementation of the OSGi R8 core framework specification"
+HOMEPAGE="https://felix.apache.org/documentation/subprojects/apache-felix-framework.html";
+SRC_URI="mirror://apache/felix/org.apache.${PN//-/.}-${PV}-source-release.tar.gz
 -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+# Common dependencies
+# POM: pom.xml
+# org.codehaus.mojo:animal-sniffer-annotations:1.9 -> 
>=dev-java/animal-sniffer-annotations-1.15:0
+
+CP_DEPEND="dev-java/animal-sniffer-annotations:0"
+
+# Compile dependencies
+# POM: pom.xml
+# org.apache.felix:org.apache.felix.resolver:2.0.4 -> 
>=dev-java/felix-resolver-2.0.4:0
+# org.osgi:org.osgi.annotation:6.0.0 -> !!!artifactId-not-found!!!
+# POM: pom.xml
+# test? junit:junit:4.12 -> >=dev-java/junit-4.13.2:4
+# test? org.easymock:easymock:2.5.2 -> >=dev-java/easymock-2.5.2:2.5
+# test? org.mockito:mockito-all:1.10.19 -> !!!artifactId-not-found!!!
+# test? org.ow2.asm:asm-all:5.2 -> !!!artifactId-not-found!!!
+
+DEPEND="
+   >=virtual/jdk-11:*
+   ${CP_DEPEND}
+   dev-java/osgi-annotation:0
+   dev-java/felix-resolver:0
+   test? (
+   dev-java/asm:4
+   dev-java/easymock:2.5
+   dev-java/mockito:0
+   )
+"
+
+RDEPEND="
+   >=virtual/jre-1.8:*
+   ${CP_DEPEND}"
+
+S="${WORKDIR}/org.apache.felix.framework-${PV}"
+
+JAVA_CLASSPATH_EXTRA="felix-resolver,osgi-annotation"
+JAVA_SRC_DIR="src/main/java"
+JAVA_RESOURCE_DIRS="src/main/resources"
+
+JAVA_TEST_GENTOO_CLASSPATH="asm-4,junit-4,easymock-2.5,mockito"
+JAVA_TEST_SRC_DIR="src/test/java"
+
+src_prepare() {
+   default
+   # 58,91 pom.xml
+   cat > src/main/java/module-info.java <<-EOF
+   $( sed -n '//,/<\/moduleInfoSource/p' pom.xml 
\
+   | grep -v moduleInfoSource )
+   EOF
+
+   sed -e 's/{dollar}//g' -i src/main/resources/default.properties || die
+
+   sed -e "s:\${pom.version}:${PV}:" \
+   -i 
src/main/resources/org/apache/felix/framework/Felix.properties || die
+
+   # bundling some classes from felix-resolver according to 99,132 pom.xml
+   # if we don't bundle compilation would fail with:
+   # src/main/java/module-info.java:23: error: package is empty or does 
not exist: org.osgi.service.resolver
+   cd src/main/resources || die
+   jar xvf "$(java-pkg_getjar --build-only felix-resolver 
felix-resolver.jar)" \
+   org/{apache/felix,osgi/service}/resolver/ || die
+}
+
+src_compile() {
+   java-pkg-simple_src_compile
+
+   # according to pom.xml, line 129
+   # grep the line between  and  from pom.xml
+   local ADD_OPENS="$( sed -n '//,/<\/Add-opens/p' pom.xml \
+   | grep -v Add-opens | tr -s '[:space:]')" || die
+   echo "Add-opens:${ADD_OPENS}" > "${T}/Add-opens-to-MANIFEST.MF" \
+   || die "Add-opens-to-MANIFEST.MF failed"
+   jar ufmv ${JAVA_JAR_FILENAME} "${T}/Add-opens-to-MANIFEST.MF" \
+

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

2022-10-04 Thread Florian Schmaus 
commit: 8fe090165234ed95ebb0c756ee2aa9e88d65761e
Author: Florian Schmaus  gentoo  org>
AuthorDate: Tue Oct  4 09:34:21 2022 +
Commit: Florian Schmaus  gentoo  org>
CommitDate: Tue Oct  4 09:38:40 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8fe09016

dev-java/felix-framework: lowercase local variable name

Signed-off-by: Florian Schmaus  gentoo.org>

 dev-java/felix-framework/felix-framework-7.0.5.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-java/felix-framework/felix-framework-7.0.5.ebuild 
b/dev-java/felix-framework/felix-framework-7.0.5.ebuild
index e80a2eac3786..a8a67fa28876 100644
--- a/dev-java/felix-framework/felix-framework-7.0.5.ebuild
+++ b/dev-java/felix-framework/felix-framework-7.0.5.ebuild
@@ -87,9 +87,9 @@ src_compile() {
 
# according to pom.xml, line 129
# grep the line between  and  from pom.xml
-   local ADD_OPENS="$( sed -n '//,/<\/Add-opens/p' pom.xml \
+   local add_opens="$(sed -n '//,/<\/Add-opens/p' pom.xml \
| grep -v Add-opens | tr -s '[:space:]')" || die
-   echo "Add-opens:${ADD_OPENS}" > "${T}/Add-opens-to-MANIFEST.MF" \
+   echo "Add-opens:${add_opens}" > "${T}/Add-opens-to-MANIFEST.MF" \
|| die "Add-opens-to-MANIFEST.MF failed"
jar ufmv ${JAVA_JAR_FILENAME} "${T}/Add-opens-to-MANIFEST.MF" \
|| die "updating MANIFEST.MF failed"

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

2022-10-05 Thread Arthur Zamarin 
commit: 5ed7d24ee60679296652ab0b2c0f36ce132a0a79
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Wed Oct  5 18:55:49 2022 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Wed Oct  5 18:55:49 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5ed7d24e

dev-java/felix-framework: Keyword 7.0.5 arm, #874879

Signed-off-by: Arthur Zamarin  gentoo.org>

 dev-java/felix-framework/felix-framework-7.0.5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/felix-framework/felix-framework-7.0.5.ebuild 
b/dev-java/felix-framework/felix-framework-7.0.5.ebuild
index a8a67fa28876..cba95f677738 100644
--- a/dev-java/felix-framework/felix-framework-7.0.5.ebuild
+++ b/dev-java/felix-framework/felix-framework-7.0.5.ebuild
@@ -18,7 +18,7 @@ 
SRC_URI="mirror://apache/felix/org.apache.${PN//-/.}-${PV}-source-release.tar.gz
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~arm"
 
 # Common dependencies
 # POM: pom.xml

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

2022-11-03 Thread Arthur Zamarin 
commit: ce8cc4e11b50e8b925886a6e010820d0ff7240b6
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Thu Nov  3 17:23:48 2022 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Thu Nov  3 17:24:10 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ce8cc4e1

dev-java/felix-framework: Stabilize 7.0.5 ppc64, #879293

Signed-off-by: Arthur Zamarin  gentoo.org>

 dev-java/felix-framework/felix-framework-7.0.5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/felix-framework/felix-framework-7.0.5.ebuild 
b/dev-java/felix-framework/felix-framework-7.0.5.ebuild
index cba95f677738..7292331ba4cf 100644
--- a/dev-java/felix-framework/felix-framework-7.0.5.ebuild
+++ b/dev-java/felix-framework/felix-framework-7.0.5.ebuild
@@ -18,7 +18,7 @@ 
SRC_URI="mirror://apache/felix/org.apache.${PN//-/.}-${PV}-source-release.tar.gz
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm"
+KEYWORDS="~amd64 ~arm ppc64"
 
 # Common dependencies
 # POM: pom.xml

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

2022-11-03 Thread Arthur Zamarin 
commit: 0bc8f3d587a7d4c3833dc39666ad1f93c63ab66c
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Thu Nov  3 17:56:42 2022 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Thu Nov  3 17:56:42 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0bc8f3d5

dev-java/felix-framework: Stabilize 7.0.5 arm64, #879293

Signed-off-by: Arthur Zamarin  gentoo.org>

 dev-java/felix-framework/felix-framework-7.0.5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/felix-framework/felix-framework-7.0.5.ebuild 
b/dev-java/felix-framework/felix-framework-7.0.5.ebuild
index 7292331ba4cf..6e6fa63d3b52 100644
--- a/dev-java/felix-framework/felix-framework-7.0.5.ebuild
+++ b/dev-java/felix-framework/felix-framework-7.0.5.ebuild
@@ -18,7 +18,7 @@ 
SRC_URI="mirror://apache/felix/org.apache.${PN//-/.}-${PV}-source-release.tar.gz
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ppc64"
+KEYWORDS="~amd64 ~arm arm64 ppc64"
 
 # Common dependencies
 # POM: pom.xml

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

2023-10-17 Thread Miroslav Šulc 
commit: 62c47ed53f3a0a63352a3a735b2a3fe5ecb5e50e
Author: Volkmar W. Pogatzki  pogatzki  net>
AuthorDate: Mon Oct 16 17:18:58 2023 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Tue Oct 17 07:37:01 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=62c47ed5

dev-java/felix-framework: verify-sig

Signed-off-by: Volkmar W. Pogatzki  pogatzki.net>
Signed-off-by: Miroslav Šulc  gentoo.org>

 dev-java/felix-framework/Manifest | 3 ++-
 ...-framework-7.0.5-r1.ebuild => felix-framework-7.0.5-r2.ebuild} | 8 ++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/dev-java/felix-framework/Manifest 
b/dev-java/felix-framework/Manifest
index 7c129e4b6fc7..61ae21b93439 100644
--- a/dev-java/felix-framework/Manifest
+++ b/dev-java/felix-framework/Manifest
@@ -1 +1,2 @@
-DIST felix-framework-7.0.5.tar.gz 505118 BLAKE2B 
3652d46dfb4c9c5b43b159450b81ad896483fb2df40165d7e7b8bbd718c8e3297163065474bd10f3858ff7fc2646134ed470e34ede8eeb5efc05cec75f1a7aec
 SHA512 
58fa96500fed827c348a47ac8672aeb4e5b94bfd681c4cde610b3a453fd2abfe2d631742281a192c76718ee83fc4c30980a5179926ff3bc7b8ea649ef07f34a3
+DIST org.apache.felix.framework-7.0.5-source-release.tar.gz 505118 BLAKE2B 
3652d46dfb4c9c5b43b159450b81ad896483fb2df40165d7e7b8bbd718c8e3297163065474bd10f3858ff7fc2646134ed470e34ede8eeb5efc05cec75f1a7aec
 SHA512 
58fa96500fed827c348a47ac8672aeb4e5b94bfd681c4cde610b3a453fd2abfe2d631742281a192c76718ee83fc4c30980a5179926ff3bc7b8ea649ef07f34a3
+DIST org.apache.felix.framework-7.0.5-source-release.tar.gz.asc 195 BLAKE2B 
94d0afbb7f20119a3f75927e75dc10420caab1c6ce2c3cc5b2b8600a2fd6af4c9217df565cd922bd0017ec6ac54113cc2a894b60249978c87c61c7961d258dda
 SHA512 
2b22f242b5d3ff6c38457908e801dc95abeca6c6427fe8eab4badae171692f9b8de6edf091dca78cc43c3a467a56aa85895cabdfa7eaa92faf6cb090e9fae8fa

diff --git a/dev-java/felix-framework/felix-framework-7.0.5-r1.ebuild 
b/dev-java/felix-framework/felix-framework-7.0.5-r2.ebuild
similarity index 91%
rename from dev-java/felix-framework/felix-framework-7.0.5-r1.ebuild
rename to dev-java/felix-framework/felix-framework-7.0.5-r2.ebuild
index 8a8d9e25d1ed..ddb1eee0510a 100644
--- a/dev-java/felix-framework/felix-framework-7.0.5-r1.ebuild
+++ b/dev-java/felix-framework/felix-framework-7.0.5-r2.ebuild
@@ -7,11 +7,12 @@ JAVA_PKG_IUSE="doc source test"
 MAVEN_ID="org.apache.felix:org.apache.felix.framework:7.0.5"
 JAVA_TESTING_FRAMEWORKS="junit-4"
 
-inherit java-pkg-2 java-pkg-simple
+inherit java-pkg-2 java-pkg-simple verify-sig
 
 DESCRIPTION="Implementation of the OSGi R8 core framework specification"
 
HOMEPAGE="https://felix.apache.org/documentation/subprojects/apache-felix-framework.html";
-SRC_URI="mirror://apache/felix/org.apache.${PN//-/.}-${PV}-source-release.tar.gz
 -> ${P}.tar.gz"
+SRC_URI="mirror://apache/felix/org.apache.${PN//-/.}-${PV}-source-release.tar.gz
+   verify-sig? ( 
https://downloads.apache.org/felix/org.apache.${PN//-/.}-${PV}-source-release.tar.gz.asc
 )"
 S="${WORKDIR}/org.apache.felix.framework-${PV}"
 
 LICENSE="Apache-2.0"
@@ -50,6 +51,9 @@ RDEPEND="
>=virtual/jre-1.8:*
${CP_DEPEND}"
 
+DEPEND="verify-sig? ( sec-keys/openpgp-keys-apache-felix )"
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}/usr/share/openpgp-keys/felix.apache.org.asc"
+
 JAVA_CLASSPATH_EXTRA="felix-resolver,osgi-annotation"
 JAVA_SRC_DIR="src/main/java"
 JAVA_RESOURCE_DIRS="src/main/resources"

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

2023-10-18 Thread Miroslav Šulc 
commit: db9ce20b07bc9209d8fc38d142ef98065ee042a6
Author: Volkmar W. Pogatzki  pogatzki  net>
AuthorDate: Tue Oct 17 15:54:37 2023 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Wed Oct 18 07:39:14 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=db9ce20b

dev-java/felix-framework: adjust typo

Closes: https://bugs.gentoo.org/915883
Signed-off-by: Volkmar W. Pogatzki  pogatzki.net>
Signed-off-by: Miroslav Šulc  gentoo.org>

 dev-java/felix-framework/felix-framework-7.0.5-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/felix-framework/felix-framework-7.0.5-r2.ebuild 
b/dev-java/felix-framework/felix-framework-7.0.5-r2.ebuild
index ddb1eee0510a..1e4ffd52d414 100644
--- a/dev-java/felix-framework/felix-framework-7.0.5-r2.ebuild
+++ b/dev-java/felix-framework/felix-framework-7.0.5-r2.ebuild
@@ -51,7 +51,7 @@ RDEPEND="
>=virtual/jre-1.8:*
${CP_DEPEND}"
 
-DEPEND="verify-sig? ( sec-keys/openpgp-keys-apache-felix )"
+BDEPEND="verify-sig? ( sec-keys/openpgp-keys-apache-felix )"
 
VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}/usr/share/openpgp-keys/felix.apache.org.asc"
 
 JAVA_CLASSPATH_EXTRA="felix-resolver,osgi-annotation"

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

2023-10-18 Thread Miroslav Šulc 
commit: 93cd3203291a4e7097e77de989542fd21982ebb9
Author: Volkmar W. Pogatzki  pogatzki  net>
AuthorDate: Tue Oct 17 15:57:14 2023 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Wed Oct 18 07:39:15 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=93cd3203

dev-java/felix-framework: minor style update

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

 .../felix-framework-7.0.5-r2.ebuild| 29 +-
 1 file changed, 6 insertions(+), 23 deletions(-)

diff --git a/dev-java/felix-framework/felix-framework-7.0.5-r2.ebuild 
b/dev-java/felix-framework/felix-framework-7.0.5-r2.ebuild
index 1e4ffd52d414..487fb4f1846f 100644
--- a/dev-java/felix-framework/felix-framework-7.0.5-r2.ebuild
+++ b/dev-java/felix-framework/felix-framework-7.0.5-r2.ebuild
@@ -19,37 +19,20 @@ LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 
-# Common dependencies
-# POM: pom.xml
-# org.codehaus.mojo:animal-sniffer-annotations:1.9 -> 
>=dev-java/animal-sniffer-annotations-1.15:0
-
 CP_DEPEND="dev-java/animal-sniffer-annotations:0"
 
-# Compile dependencies
-# POM: pom.xml
-# org.apache.felix:org.apache.felix.resolver:2.0.4 -> 
>=dev-java/felix-resolver-2.0.4:0
-# org.osgi:org.osgi.annotation:6.0.0 -> !!!artifactId-not-found!!!
-# POM: pom.xml
-# test? junit:junit:4.12 -> >=dev-java/junit-4.13.2:4
-# test? org.easymock:easymock:2.5.2 -> >=dev-java/easymock-2.5.2:2.5
-# test? org.mockito:mockito-all:1.10.19 -> !!!artifactId-not-found!!!
-# test? org.ow2.asm:asm-all:5.2 -> !!!artifactId-not-found!!!
-
-DEPEND="
-   >=virtual/jdk-11:*
-   ${CP_DEPEND}
-   dev-java/osgi-annotation:0
+DEPEND="${CP_DEPEND}
dev-java/felix-resolver:0
+   dev-java/osgi-annotation:0
+   >=virtual/jdk-11:*
test? (
dev-java/asm:9
dev-java/easymock:2.5
dev-java/mockito:0
-   )
-"
+   )"
 
-RDEPEND="
-   >=virtual/jre-1.8:*
-   ${CP_DEPEND}"
+RDEPEND="${CP_DEPEND}
+   >=virtual/jre-1.8:*"
 
 BDEPEND="verify-sig? ( sec-keys/openpgp-keys-apache-felix )"
 
VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}/usr/share/openpgp-keys/felix.apache.org.asc"

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

2023-08-15 Thread Miroslav Šulc 
commit: e1ce175dadcd9e832132b46f19be472f8e1942fd
Author: Volkmar W. Pogatzki  pogatzki  net>
AuthorDate: Wed Aug 16 05:18:20 2023 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Wed Aug 16 06:00:44 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e1ce175d

dev-java/felix-framework: adjust JAVA_TEST_GENTOO_CLASSPATH

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

 dev-java/felix-framework/felix-framework-7.0.5-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/felix-framework/felix-framework-7.0.5-r1.ebuild 
b/dev-java/felix-framework/felix-framework-7.0.5-r1.ebuild
index 11539e0d1f65..8a8d9e25d1ed 100644
--- a/dev-java/felix-framework/felix-framework-7.0.5-r1.ebuild
+++ b/dev-java/felix-framework/felix-framework-7.0.5-r1.ebuild
@@ -54,7 +54,7 @@ JAVA_CLASSPATH_EXTRA="felix-resolver,osgi-annotation"
 JAVA_SRC_DIR="src/main/java"
 JAVA_RESOURCE_DIRS="src/main/resources"
 
-JAVA_TEST_GENTOO_CLASSPATH="asm-4,junit-4,easymock-2.5,mockito"
+JAVA_TEST_GENTOO_CLASSPATH="asm-9,junit-4,easymock-2.5,mockito"
 JAVA_TEST_SRC_DIR="src/test/java"
 
 src_prepare() {

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

2023-01-27 Thread Miroslav Šulc 
commit: c487c0b91014d50154ac079a803f43cabf8ef2dd
Author: Volkmar W. Pogatzki  pogatzki  net>
AuthorDate: Thu Jan 26 09:59:54 2023 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Fri Jan 27 08:31:20 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c487c0b9

dev-java/felix-framework: switch dependency asm:4 -> asm:9

also put java-pkg-2_src_prepare instead of "default"
(preparing for bug #780585)

Signed-off-by: Volkmar W. Pogatzki  pogatzki.net>
Signed-off-by: Miroslav Šulc  gentoo.org>

 ...ramework-7.0.5.ebuild => felix-framework-7.0.5-r1.ebuild} | 12 
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/dev-java/felix-framework/felix-framework-7.0.5.ebuild 
b/dev-java/felix-framework/felix-framework-7.0.5-r1.ebuild
similarity index 91%
rename from dev-java/felix-framework/felix-framework-7.0.5.ebuild
rename to dev-java/felix-framework/felix-framework-7.0.5-r1.ebuild
index df163b2381bb..11539e0d1f65 100644
--- a/dev-java/felix-framework/felix-framework-7.0.5.ebuild
+++ b/dev-java/felix-framework/felix-framework-7.0.5-r1.ebuild
@@ -1,9 +1,6 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-# Skeleton command:
-# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri 
mirror://apache/felix/org.apache.felix.framework-7.0.5-source-release.tar.gz 
--slot 0 --keywords "~amd64" --ebuild felix-framework-7.0.5.ebuild
-
 EAPI=8
 
 JAVA_PKG_IUSE="doc source test"
@@ -15,6 +12,7 @@ inherit java-pkg-2 java-pkg-simple
 DESCRIPTION="Implementation of the OSGi R8 core framework specification"
 
HOMEPAGE="https://felix.apache.org/documentation/subprojects/apache-felix-framework.html";
 
SRC_URI="mirror://apache/felix/org.apache.${PN//-/.}-${PV}-source-release.tar.gz
 -> ${P}.tar.gz"
+S="${WORKDIR}/org.apache.felix.framework-${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
@@ -42,7 +40,7 @@ DEPEND="
dev-java/osgi-annotation:0
dev-java/felix-resolver:0
test? (
-   dev-java/asm:4
+   dev-java/asm:9
dev-java/easymock:2.5
dev-java/mockito:0
)
@@ -52,8 +50,6 @@ RDEPEND="
>=virtual/jre-1.8:*
${CP_DEPEND}"
 
-S="${WORKDIR}/org.apache.felix.framework-${PV}"
-
 JAVA_CLASSPATH_EXTRA="felix-resolver,osgi-annotation"
 JAVA_SRC_DIR="src/main/java"
 JAVA_RESOURCE_DIRS="src/main/resources"
@@ -62,7 +58,7 @@ 
JAVA_TEST_GENTOO_CLASSPATH="asm-4,junit-4,easymock-2.5,mockito"
 JAVA_TEST_SRC_DIR="src/test/java"
 
 src_prepare() {
-   default
+   java-pkg-2_src_prepare
# 58,91 pom.xml
cat > src/main/java/module-info.java <<-EOF
$( sed -n '//,/<\/moduleInfoSource/p' pom.xml 
\

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

2022-12-01 Thread Arthur Zamarin 
commit: 4fc2741e08fe51298c83398acf682951c6ab93a8
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Fri Dec  2 06:26:20 2022 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Fri Dec  2 06:26:20 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4fc2741e

dev-java/felix-framework: Stabilize 7.0.5 amd64, #879293

Signed-off-by: Arthur Zamarin  gentoo.org>

 dev-java/felix-framework/felix-framework-7.0.5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/felix-framework/felix-framework-7.0.5.ebuild 
b/dev-java/felix-framework/felix-framework-7.0.5.ebuild
index 6e6fa63d3b52..f0ae43bbeb99 100644
--- a/dev-java/felix-framework/felix-framework-7.0.5.ebuild
+++ b/dev-java/felix-framework/felix-framework-7.0.5.ebuild
@@ -18,7 +18,7 @@ 
SRC_URI="mirror://apache/felix/org.apache.${PN//-/.}-${PV}-source-release.tar.gz
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm arm64 ppc64"
+KEYWORDS="amd64 ~arm arm64 ppc64"
 
 # Common dependencies
 # POM: pom.xml

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

2022-12-02 Thread Arthur Zamarin 
commit: 2868fa3e9a60eb4a2009b52c36d9d9cec2aacc42
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sat Dec  3 06:04:45 2022 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sat Dec  3 06:04:45 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2868fa3e

dev-java/felix-framework: Stabilize 7.0.5 x86, #879293

Signed-off-by: Arthur Zamarin  gentoo.org>

 dev-java/felix-framework/felix-framework-7.0.5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/felix-framework/felix-framework-7.0.5.ebuild 
b/dev-java/felix-framework/felix-framework-7.0.5.ebuild
index f0ae43bbeb99..df163b2381bb 100644
--- a/dev-java/felix-framework/felix-framework-7.0.5.ebuild
+++ b/dev-java/felix-framework/felix-framework-7.0.5.ebuild
@@ -18,7 +18,7 @@ 
SRC_URI="mirror://apache/felix/org.apache.${PN//-/.}-${PV}-source-release.tar.gz
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 
 # Common dependencies
 # POM: pom.xml