From cf89ca044e37f79e2329552cda857215f9824e11 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 17 Oct 2023 10:00:35 +0100 Subject: gentoo auto-resync : 17:10:2023 - 10:00:35 --- dev-java/felix-main/Manifest | 5 +- dev-java/felix-main/felix-main-7.0.5-r1.ebuild | 74 -------------------------- dev-java/felix-main/felix-main-7.0.5-r2.ebuild | 74 ++++++++++++++++++++++++++ 3 files changed, 77 insertions(+), 76 deletions(-) delete mode 100644 dev-java/felix-main/felix-main-7.0.5-r1.ebuild create mode 100644 dev-java/felix-main/felix-main-7.0.5-r2.ebuild (limited to 'dev-java/felix-main') diff --git a/dev-java/felix-main/Manifest b/dev-java/felix-main/Manifest index 5083ff2fac9f..355b7bc49183 100644 --- a/dev-java/felix-main/Manifest +++ b/dev-java/felix-main/Manifest @@ -1,3 +1,4 @@ -DIST felix-main-7.0.5.tar.gz 255198 BLAKE2B 289e2305b15c28f985bee1d8687db6ecb5098a2086da6fd32a7db8572f83a1ac37e49deeb89d657d48b943a626d400caccd8185ced565e8c65aa558395aeef05 SHA512 e06f6c330a73100a739575e92a6f0af263a98643bbd6fd6661e799c2a11c8c9d9589f1f5b8802799ffcae7007e8362c629055fa8b25a50a4fa736ed2ba2955b0 -EBUILD felix-main-7.0.5-r1.ebuild 2252 BLAKE2B e4831a0bbe74081db3d5d1de98e235e229a446b5cd8bbbc29b1053c5d75c2cbad58df3af90e2bcf77b5dbb564e763a8838b27d69e1a1ebf0334dcc8b85b37770 SHA512 f816117f1ee1e8203a8c9e621d23afedb5c05d405f9d70d1352dfc5b9c6a020dc917ff5b1614ac56ee5d16effba0106d5f1d088d563df0477f0500ea7a98f217 +DIST org.apache.felix.main-7.0.5-source-release.tar.gz 255198 BLAKE2B 289e2305b15c28f985bee1d8687db6ecb5098a2086da6fd32a7db8572f83a1ac37e49deeb89d657d48b943a626d400caccd8185ced565e8c65aa558395aeef05 SHA512 e06f6c330a73100a739575e92a6f0af263a98643bbd6fd6661e799c2a11c8c9d9589f1f5b8802799ffcae7007e8362c629055fa8b25a50a4fa736ed2ba2955b0 +DIST org.apache.felix.main-7.0.5-source-release.tar.gz.asc 195 BLAKE2B 24ba68ada20056364a559fea71b1596b07e0adc669c4ddbed89e2aa14fa1937b3d21af793148c057cd2bd9817a6f2c87b5e6465ea537fe7bac69215f82d9945f SHA512 428ba861bbd51b58f8e00226ac33c186e7e91ca5469c24328b65adcfb2631b09a50847870eff483e6569a69e3e01a1c939315747f3b338462bb0e7a7d2757216 +EBUILD felix-main-7.0.5-r2.ebuild 2268 BLAKE2B 90b5f2db02fe63d7c53f2b0c1110b78f037d4adbc5c5cc36637e9b3d819bce5d6bb906665d0becfeaca785e949c2de36112c017974065037e6116f44a0f3cc3a SHA512 fbcbb2380eea494636bd2b0ba386e5a4a477384eb9c8ff87e9698f8f7bdc497a9eacc1c852b2bf0e2f2ba1ebfbe6ec1946f776cf141baea0d53eb4d172d6bbe8 MISC metadata.xml 594 BLAKE2B 9ec3f78cd94f82740e506f44a6494d8e60894f09cd655b022886978c41bcf73a01628c9f1850a39a78bb96ed9dc57c04e7e1f6f5193b91bd8f23f1706899ef84 SHA512 1d8fab624036e9eda29d385fd042a0ca6b130dfa943c63c09e2a161ee039c695f215da1fe6135b59ece4a0fec06399dff2f80d0a12ab690805fd718d90cc05f2 diff --git a/dev-java/felix-main/felix-main-7.0.5-r1.ebuild b/dev-java/felix-main/felix-main-7.0.5-r1.ebuild deleted file mode 100644 index 60e9162ace4a..000000000000 --- a/dev-java/felix-main/felix-main-7.0.5-r1.ebuild +++ /dev/null @@ -1,74 +0,0 @@ -# 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.main-7.0.5-source-release.tar.gz --slot 0 --keywords "~amd64" --ebuild felix-main-7.0.5.ebuild - -EAPI=8 - -JAVA_PKG_IUSE="doc source" -MAVEN_ID="org.apache.felix:org.apache.felix.main:7.0.5" - -inherit java-pkg-2 java-pkg-simple - -DESCRIPTION="Open source OSGi framework by Apache Software Foundation" -HOMEPAGE="https://felix.apache.org/documentation/index.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 ~arm arm64 ppc64 x86" - -# Common dependencies -# POM: pom.xml -# org.apache.felix:org.apache.felix.framework:7.0.5 -> >=dev-java/felix-framework-7.0.5:0 - -CP_DEPEND="~dev-java/felix-framework-${PV}:0" - -DEPEND=" - >=virtual/jdk-11:* - ${CP_DEPEND} -" - -RDEPEND=" - >=virtual/jre-1.8:* - ${CP_DEPEND} -" - -DOCS=( DEPENDENCIES NOTICE ) - -S="${WORKDIR}/org.apache.felix.main-${PV}" - -JAVA_MAIN_CLASS="org.apache.felix.main.Main" -JAVA_RESOURCE_DIRS="src/main/resources" -JAVA_SRC_DIR="src/main/java" - -src_prepare() { - default - # 58,91 pom.xml - cat > src/main/java/module-info.java <<-EOF || die - $( sed -n '//,/<\/moduleInfoSource/p' pom.xml \ - | grep -v moduleInfoSource ) - EOF - - # according to pom.xml, line 91 - local add_opens="$( sed -n '//,/<\/Add-opens/p' pom.xml \ - | grep -v Add-opens | tr -s '[:space:]')" || die - mkdir src/main/resources/META-INF || die - echo "Add-opens:${add_opens}" >> src/main/resources/META-INF/MANIFEST.MF \ - || die "creating MANIFEST.MF failed" - - # no idea what to do with felix.log.level=${log.level} here, but ... - sed -e 's/{dollar}//' -i src/main/resources/config.properties || die - - # bundling some classes from felix-framework according to 78,94 pom.xml - # if we don't bundle compilation of module-info would fail - cd src/main/resources || die - jar xvf "$(java-pkg_getjar --build-only felix-framework felix-framework.jar)" \ - default.properties org/ || die "felix-framework.jar does not exist" -} - -src_install() { - dodoc -r doc - java-pkg-simple_src_install -} diff --git a/dev-java/felix-main/felix-main-7.0.5-r2.ebuild b/dev-java/felix-main/felix-main-7.0.5-r2.ebuild new file mode 100644 index 000000000000..83c9c09efb09 --- /dev/null +++ b/dev-java/felix-main/felix-main-7.0.5-r2.ebuild @@ -0,0 +1,74 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +JAVA_PKG_IUSE="doc source" +MAVEN_ID="org.apache.felix:org.apache.felix.main:7.0.5" + +inherit java-pkg-2 java-pkg-simple verify-sig + +DESCRIPTION="Open source OSGi framework by Apache Software Foundation" +HOMEPAGE="https://felix.apache.org/documentation/index.html" +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.main-${PV}" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="amd64 ~arm arm64 ppc64 x86" + +# Common dependencies +# POM: pom.xml +# org.apache.felix:org.apache.felix.framework:7.0.5 -> >=dev-java/felix-framework-7.0.5:0 + +CP_DEPEND="~dev-java/felix-framework-${PV}:0" + +DEPEND=" + >=virtual/jdk-11:* + ${CP_DEPEND} +" + +RDEPEND=" + >=virtual/jre-1.8:* + ${CP_DEPEND} +" + +BDEPEND="verify-sig? ( sec-keys/openpgp-keys-apache-felix )" +VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}/usr/share/openpgp-keys/felix.apache.org.asc" + +DOCS=( DEPENDENCIES NOTICE ) + +JAVA_MAIN_CLASS="org.apache.felix.main.Main" +JAVA_RESOURCE_DIRS="src/main/resources" +JAVA_SRC_DIR="src/main/java" + +src_prepare() { + default + # 58,91 pom.xml + cat > src/main/java/module-info.java <<-EOF || die + $( sed -n '//,/<\/moduleInfoSource/p' pom.xml \ + | grep -v moduleInfoSource ) + EOF + + # according to pom.xml, line 91 + local add_opens="$( sed -n '//,/<\/Add-opens/p' pom.xml \ + | grep -v Add-opens | tr -s '[:space:]')" || die + mkdir src/main/resources/META-INF || die + echo "Add-opens:${add_opens}" >> src/main/resources/META-INF/MANIFEST.MF \ + || die "creating MANIFEST.MF failed" + + # no idea what to do with felix.log.level=${log.level} here, but ... + sed -e 's/{dollar}//' -i src/main/resources/config.properties || die + + # bundling some classes from felix-framework according to 78,94 pom.xml + # if we don't bundle compilation of module-info would fail + cd src/main/resources || die + jar xvf "$(java-pkg_getjar --build-only felix-framework felix-framework.jar)" \ + default.properties org/ || die "felix-framework.jar does not exist" +} + +src_install() { + dodoc -r doc + java-pkg-simple_src_install +} -- cgit v1.2.3