diff options
| author | root <root@alpha.trunkmasters.com> | 2026-07-15 03:04:45 -0500 |
|---|---|---|
| committer | root <root@alpha.trunkmasters.com> | 2026-07-15 03:04:45 -0500 |
| commit | 2c34c3402bb20be0fbb58513da479b431ecc7320 (patch) | |
| tree | 53a49676a7aa41b31db56731ff381a8dcce4d2de /dev-java | |
| parent | 22ab5437b999b26eb3960d336dd392ccab062827 (diff) | |
| download | baldeagleos-repo-2c34c3402bb20be0fbb58513da479b431ecc7320.tar.gz baldeagleos-repo-2c34c3402bb20be0fbb58513da479b431ecc7320.tar.xz baldeagleos-repo-2c34c3402bb20be0fbb58513da479b431ecc7320.zip | |
Adding metadata
Diffstat (limited to 'dev-java')
45 files changed, 7 insertions, 1934 deletions
diff --git a/dev-java/ant-ivy/Manifest b/dev-java/ant-ivy/Manifest index d876e93214c6..384a3ce1ffd1 100644 --- a/dev-java/ant-ivy/Manifest +++ b/dev-java/ant-ivy/Manifest @@ -1,3 +1,2 @@ -DIST apache-ivy-2.5.0-src.tar.gz 2719181 BLAKE2B 71c47e3493beac8de1bc4e8c86ae18383938265dd2803a1c4b9ad466306227dab9eeca256516ff94064d902d0694b4f0b35ce152c5f64b95b876e47289b25833 SHA512 59d9458345e3a51e8f527258ba26ebe2cf5cf257401c52fb5f75aced0da5f7bf36f8aa0f202bbc0cf029d1d49bd6634f7cb8b65ccc828eb55ff7084430879268 DIST apache-ivy-2.5.3-src.tar.gz 2740477 BLAKE2B 6539b73ea49b76fdd547417265fd54ece2352a042cd40cef34b88886c994d377048710469a4b07ac7d3ff586d8816d50e10493abf4ebe78f6d90c9f1cb3a0bee SHA512 135c9cdbd3b4d291f67849e1b38964e1adef51b879de6b46ea4b72fd1bfa2d337b7468d46c4632b2bf360bdb9a25af874195f1032c61fe9fcd1f39ffa02469be DIST apache-ivy-2.5.3-src.tar.gz.asc 190 BLAKE2B a72faaa8ef1c0fc5d3073311d2fe85ae3d9d4a1494ba74ab53ad5a779787dbd13484da84d556e46d95ef712f35941a9751de7c3ac709eb556fab4ef3711e6588 SHA512 37c40100426b4e045a738570b5133845e753d3e0ebcd7a91d401be967446fed7d8d9d17275191b4cbd33f2847f042fa36fa5f125eaea305b3eef63ea668f9af3 diff --git a/dev-java/ant-ivy/ant-ivy-2.5.0-r4.ebuild b/dev-java/ant-ivy/ant-ivy-2.5.0-r4.ebuild deleted file mode 100644 index da472003c39b..000000000000 --- a/dev-java/ant-ivy/ant-ivy-2.5.0-r4.ebuild +++ /dev/null @@ -1,196 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -JAVA_PKG_IUSE="doc source test" -MAVEN_ID="org.apache.ivy:ivy:2.5.0" -JAVA_TESTING_FRAMEWORKS="junit-4" - -inherit java-pkg-2 java-pkg-simple java-osgi - -DESCRIPTION="Ivy is a free java based dependency manager" -HOMEPAGE="https://ant.apache.org/ivy/" -SRC_URI="https://archive.apache.org/dist/ant/ivy/${PV}/apache-ivy-${PV}-src.tar.gz" -S="${WORKDIR}/apache-ivy-${PV}" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="amd64 ppc64" - -PROPERTIES="test_network" -RESTRICT="test" - -CDEPEND=" - >=dev-java/ant-1.10.14-r3:0 - dev-java/bcpg:0 - dev-java/bcprov:0 - dev-java/httpcomponents-client:4 - dev-java/commons-vfs:2 - dev-java/httpcore:0 - dev-java/jakarta-oro:2.0 - dev-java/jsch:0 - dev-java/jsch-agent-proxy:0 - test? ( - >=dev-java/ant-1.10.14-r3:0[junit,junit4,junitlauncher,testutil] - dev-java/hamcrest-core:1.3 - dev-java/hamcrest-library:1.3 - dev-java/xmlunit:1 - )" - -# Restrict to jdk:1.8 since java.util.jar.Pack200 was removed. -DEPEND="${CDEPEND} - virtual/jdk:1.8" -RDEPEND="${CDEPEND} - virtual/jre:1.8" - -DOCS=( LICENSE NOTICE README.adoc ) - -JAVA_GENTOO_CLASSPATH=" - ant - bcpg - bcprov - httpcomponents-client-4 - commons-vfs-2 - httpcore - jakarta-oro-2.0 - jsch - jsch-agent-proxy -" -JAVA_MAIN_CLASS="org.apache.ivy.Main" -JAVA_SRC_DIR="src/java" -JAVA_RESOURCE_DIRS="resources/java" - -JAVA_TEST_GENTOO_CLASSPATH=" - ant - hamcrest-core-1.3 - hamcrest-library-1.3 - junit-4 - xmlunit-1 -" -JAVA_TEST_SRC_DIR="test-src/java" -JAVA_TEST_RESOURCE_DIRS="test" -JAVA_GENTOO_CLASSPATH_EXTRA="ant-ivy.jar:test.jar:custom-resolver.jar" - -# according to 57,60 build-release.xml -# https://github.com/apache/ant-ivy/commit/c0c8df492d2312c983f50cfdc5841e18177f6f7b -JAVA_TEST_EXTRA_ARGS="-Divy.cache.ttl.default=1s -Dskip.download=true -Divy.home=/tmp -D/offline=true" - -# Several tests require a certain treatment to "generate-bundles": -# https://github.com/apache/ant-ivy/blob/48234fc5ede85a865eb874a96c08472ce1751fd1/build.xml#L426-L428 -# <ant dir="${basedir}/test/test-repo" target="generate-bundles"/> -# -# The procedure is coded in https://github.com/apache/ant-ivy/blob/48234fc5ede85a865eb874a96c08472ce1751fd1/test/test-repo/build.xml#L19-L71 -# but appears too difficult to be reprodused with 'java-pkg-simple.eclass'. -# So the failing tests will be excluded, saved for a later attempt. -# -# Not excluding any test classes results in "Tests run: 1109, Failures: 98" -# Excluding those test classes listed below leads to "OK (812 tests)" -JAVA_TEST_EXCLUDES=( - # https://github.com/apache/ant-ivy/blob/083e3f685c1fe29092e59c63b87e81d31fc9babe/build.properties#L56 - # test.class.pattern = *Test - "org.apache.ivy.ant.testutil.AntTaskTestCase" # not in scope - "org.apache.ivy.core.TestPerformance" # not in scope - "org.apache.ivy.util.TestXmlHelper" # not in scope - "org.apache.ivy.TestFixture" # not in scope - "org.apache.ivy.TestHelper" # not in scope - # https://github.com/apache/ant-ivy/blob/48234fc5ede85a865eb874a96c08472ce1751fd1/build.xml#L412-L420 - # <exclude name="**/Abstract*Test.java"/> - "org.apache.ivy.util.url.AbstractURLHandlerTest" - "org.apache.ivy.plugins.resolver.AbstractDependencyResolverTest" - "org.apache.ivy.plugins.matcher.AbstractPatternMatcherTest" - # following excluded tests cause test failures - "org.apache.ivy.ant.BuildOBRTaskTest" # Tests run: 3, Failures: 2 - "org.apache.ivy.core.deliver.DeliverTest" # Tests run: 1, Failures: 1 - "org.apache.ivy.core.module.descriptor.IvyMakePomTest" # Tests run: 1, Failures: 1 - "org.apache.ivy.core.settings.XmlSettingsParserTest" # Tests run: 29, Failures: 1 - "org.apache.ivy.osgi.core.AggregatedOSGiResolverTest" # Tests run: 3, Failures: 1 - "org.apache.ivy.osgi.obr.OBRResolverTest" # Tests run: 16, Failures: 16 - "org.apache.ivy.osgi.repo.BundleRepoTest" # Tests run: 4, Failures: 3 - "org.apache.ivy.plugins.parser.m2.PomModuleDescriptorParserTest" # Tests run: 46, Failures: 1 - "org.apache.ivy.plugins.parser.xml.XmlModuleDescriptorParserTest" # Tests run: 44, Failures: 7 - "org.apache.ivy.plugins.parser.xml.XmlModuleDescriptorWriterTest" # Tests run: 10, Failures: 1 - "org.apache.ivy.plugins.parser.xml.XmlModuleUpdaterTest" # Tests run: 14, Failures: 3 - "org.apache.ivy.plugins.resolver.JarResolverTest" # Tests run: 3, Failures: 3 - # following excluded tests can pass if run individually - "org.apache.ivy.ant.IvyConfigureTest" # OK (14 tests) - "org.apache.ivy.IvyTest" # OK (1 test) - "org.apache.ivy.MainTest" # OK (12 tests) - "org.apache.ivy.plugins.report.XmlReportWriterTest" # OK (3 tests) - "org.apache.ivy.plugins.resolver.BintrayResolverTest" # OK (12 tests) - "org.apache.ivy.plugins.resolver.ChainResolverTest" # OK (15 tests) - "org.apache.ivy.plugins.resolver.FileSystemResolverTest" # OK (27 tests) - "org.apache.ivy.plugins.resolver.IBiblioMavenSnapshotsResolutionTest" # OK (1 test) - "org.apache.ivy.plugins.resolver.IvyRepResolverTest" # OK (3 tests) - "org.apache.ivy.plugins.resolver.Maven2LocalTest" # OK (2 tests) - "org.apache.ivy.plugins.resolver.PackagerResolverTest" # OK (3 tests) - "org.apache.ivy.plugins.resolver.URLResolverTest" # OK (5 tests) - "org.apache.ivy.plugins.trigger.LogTriggerTest" # OK (3 tests) - # Without PROPERTIES="test_network", the following test cause additional failures. - "org.apache.ivy.core.settings.OnlineXmlSettingsParserTest" -# "org.apache.ivy.osgi.updatesite.UpdateSiteAndIbiblioResolverTest" - "org.apache.ivy.osgi.updatesite.UpdateSiteLoaderTest" -# "org.apache.ivy.plugins.resolver.IBiblioResolverTest" -# "org.apache.ivy.plugins.resolver.MirroredURLResolverTest" - "org.apache.ivy.util.url.ArtifactoryListingTest" -# "org.apache.ivy.util.url.BasicURLHandlerTest" -# "org.apache.ivy.util.url.HttpclientURLHandlerTest" -) - -src_prepare() { - default - - mkdir --parents "${JAVA_RESOURCE_DIRS}/META-INF" || die - pushd "${JAVA_RESOURCE_DIRS}" - cp "${S}"/{NOTICE,LICENSE} META-INF/ || die - cp -r "${S}"/src/java/* . || die - - # DEPRECATED: 'ivyconf' element is deprecated, use 'ivysettings' instead - # according to 210,221 build.xml and still in the upstream .jar file - cp org/apache/ivy/core/settings/ivy{settings,conf}-local.xml || die - cp org/apache/ivy/core/settings/ivy{settings,conf}-default-chain.xml || die - cp org/apache/ivy/core/settings/ivy{settings,conf}-main-chain.xml || die - cp org/apache/ivy/core/settings/ivy{settings,conf}-public.xml || die - cp org/apache/ivy/core/settings/ivy{settings,conf}-shared.xml || die - cp org/apache/ivy/core/settings/ivy{settings,conf}.xml || die - - find . -type f -name '*.java' -exec rm -rf {} + || die - popd || die -} - -src_test() { - # https://github.com/apache/ant-ivy/blob/48234fc5ede85a865eb874a96c08472ce1751fd1/build.xml#L396-L407 - # name="build-custom-resolver-jar" - JAVA_SRC_DIR="test/custom-classpath" - JAVA_JAR_FILENAME="test/java/org/apache/ivy/core/settings/custom-resolver.jar" - java-pkg-simple_src_compile - - # Without "license.xml" the tests won't even start. "Tests run: 1109, Failures: 318" - jar -cf test.jar \ - -C test/java org/apache/ivy/plugins/parser/xml/license.xml \ - -C test/java org/apache/ivy/plugins/parser/m2/license.xml || die - - # Reduce number of failures to "Tests run: 1109, Failures: 98" - jar -uf "test.jar" -C test/java . || die - - # Separate *.java files from test resources - # https://github.com/apache/ant-ivy/blob/48234fc5ede85a865eb874a96c08472ce1751fd1/build.xml#L389-L393 - mkdir test-src || die - cp -r test/java test-src/ || die - find test -type f -name '*.java' -exec rm -rf {} + || die - - # https://github.com/apache/ant-ivy/blob/48234fc5ede85a865eb874a96c08472ce1751fd1/build.xml#L430-L438 - # name="prepare-test-jar-repositories" - mkdir test/jar-repos || die - jar -cfM "test/jar-repos/jarrepo1.jar" -C test/repositories/1 . || die -# jar -cfM "test/jar-repos/jarrepo1_subdir.jar" -C test/repositories 1/**/*/ || die - - java-pkg-simple_src_test -} - -src_install() { - default - java-osgi_dojar-fromfile "ant-ivy.jar" "META-INF/MANIFEST.MF" "ant-ivy" - use doc && java-pkg_dojavadoc target/api - use source && java-pkg_dosrc src/* -} diff --git a/dev-java/assertj-core/Manifest b/dev-java/assertj-core/Manifest index 3639756b1ab3..212ff08d74fc 100644 --- a/dev-java/assertj-core/Manifest +++ b/dev-java/assertj-core/Manifest @@ -1,3 +1,2 @@ -DIST assertj-build-3.27.6.tar.gz 1889577 BLAKE2B 3d93636cd7ab18c775a5f19e4cc340c94b73049799c9f1ec2883cc44b5fdd266c1578596c79b955d31c208ea0f03aca5f8446835b3c899ac852953db01649bbb SHA512 87717a96e6ee776c0689f5271498314c8503feef03ea3194acf7af7617463fc9d904575e17a9f8fe1601e179f1c9731bbbe5cf6d684eb1c2770c5c909863b622 DIST assertj-build-3.27.7.tar.gz 1891766 BLAKE2B 647c07543d4cf0513b6ad208549f7916e09c0f2f3eec203a20d6f9057cd5ea06086f6731db7dbf00972646ae6e8500de1bd57fc1b7e9a54f52c7f4a8651ddac0 SHA512 7d44371c82377859cc4c7f2cac16b69808723f02e02f83980911f0c76fba83921533c3455491e3009ac5d19551d87f7315f334c29228b654dd3b0c657772800e DIST assertj-core-3.10.0.tar.gz 1100495 BLAKE2B 4050060e027588d9c62abd5f4c6b77affd96d94a6474c4acc750a946cd3906787f9b2194627abff6d2e0849d590f5a74bbc702b41de6cbfaa09fae951a1012cf SHA512 3763768c5572e133de69735b01fd64432c4330723aa7e6cc0de42e5948cb2d455ae52d9ada66391fb41e47c261816fe12a00d07962e253f0da13ef49255fc5c6 diff --git a/dev-java/assertj-core/assertj-core-3.27.6.ebuild b/dev-java/assertj-core/assertj-core-3.27.6.ebuild deleted file mode 100644 index 6b1e99229fa5..000000000000 --- a/dev-java/assertj-core/assertj-core-3.27.6.ebuild +++ /dev/null @@ -1,93 +0,0 @@ -# Copyright 1999-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -JAVA_PKG_IUSE="doc source test" -JAVA_TESTING_FRAMEWORKS="junit-jupiter" - -inherit java-pkg-2 java-pkg-simple junit5 - -DESCRIPTION="Rich and fluent assertions for testing for Java" -HOMEPAGE="https://assertj.github.io/doc/" -SRC_URI="https://github.com/assertj/assertj/archive/assertj-build-${PV}.tar.gz" -S="${WORKDIR}/assertj-assertj-build-${PV}/${PN}" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="amd64 arm64 ppc64" - -# package EngineTestKit does not exist -# package jakarta.ws.rs.core does not exist -# package nl.jqno.equalsverifier does not exist -# package org.hibernate.collection.spi does not exist -# package org.hibernate.engine.spi does not exist -# package org.hibernate.persister.collection does not exist -# package org.junit.jupiter.params.shadow.com.univocity.parsers.common does not exist -# package org.junit.platform.testkit.engine does not exist -# package org.springframework.core.convert does not exist -# package org.springframework.core.convert.support does not exist -# package org.springframework.core does not exist -# package org.springframework.util does not exist -RESTRICT="test" # Needs more stuff to get packaged - -CP_DEPEND=" - >=dev-java/byte-buddy-1.17.7:0 - >=dev-java/hamcrest-3.0:0 - dev-java/junit:4 - dev-java/junit:5 - dev-java/opentest4j:0 -" - -DEPEND=" - ${CP_DEPEND} - >=virtual/jdk-11:* - dev-java/apiguardian-api:0 - >=dev-java/asm-9.8-r1:0 - >=dev-java/jna-5.17.0:0 - dev-java/jsr305:0 - test? ( - >=dev-java/commons-collections-4.5.0:4 - >=dev-java/commons-io-2.19.0:0 - >=dev-java/commons-lang-3.18.0:0 - >=dev-java/commons-text-1.14.0:0 - >=dev-java/guava-33.4.8:0 - dev-java/junit-dataprovider:0 - >=dev-java/junit-pioneer-1.9.1:0 - dev-java/memoryfilesystem:0 - >=dev-java/mockito-5.20.0:0 - ) -" - -RDEPEND=" - ${CP_DEPEND} - >=virtual/jre-1.8:* -" - -JAVA_CLASSPATH_EXTRA="apiguardian-api asm jna jsr305" -JAVA_INTERMEDIATE_JAR_NAME="org.assertj.core" -JAVA_RELEASE_SRC_DIRS=( ["9"]="src/main/java9" ) -JAVA_SRC_DIR="src/main/java" - -JAVA_TEST_GENTOO_CLASSPATH=" - commons-collections-4 - commons-io - commons-lang - commons-text - guava - junit-5 - junit-pioneer - mockito -" - -JAVA_TEST_RESOURCE_DIRS="src/test/resources" -JAVA_TEST_SRC_DIR="src/test/java" - -src_prepare() { - java-pkg-2_src_prepare - - local vm_version="$(java-config -g PROVIDES_VERSION)" - if ver_test "${vm_version}" -ge 17; then - JAVA_TEST_EXTRA_ARGS+=( --add-opens=java.base/java.{io,lang,math,util}=ALL-UNNAMED ) - fi -} diff --git a/dev-java/bcmail/Manifest b/dev-java/bcmail/Manifest index 341f3693eaaf..460b3805a908 100644 --- a/dev-java/bcmail/Manifest +++ b/dev-java/bcmail/Manifest @@ -1,2 +1 @@ -DIST bc-java-r1rv83.tar.gz 47658743 BLAKE2B 3b223d49120d54d22276d6f4d7457f1887577640e7a572aff6ceb322adc7da2c541e0090d16763b22745695ff1d6ae13aae2d91ea3f89b186e1cd0c3027ef1ca SHA512 f9d99538c38a65ef6cb3db0eda3a293b91e370d27210e71ef17e63ecd91fd3c5b01d09385c18fc237e686775649306b9a2fe1d8250a0a304fb0d6079f74e4926 DIST bc-java-r1rv84.tar.gz 47876878 BLAKE2B 29cfa797fa7ca464666c8e74d116b77b9882b0c0ee21c9ef178615ec25ea341bfe6633b5a82c6470651ada16d20c7099f92878eaa7d781a2e30a752547cdf47b SHA512 d20ab4e28ddc432851b068564b038e2a99be20d88784340c6ce4a0e75a1278e98af6e9b5f6c75ece4095199ee3e61621d0aebce1f43827945a4ff6adc77cf59d diff --git a/dev-java/bcmail/bcmail-1.83.ebuild b/dev-java/bcmail/bcmail-1.83.ebuild deleted file mode 100644 index ea1436c6e741..000000000000 --- a/dev-java/bcmail/bcmail-1.83.ebuild +++ /dev/null @@ -1,63 +0,0 @@ -# Copyright 1999-2026 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -JAVA_PKG_IUSE="doc source test" -JAVA_TESTING_FRAMEWORKS="junit-4" -MAVEN_ID="org.bouncycastle:bcmail-jdk18on:${PV}" - -inherit java-pkg-2 java-pkg-simple - -DESCRIPTION="The Bouncy Castle Java S/MIME APIs for handling S/MIME protocols" -HOMEPAGE="https://www.bouncycastle.org/download/bouncy-castle-java/" -MY_PV="r$(ver_rs 1 'rv' 2 'v')" -SRC_URI="https://github.com/bcgit/bc-java/archive/${MY_PV}.tar.gz -> bc-java-${MY_PV}.tar.gz" -S="${WORKDIR}/bc-java-${MY_PV}/mail" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="amd64 arm64 ppc64" - -CP_DEPEND=" - ~dev-java/bcpkix-${PV}:0 - ~dev-java/bcprov-${PV}:0 - ~dev-java/bcutil-${PV}:0 - dev-java/javax-mail:0 -" - -DEPEND=" - ${CP_DEPEND} - dev-java/jakarta-activation:1 - >=virtual/jdk-11:* -" - -RDEPEND=" - ${CP_DEPEND} - dev-java/jakarta-activation-api:1 - >=virtual/jre-1.8:* -" - -DOCS=( ../{README,SECURITY}.md ) -HTML_DOCS=( ../{CONTRIBUTORS,index}.html ) - -JAVA_AUTOMATIC_MODULE_NAME="org.bouncycastle.mail" -JAVA_CLASSPATH_EXTRA="jakarta-activation-1" -JAVA_RESOURCE_DIRS="src/main/resources" -JAVA_SRC_DIR=( "src/main/java" "src/main/jdk1.9" ) -JAVA_TEST_GENTOO_CLASSPATH="junit-4" -JAVA_TEST_RESOURCE_DIRS=( "src/test/resources" "../pkix/src/main/resources" ) -JAVA_TEST_RUN_ONLY="org.bouncycastle.mail.smime.test.AllTests" -JAVA_TEST_SRC_DIR="src/test/java" - -src_prepare() { - java-pkg-2_src_prepare - java-pkg_clean .. -} - -src_install() { - docinto html - dodoc -r ../docs - java-pkg-simple_src_install - java-pkg_register-dependency jakarta-activation-api-1 -} diff --git a/dev-java/bcmail/bcmail-1.84.ebuild b/dev-java/bcmail/bcmail-1.84.ebuild index ba9a90e84529..875bd2480493 100644 --- a/dev-java/bcmail/bcmail-1.84.ebuild +++ b/dev-java/bcmail/bcmail-1.84.ebuild @@ -16,7 +16,7 @@ S="${WORKDIR}/bc-java-${MY_PV}/mail" LICENSE="BSD" SLOT="0" -KEYWORDS="amd64 arm64 ~ppc64" +KEYWORDS="amd64 arm64 ppc64" CP_DEPEND=" ~dev-java/bcpkix-${PV}:0 diff --git a/dev-java/bcpg/Manifest b/dev-java/bcpg/Manifest index 341f3693eaaf..460b3805a908 100644 --- a/dev-java/bcpg/Manifest +++ b/dev-java/bcpg/Manifest @@ -1,2 +1 @@ -DIST bc-java-r1rv83.tar.gz 47658743 BLAKE2B 3b223d49120d54d22276d6f4d7457f1887577640e7a572aff6ceb322adc7da2c541e0090d16763b22745695ff1d6ae13aae2d91ea3f89b186e1cd0c3027ef1ca SHA512 f9d99538c38a65ef6cb3db0eda3a293b91e370d27210e71ef17e63ecd91fd3c5b01d09385c18fc237e686775649306b9a2fe1d8250a0a304fb0d6079f74e4926 DIST bc-java-r1rv84.tar.gz 47876878 BLAKE2B 29cfa797fa7ca464666c8e74d116b77b9882b0c0ee21c9ef178615ec25ea341bfe6633b5a82c6470651ada16d20c7099f92878eaa7d781a2e30a752547cdf47b SHA512 d20ab4e28ddc432851b068564b038e2a99be20d88784340c6ce4a0e75a1278e98af6e9b5f6c75ece4095199ee3e61621d0aebce1f43827945a4ff6adc77cf59d diff --git a/dev-java/bcpg/bcpg-1.83.ebuild b/dev-java/bcpg/bcpg-1.83.ebuild deleted file mode 100644 index 7b245845d1af..000000000000 --- a/dev-java/bcpg/bcpg-1.83.ebuild +++ /dev/null @@ -1,62 +0,0 @@ -# Copyright 1999-2026 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -JAVA_PKG_IUSE="doc source test" -JAVA_TESTING_FRAMEWORKS="junit-4" -MAVEN_ID="org.bouncycastle:bcpg-jdk18on:${PV}" - -inherit java-pkg-2 java-pkg-simple - -DESCRIPTION="Java cryptography APIs" -HOMEPAGE="https://www.bouncycastle.org/download/bouncy-castle-java/" -MY_PV="r$(ver_rs 1 'rv' 2 'v')" -SRC_URI="https://github.com/bcgit/bc-java/archive/${MY_PV}.tar.gz -> bc-java-${MY_PV}.tar.gz" -S="${WORKDIR}/bc-java-${MY_PV}/pg" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="amd64 arm64 ppc64" - -CP_DEPEND=" - ~dev-java/bcprov-${PV}:0 - ~dev-java/bcutil-${PV}:0 -" - -DEPEND=" - ${CP_DEPEND} - >=virtual/jdk-11:* -" - -RDEPEND=" - ${CP_DEPEND} - >=virtual/jre-1.8:* -" - -DOCS=( ../{README,SECURITY}.md ) -HTML_DOCS=( ../{CONTRIBUTORS,index}.html ) - -JAVA_AUTOMATIC_MODULE_NAME="org.bouncycastle.pg" -JAVA_SRC_DIR=( src/main/{java,jdk1.9} ) -JAVA_TEST_GENTOO_CLASSPATH="junit-4" -JAVA_TEST_RESOURCE_DIRS="src/test/resources" -JAVA_TEST_SRC_DIR="src/test/java" - -src_prepare() { - java-pkg-2_src_prepare - java-pkg_clean .. -} - -src_test() { - local TESTS=$(find src/test/java -name 'AllTests.java' -printf '%P\n' ) - TESTS="${TESTS//.java}" - JAVA_TEST_RUN_ONLY="${TESTS//\//.}" - java-pkg-simple_src_test -} - -src_install() { - docinto html - dodoc -r ../docs - java-pkg-simple_src_install -} diff --git a/dev-java/bcpg/bcpg-1.84.ebuild b/dev-java/bcpg/bcpg-1.84.ebuild index 35355cb4df10..bd185d1e1997 100644 --- a/dev-java/bcpg/bcpg-1.84.ebuild +++ b/dev-java/bcpg/bcpg-1.84.ebuild @@ -16,7 +16,7 @@ S="${WORKDIR}/bc-java-${MY_PV}/pg" LICENSE="BSD" SLOT="0" -KEYWORDS="amd64 arm64 ~ppc64" +KEYWORDS="amd64 arm64 ppc64" CP_DEPEND=" ~dev-java/bcprov-${PV}:0 diff --git a/dev-java/bcpkix/Manifest b/dev-java/bcpkix/Manifest index f49f555dd611..66e844237afe 100644 --- a/dev-java/bcpkix/Manifest +++ b/dev-java/bcpkix/Manifest @@ -1,4 +1,2 @@ -DIST bc-java-r1rv83.tar.gz 47658743 BLAKE2B 3b223d49120d54d22276d6f4d7457f1887577640e7a572aff6ceb322adc7da2c541e0090d16763b22745695ff1d6ae13aae2d91ea3f89b186e1cd0c3027ef1ca SHA512 f9d99538c38a65ef6cb3db0eda3a293b91e370d27210e71ef17e63ecd91fd3c5b01d09385c18fc237e686775649306b9a2fe1d8250a0a304fb0d6079f74e4926 DIST bc-java-r1rv84.tar.gz 47876878 BLAKE2B 29cfa797fa7ca464666c8e74d116b77b9882b0c0ee21c9ef178615ec25ea341bfe6633b5a82c6470651ada16d20c7099f92878eaa7d781a2e30a752547cdf47b SHA512 d20ab4e28ddc432851b068564b038e2a99be20d88784340c6ce4a0e75a1278e98af6e9b5f6c75ece4095199ee3e61621d0aebce1f43827945a4ff6adc77cf59d -DIST bc-test-data-r1rv83.tar.gz 2930411569 BLAKE2B dfe6cd87134ee728fd49d723ad320576a670c9eff22b1d05b4fc3b650a79ab35b8d67225cdf6e9667057afc51b89ea213435a265e36f574d36e212ca1038b389 SHA512 398ca8159225d58247404ae476a01197c617b2f3bcffc4a8c581d8abad869ddec2eef7f3380b162a20fa3786998d39e34c2db8b8cbfe14f683064ad619d310e8 DIST bc-test-data-r1rv84.tar.gz 2942290969 BLAKE2B fb5370e84c9f4bce6dcd26104ecf8a9c61fff92d29abd0cf5905763e6a44a888dc5823eaa906a3231f2754b284d34bf7d29224f56616941f152f5d61ec0f0c0f SHA512 5b84b317d5d5b93f6f1f1b94815eff2561982482b8f7401ffec2f1836f1e18d4de1b6313b5cfaa498c10158d727ba15e9a2a4972bad88e7fb12102f93b6449e4 diff --git a/dev-java/bcpkix/bcpkix-1.83.ebuild b/dev-java/bcpkix/bcpkix-1.83.ebuild deleted file mode 100644 index 1162ee91448d..000000000000 --- a/dev-java/bcpkix/bcpkix-1.83.ebuild +++ /dev/null @@ -1,94 +0,0 @@ -# Copyright 1999-2026 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -JAVA_PKG_IUSE="doc source test" -JAVA_TESTING_FRAMEWORKS="junit-4" -MAVEN_ID="org.bouncycastle:bcpkix-jdk18on:${PV}" - -inherit java-pkg-2 java-pkg-simple check-reqs - -DESCRIPTION="Java APIs for CMS, PKCS, EAC, TSP, CMP, CRMF, OCSP, and certificate generation" -HOMEPAGE="https://www.bouncycastle.org/download/bouncy-castle-java/" -MY_PV="r$(ver_rs 1 'rv' 2 'v')" -SRC_URI="https://github.com/bcgit/bc-java/archive/${MY_PV}.tar.gz -> bc-java-${MY_PV}.tar.gz - test? ( https://github.com/bcgit/bc-test-data/archive/${MY_PV}.tar.gz -> bc-test-data-${MY_PV}.tar.gz )" -S="${WORKDIR}/bc-java-${MY_PV}/pkix" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="amd64 arm64 ppc64" - -CP_DEPEND=" - ~dev-java/bcprov-${PV}:0 - ~dev-java/bcutil-${PV}:0 -" - -DEPEND=" - ${CP_DEPEND} - >=virtual/jdk-11:* -" - -RDEPEND=" - ${CP_DEPEND} - >=virtual/jre-1.8:* -" - -DOCS=( ../{README,SECURITY}.md ) -HTML_DOCS=( ../{CONTRIBUTORS,index}.html ) - -JAVA_AUTOMATIC_MODULE_NAME="org.bouncycastle.pkix" -JAVA_SRC_DIR=( src/main/{java,jdk1.9} ) -JAVA_TEST_EXTRA_ARGS="-Dbc.test.data.home=${S}/../core/src/test/data" -JAVA_TEST_GENTOO_CLASSPATH="junit-4" -JAVA_TEST_RESOURCE_DIRS=( src/{main,test}/resources ) -JAVA_TEST_SRC_DIR="src/test/java" - -# https://bugs.gentoo.org/823347 -check_env() { - if use test; then - # this is needed only for tests - CHECKREQS_MEMORY="2048M" - check-reqs_pkg_pretend - fi -} - -# https://bugs.gentoo.org/823347 -pkg_pretend() { - check_env -} - -# https://bugs.gentoo.org/823347 -pkg_setup() { - check_env - java-pkg-2_pkg_setup -} - -src_unpack() { - unpack bc-java-${MY_PV}.tar.gz - use test && unpack bc-test-data-${MY_PV}.tar.gz -} - -src_prepare() { - java-pkg-2_src_prepare - java-pkg_clean .. -} - -src_test() { - mv ../../bc-test-data-${MY_PV} bc-test-data || die "cannot move bc-test-data" - - # https://bugs.gentoo.org/823347 - JAVA_TEST_EXTRA_ARGS+=" -Xmx${CHECKREQS_MEMORY}" - - local TESTS=$(find src/test/java -name 'AllTests.java' -printf '%P\n' ) - TESTS="${TESTS//.java}" - JAVA_TEST_RUN_ONLY="${TESTS//\//.}" - java-pkg-simple_src_test -} - -src_install() { - docinto html - dodoc -r ../docs - java-pkg-simple_src_install -} diff --git a/dev-java/bcpkix/bcpkix-1.84.ebuild b/dev-java/bcpkix/bcpkix-1.84.ebuild index 16a1a950cd08..9d2c28aed29c 100644 --- a/dev-java/bcpkix/bcpkix-1.84.ebuild +++ b/dev-java/bcpkix/bcpkix-1.84.ebuild @@ -17,7 +17,7 @@ S="${WORKDIR}/bc-java-${MY_PV}/pkix" LICENSE="BSD" SLOT="0" -KEYWORDS="amd64 arm64 ~ppc64" +KEYWORDS="amd64 arm64 ppc64" CP_DEPEND=" ~dev-java/bcprov-${PV}:0 diff --git a/dev-java/bcprov/Manifest b/dev-java/bcprov/Manifest index f49f555dd611..66e844237afe 100644 --- a/dev-java/bcprov/Manifest +++ b/dev-java/bcprov/Manifest @@ -1,4 +1,2 @@ -DIST bc-java-r1rv83.tar.gz 47658743 BLAKE2B 3b223d49120d54d22276d6f4d7457f1887577640e7a572aff6ceb322adc7da2c541e0090d16763b22745695ff1d6ae13aae2d91ea3f89b186e1cd0c3027ef1ca SHA512 f9d99538c38a65ef6cb3db0eda3a293b91e370d27210e71ef17e63ecd91fd3c5b01d09385c18fc237e686775649306b9a2fe1d8250a0a304fb0d6079f74e4926 DIST bc-java-r1rv84.tar.gz 47876878 BLAKE2B 29cfa797fa7ca464666c8e74d116b77b9882b0c0ee21c9ef178615ec25ea341bfe6633b5a82c6470651ada16d20c7099f92878eaa7d781a2e30a752547cdf47b SHA512 d20ab4e28ddc432851b068564b038e2a99be20d88784340c6ce4a0e75a1278e98af6e9b5f6c75ece4095199ee3e61621d0aebce1f43827945a4ff6adc77cf59d -DIST bc-test-data-r1rv83.tar.gz 2930411569 BLAKE2B dfe6cd87134ee728fd49d723ad320576a670c9eff22b1d05b4fc3b650a79ab35b8d67225cdf6e9667057afc51b89ea213435a265e36f574d36e212ca1038b389 SHA512 398ca8159225d58247404ae476a01197c617b2f3bcffc4a8c581d8abad869ddec2eef7f3380b162a20fa3786998d39e34c2db8b8cbfe14f683064ad619d310e8 DIST bc-test-data-r1rv84.tar.gz 2942290969 BLAKE2B fb5370e84c9f4bce6dcd26104ecf8a9c61fff92d29abd0cf5905763e6a44a888dc5823eaa906a3231f2754b284d34bf7d29224f56616941f152f5d61ec0f0c0f SHA512 5b84b317d5d5b93f6f1f1b94815eff2561982482b8f7401ffec2f1836f1e18d4de1b6313b5cfaa498c10158d727ba15e9a2a4972bad88e7fb12102f93b6449e4 diff --git a/dev-java/bcprov/bcprov-1.83.ebuild b/dev-java/bcprov/bcprov-1.83.ebuild deleted file mode 100644 index 9db9ceac7e8b..000000000000 --- a/dev-java/bcprov/bcprov-1.83.ebuild +++ /dev/null @@ -1,100 +0,0 @@ -# Copyright 1999-2026 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -JAVA_PKG_IUSE="doc source test" -JAVA_TESTING_FRAMEWORKS="junit-4" -MAVEN_ID="org.bouncycastle:bcprov-jdk18on:${PV}" - -inherit java-pkg-2 java-pkg-simple check-reqs - -DESCRIPTION="Java cryptography APIs" -HOMEPAGE="https://www.bouncycastle.org/download/bouncy-castle-java/" -MY_PV="r$(ver_rs 1 'rv' 2 'v')" -SRC_URI="https://github.com/bcgit/bc-java/archive/${MY_PV}.tar.gz -> bc-java-${MY_PV}.tar.gz - test? ( https://github.com/bcgit/bc-test-data/archive/${MY_PV}.tar.gz -> bc-test-data-${MY_PV}.tar.gz )" -S="${WORKDIR}/bc-java-${MY_PV}" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="amd64 arm64 ppc64" - -DEPEND=">=virtual/jdk-11:*" -RDEPEND=">=virtual/jre-1.8:*" - -DOCS=( {README,SECURITY}.md ) -HTML_DOCS=( {CONTRIBUTORS,index}.html ) - -check_env() { - if use test; then - # this is needed only for tests - CHECKREQS_MEMORY="2048M" - check-reqs_pkg_pretend - fi -} - -pkg_pretend() { - check_env -} - -pkg_setup() { - check_env - java-pkg-2_pkg_setup -} - -src_unpack() { - unpack bc-java-${MY_PV}.tar.gz - use test && unpack bc-test-data-${MY_PV}.tar.gz -} - -src_prepare() { - java-pkg-2_src_prepare - # TBD: unboundid-ldapsdk should be packaged from source. - java-pkg_clean ! -path "./libs/unboundid-ldapsdk-6.0.8.jar" -} - -src_compile() { - JAVA_RESOURCE_DIRS=( - "core/src/main/resources" - "prov/src/main/resources" - ) - JAVA_SRC_DIR=( - "core/src/main/java" - "prov/src/main/java" - "prov/src/main/jdk1.9" - ) - java-pkg-simple_src_compile -} - -src_test() { - mv ../bc-test-data-${MY_PV} bc-test-data || die "cannot move bc-test-data" - - JAVA_TEST_EXTRA_ARGS="-Dtest.java.version.prefix=$(java-config -g PROVIDES_VERSION)" - JAVA_TEST_EXTRA_ARGS+=" -Dbc.test.data.home=${S}/core/src/test/data" - JAVA_TEST_EXTRA_ARGS+=" -Xmx${CHECKREQS_MEMORY}" - JAVA_TEST_GENTOO_CLASSPATH="junit-4" - - einfo "Testing \"core\"" - JAVA_TEST_RESOURCE_DIRS="core/src/test/resources" - JAVA_TEST_SRC_DIR="core/src/test/java" - local TESTS=$(find core/src/test/java -name "AllTests.java" -printf "%P\n") - TESTS="${TESTS//.java}" - JAVA_TEST_RUN_ONLY="${TESTS//\//.}" - java-pkg-simple_src_test - - einfo "Testing bcprov" - JAVA_GENTOO_CLASSPATH_EXTRA=":core.jar:libs/unboundid-ldapsdk-6.0.8.jar" - JAVA_TEST_RESOURCE_DIRS="prov/src/test/resources" - JAVA_TEST_SRC_DIR="prov/src/test/java" - local TESTS=$(find prov/src/test/java -name "AllTests.java" -printf "%P\n") - TESTS="${TESTS//.java}" - JAVA_TEST_RUN_ONLY="${TESTS//\//.}" - java-pkg-simple_src_test -} - -src_install() { - docinto html - dodoc -r docs - java-pkg-simple_src_install -} diff --git a/dev-java/bcprov/bcprov-1.84.ebuild b/dev-java/bcprov/bcprov-1.84.ebuild index 5f76e64a11f8..580e007cf941 100644 --- a/dev-java/bcprov/bcprov-1.84.ebuild +++ b/dev-java/bcprov/bcprov-1.84.ebuild @@ -17,7 +17,7 @@ S="${WORKDIR}/bc-java-${MY_PV}" LICENSE="BSD" SLOT="0" -KEYWORDS="amd64 arm64 ~ppc64" +KEYWORDS="amd64 arm64 ppc64" DEPEND=">=virtual/jdk-11:*" RDEPEND=">=virtual/jre-1.8:*" diff --git a/dev-java/bcutil/Manifest b/dev-java/bcutil/Manifest index 341f3693eaaf..460b3805a908 100644 --- a/dev-java/bcutil/Manifest +++ b/dev-java/bcutil/Manifest @@ -1,2 +1 @@ -DIST bc-java-r1rv83.tar.gz 47658743 BLAKE2B 3b223d49120d54d22276d6f4d7457f1887577640e7a572aff6ceb322adc7da2c541e0090d16763b22745695ff1d6ae13aae2d91ea3f89b186e1cd0c3027ef1ca SHA512 f9d99538c38a65ef6cb3db0eda3a293b91e370d27210e71ef17e63ecd91fd3c5b01d09385c18fc237e686775649306b9a2fe1d8250a0a304fb0d6079f74e4926 DIST bc-java-r1rv84.tar.gz 47876878 BLAKE2B 29cfa797fa7ca464666c8e74d116b77b9882b0c0ee21c9ef178615ec25ea341bfe6633b5a82c6470651ada16d20c7099f92878eaa7d781a2e30a752547cdf47b SHA512 d20ab4e28ddc432851b068564b038e2a99be20d88784340c6ce4a0e75a1278e98af6e9b5f6c75ece4095199ee3e61621d0aebce1f43827945a4ff6adc77cf59d diff --git a/dev-java/bcutil/bcutil-1.83.ebuild b/dev-java/bcutil/bcutil-1.83.ebuild deleted file mode 100644 index 795d7dcf34c4..000000000000 --- a/dev-java/bcutil/bcutil-1.83.ebuild +++ /dev/null @@ -1,59 +0,0 @@ -# Copyright 1999-2026 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -JAVA_PKG_IUSE="doc source test" -JAVA_TESTING_FRAMEWORKS="junit-4" -MAVEN_ID="org.bouncycastle:bcutil-jdk18on:${PV}" - -inherit java-pkg-2 java-pkg-simple - -DESCRIPTION="Java APIs for ASN.1 extension and utility APIs used to support bcpkix and bctls" -HOMEPAGE="https://www.bouncycastle.org/download/bouncy-castle-java/" -MY_PV="r$(ver_rs 1 'rv' 2 'v')" -SRC_URI="https://github.com/bcgit/bc-java/archive/${MY_PV}.tar.gz -> bc-java-${MY_PV}.tar.gz" -S="${WORKDIR}/bc-java-${MY_PV}/util" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="amd64 arm64 ppc64" - -CP_DEPEND="~dev-java/bcprov-${PV}:0" - -DEPEND=" - ${CP_DEPEND} - >=virtual/jdk-11:* -" - -RDEPEND=" - ${CP_DEPEND} - >=virtual/jre-1.8:* -" - -DOCS=( ../{README,SECURITY}.md ) -HTML_DOCS=( ../{CONTRIBUTORS,index}.html ) - -JAVA_AUTOMATIC_MODULE_NAME="org.bouncycastle.util" -JAVA_SRC_DIR=( src/main/{java,jdk1.9} ) -JAVA_TEST_GENTOO_CLASSPATH="junit-4" -JAVA_TEST_RESOURCE_DIRS="src/test/resources" -JAVA_TEST_SRC_DIR="src/test/java" - -src_prepare() { - java-pkg-2_src_prepare - java-pkg_clean .. -} - -src_test() { - local TESTS=$(find src/test/java -name 'AllTests.java' -printf '%P\n' ) - TESTS="${TESTS//.java}" - JAVA_TEST_RUN_ONLY="${TESTS//\//.}" - java-pkg-simple_src_test -} - -src_install() { - docinto html - dodoc -r ../docs - java-pkg-simple_src_install -} diff --git a/dev-java/bcutil/bcutil-1.84.ebuild b/dev-java/bcutil/bcutil-1.84.ebuild index 7b0e5e44b247..76c16300dc5a 100644 --- a/dev-java/bcutil/bcutil-1.84.ebuild +++ b/dev-java/bcutil/bcutil-1.84.ebuild @@ -16,7 +16,7 @@ S="${WORKDIR}/bc-java-${MY_PV}/util" LICENSE="BSD" SLOT="0" -KEYWORDS="amd64 arm64 ~ppc64" +KEYWORDS="amd64 arm64 ppc64" CP_DEPEND="~dev-java/bcprov-${PV}:0" diff --git a/dev-java/jackcess/Manifest b/dev-java/jackcess/Manifest index efb47f9deabf..403178864357 100644 --- a/dev-java/jackcess/Manifest +++ b/dev-java/jackcess/Manifest @@ -1,2 +1 @@ DIST jackcess-4.0.10-sources.tar.gz 12257097 BLAKE2B ba09a360f30d487f304e200304d71207b469ccbed6cd0a4d6ad5382471510b8afc890eeca3fc6808974548d751ff4712808a2670f90f598494829c85ef604f89 SHA512 81ec8f9b02032eb8dfebd778f6a59205b8500e4ed0a4460a6feba689b6ef694b60d8b4706ba0c638f74ff08cdcfca50d7de01e8027f366e2726304f38ffb0d3b -DIST jackcess-4.0.7-sources.tar.gz 12257727 BLAKE2B 5d19d5aef02388342d881214e6956eb118e74fd4dcc6b750df927c888e689eb94bf605952c30884b0b0c4bfd1ae651c8b96cc908dd2dbf0fa7506fd789c14fa0 SHA512 3867019b50e8734938c08e562a57cd16b49f664865b8dbe904c418d73dc750492c6f94bccecd9c9a9d2ab2be51a211d49416a5dcb5130ac96aef7a9aeef7a3e0 diff --git a/dev-java/jackcess/jackcess-4.0.10.ebuild b/dev-java/jackcess/jackcess-4.0.10.ebuild index 9eb4c9bf5ce2..2f64475b9642 100644 --- a/dev-java/jackcess/jackcess-4.0.10.ebuild +++ b/dev-java/jackcess/jackcess-4.0.10.ebuild @@ -15,7 +15,7 @@ S="${WORKDIR}/${PN}-${P}" LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="amd64 arm64 ~ppc64" +KEYWORDS="amd64 arm64 ppc64" CP_DEPEND=" >=dev-java/poi-5.5.1:0 diff --git a/dev-java/jackcess/jackcess-4.0.7-r1.ebuild b/dev-java/jackcess/jackcess-4.0.7-r1.ebuild deleted file mode 100644 index f3eb1698afd3..000000000000 --- a/dev-java/jackcess/jackcess-4.0.7-r1.ebuild +++ /dev/null @@ -1,61 +0,0 @@ -# Copyright 1999-2026 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -JAVA_PKG_IUSE="doc source test" -MAVEN_ID="com.healthmarketscience.jackcess:jackcess:4.0.7" -JAVA_TESTING_FRAMEWORKS="junit-4" - -inherit java-pkg-2 java-pkg-simple - -DESCRIPTION="A pure Java library for reading from and writing to MS Access databases" -HOMEPAGE="https://jackcess.sourceforge.io" -SRC_URI="https://github.com/jahlborn/${PN}/archive/${P}.tar.gz -> ${P}-sources.tar.gz" -S="${WORKDIR}/${PN}-${P}" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="amd64 arm64 ppc64" - -CP_DEPEND=" - >=dev-java/commons-lang-3.17:3.6 - >=dev-java/commons-logging-1.3.1:0[log4j] - >=dev-java/poi-5.2.5:0 -" - -# max jdk-25 for bug #968556 -DEPEND=" - ${CP_DEPEND} - <virtual/jdk-26:* -" - -RDEPEND=" - >=virtual/jre-1.8:* - ${CP_DEPEND}" - -PATCHES=( "${FILESDIR}/jackcess-4.0.0-fix-tests.patch" ) - -JAVA_RESOURCE_DIRS="src/main/resources" -JAVA_SRC_DIR="src/main/java" - -JAVA_TEST_GENTOO_CLASSPATH="junit-4" -JAVA_TEST_RESOURCE_DIRS="src/test/resources" -JAVA_TEST_SRC_DIR="src/test/java" - -JAVA_TEST_EXCLUDES=( - # initializationError(com.healthmarketscience.jackcess.TestUtil) - # org.junit.runners.model.InvalidTestClassError: Invalid test class 'com.healthmarketscience.jackcess.TestUtil' - "com.healthmarketscience.jackcess.TestUtil" -) - -src_prepare() { - default #780585 - java-pkg-2_src_prepare -} - -src_test() { - export TZ=UTC - export LC_ALL=C - java-pkg-simple_src_test -} diff --git a/dev-java/openjfx/Manifest b/dev-java/openjfx/Manifest index 63028b364713..924608fcfead 100644 --- a/dev-java/openjfx/Manifest +++ b/dev-java/openjfx/Manifest @@ -8,5 +8,3 @@ DIST lucene-queries-7.1.0.jar 243126 BLAKE2B 166c3efea04c19314be7fd8c1d6b1378b2b DIST lucene-queryparser-7.1.0.jar 384680 BLAKE2B adce2572de9f534323eead31dd30f97b853b2d5e4be6828c415f0c647460c361e00680d856ff9ffbba0fe45c3e4a425d68938a3d2dc01c76491bb65673e120fa SHA512 7151ef899e318679995138262c3450577ae33580708864581dc22a027f43ca4989825d434680925547e3c04ad4453a454e7045f605d7eee0da57d63db978ed68 DIST lucene-sandbox-7.1.0.jar 182914 BLAKE2B 70c795f84d8f0908abe47db77f632eeb6571a77e1445b8ab04a75080cea40e3b8171071965ff7fd9f6d39a450dd33144e922d19c1f07c605de54b45e3e881323 SHA512 6faf9fd9c7c082bf062adb6a28d89447e6e27152eb3f0a325081e5f791196e5440334632ccbf9c458940220676f7e73390a174889d9b7a656d088b3dade5d500 DIST openjfx-11.0.11_p1.tar.bz2 65017753 BLAKE2B ea5834e469bb0bd3a70595a91cc298f6091bc45de4c471ee9d0bcd45700ab3966a3396781ace2666bf94decd1219a83f01b277116cf23baeb6dd34a1a0f44191 SHA512 a1f94b3166aca50344f8af77ec2a5f52be1b0abc1c65fd3ff97f98017377ab772262502af00ad8cd4a6c44281ea459aff43a9cb7e30a1c35b822da8fb39b94fb -DIST openjfx-8.1000-backports.tar.bz2 9142182 BLAKE2B 58ea420ec015c49d2755105a3d11675a92ecab337c7bda5a1ad72e84d0b35f04ed4252cee24da89b1e7b1b5b8b8b9fea7db93364434800246b87827b21970cc3 SHA512 077392368947cb9da1b5c7e14b641d6edcddd9821eb4f16dbea33e8986568211e93799aca29e70b490c8ef2125d69f8372abd1b1ce428a95420f62ff15c414d6 -DIST openjfx-8.1000.tar.bz2 62286455 BLAKE2B c9a714a618d9ae02768dae6128756d64b2b6299a36a6ad9828bf2213dc641cbbcaa2d3f3e0b4913bb60893419a2d5c730ca2db88f759bbd94b3e83112199278c SHA512 6049730b72e569939fed3d62b46a409e949b4c2309f4355253c8c891799c7fb5138e20aa217454fbbd78b1dd99c254b34b3fe6c9cbb35854bd8656993655bf32 diff --git a/dev-java/openjfx/files/8/0000-Fix-wait-call-in-PosixPlatform.patch b/dev-java/openjfx/files/8/0000-Fix-wait-call-in-PosixPlatform.patch deleted file mode 100644 index 4a482240dc6b..000000000000 --- a/dev-java/openjfx/files/8/0000-Fix-wait-call-in-PosixPlatform.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- rt-8u202-b02/modules/fxpackager/src/main/native/library/common/PosixPlatform.cpp -+++ rt-8u202-b02-patched/modules/fxpackager/src/main/native/library/common/PosixPlatform.cpp -@@ -232,10 +232,7 @@ - pid_t wpid = 0; - - //TODO Use waitpid instead of wait --#ifdef LINUX -- wait(&status); --#endif --#ifdef MAC -+#if defined(LINUX) || defined(MAC) - wpid = wait(&status); - #endif - diff --git a/dev-java/openjfx/files/8/0001-Change-Lucene.patch b/dev-java/openjfx/files/8/0001-Change-Lucene.patch deleted file mode 100644 index 58d0c805ccb5..000000000000 --- a/dev-java/openjfx/files/8/0001-Change-Lucene.patch +++ /dev/null @@ -1,79 +0,0 @@ ---- rt-8u202-b02/build.gradle -+++ rt-8u202-b02-patched/build.gradle -@@ -3268,38 +3268,38 @@ - // The apps build is Ant based, and gradle lets us "import" ant build.xml - // into our configuration. - -- ant.importBuild 'build.xml' -+ //ant.importBuild 'build.xml' - - // Download the Lucene libraries needed for the Ensemble8 app -- def luceneVersion = "7.4.0" -- getConfigurations().create("lucene"); -- dependencies { -- lucene group: "org.apache.lucene", name: "lucene-core", version: luceneVersion -- lucene group: "org.apache.lucene", name: "lucene-grouping", version: luceneVersion -- lucene group: "org.apache.lucene", name: "lucene-queryparser", version: luceneVersion -- } -+ //def luceneVersion = "7.4.0" -+ //getConfigurations().create("lucene"); -+ //dependencies { -+ // lucene group: "org.apache.lucene", name: "lucene-core", version: luceneVersion -+ // lucene group: "org.apache.lucene", name: "lucene-grouping", version: luceneVersion -+ // lucene group: "org.apache.lucene", name: "lucene-queryparser", version: luceneVersion -+ //} - - // Copy Lucene libraries into the Ensemble8/lib directory -- File ensembleLibDir = rootProject.file("apps/samples/Ensemble8/lib"); -- def libNames = [ "lucene-core-${luceneVersion}.jar", -- "lucene-grouping-${luceneVersion}.jar", -- "lucene-queryparser-${luceneVersion}.jar" ] -- -- -- task getLucene(type: Copy) { -- doFirst { -- ensembleLibDir.mkdirs(); -- } -- into ensembleLibDir -- includeEmptyDirs = false -- configurations.lucene.files.each { f -> -- libNames.each { name -> -- if (name == f.getName()) { -- from f.getPath() -- } -- } -- } -- } -+ //File ensembleLibDir = rootProject.file("apps/samples/Ensemble8/lib"); -+ //def libNames = [ "lucene-core-${luceneVersion}.jar", -+ // "lucene-grouping-${luceneVersion}.jar", -+ // "lucene-queryparser-${luceneVersion}.jar" ] -+ -+ -+ //task getLucene(type: Copy) { -+ // doFirst { -+ // ensembleLibDir.mkdirs(); -+ // } -+ // into ensembleLibDir -+ // includeEmptyDirs = false -+ // configurations.lucene.files.each { f -> -+ // libNames.each { name -> -+ // if (name == f.getName()) { -+ // from f.getPath() -+ // } -+ // } -+ // } -+ //} - - compileTargets { t -> - // The apps build is Ant based, and gradle lets us "import" ant apps/build.xml -@@ -3310,7 +3310,7 @@ - def jfxrtJar = "${rootProject.buildDir}/${sdkDirName}/rt/lib/ext/jfxrt.jar" - - def appsJar = project.task("appsJar${t.capital}") { -- dependsOn(sdk, getLucene) -+ dependsOn(sdk) - doLast() { - ant.properties['targetBld'] = "$t.name" - if (!rootProject.ext[t.upper].compileSwing) { - diff --git a/dev-java/openjfx/files/8/0003-fix-cast-between-incompatible-function-types.patch b/dev-java/openjfx/files/8/0003-fix-cast-between-incompatible-function-types.patch deleted file mode 100644 index 7095841498a1..000000000000 --- a/dev-java/openjfx/files/8/0003-fix-cast-between-incompatible-function-types.patch +++ /dev/null @@ -1,68 +0,0 @@ -From 36b952bdcdc301a600009308bff90440b6ceab5b Mon Sep 17 00:00:00 2001 -From: Mat Booth <mat.booth@redhat.com> -Date: Thu, 21 Jun 2018 15:57:01 +0100 -Subject: [PATCH 4/4] fix cast between incompatible function types - ---- a/modules/graphics/src/main/native-glass/gtk/glass_dnd.cpp -+++ b/modules/graphics/src/main/native-glass/gtk/glass_dnd.cpp -@@ -556,7 +556,7 @@ static GdkDragContext *get_drag_context() { - return ctx; - } - --static gboolean dnd_finish_callback() { -+static gboolean dnd_finish_callback(gpointer data) { - if (dnd_window) { - dnd_set_performed_action( - translate_gdk_action_to_glass( -@@ -1079,6 +1079,10 @@ gboolean DragView::get_drag_image_offset(int* x, int* y) { - return offset_set; - } - -+static void on_pixbuf_destroy_notify(guchar *pixels, gpointer data) { -+ g_free(pixels); -+} -+ - GdkPixbuf* DragView::get_drag_image(gboolean* is_raw_image, gint* width, gint* height) { - GdkPixbuf *pixbuf = NULL; - gboolean is_raw = FALSE; -@@ -1106,7 +1110,7 @@ GdkPixbuf* DragView::get_drag_image(gboolean* is_raw_image, gint* width, gint* h - if (data) { - memcpy(data, (raw + whsz), nraw - whsz); - pixbuf = gdk_pixbuf_new_from_data(data, GDK_COLORSPACE_RGB, TRUE, 8, -- w, h, w * 4, (GdkPixbufDestroyNotify) g_free, NULL); -+ w, h, w * 4, (GdkPixbufDestroyNotify) on_pixbuf_destroy_notify, NULL); - } - } - } ---- a/modules/graphics/src/main/native-glass/gtk/glass_window_ime.cpp -+++ b/modules/graphics/src/main/native-glass/gtk/glass_window_ime.cpp -@@ -122,15 +122,12 @@ bool WindowContextBase::filterIME(GdkEvent * event) { - } - } - --//Note: this function must return int, despite the fact it doesn't conform to XIMProc type. --// This is required in documentation of XIM --static int im_preedit_start(XIM im_xim, XPointer client, XPointer call) { -+static void im_preedit_start(XIM im_xim, XPointer client, XPointer call) { - (void)im_xim; - (void)call; - - mainEnv->CallVoidMethod((jobject) client, jViewNotifyPreeditMode, JNI_TRUE); -- CHECK_JNI_EXCEPTION_RET(mainEnv, -1); -- return -1; // No restrictions -+ CHECK_JNI_EXCEPTION(mainEnv); - } - - static void im_preedit_done(XIM im_xim, XPointer client, XPointer call) { -@@ -234,7 +231,7 @@ void WindowContextBase::enableOrResetIME() { - return; - } - -- XIMCallback startCallback = {(XPointer) jview, (XIMProc) im_preedit_start}; -+ XIMCallback startCallback = {(XPointer) jview, im_preedit_start}; - XIMCallback doneCallback = {(XPointer) jview, im_preedit_done}; - XIMCallback drawCallback = {(XPointer) jview, im_preedit_draw}; - XIMCallback caretCallback = {(XPointer) jview, im_preedit_caret}; --- -2.17.1 - diff --git a/dev-java/openjfx/files/8/0004-Fix-Compilation-Flags.patch b/dev-java/openjfx/files/8/0004-Fix-Compilation-Flags.patch deleted file mode 100644 index 17c91ab9ab88..000000000000 --- a/dev-java/openjfx/files/8/0004-Fix-Compilation-Flags.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- rt-8u202-b07/buildSrc/linux.gradle -+++ rt-8u202-b07-patched/buildSrc/linux.gradle -@@ -54,7 +54,7 @@ - def ccFlags = [ - commonFlags, "-I$JDK_HOME/include", "-I$JDK_HOME/include/linux", "-c", - "-ffunction-sections", "-fdata-sections", -- IS_DEBUG_NATIVE ? ["-ggdb", "-DVERBOSE"] : ["-O2", "-DNDEBUG"]].flatten() -+ IS_DEBUG_NATIVE ? ["-ggdb", "-DNDEBUG"] : ["-O2", "-DNDEBUG"]].flatten() - def ccFlagsGTK3 = ccFlags - //ccFlags.addAll(["-Wnon-virtual-dtor", "-Woverloaded-virtual", "-std=c++0x"]) - def linkFlags = ["-static-libgcc", "-static-libstdc++", "-shared", commonFlags, - ---- rt-8u202-b07/buildSrc/x86egl.gradle -+++ rt-8u202-b07-patched/buildSrc/x86egl.gradle -@@ -99,7 +99,7 @@ - def ccFlags = [ - commonFlags, - "-I$JDK_HOME/include", "-I$JDK_HOME/include/${jniPlatform}", "-c", -- IS_DEBUG_NATIVE ? ["-ggdb", "-DVERBOSE"] : ["-O2", "-DNDEBUG"]].flatten() -+ IS_DEBUG_NATIVE ? ["-ggdb", "-DNDEBUG"] : ["-O2", "-DNDEBUG"]].flatten() - //ccFlags.addAll(["-Wnon-virtual-dtor", "-Woverloaded-virtual", "-std=c++0x"]) - def linkFlags = ["-shared", commonFlags].flatten() - diff --git a/dev-java/openjfx/files/8/0005-don-t-include-xlocale.h.patch b/dev-java/openjfx/files/8/0005-don-t-include-xlocale.h.patch deleted file mode 100644 index cabb36eefe54..000000000000 --- a/dev-java/openjfx/files/8/0005-don-t-include-xlocale.h.patch +++ /dev/null @@ -1,19 +0,0 @@ -From 597f200762be416d5a62f1efd351cba6e47c1c4c Mon Sep 17 00:00:00 2001 -From: Georgy Yakovlev <gyakovlev@gentoo.org> -Date: Thu, 30 May 2019 12:07:30 -0700 -Subject: [PATCH] don't include xlocale.h - ---- a/modules/media/src/main/native/gstreamer/3rd_party/glib/glib-2.56.1/glib/gstrfuncs.c -+++ b/modules/media/src/main/native/gstreamer/3rd_party/glib/glib-2.56.1/glib/gstrfuncs.c -@@ -39,7 +39,7 @@ - - #ifdef HAVE_XLOCALE_H - /* Needed on BSD/OS X for e.g. strtod_l */ --#include <xlocale.h> -+#include <locale.h> - #endif - - #ifdef G_OS_WIN32 --- -2.21.0 - diff --git a/dev-java/openjfx/files/8/06-disable-architecture-verification.patch b/dev-java/openjfx/files/8/06-disable-architecture-verification.patch deleted file mode 100644 index d10e62850c31..000000000000 --- a/dev-java/openjfx/files/8/06-disable-architecture-verification.patch +++ /dev/null @@ -1,21 +0,0 @@ -Description: Disable the architecture verification which is limited to i386 and amd64 -Author: Emmanuel Bourg <ebourg@apache.org> -Forwarded: no ---- a/build.gradle -+++ b/build.gradle -@@ -699,6 +699,7 @@ - // at present building on PI is not supported, but we would only need to make - // some changes on assumptions on what should be built (like SWT / Swing) and - // such and we could probably make it work. -+/* - if (!IS_MAC && !IS_WINDOWS && !IS_LINUX) logger.error("Unsupported build OS ${OS_NAME}") - if (IS_WINDOWS && OS_ARCH != "x86" && OS_ARCH != "amd64") { - throw new Exception("Unknown and unsupported build architecture: $OS_ARCH") -@@ -707,6 +708,7 @@ - } else if (IS_LINUX && OS_ARCH != "i386" && OS_ARCH != "amd64") { - throw new Exception("Unknown and unsupported build architecture: $OS_ARCH") - } -+*/ - - // Sanity check that we actually have a list of compile targets to execute - if (COMPILE_TARGETS == null || COMPILE_TARGETS == "") { diff --git a/dev-java/openjfx/files/8/10-javadoc-locale.patch b/dev-java/openjfx/files/8/10-javadoc-locale.patch deleted file mode 100644 index 39d346a4fb73..000000000000 --- a/dev-java/openjfx/files/8/10-javadoc-locale.patch +++ /dev/null @@ -1,21 +0,0 @@ -Description: Set the locale of the javadoc to make the build reproducible -Author: Emmanuel Bourg <ebourg@apache.org> -Forwarded: no ---- a/build.gradle -+++ b/build.gradle -@@ -1218,6 +1218,7 @@ - } else { - options.links(JDK_DOCS); - } -+ options.locale("en"); - options.addBooleanOption("XDignore.symbol.file").setValue(true); - options.addBooleanOption("Xdoclint:none").setValue(!IS_DOC_LINT); - options.addBooleanOption("javafx").setValue(true); -@@ -2769,6 +2770,7 @@ - options.windowTitle("${javadocTitle}") - options.header("${javadocHeader}") - options.bottom("${javadocBottom}") -+ options.locale("en"); - if (BUILD_CLOSED) { - options.linksOffline(JDK_DOCS, JDK_DOCS_CLOSED); - } else { diff --git a/dev-java/openjfx/files/8/99-sysdeps.patch b/dev-java/openjfx/files/8/99-sysdeps.patch deleted file mode 100644 index abcdbab67ef3..000000000000 --- a/dev-java/openjfx/files/8/99-sysdeps.patch +++ /dev/null @@ -1,26 +0,0 @@ ---- a/build.gradle -+++ b/build.gradle -@@ -1309,6 +1309,7 @@ project(":graphics") { - antlr3 group: "org.antlr", name: "antlr", version: "3.1.3" - antlr3 group: "org.antlr", name: "antlr-runtime", version: "3.1.3" - antlr3 group: "org.antlr", name: "stringtemplate", version: "3.2" -+ antlr3 group: "antlr", name: "antlr", version: "2.7.7" - } - - // Create a single "native" task which will depend on all the individual native tasks for graphics ---- a/buildSrc/build.gradle -+++ b/buildSrc/build.gradle -@@ -82,10 +82,13 @@ getConfigurations().create("antlr3"); - - dependencies { - compile group: "org.antlr", name: "antlr", version: "3.1.3" -+ compile group: "org.antlr", name: "antlr-runtime", version: "3.1.3" -+ compile group: "org.antlr", name: "stringtemplate", version: "3.2" - testCompile group: "junit", name: "junit", version: "4.8.2" - antlr3 group: "org.antlr", name: "antlr-runtime", version: "3.1.3" - antlr3 group: "org.antlr", name: "stringtemplate", version: "3.2" - antlr3 group: "org.antlr", name: "antlr", version: "3.1.3" -+ antlr3 group: "antlr", name: "antlr", version: "2.7.7" - } - - // At the moment the ASM library shipped with Gradle that is used to diff --git a/dev-java/openjfx/files/8/Wno-error.patch b/dev-java/openjfx/files/8/Wno-error.patch deleted file mode 100644 index 771da0707088..000000000000 --- a/dev-java/openjfx/files/8/Wno-error.patch +++ /dev/null @@ -1,68 +0,0 @@ -From 822bf818933311327c5b73cb1b185484f22f55fb Mon Sep 17 00:00:00 2001 -From: Georgy Yakovlev <gyakovlev@gentoo.org> -Date: Sun, 26 Apr 2020 21:15:36 -0700 -Subject: [PATCH] Wno-error - ---- a/buildSrc/armv5sf.gradle -+++ b/buildSrc/armv5sf.gradle -@@ -135,7 +135,6 @@ def dfbLFlags = ["-ldl"] - def lensLFlags = [extraLFlags, "-lpthread", "-ludev", "-ldl", "-lm"].flatten() - def monocleCFlags = [ - extraCFlags, -- "-Werror", - "-I", file("modules/graphics/src/main/native-glass/monocle/")].flatten(); - def monocleLFlags = [extraLFlags, "-ldl", "-lm"].flatten() - def glassCFlags = ["-ffast-math"] ---- a/buildSrc/armv6hf.gradle -+++ b/buildSrc/armv6hf.gradle -@@ -131,7 +131,6 @@ def extraLFlags = [ - def lensLFlags = [extraLFlags, "-lpthread", "-ludev", "-ldl", "-lm"].flatten() - def monocleCFlags = [ - extraCFlags, -- "-Werror", - "-I", file("modules/graphics/src/main/native-glass/monocle/")].flatten(); - def monocleLFlags = [extraLFlags, "-ldl", "-lm"].flatten() - ---- a/buildSrc/armv6sf.gradle -+++ b/buildSrc/armv6sf.gradle -@@ -135,7 +135,6 @@ def dfbLFlags = ["-ldl"] - def lensLFlags = [extraLFlags, "-lpthread", "-ludev", "-ldl", "-lm"].flatten() - def monocleCFlags = [ - extraCFlags, -- "-Werror", - "-I", file("modules/graphics/src/main/native-glass/monocle/")].flatten(); - def monocleLFlags = [extraLFlags, "-ldl", "-lm"].flatten() - def glassCFlags = ["-ffast-math"] ---- a/buildSrc/armv7hf.gradle -+++ b/buildSrc/armv7hf.gradle -@@ -131,7 +131,6 @@ def extraLFlags = [ - def lensLFlags = [extraLFlags, "-lpthread", "-ludev", "-ldl", "-lm"].flatten() - def monocleCFlags = [ - extraCFlags, -- "-Werror", - "-I", file("modules/graphics/src/main/native-glass/monocle/")].flatten(); - def monocleLFlags = [extraLFlags, "-ldl", "-lm"].flatten() - ---- a/buildSrc/armv7sf.gradle -+++ b/buildSrc/armv7sf.gradle -@@ -135,7 +135,6 @@ def dfbLFlags = ["-ldl"] - def lensLFlags = [extraLFlags, "-lpthread", "-ludev", "-ldl", "-lm"].flatten() - def monocleCFlags = [ - extraCFlags, -- "-Werror", - "-I", file("modules/graphics/src/main/native-glass/monocle/")].flatten(); - def monocleLFlags = [extraLFlags, "-ldl", "-lm"].flatten() - def glassCFlags = ["-ffast-math"] ---- a/buildSrc/x86egl.gradle -+++ b/buildSrc/x86egl.gradle -@@ -118,7 +118,6 @@ def extraLFlags = [ - def lensLFlags = [extraLFlags, "-lpthread", "-ludev", "-ldl", "-lm"].flatten() - def monocleCFlags = [ - extraCFlags, -- "-Werror", - "-I", file("modules/graphics/src/main/native-glass/monocle/")].flatten(); - def monocleLFlags = [extraLFlags, "-ldl", "-lm"].flatten() - --- -2.26.2 - diff --git a/dev-java/openjfx/files/8/disable-online-repos.patch b/dev-java/openjfx/files/8/disable-online-repos.patch deleted file mode 100644 index 6dd2db128e90..000000000000 --- a/dev-java/openjfx/files/8/disable-online-repos.patch +++ /dev/null @@ -1,52 +0,0 @@ ---- a/build.gradle -+++ b/build.gradle -@@ -1135,17 +1135,17 @@ allprojects { - // "artifact" in the pattern below. Note that the closed builds use different repositories - // so if you are debugging a closed-build artifact related build issue, check out the - // closed gradle file instead. -- if (!BUILD_CLOSED) { -- repositories { -- mavenCentral() -- ivy { -- url "http://download.eclipse.org/eclipse/updates/4.6/R-4.6.3-201703010400/plugins/" -- layout "pattern", { -- artifact "[artifact].[ext]" -- } -- } -- } -- } -+ // if (!BUILD_CLOSED) { -+ // repositories { -+ // mavenCentral() -+ // ivy { -+ // url "http://download.eclipse.org/eclipse/updates/4.6/R-4.6.3-201703010400/plugins/" -+ // layout "pattern", { -+ // artifact "[artifact].[ext]" -+ // } -+ // } -+ // } -+ // } - - // We want to configure all projects as java projects and use the same compile settings - // etc, except for the root project which we just want to ignore (and for now media) -@@ -1785,13 +1785,13 @@ project(":fxpackager") { - } - // fxpackager has a dependency on ant in order to build the ant jar, - // and as such needs to point to the apache binary repository -- if (!BUILD_CLOSED) { -- repositories { -- maven { -- url "https://repository.apache.org" -- } -- } -- } -+ // if (!BUILD_CLOSED) { -+ // repositories { -+ // maven { -+ // url "https://repository.apache.org" -+ // } -+ // } -+ // } - - dependencies { - compile group: "org.apache.ant", name: "ant", version: "1.8.2" diff --git a/dev-java/openjfx/files/8/don-t-force-msse.patch b/dev-java/openjfx/files/8/don-t-force-msse.patch deleted file mode 100644 index 6cdb19e5a002..000000000000 --- a/dev-java/openjfx/files/8/don-t-force-msse.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 6483d73551590e8036cd5ec6d317e8114b403f36 Mon Sep 17 00:00:00 2001 -From: Georgy Yakovlev <gyakovlev@gentoo.org> -Date: Sun, 26 Apr 2020 20:57:39 -0700 -Subject: [PATCH] don't force msse - ---- a/modules/media/src/main/native/gstreamer/projects/linux/avplugin/Makefile -+++ b/modules/media/src/main/native/gstreamer/projects/linux/avplugin/Makefile -@@ -28,7 +28,6 @@ CFLAGS = -fPIC \ - -Wformat-security \ - -Werror=implicit-function-declaration \ - -fstack-protector \ -- -msse2 \ - -fbuiltin \ - -DHAVE_STDINT_H \ - -DLINUX \ ---- a/modules/media/src/main/native/gstreamer/projects/linux/fxplugins/Makefile -+++ b/modules/media/src/main/native/gstreamer/projects/linux/fxplugins/Makefile -@@ -25,7 +25,6 @@ CFLAGS = -fPIC \ - -Wformat-security \ - -Werror=implicit-function-declaration \ - -fstack-protector \ -- -msse2 \ - -fbuiltin \ - -DHAVE_STDINT_H \ - -DLINUX \ ---- a/modules/media/src/main/native/jfxmedia/projects/linux/Makefile -+++ b/modules/media/src/main/native/jfxmedia/projects/linux/Makefile -@@ -44,7 +44,6 @@ ifdef HOST_COMPILE - -Wformat-security \ - -fstack-protector \ - -Werror=implicit-function-declaration \ -- -msse2 \ - -DGSTREAMER_LITE - - INCLUDES = $(BASE_INCLUDES) \ --- -2.26.2 - diff --git a/dev-java/openjfx/files/8/fxpackager-don-t-include-obsolete-sys-sysctl.h.patch b/dev-java/openjfx/files/8/fxpackager-don-t-include-obsolete-sys-sysctl.h.patch deleted file mode 100644 index 6fd0a9852012..000000000000 --- a/dev-java/openjfx/files/8/fxpackager-don-t-include-obsolete-sys-sysctl.h.patch +++ /dev/null @@ -1,18 +0,0 @@ -From 26d59b7c8cc2b40277756f55387606ba8a852b31 Mon Sep 17 00:00:00 2001 -From: Georgy Yakovlev <gyakovlev@gentoo.org> -Date: Fri, 18 Sep 2020 21:43:57 -0700 -Subject: [PATCH] fxpackager: don't include obsolete sys/sysctl.h - ---- a/modules/fxpackager/src/main/native/library/common/PosixPlatform.cpp -+++ b/modules/fxpackager/src/main/native/library/common/PosixPlatform.cpp -@@ -43,7 +43,6 @@ - #include <sys/types.h> - #include <sys/wait.h> - #include <unistd.h> --#include <sys/sysctl.h> - #include <iostream> - #include <dlfcn.h> - #include <signal.h> --- -2.28.0 - diff --git a/dev-java/openjfx/files/8/missing-casts.patch b/dev-java/openjfx/files/8/missing-casts.patch deleted file mode 100644 index c3d45f4f07df..000000000000 --- a/dev-java/openjfx/files/8/missing-casts.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- a/modules/graphics/src/main/native-font/pango.c -+++ b/modules/graphics/src/main/native-font/pango.c -@@ -225,7 +225,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(FcConfigAppFontAddFile) - if (text) { - // rc = (jboolean)FcConfigAppFontAddFile(arg0, text); - if (fp) { -- rc = (jboolean)((jboolean (*)(void *, const char *))fp)(arg0, text); -+ rc = (jboolean)((jboolean (*)(void *, const char *))fp)((void *)(intptr_t)arg0, text); - } - (*env)->ReleaseStringUTFChars(env, arg1, text); - } ---- a/modules/graphics/src/main/native-prism-es2/x11/X11GLContext.c -+++ b/modules/graphics/src/main/native-prism-es2/x11/X11GLContext.c -@@ -275,7 +275,7 @@ JNIEXPORT jlong JNICALL Java_com_sun_prism_es2_X11GLContext_nInitialize - dlsym(RTLD_DEFAULT, "glXSwapIntervalSGI"); - - if (ctxInfo->glXSwapIntervalSGI == NULL) { -- ctxInfo->glXSwapIntervalSGI = glXGetProcAddress("glXSwapIntervalSGI"); -+ ctxInfo->glXSwapIntervalSGI = (PFNGLXSWAPINTERVALSGIPROC)glXGetProcAddress("glXSwapIntervalSGI"); - } - - } diff --git a/dev-java/openjfx/files/8/respect_flags.patch b/dev-java/openjfx/files/8/respect_flags.patch deleted file mode 100644 index b8a0975965a8..000000000000 --- a/dev-java/openjfx/files/8/respect_flags.patch +++ /dev/null @@ -1,192 +0,0 @@ -From 102cfe6848fe3e67c3d85cca8f3c02c1f316845b Mon Sep 17 00:00:00 2001 -From: Georgy Yakovlev <gyakovlev@gentoo.org> -Date: Thu, 25 Mar 2021 10:06:49 -0700 -Subject: [PATCH] respect flags - ---- a/buildSrc/linux.gradle -+++ b/buildSrc/linux.gradle -@@ -46,6 +46,9 @@ def commonFlags = [ - "-fstack-protector", - "-W", "-Wall", "-Wno-unused", "-Wno-parentheses", "-Werror=implicit-function-declaration"] // warning flags - -+ -+commonFlags.addAll(System.getenv('CFLAGS').trim().split(" ")) -+ - if (!IS_64) { - commonFlags += "-m32" - } -@@ -61,6 +64,7 @@ def linkFlags = ["-static-libgcc", "-static-libstdc++", "-shared", commonFlags, - "-z", "relro", - "-Wl,--gc-sections"].flatten() - def defaultLinkFlags = linkFlags.flatten() -+linkFlags.addAll(System.getenv('LDFLAGS').trim().split(" ")) - - def toolchainDir - if (hasProperty('toolchainDir')) { ---- a/modules/media/src/main/native/gstreamer/projects/linux/avplugin/Makefile -+++ b/modules/media/src/main/native/gstreamer/projects/linux/avplugin/Makefile -@@ -22,7 +22,7 @@ TARGET = $(BUILD_DIR)/lib$(BASE_NAME).so - OBJBASE_DIR = $(BUILD_DIR)/obj/plugins/avplugin - endif - --CFLAGS = -fPIC \ -+CFLAGS := -fPIC \ - -Wformat \ - -Wextra \ - -Wformat-security \ -@@ -34,13 +34,8 @@ CFLAGS = -fPIC \ - -DGST_DISABLE_LOADSAVE \ - -DGSTREAMER_LITE \ - -DG_DISABLE_DEPRECATED \ -- -ffunction-sections -fdata-sections -- --ifeq ($(BUILD_TYPE), Release) -- CFLAGS += -Os --else -- CFLAGS += -g -Wall --endif -+ -ffunction-sections -fdata-sections \ -+ ${CFLAGS} - - INCLUDES= -I../../../plugins \ - -I../../../plugins/av \ -@@ -50,11 +45,12 @@ INCLUDES= -I../../../plugins \ - -I$(GLIB_DIR)/glib \ - -I$(GLIB_DIR)/gmodule - --LDFLAGS = -L$(BUILD_DIR) \ -+LDFLAGS := -L$(BUILD_DIR) \ - -z relro \ - -lgstreamer-lite \ - -lglib-lite \ -- -static-libgcc -static-libstdc++ -Wl,--gc-sections -+ -static-libgcc -static-libstdc++ -Wl,--gc-sections \ -+ ${LDFLAGS} - - ifneq ($(strip $(LIBAV_DIR)),) - INCLUDES += -I$(LIBAV_DIR)/include ---- a/modules/media/src/main/native/gstreamer/projects/linux/fxplugins/Makefile -+++ b/modules/media/src/main/native/gstreamer/projects/linux/fxplugins/Makefile -@@ -19,7 +19,7 @@ DIRLIST = progressbuffer \ - - TARGET = $(BUILD_DIR)/lib$(BASE_NAME).so - --CFLAGS = -fPIC \ -+CFLAGS := -fPIC \ - -Wformat \ - -Wextra \ - -Wformat-security \ -@@ -35,14 +35,8 @@ CFLAGS = -fPIC \ - -DGST_DISABLE_GST_DEBUG \ - -DGSTREAMER_LITE \ - -DG_DISABLE_DEPRECATED \ -- -ffunction-sections -fdata-sections -- --ifeq ($(BUILD_TYPE), Release) -- CFLAGS += -Os --else -- CFLAGS += -g -Wall --endif -- -+ -ffunction-sections -fdata-sections \ -+ ${CFLAGS} - - INCLUDES = -I$(SRCBASE_DIR) \ - $(addprefix -I$(SRCBASE_DIR)/,$(DIRLIST)) \ -@@ -52,9 +46,10 @@ INCLUDES = -I$(SRCBASE_DIR) \ - -I$(GLIB_DIR)/glib \ - -I$(GLIB_DIR)/gmodule - --LDFLAGS = -L$(BUILD_DIR) -lgstreamer-lite -lglib-lite \ -+LDFLAGS := -L$(BUILD_DIR) -lgstreamer-lite -lglib-lite \ - -z relro \ -- -static-libgcc -static-libstdc++ -Wl,--gc-sections -+ -static-libgcc -static-libstdc++ -Wl,--gc-sections \ -+ ${LDFLAGS} - - ifeq ($(ARCH), x32) - CFLAGS += -m32 ---- a/modules/media/src/main/native/gstreamer/projects/linux/glib-lite/Makefile -+++ b/modules/media/src/main/native/gstreamer/projects/linux/glib-lite/Makefile -@@ -40,20 +40,15 @@ CFLAGS += -fPIC \ - -DMATCH_LIMIT=10000000 \ - -DMATCH_LIMIT_RECURSION=10000000 - --ifeq ($(BUILD_TYPE), Release) -- CFLAGS += -Os --else -- CFLAGS += -g -Wall --endif -- - INCLUDES = -I$(SRCBASE_DIR) \ - -I$(SRCBASE_DIR)/glib \ - -I$(SRCBASE_DIR)/build/linux \ - -I$(LIBFFI_DIR)/include - --LDFLAGS = -L$(BUILD_DIR) -lffi \ -+LDFLAGS := -L$(BUILD_DIR) -lffi \ - -z relro \ -- -static-libgcc -static-libstdc++ -Wl,--gc-sections -+ -static-libgcc -static-libstdc++ -Wl,--gc-sections \ -+ ${LDFLAGS} - - ifeq ($(ARCH), x32) - CFLAGS += -m32 ---- a/modules/media/src/main/native/gstreamer/projects/linux/gstreamer-lite/Makefile -+++ b/modules/media/src/main/native/gstreamer/projects/linux/gstreamer-lite/Makefile -@@ -41,7 +41,7 @@ DIRLIST = gstreamer/gst \ - - TARGET = $(BUILD_DIR)/lib$(BASE_NAME).so - --CFLAGS =-fPIC \ -+CFLAGS :=-fPIC \ - -Wformat \ - -Wextra \ - -Wformat-security \ -@@ -56,13 +56,8 @@ CFLAGS =-fPIC \ - -DGST_DISABLE_GST_DEBUG \ - -DGST_DISABLE_LOADSAVE \ - -DG_DISABLE_DEPRECATED \ -- -ffunction-sections -fdata-sections -- --ifeq ($(BUILD_TYPE), Release) -- CFLAGS += -Os --else -- CFLAGS += -g -Wall --endif -+ -ffunction-sections -fdata-sections \ -+ ${CFLAGS} - - INCLUDES = -I$(BASE_DIR)/plugins \ - -I$(SRCBASE_DIR)/projects/build/linux/common \ -@@ -83,9 +78,10 @@ INCLUDES = -I$(BASE_DIR)/plugins \ - PACKAGES_INCLUDES := $(shell pkg-config --cflags alsa) - PACKAGES_LIBS := $(shell pkg-config --libs alsa) - --LDFLAGS = -L$(BUILD_DIR) -lm -lglib-lite $(PACKAGES_LIBS) \ -+LDFLAGS := -L$(BUILD_DIR) -lm -lglib-lite $(PACKAGES_LIBS) \ - -z relro \ -- -static-libgcc -static-libstdc++ -Wl,--gc-sections -+ -static-libgcc -static-libstdc++ -Wl,--gc-sections \ -+ ${LDFLAGS} - - ifeq ($(ARCH), x32) - CFLAGS += -m32 ---- a/modules/media/src/main/native/gstreamer/projects/linux/libffi/Makefile -+++ b/modules/media/src/main/native/gstreamer/projects/linux/libffi/Makefile -@@ -20,12 +20,6 @@ CFLAGS += -c \ - -DHAVE_AS_X86_PCREL \ - -DGSTREAMER_LITE - --ifeq ($(BUILD_TYPE), Release) -- CFLAGS += -Os --else -- CFLAGS += -O0 -g -Wall --endif -- - INCLUDES = -I$(SRCBASE_DIR)/include - - C_SOURCES = src/closures.c \ --- -2.31.0 - diff --git a/dev-java/openjfx/openjfx-8.1000-r2.ebuild b/dev-java/openjfx/openjfx-8.1000-r2.ebuild deleted file mode 100644 index 303971b7904b..000000000000 --- a/dev-java/openjfx/openjfx-8.1000-r2.ebuild +++ /dev/null @@ -1,196 +0,0 @@ -# Copyright 2020-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -JAVA_PKG_IUSE="doc source" - -inherit flag-o-matic java-pkg-2 java-pkg-simple multiprocessing toolchain-funcs - -EGRADLE_VER="4.10.3" -EHG_COMMIT="9f49e3b6147f" - -DESCRIPTION="Java OpenJFX 8 client application platform" -HOMEPAGE="https://openjfx.io" -SRC_URI=" - https://hg.openjdk.java.net/${PN}/8u-dev/rt/archive/${EHG_COMMIT}.tar.bz2 -> ${P}.tar.bz2 - https://dev.gentoo.org/~gyakovlev/distfiles/${P}-backports.tar.bz2 - https://downloads.gradle.org/distributions/gradle-${EGRADLE_VER}-bin.zip -" -# eclass overrides it, set back to normal -S="${WORKDIR}/${P}" - -LICENSE="GPL-2-with-classpath-exception" -SLOT="$(ver_cut 1)" -KEYWORDS="~amd64 ~ppc64" -IUSE="debug doc media cpu_flags_x86_sse2" -REQUIRED_USE="amd64? ( cpu_flags_x86_sse2 )" -RESTRICT="test" # needs junit version we don't have, fragile - -DEPEND=" - app-arch/unzip - >=dev-java/ant-1.10.14:0 - >=dev-java/antlr-2.7.7-r7:0 - dev-java/antlr:3 - dev-java/openjdk:8 - dev-java/stringtemplate:0 - dev-java/swt:4.10[cairo,opengl] - app-alternatives/yacc - app-alternatives/lex - virtual/jdk:1.8 - virtual/pkgconfig -" - -RDEPEND=" - dev-java/swt:4.10[cairo,opengl] - virtual/jre:1.8 -" - -# FIXME: majority of flags are honored, needs a bit more patching -QA_FLAGS_IGNORED=".*" - -JAVA_PKG_WANT_BUILD_VM="openjdk-8" -JAVA_PKG_WANT_SOURCE="1.8" -JAVA_PKG_WANT_TARGET="1.8" - -PATCHES=( - "${FILESDIR}"/8/99-sysdeps.patch - "${FILESDIR}"/8/disable-online-repos.patch - "${FILESDIR}"/8/respect_flags.patch - "${FILESDIR}"/8/0000-Fix-wait-call-in-PosixPlatform.patch - "${FILESDIR}"/8/0001-Change-Lucene.patch - "${FILESDIR}"/8/0003-fix-cast-between-incompatible-function-types.patch - "${FILESDIR}"/8/0004-Fix-Compilation-Flags.patch - "${FILESDIR}"/8/0005-don-t-include-xlocale.h.patch - "${FILESDIR}"/8/06-disable-architecture-verification.patch - "${FILESDIR}"/8/10-javadoc-locale.patch - "${FILESDIR}"/8/Wno-error.patch - "${FILESDIR}"/8/don-t-force-msse.patch - "${FILESDIR}"/8/fxpackager-don-t-include-obsolete-sys-sysctl.h.patch - "${FILESDIR}"/8/missing-casts.patch -) - -egradle() { - local GRADLE_HOME="${WORKDIR}/gradle-${EGRADLE_VER}" - local gradle="${GRADLE_HOME}/bin/gradle" - local gradle_args=( - --info - --stacktrace - --no-build-cache - --no-daemon - --offline - --gradle-user-home "${T}/gradle_user_home" - --project-cache-dir "${T}/gradle_project_cache" - ) - - export GRADLE_HOME - - # FIXME: build.gradle believes $ANT_HOME/bin/ant shoud exist - unset ANT_HOME - - einfo "gradle "${gradle_args[@]}" ${@}" - # TERM needed, otherwise gradle may fail on terms it does not know about - TERM="xterm" "${gradle}" "${gradle_args[@]}" ${@} || die "gradle failed" -} - -src_unpack() { - default - mv -v "rt-${EHG_COMMIT}" "${P}" || die -} - -src_prepare() { - eapply "${WORKDIR}/${P}-backports" - default - - # this will create local jar storage to be used as ivy repo - local d="${T}/jars" - mkdir "${d}" || die - - # we need jars subdir in every prokect so gradle can find them - # only system jars, no bundling - local target targets - targets=( - jars - buildSrc/jars - modules/{base,builders,controls,extensions,fxml}/jars - modules/{graphics,jmx,media,swing,swt,web,fxpackager}/jars - ) - einfo "Copying system jars" - for target in ${targets[@]}; do - ln -vs "${T}/jars" "${target}" || die - done - - local swt_file_name="$(java-pkg_getjars swt-4.10)" - java-pkg_jar-from --build-only --into "${d}" ant ant.jar ant-1.8.2.jar - java-pkg_jar-from --build-only --into "${d}" ant ant-launcher.jar ant-launcher-1.8.2.jar - java-pkg_jar-from --build-only --into "${d}" antlr antlr.jar antlr-2.7.7.jar - java-pkg_jar-from --build-only --into "${d}" antlr-3 antlr-tool.jar antlr-3.1.3.jar - java-pkg_jar-from --build-only --into "${d}" antlr-3 antlr-runtime.jar antlr-runtime-3.1.3.jar - java-pkg_jar-from --build-only --into "${d}" stringtemplate stringtemplate.jar stringtemplate-3.2.jar - sed -i "s#compile name: SWT_FILE_NAME#compile files(\"${swt_file_name}\")#" "${S}"/build.gradle || die - - sed -i 's/-rpath/-rpath-link/g' modules/media/src/main/native/jfxmedia/projects/linux/Makefile || die -} - -src_configure() { - # see gradle.properties.template in ${S} - cat <<- _EOF_ > "${S}"/gradle.properties - COMPILE_TARGETS = linux - GRADLE_VERSION_CHECK = false - COMPILE_AVPLUGIN = $(usex media true false) - COMPILE_MEDIA = $(usex media true false) - COMPILE_WEBKIT = false - BUILD_JAVADOC = $(usex doc true false) - BUILD_SRC_ZIP = $(usex source true false) - FULL_TEST = false - CONF = $(usex debug DebugNative Release) - NUM_COMPILE_THREADS = $(makeopts_jobs) - _EOF_ - - local repostring=' - repositories { - ivy { - url file("${projectDir}/jars") - layout "pattern", { - artifact "[artifact]-[revision].[ext]" - artifact "[artifact].[ext]" - } - } - mavenLocal() - }' - - cat <<- _EOF_ > "${S}"/buildSrc/gentoo.gradle - ${repostring} - _EOF_ - - cat <<- _EOF_ > "${S}"/gentoo.gradle - ${repostring} - allprojects { - ${repostring} - } - _EOF_ - - echo "apply from: 'gentoo.gradle'" >> build.gradle || die - echo "apply from: 'gentoo.gradle'" >> buildSrc/build.gradle || die - sed -i 's/mavenCentral/mavenLocal/g' build.gradle || die - sed -i 's/mavenCentral/mavenLocal/g' buildSrc/build.gradle || die - einfo "Configured with the following settings:" - cat gradle.properties || die - -} - -src_compile() { - append-cflags '-fcommon' - tc-export_build_env CC CXX PKG_CONFIG - rm -r tests buildSrc/src/test || die - egradle openExportLinux -} - -src_install() { - local dest="/usr/$(get_libdir)/openjdk-${SLOT}" - local ddest="${ED}${dest}" - dodir "${dest}" - pushd build/export/sdk > /dev/null || die - cp -pPRv * "${ddest}" || die - popd > /dev/null || die -} diff --git a/dev-java/poi/Manifest b/dev-java/poi/Manifest index 2bfa2caf7714..ecac6d6d0b00 100644 --- a/dev-java/poi/Manifest +++ b/dev-java/poi/Manifest @@ -1,4 +1,2 @@ DIST apache-poi-src-5.5.1-20251126.tgz 121846633 BLAKE2B 0435eac69119a6a2acf9c44e2f3a4522ab19e7b58c1f9e6fecedbcf46dc6129b369dbbe31c268d128acc2d8f8aa2a143e7e491f64ffae1ff1c517540b8b24812 SHA512 c40638012cacb52e0667af42eb397ebac28d618a882e82e6933b7833550fca7e17f636f297837616436afb79269ae6e5e110574294f2794e2366e1acbb158cac DIST apache-poi-src-5.5.1-20251126.tgz.asc 488 BLAKE2B 159f281c39863a5153e7862cd1f6b89d6c0387772caa3848caf779b6540e2e7ca94574d959e223de0b7494fd34031b0f154dda283e8d83199a634e641da763a9 SHA512 8dedc18ba861b0d1b1a63158a321a1dd05e0438b11a7d1a0f57dd2d9e06e63bc584109bc2cc5d6ceb4c5a77fd29e36e0bcade05d8e331df4552de2952061f75b -DIST poi-src-5.2.5-20231118.tgz 120325373 BLAKE2B a998b874040ac2fb136b9ffa59d30cf5939434efe59d51fc2e79c63f6fd1f3ad1679b532840f0e1975aa0fe79368951ecf2ddc0259e3dfce9fc2c34d95cb7216 SHA512 d46e94cfadc3a843d8e06033a618098dde738830f20146c6e39abd8f467aa88987719363ee2b91ecf6812e604cdc72a5c0a799676e264a6f9d3799aa4639a6c9 -DIST poi-src-5.2.5-20231118.tgz.asc 488 BLAKE2B 634ed5e3bacd71213a96b9da147348deb3dd2837f6cf47f4d76c254442504815e41b1d9a3facfaa27c927f11f1ba552acf4dc94c4ffbfd11cc70eefd054a1523 SHA512 3588d60ad1c5e59540f19e345f2cfd6600a592fda313ab53bfd280599906e9d3c44aedae8fb72409ebae67c0285b257290bdca9128a632379db894143585dd1e diff --git a/dev-java/poi/poi-5.2.5.ebuild b/dev-java/poi/poi-5.2.5.ebuild deleted file mode 100644 index e16a09749d08..000000000000 --- a/dev-java/poi/poi-5.2.5.ebuild +++ /dev/null @@ -1,60 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -# No tests, #839681 -JAVA_PKG_IUSE="doc source" -MAVEN_ID="org.apache.poi:poi-main:${PV}" - -inherit java-pkg-2 java-pkg-simple verify-sig - -DESCRIPTION="Maven build of Apache POI for Sonar checks" -HOMEPAGE="https://poi.apache.org/" -RELEASE_DATE="20231118" -SRC_URI="https://archive.apache.org/dist/poi/release/src/poi-src-${PV}-${RELEASE_DATE}.tgz - verify-sig? ( https://archive.apache.org/dist/poi/release/src/poi-src-${PV}-${RELEASE_DATE}.tgz.asc )" -S="${WORKDIR}/poi-src-${PV}-${RELEASE_DATE}" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="amd64 arm64 ppc64" - -VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/poi.apache.org.asc" -BDEPEND="verify-sig? ( sec-keys/openpgp-keys-apache-poi )" -DEPEND=" - dev-java/commons-codec:0 - dev-java/commons-collections:4 - dev-java/commons-io:1 - dev-java/commons-math:3 - dev-java/log4j-api:2 - >=dev-java/sparsebitset-1.3:0 - >=virtual/jdk-11:* -" - -RDEPEND=">=virtual/jre-1.8:*" - -JAVA_AUTOMATIC_MODULE_NAME="org.apache.poi.poi" -JAVA_CLASSPATH_EXTRA=" - commons-codec - commons-collections-4 - commons-io-1 - commons-math-3 - log4j-api-2 - sparsebitset -" -JAVA_RESOURCE_DIRS="poi/src/main/resources" -JAVA_SRC_DIR=( poi/src/main/java{,9} ) - -src_prepare() { - java-pkg-2_src_prepare - sed \ - -e "s:@VERSION@:${PV}:g" \ - -e "s:@DSTAMP@:${RELEASE_DATE}:g" \ - poi/src/main/version/Version.java.template \ - > poi/src/main/java/org/apache/poi/Version.java || die - # log4j-api does not provide Automatic-Module - sed \ - -e '/org.apache.logging.log4j/d' \ - -i poi/src/main/java9/module-info.java || die -} diff --git a/dev-java/poi/poi-5.5.1.ebuild b/dev-java/poi/poi-5.5.1.ebuild index 94dc5e44b97a..3a53ada970cd 100644 --- a/dev-java/poi/poi-5.5.1.ebuild +++ b/dev-java/poi/poi-5.5.1.ebuild @@ -16,7 +16,7 @@ S="${WORKDIR}/apache-poi-src-${PV}-${RELEASE_DATE}" LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="amd64 arm64 ~ppc64" +KEYWORDS="amd64 arm64 ppc64" BDEPEND="verify-sig? ( >=sec-keys/openpgp-keys-apache-poi-20240421 )" DEPEND=" diff --git a/dev-java/swt/Manifest b/dev-java/swt/Manifest index e3f7ac73b441..274290f156be 100644 --- a/dev-java/swt/Manifest +++ b/dev-java/swt/Manifest @@ -1,5 +1,3 @@ -DIST swt-4.10-gtk-linux-ppc64le.zip 3848264 BLAKE2B 214861fde6987906fb24f3187936f3bcb49aebed54fe242427c3737bf6761e8f77d049c376f30ca0fc33e74a1e8a48b6aff6d9863775ee9c33fea7cb2edd1309 SHA512 1b3ede58c2b41abae76f58a303bd3fbf1849ba8be3fd6518325bc22400e960c3ab542e7351b1bc08053e2746ea3e28812e04c2d1789cb1e19ea28745c8a5f39a -DIST swt-4.10-gtk-linux-x86_64.zip 3844306 BLAKE2B 0e0ed21708acce347fd025920ee635f586c460f8a9c05a7067fd70eed9da999b4a62a5febd17f0c5546ab15198336038e4ab49a1bd588d49ffb39450353a1911 SHA512 9dd946cb7c11446f553f06b8af516167519bab00d4a89f626cd612be6d18e50023fc537aa3d844a8f7a56a767df00410efe4dd20e2bfd930639330a1e279a7a0 DIST swt-4.29-gtk-linux-aarch64.zip 3836724 BLAKE2B 8c905df298688686ee22c9f2021560856f7ac7b6a92dad744b27cd30530c6ff76470fdcbb79b91ada01f28c43b8f694c334ff1337d692366ae9dc0319f7e46e2 SHA512 44ff572b57631b1b6a98192f60624758d90f54a2b2272c6bbb140ece39e65bb4086cf08fbc50c5f2e388e7b410b28fc014b87a8560062053b4c131970fa38b17 DIST swt-4.29-gtk-linux-ppc64le.zip 3860955 BLAKE2B f24f8224581425dc86926a147f2f4c644f086cb7907e03bfca64df93ef5ce8341f519acc91e90c0af4eede65797ac019c17a410ff0312306714fa26ddb4234b4 SHA512 09326b5204970d9db2cede4aebf11c7f24a47c30b6bc49764dda1d0a33fa83c7c4755797cac387d1814a29ad2574e45244b994e5df0c7ef2fd1375fc7877814b DIST swt-4.29-gtk-linux-x86_64.zip 3857122 BLAKE2B ac4416044f93eaed396ac10edb74eb5ebcbb967797109f57580bd0ac7c1e3752e8895c5ff1b315aa32b5d5b5ce8e1440badb8b9c3138a0eaeb4df63098919a8c SHA512 c92381e4d1479c219e174c027e54af781e674b266334a5e087f5821935e0a87696f40afbc9fe6f9ffaa00b5204165d9ff6476031b5e4e2df8aea1a54aeb2e65e diff --git a/dev-java/swt/files/swt-4.10-as-needed-and-flag-fixes.patch b/dev-java/swt/files/swt-4.10-as-needed-and-flag-fixes.patch deleted file mode 100644 index cb70122aa411..000000000000 --- a/dev-java/swt/files/swt-4.10-as-needed-and-flag-fixes.patch +++ /dev/null @@ -1,81 +0,0 @@ ---- a/make_linux.mak -+++ b/make_linux.mak -@@ -101,7 +101,7 @@ - WEBKIT_OBJECTS = swt.o webkitgtk.o webkitgtk_structs.o webkitgtk_stats.o webkitgtk_custom.o - GLX_OBJECTS = swt.o glx.o glx_structs.o glx_stats.o - --CFLAGS := $(CFLAGS) \ -+CFLAGS += -fPIC \ - -DSWT_VERSION=$(SWT_VERSION) \ - $(NATIVE_STATS) \ - $(SWT_DEBUG) \ -@@ -129,13 +129,13 @@ - make_swt: $(SWT_LIB) $(SWTPI_LIB) - - $(SWT_LIB): $(SWT_OBJECTS) -- $(CC) $(LFLAGS) -o $(SWT_LIB) $(SWT_OBJECTS) -+ $(CC) $(LDFLAGS) $(LFLAGS) -o $(SWT_LIB) $(SWT_OBJECTS) - - callback.o: callback.c callback.h - $(CC) $(CFLAGS) -DUSE_ASSEMBLER -c callback.c - - $(SWTPI_LIB): $(SWTPI_OBJECTS) -- $(CC) $(LFLAGS) -o $(SWTPI_LIB) $(SWTPI_OBJECTS) $(GTKLIBS) -+ $(CC) $(LDFLAGS) $(LFLAGS) -o $(SWTPI_LIB) $(SWTPI_OBJECTS) $(GTKLIBS) - - swt.o: swt.c swt.h - $(CC) $(CFLAGS) -c swt.c -@@ -154,7 +154,7 @@ - make_cairo: $(CAIRO_LIB) - - $(CAIRO_LIB): $(CAIRO_OBJECTS) -- $(CC) $(LFLAGS) -o $(CAIRO_LIB) $(CAIRO_OBJECTS) $(CAIROLIBS) -+ $(CC) $(LDFLAGS) $(LFLAGS) -o $(CAIRO_LIB) $(CAIRO_OBJECTS) $(CAIROLIBS) - - cairo.o: cairo.c cairo.h swt.h - $(CC) $(CFLAGS) $(CAIROCFLAGS) -c cairo.c -@@ -169,7 +169,7 @@ - make_awt:$(AWT_LIB) - - $(AWT_LIB): $(AWT_OBJECTS) -- $(CC) $(AWT_LFLAGS) -o $(AWT_LIB) $(AWT_OBJECTS) $(AWT_LIBS) -+ $(CC) -fPIC $(LDFLAGS) $(AWT_LFLAGS) -o $(AWT_LIB) $(AWT_OBJECTS) $(AWT_LIBS) - - # - # Atk lib -@@ -177,7 +177,7 @@ - make_atk: $(ATK_LIB) - - $(ATK_LIB): $(ATK_OBJECTS) -- $(CC) $(LFLAGS) -o $(ATK_LIB) $(ATK_OBJECTS) $(ATKLIBS) -+ $(CC) $(LDFLAGS) $(LFLAGS) -o $(ATK_LIB) $(ATK_OBJECTS) $(ATKLIBS) - - atk.o: atk.c atk.h - $(CC) $(CFLAGS) $(ATKCFLAGS) -c atk.c -@@ -198,7 +198,7 @@ - endif - - $(WEBKIT_LIB): $(WEBKIT_OBJECTS) -- $(CC) $(LFLAGS) -o $(WEBKIT_LIB) $(WEBKIT_OBJECTS) $(WEBKITLIBS) -+ $(CC) $(LDFLAGS) $(LFLAGS) -o $(WEBKIT_LIB) $(WEBKIT_OBJECTS) $(WEBKITLIBS) - - webkitgtk.o: webkitgtk.c webkitgtk_custom.h - $(CC) $(CFLAGS) $(WEBKITCFLAGS) -c webkitgtk.c -@@ -217,7 +217,7 @@ - make_webkit2extension: $(WEBKIT_EXTENSION_LIB) - - $(WEBKIT_EXTENSION_LIB) : webkitgtk_extension.o -- $(CC) $(LFLAGS) -o $@ $^ $(WEBKIT_EXTENSION_LFLAGS) -+ $(CC) $(LDFLAGS) $(LFLAGS) -o $@ $^ $(WEBKIT_EXTENSION_LFLAGS) - - webkitgtk_extension.o : webkitgtk_extension.c - $(CC) $(CFLAGS) $(WEBKIT_EXTENSION_CFLAGS) ${SWT_PTR_CFLAGS} -fPIC -c $^ -@@ -228,7 +228,7 @@ - make_glx: $(GLX_LIB) - - $(GLX_LIB): $(GLX_OBJECTS) -- $(CC) $(LFLAGS) -o $(GLX_LIB) $(GLX_OBJECTS) $(GLXLIBS) -+ $(CC) $(LDFLAGS) $(LFLAGS) -o $(GLX_LIB) $(GLX_OBJECTS) $(GLXLIBS) - - glx.o: glx.c - $(CC) $(CFLAGS) $(GLXCFLAGS) -c glx.c diff --git a/dev-java/swt/files/swt-4.10-manifest b/dev-java/swt/files/swt-4.10-manifest deleted file mode 100644 index 230d33f7bf1c..000000000000 --- a/dev-java/swt/files/swt-4.10-manifest +++ /dev/null @@ -1,16 +0,0 @@ -Manifest-Version: 1.0 -Bundle-ManifestVersion: 2 -Bundle-Name: %pluginName -Bundle-Vendor: %providerName -Bundle-Localization: plugin -Fragment-Host: org.eclipse.swt; bundle-version=4.5.1 -Bundle-SymbolicName: org.eclipse.swt.gtk.linux.SWT_ARCH; singleton:=true -Bundle-Version: 4.5 -Eclipse-PlatformFilter: (& (osgi.ws=gtk) (osgi.os=linux) (osgi.arch=SWT_ARCH)) -Export-Package: org.eclipse.swt.internal.accessibility.gtk; x-internal:=true, - org.eclipse.swt.internal.cairo; x-internal:=true, - org.eclipse.swt.internal.cde; x-internal:=true, - org.eclipse.swt.internal.gnome; x-internal:=true, - org.eclipse.swt.internal.gtk; x-internal:=true, - org.eclipse.swt.internal.opengl.glx; x-internal:=true - org.eclipse.swt.internal.webkit; x-internal:=true diff --git a/dev-java/swt/swt-4.10-r4.ebuild b/dev-java/swt/swt-4.10-r4.ebuild deleted file mode 100644 index 9c3211738446..000000000000 --- a/dev-java/swt/swt-4.10-r4.ebuild +++ /dev/null @@ -1,169 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -JAVA_PKG_IUSE="doc source" - -inherit flag-o-matic java-pkg-2 java-pkg-simple toolchain-funcs java-osgi - -MY_PV="${PV/_rc/RC}" -MY_DMF="https://archive.eclipse.org/eclipse/downloads/drops4/R-${MY_PV}-201812060815" -MY_P="${PN}-${MY_PV}" - -DESCRIPTION="GTK based SWT Library" -HOMEPAGE="https://www.eclipse.org/swt/" -SRC_URI=" - amd64? ( ${MY_DMF}/${MY_P}-gtk-linux-x86_64.zip ) - ppc64? ( ${MY_DMF}/${MY_P}-gtk-linux-ppc64le.zip )" - -LICENSE="CPL-1.0 LGPL-2.1 MPL-1.1" -SLOT="4.10" -KEYWORDS="amd64 ppc64" -IUSE="cairo opengl webkit" - -BDEPEND=" - app-arch/unzip - virtual/pkgconfig -" -COMMON_DEP=" - app-accessibility/at-spi2-core:2 - dev-libs/glib - >=x11-libs/gtk+-2.6.8:2 - x11-libs/libXtst - cairo? ( x11-libs/cairo ) - opengl? ( - virtual/glu - virtual/opengl - ) - webkit? ( - net-libs/webkit-gtk:4 - )" -DEPEND="${COMMON_DEP} - >=virtual/jdk-1.8:*[-headless-awt] - x11-base/xorg-proto - x11-libs/libX11 - x11-libs/libXrender - x11-libs/libXt - x11-libs/libXtst" -RDEPEND="${COMMON_DEP} - >=virtual/jre-1.8:* - x11-libs/libX11" - -# JNI libraries don't need SONAME, bug #253756 -QA_SONAME='usr/lib[^/]*/libswt-[^/]+.so' - -JAVA_RESOURCE_DIRS="resources" -JAVA_SRC_DIR="src" - -PATCHES=( - "${FILESDIR}"/${P}-as-needed-and-flag-fixes.patch -) - -src_unpack() { - default - unpack "./src.zip" -} - -src_prepare() { - default #780585 - java-pkg-2_src_prepare - # .css stuff is essential at least for running net-p2p/biglybt - unzip swt.jar 'org/eclipse/swt/internal/gtk/*.css' -d resources || die - java-pkg_clean - - # Define missing g_thread_supported() to be already started. - sed -i '1s/^/#define g_thread_supported() 1\n\n/' "${S}"/os_custom.h || die - - # Webext is also in the library directory - sed -i 's|findResource([^,]\+|findResource("swt"|' \ - org/eclipse/swt/browser/WebKit.java || die - - mkdir src || die "mkdir failed" - mv org src || die "moving java sources failed" - pushd src > /dev/null || die - find -type f ! -name '*.java' \ - | xargs \ - cp --parent -t ../resources -v \ - || die "copying resources failed" - popd > /dev/null || die - cp version.txt resources || die "adding version.txt failed" -} - -src_compile() { - append-cflags -fcommon # https://bugs.gentoo.org/707838 - - local JAWTSO="libjawt.so" - IFS=":" read -r -a ldpaths <<< $(java-config -g LDPATH) - - for libpath in "${ldpaths[@]}"; do - if [[ -f "${libpath}/${JAWTSO}" ]]; then - export AWT_LIB_PATH="${libpath}" - break - # this is a workaround for broken LDPATH in <=openjdk-8.292_p10 and <=dev-java/openjdk-bin-8.292_p10 - elif [[ -f "${libpath}/$(tc-arch)/${JAWTSO}" ]]; then - export AWT_LIB_PATH="${libpath}/$(tc-arch)" - break - fi - done - - if [[ -z "${AWT_LIB_PATH}" ]]; then - eerror "${JAWTSO} not found in the JDK being used for compilation!" - die "cannot build AWT library" - fi - - # Fix the pointer size for AMD64 - export SWT_PTR_CFLAGS=-DJNI64 - - # Bug #461784, g_thread_init is deprecated since glib-2.32. - append-cflags -DNO__1g_1thread_1init - - local make="emake -f make_linux.mak NO_STRIP=y CC=$(tc-getCC) CXX=$(tc-getCXX)" - - einfo "Building AWT library" - export SWT_JAVA_HOME="$(java-config -g JAVA_HOME)" - ${make} make_awt AWT_LIBS="-L\$(AWT_LIB_PATH) -Wl,-rpath,\$(AWT_LIB_PATH) -ljawt \`pkg-config --libs x11\`" - - einfo "Building SWT library" - ${make} make_swt - - einfo "Building JAVA-AT-SPI bridge" - ${make} make_atk - - if use cairo ; then - einfo "Building CAIRO support" - ${make} make_cairo - fi - - if use opengl ; then - einfo "Building OpenGL component" - ${make} make_glx - fi - - if use webkit ; then - einfo "Building WebKit component" - ${make} make_webkit - fi - - java-pkg-simple_src_compile -} - -src_install() { - local swtArch=${ARCH} - use amd64 && swtArch=x86_64 - - sed "s/SWT_ARCH/${swtArch}/" "${FILESDIR}/${PN}-${SLOT}-manifest" > "MANIFEST_TMP.MF" || die - remove_from_manifest() { - local subpkg=$1 - sed -i -e "/ org.eclipse.swt.internal.$subpkg; x-internal:=true,/d" "MANIFEST_TMP.MF" || die - } - use cairo || remove_from_manifest cairo - use opengl || remove_from_manifest opengl.glx - use webkit || remove_from_manifest webkit - java-osgi_newjar-fromfile "swt.jar" "MANIFEST_TMP.MF" "Standard Widget Toolkit for GTK 2.0" - - java-pkg_sointo "/usr/$(get_libdir)/swt" - java-pkg_doso *.so - - dodoc about.html -} |