From bfd63d5b0e96ad32e0d0a8fe15512b6a9ac6fc9e Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 21 May 2024 00:05:36 +0100 Subject: gentoo auto-resync : 21:05:2024 - 00:05:35 --- dev-java/Manifest.gz | Bin 55173 -> 55185 bytes dev-java/commons-logging/Manifest | 2 - .../commons-logging-1.3.0_pre20230319.ebuild | 121 --------------------- dev-java/lucene/Manifest | 7 +- .../lucene/files/lucene-2.4.1-javacc.home.patch | 13 +++ .../files/lucene-2.4.1-skipFailingTest.patch | Bin 0 -> 1012 bytes dev-java/lucene/lucene-2.4.1-r3.ebuild | 83 -------------- dev-java/lucene/lucene-2.4.1-r4.ebuild | 82 ++++++++++++++ 8 files changed, 100 insertions(+), 208 deletions(-) delete mode 100644 dev-java/commons-logging/commons-logging-1.3.0_pre20230319.ebuild create mode 100644 dev-java/lucene/files/lucene-2.4.1-javacc.home.patch create mode 100644 dev-java/lucene/files/lucene-2.4.1-skipFailingTest.patch delete mode 100644 dev-java/lucene/lucene-2.4.1-r3.ebuild create mode 100644 dev-java/lucene/lucene-2.4.1-r4.ebuild (limited to 'dev-java') diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz index eea4536d1942..d32a713d5d87 100644 Binary files a/dev-java/Manifest.gz and b/dev-java/Manifest.gz differ diff --git a/dev-java/commons-logging/Manifest b/dev-java/commons-logging/Manifest index d24c18f879f9..bbdcbf499dca 100644 --- a/dev-java/commons-logging/Manifest +++ b/dev-java/commons-logging/Manifest @@ -1,6 +1,4 @@ -DIST commons-logging-1.3.0_pre20230319.tar.gz 184984 BLAKE2B 01b46bdb657dfaf3ffb55b3440b416d61a419a3358e4d240cc7e25794f38e0061e14ee77e5578aedf1b50006d6ec65016c9e837bd13c4dab9a2182604fe85c72 SHA512 b586be5dd891572aa55c3066c3fb7d57ba5f31c0bfaa768b80cd8c1c5c659a8c718b4cb42e6c65332b52f073462432c0f81e4aaf1535afb781da9a7884cdc07e DIST commons-logging-1.3.1-src.tar.gz 189156 BLAKE2B 23308b2bff6ea67620b0f07f49a63ffdbd07833fc0d9a6654386f4c17c9125abef5ad2afb6d8c798dcb98bc3e99bd8d94d35b9deec569c3aec1dde20f69e1a1d SHA512 ffda970d086601df4b476caf8bd01d1bdc22dd7f8846a22287036f7f000ce6cf0a757d16621910f041f8d90aa6066819454b3977dd005ca66817bec59e91e91f DIST commons-logging-1.3.1-src.tar.gz.asc 488 BLAKE2B 3225a62f6269224f1b52907631be03d97cde65d1c7a76c06b6a23b9e30b1cee08b048eb4fdaa41b0a6b5bcf090b54c9dc54307fb1629b039b786fd426572a4d1 SHA512 6f13f85a5aeab1099ebfca38a6173384050b1f1c2e7eac93d978587c92751ddd24d583e39bc5a949f0caec66ca141d265147e63e9e2afea2094bda4667936a86 -EBUILD commons-logging-1.3.0_pre20230319.ebuild 4184 BLAKE2B 3ece0c8ce0d4be3b106d3986bdd935f9e302287993816989965bfe32fe9880eae6770666071917d95d4b9ba4f1b16f5e5ddbaa19ed1e7b98feb74eac53f61f2f SHA512 a96e5f06f4b990f76761a0d6a3e64f58f1ae021a312bbaea0ca66a1a095fb3a808f231bd042636227454ca2692d67fc432d52d49ec962e6a7c803a70ed0e740a EBUILD commons-logging-1.3.1.ebuild 5391 BLAKE2B 884971f43e1de90ae8e96cd3bb1ccc19fc56b86458210bb62728c8637d736bb5e76a642dd048d7be89e981ed19d6404331a96acfcff7e7f406e70ca1367f993d SHA512 3c5b7dcb4d9c53588a425b3ad01df9a20544f3c63444e810a49825fd6e94f5d07b968d971e302f027aa8e0d6745062544806c5efed3abfbdcae60f10ca7e4531 MISC metadata.xml 549 BLAKE2B b20c8451a73329dbdb8aa88120543b948014115d754a84e8a77a8f61b9134277a7849fc10e35323c028a32d69f6e45702200e06af4481bf5238f5d848b3ccc03 SHA512 105c2bdf3eed380f11be1b8987a08fbcf1b6e6cbbb00c0e38e4813875865abd65c9be85267d5b49486913fdb0635b7329b5c4e84a86d9f93f9dcdad74c336ff0 diff --git a/dev-java/commons-logging/commons-logging-1.3.0_pre20230319.ebuild b/dev-java/commons-logging/commons-logging-1.3.0_pre20230319.ebuild deleted file mode 100644 index e7ce766be362..000000000000 --- a/dev-java/commons-logging/commons-logging-1.3.0_pre20230319.ebuild +++ /dev/null @@ -1,121 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -JAVA_PKG_IUSE="doc source test" -MAVEN_ID="commons-logging:commons-logging:1.3.0" -JAVA_TESTING_FRAMEWORKS="junit-4" - -inherit java-pkg-2 java-pkg-simple - -DESCRIPTION="Thin adapter allowing configurable bridging to other well known logging systems" -HOMEPAGE="https://commons.apache.org/proper/commons-logging/" -MY_COMMIT="d376d3128663e53de4af948e161291e7ec0c6ec1" -SRC_URI="https://github.com/apache/${PN}/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz" -S="${WORKDIR}/${PN}-${MY_COMMIT}" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" -IUSE="log4j" - -CDEPEND=" - log4j? ( - dev-java/log4j-12-api:2 - dev-java/log4j-api:2 - dev-java/log4j-core:2 - ) -" - -DEPEND="${CDEPEND} - dev-java/javax-servlet-api:2.5 - >=virtual/jdk-1.8:* -" - -RDEPEND="${CDEPEND} - >=virtual/jre-1.8:*" - -DOCS=( README.md src/changes/changes.xml ) - -JAVA_AUTOMATIC_MODULE_NAME="org.apache.commons.logging" -JAVA_ENCODING="iso-8859-1" -JAVA_CLASSPATH_EXTRA="javax-servlet-api-2.5" -JAVA_SRC_DIR="src/main/java" - -src_prepare() { - java-pkg-2_src_prepare - # https://avalon.apache.org/closed.html Apache Avalon has closed. - rm src/main/java/org/apache/commons/logging/impl/{Avalon,LogKit}Logger.java || die - rm src/test/java/org/apache/commons/logging/{avalon/AvalonLogger,logkit/Standard}TestCase.java || die - - if use !log4j; then - rm src/main/java/org/apache/commons/logging/impl/Log4JLogger.java || die - fi -} - -src_compile() { - if use log4j; then - JAVA_GENTOO_CLASSPATH="log4j-12-api-2,log4j-api-2,log4j-core-2" - fi - java-pkg-simple_src_compile - - pushd target/classes > /dev/null || die - - # Need Automatic-Module-Name also for the other JAR files - jar xvf ../../commons-logging.jar META-INF/MANIFEST.MF || die - - # https://github.com/apache/commons-logging/blob/058cf5ee350cd83d1ab28b000ad6be903ca160c5/pom.xml#L215-L236 - jar -cvfm ../../commons-logging-api.jar META-INF/MANIFEST.MF \ - $(find . -type f -name '*.class' \ - ! -name 'Jdk13LumberjackLogger.class' \ - ! -name 'ServletContextCleaner.class' \ - ) || die - - # https://github.com/apache/commons-logging/blob/058cf5ee350cd83d1ab28b000ad6be903ca160c5/pom.xml#L240-L257 - jar -cvfm ../../commons-logging-adapters.jar META-INF/MANIFEST.MF \ - $(find . -type f -path './org/apache/commons/logging/impl/**.class' \ - ! -name 'WeakHashtable*.class' \ - ! -name 'LogFactoryImpl*.class' \ - ) || die - - popd > /dev/null || die -} - -src_test() { - # Do not run Log4j tests because these tests use an Appender to verify - # logging correctness. The log4j-12-api bridge no longer supports using an - # Appender for verifications since the methods for adding an Appender in - # the bridge "are largely no-ops". This means an Appender's state would - # never be changed by log4j-12-api after new messages are logged. The test - # cases, however, expect changes to the Appender's state in such an event, - # so they would fail with log4j-12-api. - # https://logging.apache.org/log4j/log4j-2.8/log4j-1.2-api/index.html - rm src/test/java/org/apache/commons/logging/pathable/ParentFirstTestCase.java || die # Log4JLogger - rm src/test/java/org/apache/commons/logging/pathable/ChildFirstTestCase.java || die # Log4JLogger - rm -r src/test/java/org/apache/commons/logging/log4j || die - - JAVA_TEST_EXCLUDES=( - org.apache.commons.logging.security.SecurityForbiddenTestCase # 2 tests 1 failing - org.apache.commons.logging.jdk14.TestHandler # No runnable methods - ) - JAVA_TEST_EXTRA_ARGS=( - -Dservlet-api="$(java-pkg_getjars javax-servlet-api-2.5)" - -Dcommons-logging="commons-logging.jar" - -Dcommons-logging-api="commons-logging-api.jar" - -Dcommons-logging-adapters="commons-logging-adapters.jar" - -Dtestclasses="target/test-classes" - ) - if use log4j; then - JAVA_TEST_EXTRA_ARGS+=" -Dlog4j12=$(java-pkg_getjars log4j-12-api-2,log4j-core-2)" - fi - JAVA_TEST_GENTOO_CLASSPATH="junit-4" - JAVA_TEST_RESOURCE_DIRS="src/test/resources" - JAVA_TEST_SRC_DIR="src/test/java" - java-pkg-simple_src_test -} - -src_install() { - java-pkg-simple_src_install - java-pkg_dojar commons-logging-api.jar commons-logging-adapters.jar -} diff --git a/dev-java/lucene/Manifest b/dev-java/lucene/Manifest index 06c505bdaabc..db5d135b98d7 100644 --- a/dev-java/lucene/Manifest +++ b/dev-java/lucene/Manifest @@ -1,3 +1,6 @@ -DIST lucene-2.4.1.tar.gz 5057003 BLAKE2B 3e2a29cfa94b367f1e62f60a2f7b7e195c788048564fb061ade4b1babcb2fd71e36b282049d3816c3faaaa3dacc07f4a7dbdb0504a659ea3ab8e06e247debcba SHA512 cf227eea4aeee904ccf5316ee7f2399864bf28b9c01e044ef27232dd483c3a5f0ecc8836633f44acfa41ffee6bf1c530e756ef45fa77ac1d15e1f83129b7aa5e -EBUILD lucene-2.4.1-r3.ebuild 2072 BLAKE2B 4b247db9d5730206b28ec413615a99a8d097c80085469e589e567c81eeb0f14143f9b3b276411083136bf91f6241a66802faf0805c13137dea010711dec10297 SHA512 d2bc9f55e5efe2f7b5a0af5a8f6731fff2b59f9322dcf0d86ea6e3b25eb914e944183a9216faf272c1ff8868d23a078862bf31aa6d82f4115916c4f5e87e5138 +AUX lucene-2.4.1-javacc.home.patch 349 BLAKE2B 84c84886c40848052358b835c2bd5f3dec031c583bac8db9060b0a2e02a79e142ee2d1ea6e156179eb6de6b54aa22bea97ace36313222be0b65d6fb0d54a40b6 SHA512 83e57c94d3e432b0a1a4ec2d4d1d1acebd0b0ea451f0c39f03b5a62a0c8978da541de0009b4956c1672097df7f2c816c73590ec6077533d73a9d2309597cde1c +AUX lucene-2.4.1-skipFailingTest.patch 1012 BLAKE2B c0af8c7f4c06f16a77e6de18eaf38b5a7b8178d4627e617a854950b2050553d4895cfc687ce4217ed6a442c8af599fda35ea8fe8c2887912e989fc71bc5f5617 SHA512 37838db1079f9bdee1ac364b713cb65f1579387132b50dd6a769478f2b0a4406b3595264354710135444aa5a16267a2d94a9708f3edb805deb74edff864d7643 +DIST lucene-2.4.1-src.tar.gz 5057003 BLAKE2B 3e2a29cfa94b367f1e62f60a2f7b7e195c788048564fb061ade4b1babcb2fd71e36b282049d3816c3faaaa3dacc07f4a7dbdb0504a659ea3ab8e06e247debcba SHA512 cf227eea4aeee904ccf5316ee7f2399864bf28b9c01e044ef27232dd483c3a5f0ecc8836633f44acfa41ffee6bf1c530e756ef45fa77ac1d15e1f83129b7aa5e +DIST lucene-2.4.1-src.tar.gz.asc 189 BLAKE2B 614fc428936d49caac1072e5c4fe5a31d86545220483f1e60fee6560b3bf1d661eb718013c8211ff701758aff37ebe3ffe18bb0a94d90b75962d1e74b8005f6b SHA512 38eee5a062ca11c638b3a0e131ffe133b49e9c759216d854f2be99e27a8445408b1097df28436e6155f551df0ddf9ca16a286652c9ce12dc114228bbd125dba2 +EBUILD lucene-2.4.1-r4.ebuild 2083 BLAKE2B d862647f006b0115168d1299934927e80f6db03fdc95b66985343736e4fa50e7e96e3a5e37d9c637ae5670e16974ddecdf5bf1046cf26481d1849498395f4e9a SHA512 163b9ad1667e8a1be7cec2d1b62dc0304b3e9d144570a185f89470b710c1439b6de80ad4b4245bcd03acfc667ac28cf5b3401b314af3755d573fc28e6d1cd5f7 MISC metadata.xml 235 BLAKE2B 5144dc07ec1e929d9a5734dc5c96258dbc8292cd9710c8deb32bdb3b585964b29e7f28563f2b71fc10e8601805c8d75549315d5997c5c0544bacfbd1c554c365 SHA512 da42efb5c9e4e199aa88b5ff4c2ba647284a3f82d251ddabd7e888ffb7e0efe68f6060aa06ebf8c059f3affdf275ee787566acb355ccbc9f072f9f7f3e28f729 diff --git a/dev-java/lucene/files/lucene-2.4.1-javacc.home.patch b/dev-java/lucene/files/lucene-2.4.1-javacc.home.patch new file mode 100644 index 000000000000..9668b6de1ff4 --- /dev/null +++ b/dev-java/lucene/files/lucene-2.4.1-javacc.home.patch @@ -0,0 +1,13 @@ +diff --git a/common-build.xml b/common-build.xml +index 3fa75d1..1e695cf 100644 +--- a/common-build.xml ++++ b/common-build.xml +@@ -110,7 +110,7 @@ + + + task - # doesn't use it - it's to fool the test, first time - # it's useful not to have ignoresystemclasses=true... - ANT_TASKS="ant-core javacc" \ - eant \ - -Djavacc.home="${EPREFIX}"/usr/share/javacc/lib \ - javacc - ANT_TASKS="none" \ - eant \ - -Dversion=${PV} \ - jar-core \ - jar-demo \ - $(use_doc javadocs-core javadocs-demo) -} - -src_test() { - java-ant_rewrite-classpath common-build.xml - EANT_GENTOO_CLASSPATH="junit ant-core" \ - ANT_TASKS="ant-junit" \ - eant \ - test-core -} - -src_install() { - einstalldocs - java-pkg_newjar "build/${PN}-core-${PV}.jar" "${PN}-core.jar" - java-pkg_newjar "build/${PN}-demos-${PV}.jar" "${PN}-demos.jar" - - if use doc; then - dodoc -r docs - java-pkg_dohtml -r build/docs/api - fi - use source && java-pkg_dosrc src/java/org -} diff --git a/dev-java/lucene/lucene-2.4.1-r4.ebuild b/dev-java/lucene/lucene-2.4.1-r4.ebuild new file mode 100644 index 000000000000..c69bb031e695 --- /dev/null +++ b/dev-java/lucene/lucene-2.4.1-r4.ebuild @@ -0,0 +1,82 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +JAVA_PKG_IUSE="doc source test" + +inherit java-pkg-2 java-ant-2 verify-sig + +DESCRIPTION="High-performance, full-featured text search engine written entirely in Java" +HOMEPAGE="https://lucene.apache.org" +SRC_URI="https://archive.apache.org/dist/${PN}/java/${P}-src.tar.gz + verify-sig? ( https://archive.apache.org/dist/${PN}/java/${P}-src.tar.gz.asc )" + +LICENSE="Apache-2.0" +SLOT="2.4" +KEYWORDS="~amd64 ~x86" + +VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/lucene.apache.org.asc" +BDEPEND="verify-sig? ( sec-keys/openpgp-keys-apache-lucene )" + +# Restricting to jdk:1.8 since it fails to build with openjdk-17 +# BUILD FAILED +# /var/tmp/portage/dev-java/lucene-2.4.1-r3/work/lucene-2.4.1/build.xml:52: \ +# rmic does not exist under Java 15 and higher, +# use rmic of an older JDK and explicitly set the executable attribute +DEPEND=" + dev-java/javacc:0 + virtual/jdk:1.8 + test? ( + >=dev-java/ant-1.10.14-r3:0[junit] + dev-java/junit:0 + )" + +RDEPEND=">=virtual/jre-1.8:*" + +PATCHES=( + "${FILESDIR}/lucene-2.4.1-skipFailingTest.patch" + "${FILESDIR}/lucene-2.4.1-javacc.home.patch" +) + +src_prepare() { + default #780585 + java-pkg-2_src_prepare + java-pkg_clean + + cat > build.properties <<-EOF || die + junit-location.jar=$(java-pkg_getjars --build-only junit) + javacc.home=${EPREFIX}/usr/share/javacc/lib/ + EOF + # stop scrambling the build.xml + touch "${T}/java-ant-2_src_configure-run" + + rm docs/skin/images/instruction_arrow.png || die #: broken IDAT window length + rm docs/images/instruction_arrow.png || die #: broken IDAT window length +} + +src_compile() { + eant javacc + + eant \ + -Dversion=${PV} \ + jar-core \ + jar-demo \ + $(use_doc javadocs-core javadocs-demo) +} + +src_test() { + eant test-core +} + +src_install() { + einstalldocs + java-pkg_newjar "build/${PN}-core-${PV}.jar" "${PN}-core.jar" + java-pkg_newjar "build/${PN}-demos-${PV}.jar" "${PN}-demos.jar" + + if use doc; then + dodoc -r docs + java-pkg_dohtml -r build/docs/api + fi + use source && java-pkg_dosrc src/java/org +} -- cgit v1.2.3