gentoo auto-resync : 07:08:2024 - 12:37:20

3 files changed, 2 insertions, 97 deletions

diff --git a/dev-java/java-service-wrapper/Manifest b/dev-java/java-service-wrapper/Manifest
index f140fb992acd..375c695e12d3 100644
--- a/dev-java/java-service-wrapper/Manifest
+++ b/dev-java/java-service-wrapper/Manifest
@@ -1,5 +1,4 @@
 AUX java-service-wrapper-3.5.25-gentoo-wrapper-defaults.patch 1292 BLAKE2B 192bb8dc9deb6d39131b4af992dc3e906fcf6d6d21e4d2edcb5e4aea9169c01dff273643c196b47c1f118b44e38083c1092f71e49e5502936945d51cf4c4c8b5 SHA512 075434a9a2067593332f7b0827dcc077102fb1c1ca11347ed3e2d62e499f6022c1948feaa3be66b17891e539c12a77d98bc292ac143bc5acdf387bd1e3ec399f
 DIST wrapper_3.5.50_src.tar.gz 779253 BLAKE2B 64863e408c2147014946f869bbd98775d1d23d4cd63ef562167f40191febf87cc72697a55fe2ec6a5d085f3df4897cc4485f4ed88a3ee3a7f7930215448972f7 SHA512 403deec1bcc70a93ce0b0749bf2d5bc27a4a540d07785bc3ac83b38257cc5e8247a784f646770c96ac318f22d30c463dafb2f002720041b93443b292d6669c09
-EBUILD java-service-wrapper-3.5.50-r1.ebuild 2388 BLAKE2B f157561b01c9cbd75bc5f4327bdaa1eafb7fc445b024cf75c81c4f01cad3229cc4f542e8c3e932b188c03a09c23ca434536a0f5c83ead8ae3ccde3180add7fef SHA512 8a00fdb945e8cd0053daa3546c56e8000600f4bc81fe8c7fa25206b8d55f68c391e309f4c7a8f504844d8da5d9310324c0751aaa849a3dd99c1b9e7dfcda88dc
-EBUILD java-service-wrapper-3.5.50-r2.ebuild 2403 BLAKE2B 1a592cd6c11e0d26d7e98dd0b9d57048fc56008a0ffd231beb43ee6244662752c7e33b883c2e469f596316d7fbcb5435b27fef7f05e0529df496657ff169ee81 SHA512 bcb2f9b0463031960c0b9b0c501d813dc9c6d457aa62317419c21c4423ab82c3573b669b7dea84293c362b3d53aa85e352b3fcbd647b4684e2731c664dbb1f33
+EBUILD java-service-wrapper-3.5.50-r2.ebuild 2401 BLAKE2B f803ff8ba0834d57bc17b8a0ee9dbf3784e67cad21062ce7fbbab440f48621c899ad9fe6ab4865ebf77b330198ced6e296898a1ee0daae2a965244cf4b758247 SHA512 decd48432171932342c37b1e677b03d44ed8245c521b2c302830a013058bd3bf63a3a040436fe962841995b609a2510d17c1ef13cc33ebf1f93b6cfc7d5bdc63
 MISC metadata.xml 640 BLAKE2B 1ced5abe1a0ff9b141f3a6020cd6352b02cf228524b694f36bedb7ef91a892ee471235b36e81e03fbe98eee6f28f680821b15501447b58c8788129eaf8e6b39a SHA512 4d9eb54f0328aa00380b40a0ead3fc43e552b71e8d4b5279341d5249a9615c3c161ca19295d6f586c43708f9e29aaf3799799243dd277c8822b95d7c1f82afd1
diff --git a/dev-java/java-service-wrapper/java-service-wrapper-3.5.50-r1.ebuild b/dev-java/java-service-wrapper/java-service-wrapper-3.5.50-r1.ebuild
deleted file mode 100644
index 8fdfe9ac2063..000000000000
--- a/dev-java/java-service-wrapper/java-service-wrapper-3.5.50-r1.ebuild
+++ /dev/null
@@ -1,94 +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"
-inherit java-pkg-2 java-pkg-simple toolchain-funcs java-ant-2
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-DESCRIPTION="A wrapper that makes it possible to install a Java Application as daemon"
-HOMEPAGE="https://wrapper.tanukisoftware.com"
-SRC_URI="https://download.tanukisoftware.com/wrapper/${PV}/wrapper_${PV}_src.tar.gz"
-
-LICENSE="tanuki-community"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=virtual/jre-1.8:*"
-DEPEND="
-	>=virtual/jdk-1.8:*
-	test? (
-		dev-java/junit:4
-		dev-util/cunit
-	)
-"
-BDEPEND="virtual/jdk"
-
-S="${WORKDIR}/wrapper_${PV}_src"
-
-JAVA_SRC_DIR="src/java/"
-JAVA_JAR_FILENAME="wrapper.jar"
-JAVA_TEST_SRC_DIR="src/test"
-JAVA_TEST_GENTOO_CLASSPATH="junit-4"
-
-PATCHES=(
-	"${FILESDIR}"/java-service-wrapper-3.5.25-gentoo-wrapper-defaults.patch
-)
-
-src_prepare() {
-	default
-
-	# replaces as-needed.patch
-	sed -i \
-		-e 's/gcc -O3/$(CC)/g' \
-		-e 's/ -pthread/ $(CFLAGS) $(LDFLAGS) -pthread/g' \
-		-e 's/ -shared/ $(LDFLAGS) -shared/g' \
-		-e 's/$(TEST)\/testsuite/testsuite/g' \
-		src/c/Makefile-*.make || die
-
-	cp "${S}/src/c/Makefile-linux-armel-32.make" "${S}/src/c/Makefile-linux-arm-32.make"
-	java-pkg-2_src_prepare
-
-	# disable tests by default (they are only enabled by default on amd64)
-	sed -e "s/\(all: init wrapper libwrapper.so\) testsuite/\1/g" \
-		-i src/c/Makefile-linux-x86-64.make || die
-
-	# re-enable tests on all platforms if requested
-	if use test; then
-		grep "testsuite_SOURCE" "src/c/Makefile-linux-x86-64.make" | tee -a src/c/Makefile-*.make
-		assert
-		echo 'all: testsuite' | tee -a src/c/Makefile-*.make
-		assert
-	fi
-}
-
-src_compile() {
-	tc-export CC
-
-	pushd "${T}" || die
-	echo 'public class GetArchDataModel{public static void main(String[] args){System.out.println(System.getProperty("sun.arch.data.model"));}}' \
-		> GetArchDataModel.java || die
-	ejavac GetArchDataModel.java
-	local BITS
-	BITS="$(java GetArchDataModel)" || die "Failed to identify sun.arch.data.model property"
-	popd || die
-	eant -Dbits="${BITS}" compile-c
-
-	java-pkg-simple_src_compile
-}
-
-src_test() {
-	src/c/testsuite --basic || die
-	java-pkg-simple_src_test
-}
-
-src_install() {
-	java-pkg-simple_src_install
-	java-pkg_doso lib/libwrapper.so
-
-	dobin bin/wrapper
-	dodoc README*.txt
-	dodoc doc/revisions.txt
-}
diff --git a/dev-java/java-service-wrapper/java-service-wrapper-3.5.50-r2.ebuild b/dev-java/java-service-wrapper/java-service-wrapper-3.5.50-r2.ebuild
index 7d8fc6989375..2576ab85e550 100644
--- a/dev-java/java-service-wrapper/java-service-wrapper-3.5.50-r2.ebuild
+++ b/dev-java/java-service-wrapper/java-service-wrapper-3.5.50-r2.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/wrapper_${PV}_src"
 
 LICENSE="tanuki-community"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 RESTRICT="!test? ( test )"
 
 RDEPEND=">=virtual/jre-1.8:*"