Merge updates from master

2026-08-23 18:38:08 -07:00 · 2026-04-13 20:30:57 +00:00
parent 2bebb3b7bc 9c0e8191dc
commit d2da118fa4
13 changed files with 0 additions and 628 deletions
--- a/dev-java/bnd-ant/Manifest
+++ b/dev-java/bnd-ant/Manifest
@@ -1,2 +1 @@
-DIST aQute.bnd-7.1.0.tar.gz 173448302 BLAKE2B 53c7fbbde15f27b0f96e1685ce7d4a03951360f57c9139ee36013138fae70034b0fe6b72300c2d9a0fe9dc5d2f8b5a75462e396e0383dd8b46237b43021bb35b SHA512 161a383b37cd2e6f75958d68c476c1e4fa581afc095e6c6081e4aa1822672f7ace0ec0948ee6bd5eba0c5d3490ef081bb7f4e5851ef590d4e6b9634a75963028
 DIST aQute.bnd-7.2.1.tar.gz 173798560 BLAKE2B 49aa3412633797899f73c908da168d51e84bc071f12a5ed8e9fc5509fee17ba85fdc19c642b11e331f31309aaf2c548e5ce14d58d6591a29c9f264cf2759b83d SHA512 f2bf66ac6abea03bdb22278ce2b9177e56ad9621d667d9dfaf0f42490e11edc2911a09e482892f0345dd2a7e39803e8f5ac829d41770a737817aee1a236e0924
--- a/dev-java/bnd-ant/bnd-ant-7.1.0.ebuild
+++ b/dev-java/bnd-ant/bnd-ant-7.1.0.ebuild
@@ -1,46 +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"
-MAVEN_ID="biz.aQute.bnd:biz.aQute.bnd.ant:${PV}"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Bnd Ant Tasks"
-HOMEPAGE="https://bnd.bndtools.org/"
-SRC_URI="https://github.com/bndtools/bnd/archive/${PV/_rc/.RC}.tar.gz -> aQute.bnd-${PV}.tar.gz"
-S="${WORKDIR}/bnd-${PV/_rc/.RC}"
-
-LICENSE="Apache-2.0 EPL-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64"
-
-DEPEND="
-	dev-java/ant:0
-	~dev-java/bnd-${PV}:0
-	>=virtual/jdk-17:*"
-RDEPEND=">=virtual/jre-17:*"
-
-JAVA_AUTOMATIC_MODULE_NAME="biz.aQute.bnd.ant"
-JAVA_CLASSPATH_EXTRA="
-	ant
-	bnd
-"
-
-JAVA_RESOURCE_DIRS="res"
-JAVA_SRC_DIR="biz.aQute.bnd.ant/src"
-
-src_prepare() {
-	default #780585
-	java-pkg-2_src_prepare
-	mkdir res || die
-
-	# java-pkg-simple wants resources in JAVA_RESOURCE_DIRS
-	pushd biz.aQute.bnd.ant/src > /dev/null || die
-		find -type f \
-			! -name '*.java' \
-			| xargs cp --parent -t ../../res || die
-	popd > /dev/null || die
-}
--- a/dev-java/bnd/Manifest
+++ b/dev-java/bnd/Manifest
@@ -1,2 +1 @@
-DIST aQute.bnd-7.1.0.tar.gz 173448302 BLAKE2B 53c7fbbde15f27b0f96e1685ce7d4a03951360f57c9139ee36013138fae70034b0fe6b72300c2d9a0fe9dc5d2f8b5a75462e396e0383dd8b46237b43021bb35b SHA512 161a383b37cd2e6f75958d68c476c1e4fa581afc095e6c6081e4aa1822672f7ace0ec0948ee6bd5eba0c5d3490ef081bb7f4e5851ef590d4e6b9634a75963028
 DIST aQute.bnd-7.2.1.tar.gz 173798560 BLAKE2B 49aa3412633797899f73c908da168d51e84bc071f12a5ed8e9fc5509fee17ba85fdc19c642b11e331f31309aaf2c548e5ce14d58d6591a29c9f264cf2759b83d SHA512 f2bf66ac6abea03bdb22278ce2b9177e56ad9621d667d9dfaf0f42490e11edc2911a09e482892f0345dd2a7e39803e8f5ac829d41770a737817aee1a236e0924
--- a/dev-java/bnd/bnd-7.1.0-r3.ebuild
+++ b/dev-java/bnd/bnd-7.1.0-r3.ebuild
@@ -1,110 +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"
-MAVEN_ID="biz.aQute.bnd:biz.aQute.bnd:${PV}"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="bndlib: A Swiss Army Knife for OSGi"
-HOMEPAGE="https://bnd.bndtools.org/"
-SRC_URI="https://github.com/bndtools/bnd/archive/${PV/_rc/.RC}.tar.gz -> aQute.bnd-${PV}.tar.gz"
-S="${WORKDIR}/${P/_rc/.RC}"
-
-LICENSE="Apache-2.0 EPL-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64"
-
-BDEPEND="app-arch/zip"
-
-CP_DEPEND="
-	~dev-java/bndlib-${PV}:0
-	dev-java/felix-resolver:0
-	dev-java/guava:0
-	<=dev-java/javaparser-core-3.13.10:0
-	dev-java/jline:2
-	dev-java/jtwig-core:0
-	dev-java/osgi-annotation:0
-	dev-java/osgi-cmpn:8
-	dev-java/osgi-core:0
-	dev-java/slf4j-simple:0
-	dev-java/snakeyaml:1
-	dev-java/xz-java:0
-"
-
-DEPEND="${CP_DEPEND}
-	dev-java/commons-lang:3.6
-	dev-java/eclipse-jdt-annotation:0
-	dev-java/felix-gogo-runtime:0
-	dev-java/jtwig-reflection:0
-	dev-java/osgi-service-log:0
-	dev-java/osgi-service-subsystem:0
-	>=virtual/jdk-17:*"
-
-RDEPEND="${CP_DEPEND}
-	~dev-java/bnd-annotation-${PV}:0
-	~dev-java/bnd-util-${PV}:0
-	~dev-java/libg-${PV}:0
-	dev-java/slf4j-api:0
-	>=virtual/jre-17:*"
-
-PATCHES=(
-	"${FILESDIR}/bnd-7.0.0-aQute.bnd.main.bnd.patch"
-)
-
-JAVA_AUTOMATIC_MODULE_NAME="biz.aQute.bnd"
-JAVA_CLASSPATH_EXTRA="
-	commons-lang-3.6
-	eclipse-jdt-annotation
-	jtwig-reflection
-	felix-gogo-runtime
-	osgi-service-subsystem
-"
-JAVA_MAIN_CLASS="aQute.bnd.main.bnd"
-JAVA_RESOURCE_DIRS="res"
-JAVA_SRC_DIR=(
-	"biz.aQute.bnd.exporters/src"
-	"biz.aQute.bnd.reporter/src"
-	"biz.aQute.bnd/src"
-	"biz.aQute.remote/src"
-	"biz.aQute.repository/src"
-	"biz.aQute.resolve/src"
-)
-
-src_prepare() {
-	default #780585
-	java-pkg-2_src_prepare
-	mkdir res || die
-
-	# java-pkg-simple wants resources in JAVA_RESOURCE_DIRS
-	pushd biz.aQute.bnd/src > /dev/null || die
-		find -type f \
-			! -name '*.java' \
-			| xargs cp --parent -t ../../res || die
-	popd > /dev/null || die
-}
-
-src_compile() {
-	# There is another version of osgi-service-log in osgi-core-0
-	JAVA_GENTOO_CLASSPATH_EXTRA=":$(java-pkg_getjars --build-only osgi-service-log)"
-	java-pkg-simple_src_compile
-
-	# remove classes which are not in upstream's jar file
-	zip -d ${PN}.jar \
-		"*/remote/agent/*" \
-		"*/remote/embedded/*" \
-		"*/remote/main/*" \
-		"*/remote/plugin/*" \
-		"*/remote/test/*" \
-		|| die
-}
-
-src_install() {
-	java-pkg-simple_src_install
-	java-pkg_register-dependency libg
-	java-pkg_register-dependency bnd-annotation
-	java-pkg_register-dependency bnd-util
-	java-pkg_register-dependency slf4j-api
-}
--- a/dev-java/maven-bin/Manifest
+++ b/dev-java/maven-bin/Manifest
@@ -1,4 +1,2 @@
-DIST apache-maven-3.9.12-bin.tar.gz 9233336 BLAKE2B 3075d7aef7a49bdaecdf3e758b8c6de0ec6d6622611af08bd2a55174f41c53e2a7053f5ce9cedf3853e3a709a0897474b73fe4877c1d563df2e77e4a9db404be SHA512 0a1be79f02466533fc1a80abbef8796e4f737c46c6574ede5658b110899942a94db634477dfd3745501c80aef9aac0d4f841d38574373f7e2d24cce89d694f70
-DIST apache-maven-3.9.12-bin.tar.gz.asc 866 BLAKE2B 3f6c961ec1d4ca6bb4418c933d212ee127a29eb9616ec9f00f17d7cd220b1c50c9c6ef5fb2e686fb2a42b8653f0a99e2a54390a7f37c0cf563a7f2e0774f5dd4 SHA512 8160e4489f4c9b88811f800d5709065b63be4ef347d96506829bdd3b55c90d224e7ca7b9878f9f3a0c493cbec402e995577ee77793231aa1c3c53d21ad8edf7b
 DIST apache-maven-3.9.14-bin.tar.gz 9238692 BLAKE2B 9c63e4b74421b3bc2a160276e11729e63a7d24867dbdc6455a246ea33d230ffb07c38a4adcf4a815392c7cc4be7d918f42955c29f2c1ceb59807bccd15f7b556 SHA512 d50af8ab5e6005b46a07f0ce9d3719e67cfdf898da988a84871304cd59fb1af0fef2f99dea709e6e66f21f732f905979b5c2dce6b6860406f60a70e84d9cf0b8
 DIST apache-maven-3.9.14-bin.tar.gz.asc 228 BLAKE2B be3d904070f49c1be2f0ac6fae48d4b73da29758e340d5e2a10f57844138ece756bb9005384091c2771e714d4130df3fc2e7d786b14575f25cf5cee51834aa6e SHA512 318d31baed5d5cffa5536c4b578a0b82a0a412bc23e362c66589390cee87bc7cfd3c56046e4d2206143725942f0214b0622adc3a077efa91a174c3f00aac76cf
--- a/dev-java/maven-bin/maven-bin-3.9.12.ebuild
+++ b/dev-java/maven-bin/maven-bin-3.9.12.ebuild
@@ -1,66 +0,0 @@
-# Copyright 1999-2026 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit java-pkg-2 verify-sig
-
-MY_PN=apache-${PN%%-bin}
-MY_PV=${PV/_alpha/-alpha-}
-MY_P="${MY_PN}-${MY_PV}"
-MY_MV="${PV%%.*}"
-
-DESCRIPTION="Project Management and Comprehension Tool for Java"
-HOMEPAGE="https://maven.apache.org/"
-SRC_URI="mirror://apache/maven/maven-${MY_MV}/${PV}/binaries/${MY_P}-bin.tar.gz
-	verify-sig? ( https://downloads.apache.org/maven/maven-${MY_MV}/${PV}/binaries/${MY_P}-bin.tar.gz.asc )"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="Apache-2.0"
-SLOT="3.9"
-KEYWORDS="amd64"
-
-BDEPEND="verify-sig? ( sec-keys/openpgp-keys-sjaranowski )"
-
-DEPEND="
-	>=virtual/jdk-1.8:*
-	app-eselect/eselect-java"
-
-RDEPEND="
-	>=virtual/jre-1.8:*"
-
-MAVEN="${PN}-${SLOT}"
-MAVEN_SHARE="/usr/share/${MAVEN}"
-
-QA_FLAGS_IGNORED=(
-	"${MAVEN_SHARE}/lib/jansi-native/linux32/libjansi.so"
-	"${MAVEN_SHARE}/lib/jansi-native/linux64/libjansi.so"
-)
-VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/sjaranowski.asc"
-
-# TODO:
-# We should use jars from packages, instead of what is bundled.
-src_install() {
-	dodir "${MAVEN_SHARE}"
-
-	cp -Rp bin boot conf lib "${ED}/${MAVEN_SHARE}" || die "failed to copy"
-
-	java-pkg_regjar "${ED}/${MAVEN_SHARE}"/boot/*.jar
-	java-pkg_regjar "${ED}/${MAVEN_SHARE}"/lib/*.jar
-
-	dodoc NOTICE README.txt
-
-	dosym -r "${MAVEN_SHARE}/bin/mvn" "/usr/bin/mvn-${SLOT}"
-
-	# See bug #342901.
-	echo "CONFIG_PROTECT=\"${MAVEN_SHARE}/conf\"" > "${T}/25${MAVEN}" || die
-	doenvd "${T}/25${MAVEN}"
-}
-
-pkg_postinst() {
-	eselect maven update mvn-${SLOT}
-}
-
-pkg_postrm() {
-	eselect maven update
-}
--- a/dev-java/swt/Manifest
+++ b/dev-java/swt/Manifest
@@ -3,10 +3,6 @@ DIST swt-4.10-gtk-linux-x86_64.zip 3844306 BLAKE2B 0e0ed21708acce347fd025920ee63
 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
-DIST swt-4.37-gtk-linux-aarch64.zip 3988879 BLAKE2B 4cffdf1653178b7abe3f9a7c9a0bcbf0d41a0410f24c8d5213fd4f5890341da0e1fc073c6a0a2133eb562683ef851885f5810c6cc7447d51dc40f47378a6a827 SHA512 d253bd7e9fe06696cc34e08a12c7ac46f305fc0370a71631d2da199d561f7dfbcf189d69a1c8269055a00b00d84849dff87b3a9548853e18f8811059ac64e6c6
-DIST swt-4.37-gtk-linux-ppc64le.zip 4029217 BLAKE2B fc928746f9a813bb9d25eb3f0f51b039521e4e79ba221528a6f37be11f2b99b62c5f3a3c691580b0668f604f3346d252c84aa80cee5b2c1818dfff4bd8c7907a SHA512 ee7e5abf31aa73e094d4cbe67a5d210547577e95296bd466d31572d02988df369789b0ad8a44b0a8c4bfc84469bb4e3eee0981c6b97477a15fd7447d0d985350
-DIST swt-4.37-gtk-linux-riscv64.zip 4000988 BLAKE2B a3ccb69f608b85ddd4e9afa237016820953a31da5864f9eb3a956b0d227e57e06181833a6701bdca8767c8e911e5c93143a06844cf564688abb3922038d67d0e SHA512 f36b2d047c83475dc76bb2821c1af5eecb62f4cdaa2edc10f5953eb14bf21b03b73af32fe818a17156e8eee8fcb6d7564b992c3b3a445e7385a5b4c86e2ec73c
-DIST swt-4.37-gtk-linux-x86_64.zip 4103684 BLAKE2B b44268fc17de27148284bf6d3f53f75fa7608b98401486a40b78ca4783109a0c08dbe7979a51478cb025049c0f5cfde0ea876abd3602562ce48865b19c87bbdc SHA512 b89049ab6b88422612a7d6427eef1a10bbfa632a228ab207521ed86a8a8f6a3742c23c2a961174c3ed89e56ec70c9535bb21e34d844355edeb1d33d3607e5b84
 DIST swt-4.38-gtk-linux-aarch64.zip 4049598 BLAKE2B 676c19d0d9fde24ebad86b00c63f1bbfb506b0247237f1808ab8f8f44396d1ff5cd60a312dcaea71268bfc16b4d0dfca18bd27365713f71817d2d334301b80b9 SHA512 bf4f421621933a0d12ee126488f8a8f2c865fbb6610ae30540e048f86295f4e22a9d338476f7a29896e9488aef2b329d6e77ea49ead671707528ce6933e4ce18
 DIST swt-4.38-gtk-linux-ppc64le.zip 4089939 BLAKE2B 1077e9cbcf3b001a4d10327e00bb8cfb53f5c46753641fb0e6e8e13cca944d7e59c9357cc9b1901efeddce3f4bf1e12a61dfd8b33ecf92d483cc84475b2b10cb SHA512 54a030612db14b61bcf03c3a3d23b3c4f3b3bffe9d91b0a208a641d2471df235cdeda488d157d771db57676b1954681f08818dcfdcf3ef806f713c68c8e736d4
 DIST swt-4.38-gtk-linux-riscv64.zip 4062250 BLAKE2B 4cece6c79dce99a6641f9fa0c2092fed88adb7f8250ec687f0a614cb74a101ce60b697b1e95a85f9f86e792742bd300fd1aaa95aefd5cd8ab1490178f21b5a45 SHA512 b3622521f4ea299ae1de9b7d4bd526b29aed5078e8e86fed814cfb42d2e48e8bb93251fbfb29c21f3c4f9c0aa00de99d24d493a9dda20ff2fc9acab597b877d1
--- a/dev-java/swt/swt-4.37.ebuild
+++ b/dev-java/swt/swt-4.37.ebuild
@@ -1,151 +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"
-
-inherit flag-o-matic java-pkg-2 java-pkg-simple toolchain-funcs
-
-MY_PV="${PV/_rc/RC}"
-MY_DMF="https://download.eclipse.org/eclipse/downloads/drops4/R-${MY_PV}-202509050730"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="GTK based SWT Library"
-HOMEPAGE="https://eclipse.dev/eclipse/swt/"
-SRC_URI="
-	amd64? ( ${MY_DMF}/${MY_P}-gtk-linux-x86_64.zip )
-	arm64? ( ${MY_DMF}/${MY_P}-gtk-linux-aarch64.zip )
-	ppc64? ( ${MY_DMF}/${MY_P}-gtk-linux-ppc64le.zip )
-	riscv? ( ${MY_DMF}/${MY_P}-gtk-linux-riscv64.zip )"
-S="${WORKDIR}/library"
-
-LICENSE="CPL-1.0 LGPL-2.1 MPL-1.1"
-SLOT="0"
-KEYWORDS="amd64 arm64 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+:3
-	x11-libs/libXtst
-	cairo? ( x11-libs/cairo )
-	opengl?	(
-		virtual/glu
-		virtual/opengl
-	)
-	webkit? (
-		net-libs/webkit-gtk:4.1
-	)
-"
-DEPEND="
-	${COMMON_DEP}
-	>=virtual/jdk-17:*[-headless-awt]
-	x11-base/xorg-proto
-	x11-libs/libX11
-	x11-libs/libXrender
-	x11-libs/libXt
-	x11-libs/libXtst
-"
-# error: pattern matching in instanceof is not supported in -source 11
-RDEPEND="${COMMON_DEP}
-	>=virtual/jre-17:*
-	x11-libs/libX11"
-
-HTML_DOCS=( ../about.html )
-
-JAVA_RESOURCE_DIRS="../resources"
-JAVA_SRC_DIR="../org"
-
-PATCHES=( "${FILESDIR}/swt-4.37-as-needed-and-flag-fixes.patch" )
-
-src_unpack() {
-	default
-	unpack "./src.zip"
-}
-
-src_prepare() {
-	default #780585
-	java-pkg-2_src_prepare
-	cd .. || die
-	mkdir -p resources/META-INF src || die "mkdir failed"
-	# save SWT-OS and SWT-Arch attributes from original MANIFEST.MF
-	unzip swt.jar META-INF/MANIFEST.MF -d . || die "failed to extract manifest"
-	grep '^SWT-OS\|^SWT-Arch' META-INF/MANIFEST.MF \
-		> resources/META-INF/MANIFEST.MF || die "MANIFEST.MF"
-	java-pkg_clean
-	find org -type f ! -name '*.java' ! -name 'package.html' |
-		xargs  cp --parent -t resources \
-		|| die "copying resources failed"
-	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() {
-	java-pkg-simple_src_install
-
-	java-pkg_sointo "/usr/$(get_libdir)/swt"
-	java-pkg_doso *.so
-}
--- a/dev-java/tomcat-native/Manifest
+++ b/dev-java/tomcat-native/Manifest
@@ -1,8 +1,4 @@
-DIST tomcat-native-1.3.6-src.tar.gz 351606 BLAKE2B 87c0591639b1488060bf60a0ec635022e8922b079f59e57a78ac371b6a3d0f9dd5263275ee0879885adf50d40f8842c084a61d7c2c9d0a0c17bca56682832c0c SHA512 69da49fcab28822d67af52b164084b983793b1741417ee3952380db303943f39c03f35c7fd4e82b3f7b6d0f8ffa2d95d82e87a9e80dfe1b3d70800b5a27f0076
-DIST tomcat-native-1.3.6-src.tar.gz.asc 833 BLAKE2B 5921a863165fc66ee9d7be8969535f0ccd7e16cc820c06733e3d715997992bb373027de4be5d31f16550ad1823ecdf56a930677f04c8373ae5b9773ae0509d6a SHA512 7148f6c0b306acbcbaf916df407380b1a34b1d5f2df9fe3fffd12e8a143bcd2d2a3f24a51e874133c3bbf2eb3765c2a721eb97cdf2aee21c0128b480102ce56e
 DIST tomcat-native-1.3.7-src.tar.gz 352199 BLAKE2B 20fc14a5304af0ec78468ac81a669dee7ba2610a36232b3acd3246da34a37d5f030b2b1bd7070360858f43236dd73133b2ee8ee8e1ee90415864eda9a173a8e1 SHA512 a7d466d3cbca0cd1d63bd00588f62ab5bdd23f9e063818b03783605de5ac0dfe4402765db46bb10cd62dd05e0c6ca3f9be5b98f17e522ac6690dd0efd66b7ba2
 DIST tomcat-native-1.3.7-src.tar.gz.asc 833 BLAKE2B 06394e7cd8b74991e228303e7fbcc4b28aa17e24eeb722f2962c6351471d77912354a57d43259b1b081921c9544fe70ecabac51046bd6e506a9519427e79c370 SHA512 062a26fd18bcf0e480412c63af8e4c6e57d492e777b18dd74ffb491c8e6240e75dce72a22381605bd2e6fd41e27f1526fd53d567ac90c4795917a4b84e9bdc53
-DIST tomcat-native-2.0.13-src.tar.gz 474267 BLAKE2B 3178b4e1889850edf83257e3046104e7359566439020fe26d91db4426e524af8919e771c7b58ad95d1827519dbafc2a71091a77f952a972cecbb4ba9907422d1 SHA512 7bdcf6fab95b7a349ea2cc9f428cff165439191aa69928b6feb9c49d72b5b28fbb411a7ca94042320f8b1a571b29e8a74889d57a9e9cf4cf6e4ff3a0a158d342
-DIST tomcat-native-2.0.13-src.tar.gz.asc 833 BLAKE2B 70951aae0d4ee075cdfafa62dc52ba832d07eb755067716869070c0896dba627e0b8de33e62487d948174c23ce20c0bc77a3c6243601db992a5a3bf3f0357c16 SHA512 d0fd27175171425f1866e8a1e2193fee5867ebcc850ee8d53775661d3bfe5c9125913bf17d0465050163fbcb47bea23a327fd55aded80b7db1740aa358ca4701
 DIST tomcat-native-2.0.14-src.tar.gz 474739 BLAKE2B 749d87c677eda0fd78c4e7aa357ec663121f50d5410282c46e835b4014463322d30803fb9e1a68515cdb6b4ed7acaa58cac0b65aa02e5134de5fbd67362db6dd SHA512 33d626fab35cbfa7398ca90cabd99950c6362ab4e19637012850fd84ecc78184e4c6c975ece92dc8d6461b6a8c2f83221cbc7374ff154422e7722606a4a144c7
 DIST tomcat-native-2.0.14-src.tar.gz.asc 833 BLAKE2B 2096792039fee1bcf71c944c81385e5e580d8705c3e098510c052e0bb8081ba397118f5664598a3526e8ae9a682be5c5fa67ee3e3b3aeff6576d5dbb1f66faf2 SHA512 bf148807aa61ac16dd3cd7d06989c9e4ae5a7d5bad7312aec1447489b65be6f1d44f448e052c2eb3be4d156750090b39ed196e7867e3126059c269b13b189715
--- a/dev-java/tomcat-native/tomcat-native-1.3.6.ebuild
+++ b/dev-java/tomcat-native/tomcat-native-1.3.6.ebuild
@@ -1,85 +0,0 @@
-# Copyright 1999-2026 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=9
-
-JAVA_PKG_IUSE="doc source test"
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit java-pkg-2 java-pkg-simple verify-sig
-
-DESCRIPTION="Allows Tomcat to use certain native resources for better performance"
-HOMEPAGE="https://tomcat.apache.org/native-doc/"
-SRC_URI="mirror://apache/tomcat/tomcat-connectors/native/${PV}/source/${P}-src.tar.gz
-	verify-sig? ( mirror://apache/tomcat/tomcat-connectors/native/${PV}/source/${P}-src.tar.gz.asc )"
-S=${WORKDIR}/${P}-src/native
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE="static-libs"
-
-BDEPEND="verify-sig? ( ~sec-keys/openpgp-keys-apache-tomcat-11 )"
-DEPEND="
-	>=virtual/jdk-1.8:*
-"
-RDEPEND="
-	dev-libs/apr:1=
-	dev-libs/openssl:0/3
-	>=virtual/jre-1.8:*
-"
-
-JAVA_RESOURCE_DIRS="../resources"
-JAVA_SRC_DIR="../java"
-JAVA_TEST_GENTOO_CLASSPATH="junit-4"
-JAVA_TEST_SRC_DIR="../test"
-VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/tomcat-11.apache.org.asc"
-
-DOCS=( ../{CHANGELOG.txt,NOTICE,README.txt} )
-
-src_prepare() {
-	java-pkg-2_src_prepare
-	mkdir -p "${JAVA_RESOURCE_DIRS}/META-INF" || die
-	sed -ne '/attribute name/s:^.*name="\(.*\)" value="\(.*\)".*$:\1\: \2:p' \
-		../build.xml |
-		sed "s:\${version}:${PV}:" \
-		> "${JAVA_RESOURCE_DIRS}/META-INF/MANIFEST.MF" || die
-}
-
-src_configure() {
-	local myeconfargs=(
-		--with-apr="${EPREFIX}"/usr/bin/apr-1-config
-		--with-ssl="${EPREFIX}"/usr
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	java-pkg-simple_src_compile
-	default
-}
-
-src_test() {
-	# Adjusting "String testFile =" path in TestFile.java:29 to match ${S}
-	sed \
-		-e '/String testFile =/s&test/&../test/&' \
-		-i ../test/org/apache/tomcat/jni/TestFile.java || die
-
-	JAVA_TEST_EXTRA_ARGS=(
-		-Djava.library.path=".libs"
-		--enable-native-access=ALL-UNNAMED
-	)
-	java-pkg-simple_src_test
-}
-
-src_install() {
-	java-pkg-simple_src_install
-	java-pkg_doso .libs/*.so*
-	dodoc -r ../docs
-	! use static-libs && find "${D}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	elog "For more information, please visit"
-	elog "https://tomcat.apache.org/tomcat-9.0-doc/apr.html"
-}
--- a/dev-java/tomcat-native/tomcat-native-2.0.13.ebuild
+++ b/dev-java/tomcat-native/tomcat-native-2.0.13.ebuild
@@ -1,81 +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"
-
-inherit java-pkg-2 java-pkg-simple verify-sig
-
-DESCRIPTION="Allows Tomcat to use certain native resources for better performance"
-HOMEPAGE="https://tomcat.apache.org/native-doc/"
-SRC_URI="mirror://apache/tomcat/tomcat-connectors/native/${PV}/source/${P}-src.tar.gz
-	verify-sig? ( mirror://apache/tomcat/tomcat-connectors/native/${PV}/source/${P}-src.tar.gz.asc )"
-S=${WORKDIR}/${P}-src/native
-
-LICENSE="Apache-2.0"
-SLOT="2"
-KEYWORDS="amd64"
-IUSE="static-libs"
-
-BDEPEND="verify-sig? ( ~sec-keys/openpgp-keys-apache-tomcat-11 )"
-DEPEND=">=virtual/jdk-17:*"	#958655
-
-RDEPEND="
-	dev-libs/apr:1=
-	dev-libs/openssl:0/3
-	>=virtual/jre-1.8:*
-"
-
-JAVA_RESOURCE_DIRS="../resources"
-JAVA_SRC_DIR="../java"
-JAVA_TEST_GENTOO_CLASSPATH="junit-4"
-JAVA_TEST_SRC_DIR="../test"
-VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/tomcat-11.apache.org.asc"
-
-DOCS=( ../{CHANGELOG.txt,NOTICE,README.txt} )
-
-src_prepare() {
-	java-pkg-2_src_prepare
-	mkdir -p "${JAVA_RESOURCE_DIRS}/META-INF" || die
-	sed -ne '/attribute name/s:^.*name="\(.*\)" value="\(.*\)".*$:\1\: \2:p' \
-		../build.xml |
-		sed "s:\${version}:${PV}:" \
-		> "${JAVA_RESOURCE_DIRS}/META-INF/MANIFEST.MF" || die
-}
-
-src_configure() {
-	local myeconfargs=(
-		--with-apr="${EPREFIX}"/usr/bin/apr-1-config
-		--with-ssl="${EPREFIX}"/usr
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	java-pkg-simple_src_compile
-	default
-}
-
-src_test() {
-	# WARNING: A restricted method in java.lang.System has been called
-	# WARNING: Restricted methods will be blocked in a future release unless native access is enabled
-	JAVA_TEST_EXTRA_ARGS=(
-		-Djava.library.path=".libs"
-		--enable-native-access=ALL-UNNAMED
-	)
-	java-pkg-simple_src_test
-}
-
-src_install() {
-	java-pkg-simple_src_install
-	java-pkg_doso .libs/*.so*
-	dodoc -r ../docs
-	! use static-libs && find "${D}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	elog "For more information, please visit"
-	elog "https://tomcat.apache.org/tomcat-9.0-doc/apr.html"
-}
--- a/games-strategy/freecol/Manifest
+++ b/games-strategy/freecol/Manifest
@@ -1,2 +1 @@
-DIST freecol-1.0.0-src.zip 159875314 BLAKE2B 6153be9553ded4c2a1f9635d67e48165d07b5d1634f26a44d2f01195e1610d6cb525ffa60368f3225cdf62ffd7751242942fd86b5735455e7396deca68d8350d SHA512 68b313b42fc38e6ea95a4a04ca5af534c4487709fb036018d6d09f6de3455325031ad1fd0ae4c6415cbbeebd3f181e598a2602ad7be6cca9150ad9523b8bb3c2
 DIST freecol-1.2.0-src.zip 231798930 BLAKE2B 2c53498843a4d25356269dd3a6ab4929ce77ad9346ad3a55c98a3b8afca3bda99278d01fdb20d65036499059b1b18c69e4a5895818cd5d2184642683786ad5f6 SHA512 197a4277afe99928cb220cee6d9d113ef4e7b4a68430b62423f3da5afc146ce2e644e3ada7d788e60288caf2bd49e4e68fa95059762813321a4e8f23012b8010
--- a/games-strategy/freecol/freecol-1.0.0-r1.ebuild
+++ b/games-strategy/freecol/freecol-1.0.0-r1.ebuild
@@ -1,76 +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"
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit desktop java-pkg-2 java-pkg-simple
-
-DESCRIPTION="An open source clone of the game Colonization"
-HOMEPAGE="https://www.freecol.org/"
-SRC_URI="https://downloads.sourceforge.net/project/freecol/freecol/freecol-${PV}/freecol-${PV}-src.zip"
-S="${WORKDIR}/${PN}"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64"
-
-CP_DEPEND="
-	dev-java/commons-cli:0
-	dev-java/cortado:0
-	dev-java/findbugs-annotations:0
-	dev-java/miglayout:5
-"
-
-DEPEND=">=virtual/jdk-11:*
-	${CP_DEPEND}"
-
-# error: variables in try-with-resources are not supported in -source 8
-RDEPEND=">=virtual/jre-11:*
-	${CP_DEPEND}"
-
-BDEPEND="app-arch/unzip"
-
-DOCS=(
-	CHANGELOG.md
-	COPYING
-	README
-	README.md
-	SECURITY.md
-)
-
-JAVA_JAR_FILENAME="FreeCol.jar"
-JAVA_RESOURCE_DIRS="resources"
-JAVA_SRC_DIR="src"
-JAVA_TEST_GENTOO_CLASSPATH="junit-4"
-JAVA_TEST_RUN_ONLY="net.sf.freecol.AllTests"
-JAVA_TEST_SRC_DIR="test/src"
-
-src_prepare() {
-	java-pkg-2_src_prepare
-	java-pkg_clean
-	mkdir -p "${JAVA_RESOURCE_DIRS}/META-INF" || die
-	cp build/splash.jpg "${JAVA_RESOURCE_DIRS}" || die
-	grep Main-Class src/MANIFEST.MF \
-		> "${JAVA_RESOURCE_DIRS}/META-INF/MANIFEST.MF" || die
-}
-
-src_install() {
-	java-pkg-simple_src_install
-
-	local datadir=/usr/share/${PN}
-
-	# launcher of java-pkg-simple.eclass seems not to support --pwd
-	java-pkg_dolauncher ${PN} \
-		--pwd ${datadir} \
-		--main net.sf.freecol.FreeCol \
-		--java_args -Xmx2000M
-
-	insinto ${datadir}
-	doins -r data schema
-
-	doicon data/${PN}.png
-	make_desktop_entry ${PN} FreeCol
-}