gentoo auto-resync : 10:09:2024 - 12:30:41

10 files changed, 102 insertions, 23 deletions

diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index 5f60ed65e155..57d9e9648a08 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
diff --git a/dev-java/lucene/Manifest b/dev-java/lucene/Manifest
index 49e146710a6b..186ab7a9da5c 100644
--- a/dev-java/lucene/Manifest
+++ b/dev-java/lucene/Manifest
@@ -3,4 +3,5 @@ AUX lucene-2.4.1-skipFailingTest.patch 1010 BLAKE2B f415e401c30daf4fff339b241930
 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
+EBUILD lucene-2.4.1-r5.ebuild 2177 BLAKE2B ab63805dad7dfafd8c0e8580ee073dd49c8e85522df841e1962c94496b2574d94fd11c016b2df1eceb0bce701a9ac7533dc69514e31f207eff3e5f080c3f550d SHA512 195b23d807007c4f3de2c4d4d871821573e63068839bc806ed42d3c1b8bc704a376b32e42a08a1efab49c7008655d1392ccd3a0fa04a09dbe4e4ce3366a00091
 MISC metadata.xml 235 BLAKE2B 5144dc07ec1e929d9a5734dc5c96258dbc8292cd9710c8deb32bdb3b585964b29e7f28563f2b71fc10e8601805c8d75549315d5997c5c0544bacfbd1c554c365 SHA512 da42efb5c9e4e199aa88b5ff4c2ba647284a3f82d251ddabd7e888ffb7e0efe68f6060aa06ebf8c059f3affdf275ee787566acb355ccbc9f072f9f7f3e28f729
diff --git a/dev-java/lucene/lucene-2.4.1-r5.ebuild b/dev-java/lucene/lucene-2.4.1-r5.ebuild
new file mode 100644
index 000000000000..a3429854eef1
--- /dev/null
+++ b/dev-java/lucene/lucene-2.4.1-r5.ebuild
@@ -0,0 +1,81 @@
+# 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 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
+		ant.build.javac.source=$(java-pkg_get-source)
+		ant.build.javac.target=$(java-pkg_get-target)
+		javac.source=$(java-pkg_get-source)
+		javac.target=$(java-pkg_get-target)
+		javacc.home=${EPREFIX}/usr/share/javacc/lib/
+		junit-location.jar=$(java-pkg_getjars --build-only junit)
+	EOF
+
+	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 && eant -Dversion=${PV} javadocs-core javadocs-demo
+}
+
+src_test() {
+	ant 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/rxtx/Manifest b/dev-java/rxtx/Manifest
index bb53d99f8750..d5a54090bc83 100644
--- a/dev-java/rxtx/Manifest
+++ b/dev-java/rxtx/Manifest
@@ -4,10 +4,11 @@ AUX rxtx-2.1-7r2-nouts.diff 3583 BLAKE2B a92f5459ec2309f941ca7f8c3437a1c392da069
 AUX rxtx-2.1-7r2-ppcioh.diff 422 BLAKE2B 818bf8cf360267ed84ac7d7a4aa6ea6bc5c67c1af78b7c3db2c32f0a7f858661e5499f130f4c837fc48f5064f12d8d69ba083244e66686e0285fdd120f76700e SHA512 c7cbe130dbb9757f6a542f495589bfaeb0fbf77a03a4034bcb25366931df2dab9ef958cf7527b35e711ca874e0e196735eb49582f4de0268b04b2c4cba4974d5
 AUX rxtx-2.1-7r2-ttyPZ.diff 893 BLAKE2B 2004bf1e5d52f62cae6407630d646d00addac73bda39eafc961c94e42baf62b910ead703772747ba77207ec4f7e6d8773e5636a49903471b0fd19acedd24c801 SHA512 5f9452a2e681d903ef07c4ff0abe99917260a857c59d5b24808389a6154134f296e68d7a2bbe629200d95a2948b24d53da371cfb407f1fa88c0020600df6bab1
 AUX rxtx-2.2_pre2-add-ttyACM.patch 328 BLAKE2B 93e5ddca58bf3886c1ed7d34ef6e718d844eb067b55d9ff4fde7faa083735b135a853ebad7f9baf9ce1877fbc5cc3ce9bbd88b342aac4f040a2c0b6045629b99 SHA512 c81ae4e3f6fe09722709b6a9ae09fd3a300c9ef94641a3aa9f821b6fd4e4c28f15e9f672d2bfe6b51715f9e6b2caa5f637be20a76027cb31098062f60a0b0d0f
-AUX rxtx-2.2_pre2-fix-for-java-10+.patch 1825 BLAKE2B 5ae56268cf4e98ec78f91c4e65d17c0bccefcc297b7f34354d4de972038f894f4aa14493c8f40f4ba0ef89c93865e4384494195e93b2c2083d4612b13f54ac65 SHA512 61a1d5ced0f25cd5cd7eea7e4da57eeb933f59919c3b1137a27cf69195d08c9ad0f2d7d0a52748df2daf280c9abd5bdd4f610783b8ccaccd480b02ef1d0a8555
-AUX rxtx-2.2_pre2-fix-invalid-javadoc.patch 8268 BLAKE2B f5b40ce1dbdfa2a1ec98ad6c886a932ddfea7157ff5a2e21f7c56c32e50dfe9b220e033ced0e41f94b0432669d042eebb37dc23e0b1084127f5376fb8f1faaa1 SHA512 a86dbc331e6c3a697f09a517abdebbf450ecffdd0a90dd0b539a4ea7ccda366655e1efd626d8fd503d58a9e221be9a01ad44ac37327316149d8d0e2fb6923802
-AUX rxtx-2.2_pre2-format-security.patch 2480 BLAKE2B 5e19b8ae5d49c094a8faa84c2cd5eca513bb309836fc8f1544e142ccab5b9a53f05771f2412b2953cae3f13e1c96d8d84e1f4a1f4dfdcc3719947d5ec182cec8 SHA512 c0ed0d34c04cfe87b134c55c819af65017c30e38cce00eedd146d70bb7e3a304b92b8fa8c11f3ab9076701f71f7370b28a902c7e3fee18f46f5a6a2aea3ed66a
-AUX rxtx-2.2_pre2-limits.patch 272 BLAKE2B 8f49c4a9dbf852f444a742ab3b2b5c846d3d0035307415dd3b4ba34bf3a37179e82d63e04eeb3b553e678fcfc5d0cc3ab0651fdcbf6be20228e35d13db3bf1b0 SHA512 0e4d5b8e622515c75613aeb8c5e4fc1786f1c05ef2619b65c4b1060776933172479957b9f9a15195c79f10c90a1802956eac32cd60939b9b0a15540901e62180
+AUX rxtx-2.2_pre2-fix-for-java-10+.patch 1714 BLAKE2B 49b76a9017f8cc774f8fdc7a131e2d9e5491014491148d65c9c57ec08b765768afe63478b5b641066e1734d7e4749d2fc951115a77b517616b791cb13c5f06c1 SHA512 bec12f273ed379e3827f82f9fa835c7d555d5a8aa46d9d87c11c8d09fac1a263d1144836376462fb762881743f1fc378f5f70aa4db2ef32a3e820591d67f7bc5
+AUX rxtx-2.2_pre2-fix-invalid-javadoc.patch 8045 BLAKE2B fa0038dbbd977d51ba986018443c7295f311574628cdef0d14e43110c26be91cd8e8572bf1e2733356b7bfa84b790fe131892918624812eecff0ba9b3322809f SHA512 d077c1f68c1b8c2646e1a204e45ab5381c17a6a47d030b25d1b52b0a84be4ec803ff2361898dd6064c9a683e6c8fc9645e254db51527225e1c7849660cbdbecf
+AUX rxtx-2.2_pre2-format-security.patch 2343 BLAKE2B 7c6a7074adbc92cc16cd7009d82c2f4fd120cec6ed2e5daa57929a320340b173609bd99b077e5e3bd71f1b74e4a7cf080422fc562018c3a866e35c2bb7021e37 SHA512 78c07cdccffc20add5390892fcded4a9fb2c7d9180d90fac67b5492e53dea7f5a62413e5cec8b5a7dae79275bafb6248f99d30b32336e2153b0b770347f823df
+AUX rxtx-2.2_pre2-limits.patch 200 BLAKE2B 0cbff3d498782f6c6abbd9f347eb7711667ea390cc91595b1ee83530e554d476a6c45a79fe04c4fecbf7d61b179c09c5b4225abf494eff84932625e10976639d SHA512 2dcf5425566a65781639193e82d7ab5995f6f1dae4fcc6c4d450a6628c4f6d8e5049ee5deb6f2051d6cac1046d48d0e779bdb5c151b16d4b353515981cc0659b
+AUX rxtx-2.2_pre2-missing-include.patch 181 BLAKE2B 4dae43426efde9858e180dca6535ac604672dbc30e39b1c8cc070295f79cff47b2a8bbd08003644e33ac9fc06d0e63d15b4e4c38183378a7a0c94684eaf68325 SHA512 b266d4bd6a53204cfc43451cdfab88b5ea17139e9da2b4eb758121e2fa2a4e1f686767b5488b0e1906640f12f898f9d27e1260659c336f60192d96132236d66d
 DIST rxtx-2.2pre2.zip 1491209 BLAKE2B fe115833ee89cfe9a3ae58117ac4a4326e8f79e6fdc0528cb8dd2824e231c862e4b421c94784059e4cf03f6cc93a32636444916a5c8cebe002da470b460bf23b SHA512 cd94bd08bc8b5689fc9a0e539f17645f530a3a280998e9838a2e4c8b3386f2b00a592ab41c07bd720eadf26fddb324bf80d8f7b9ecb35ea8507120c16048f514
-EBUILD rxtx-2.2_pre2-r2.ebuild 2752 BLAKE2B 4b8ec7df31ef7fce2cedd4b82722f1702205bbcebf55fe7656570ae9108f0f26d59c9a996d08a7b6f7b447a7c9a213b5b5876f1c8e58a6cc0d6134b863deb4d8 SHA512 85e77dc19acc5bac48e58a10a03309b36733927e73693c071c19fcb12dd76c2bc1a858dbc0e43b8b640ce65e585efac0c0935ebdd9dc67e0bf3af2307c32b4fd
+EBUILD rxtx-2.2_pre2-r2.ebuild 2801 BLAKE2B 9e367542b33fff0e01ccd8d27154309133825718228b66c77e3a5ced7422929c5cda79940fcfe6df24cc989ead000fb5873b7784b0b4ed7739acd12d607af4c8 SHA512 5e93daab46df5dba7ea7952b63c05bb40485b01d0a1ccdd43244653fb9cb86f133abe8779ca5c5bd02968a83209e202f2d28c37e8b4d4109dceb89d7fa3fc656
 MISC metadata.xml 334 BLAKE2B b86a021232d18fba74442a66f689351c6440a1cca9be38d526ec2c9e65fa634f1cb265177d974bdf6b6f764c1df9531f75346f69ac071de6ed3f880eb09a3f44 SHA512 cb51df875f3ab1e39a5141ffe2cf79fed88339a9bf2bcb747be78b5986035dd5925fccd120cdb54ab8ab4e0371eda1cb9412f141bcc7583cb55f7bcf85a3683a
diff --git a/dev-java/rxtx/files/rxtx-2.2_pre2-fix-for-java-10+.patch b/dev-java/rxtx/files/rxtx-2.2_pre2-fix-for-java-10+.patch
index 366bb78c2cba..9ed045fef250 100644
--- a/dev-java/rxtx/files/rxtx-2.2_pre2-fix-for-java-10+.patch
+++ b/dev-java/rxtx/files/rxtx-2.2_pre2-fix-for-java-10+.patch
@@ -16,10 +16,6 @@ https://salsa.debian.org/java-team/rxtx/-/blob/6500bd55f265de7d2dfef68dc1df5d8b9
 
 Bug: https://bugs.gentoo.org/831394
 
----
-Description: Fixes the build failure with Java 10
-Author: Emmanuel Bourg <ebourg@apache.org>
-Forwarded: no
 --- a/Makefile.am
 +++ b/Makefile.am
 @@ -111,11 +111,6 @@
diff --git a/dev-java/rxtx/files/rxtx-2.2_pre2-fix-invalid-javadoc.patch b/dev-java/rxtx/files/rxtx-2.2_pre2-fix-invalid-javadoc.patch
index a00ed96f7e5a..b734ac7ffd25 100644
--- a/dev-java/rxtx/files/rxtx-2.2_pre2-fix-invalid-javadoc.patch
+++ b/dev-java/rxtx/files/rxtx-2.2_pre2-fix-invalid-javadoc.patch
@@ -5,12 +5,6 @@ Subject: [PATCH] Fix invalid Javadoc syntax that leads to errors
 
 Bug: https://bugs.gentoo.org/642030
 Signed-off-by: Yuan Liao <liaoyuan@gmail.com>
----
- src/gnu/io/RXTXPort.java | 50 ++++++++++++++++++++++------------------
- 1 file changed, 27 insertions(+), 23 deletions(-)
-
-diff --git a/src/gnu/io/RXTXPort.java b/src/gnu/io/RXTXPort.java
-index 622a6a8..77a23ea 100644
 --- a/src/gnu/io/RXTXPort.java
 +++ b/src/gnu/io/RXTXPort.java
 @@ -1732,7 +1732,7 @@ Documentation is at http://java.sun.com/products/jdk/1.2/docs/api/java/io/InputS
diff --git a/dev-java/rxtx/files/rxtx-2.2_pre2-format-security.patch b/dev-java/rxtx/files/rxtx-2.2_pre2-format-security.patch
index 1337cce3c546..2d060c338429 100644
--- a/dev-java/rxtx/files/rxtx-2.2_pre2-format-security.patch
+++ b/dev-java/rxtx/files/rxtx-2.2_pre2-format-security.patch
@@ -4,11 +4,6 @@ https://salsa.debian.org/java-team/rxtx/-/blob/6500bd55f265de7d2dfef68dc1df5d8b9
 
 Bug: https://bugs.gentoo.org/550534
 
----
-From: tony mancill <tmancill@debian.org>
-Forwarded: no
-Description: use format specifiers in fprintf statements for hardening flags
-
 --- a/src/SerialImp.c
 +++ b/src/SerialImp.c
 @@ -5108,7 +5108,7 @@
diff --git a/dev-java/rxtx/files/rxtx-2.2_pre2-limits.patch b/dev-java/rxtx/files/rxtx-2.2_pre2-limits.patch
index 1e4ff4af57b7..9a69c64029db 100644
--- a/dev-java/rxtx/files/rxtx-2.2_pre2-limits.patch
+++ b/dev-java/rxtx/files/rxtx-2.2_pre2-limits.patch
@@ -1,5 +1,5 @@
---- src/lfd/lockdaemon.c.orig	2007-04-26 06:26:07.000000000 +0100
-+++ src/lfd/lockdaemon.c	2016-02-17 20:41:09.137509089 +0000
+--- src/lfd/lockdaemon.c.orig
++++ src/lfd/lockdaemon.c
 @@ -69,6 +69,7 @@
  #include <errno.h>
  #include <signal.h>
diff --git a/dev-java/rxtx/files/rxtx-2.2_pre2-missing-include.patch b/dev-java/rxtx/files/rxtx-2.2_pre2-missing-include.patch
new file mode 100644
index 000000000000..b56fe43092d0
--- /dev/null
+++ b/dev-java/rxtx/files/rxtx-2.2_pre2-missing-include.patch
@@ -0,0 +1,10 @@
+--- a/src/SerialImp.c
++++ b/src/SerialImp.c
+@@ -146,6 +146,7 @@
+ #ifdef LIBLOCKDEV
+ #include	<lockdev.h>
+ #endif /* LIBLOCKDEV */
++#include <sys/sysmacros.h>
+ 
+ extern int errno;
+ 
diff --git a/dev-java/rxtx/rxtx-2.2_pre2-r2.ebuild b/dev-java/rxtx/rxtx-2.2_pre2-r2.ebuild
index 2d39447cb63b..460474c3ba23 100644
--- a/dev-java/rxtx/rxtx-2.2_pre2-r2.ebuild
+++ b/dev-java/rxtx/rxtx-2.2_pre2-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -46,6 +46,7 @@ src_prepare() {
 	eapply "${FILESDIR}/${P}-format-security.patch"
 	eapply "${FILESDIR}/${P}-fix-invalid-javadoc.patch"
 	eapply "${FILESDIR}/${P}-fix-for-java-10+.patch"
+	eapply "${FILESDIR}/${P}-missing-include.patch"
 	eapply_user
 
 	rm acinclude.m4 || die