gentoo resync : 20.03.2022

5 files changed, 69 insertions, 123 deletions

diff --git a/dev-java/commons-daemon/Manifest b/dev-java/commons-daemon/Manifest
index 81b79f7a03bb..e1eff5398b62 100644
--- a/dev-java/commons-daemon/Manifest
+++ b/dev-java/commons-daemon/Manifest
@@ -1,5 +1,3 @@
-DIST commons-daemon-1.0.15-src.tar.gz 291128 BLAKE2B af874e6a0852c2dc5c84fcbf5e1e443fb880a306b19054263d06e8d83a9b0866a52f2950c457315d80031a58250ec75284fc7839df82b7555b1ff3bd92e67810 SHA512 f20cc8796978fb09b6ecc8d99bb3c8b271b097d74c1f99b286cde213631e7f50a4104f5db2c354f9624ba8b037502d81e327c581b38253b9b216aa2172016e40
-DIST commons-daemon-1.1.0-src.tar.gz 298028 BLAKE2B 5e8a0719467523438559472270ac7038ecce040f2a5a8ea8704e181557df726b9c09267b57336d9659dcb3528fecb8ac61937ef3d56e5cb12b562b88b5f6f218 SHA512 a370085a991cd6b121fcfb49822660dfc0aac19f164677dd2e6373750c1a526ef5a10334a8e075fd965c038198f6638b9e9130b5b13256f4a23a6c5a29959701
-EBUILD commons-daemon-1.0.15.ebuild 1232 BLAKE2B 78bc104748e2134d37d137570be7cc16191060ea0c4df790563219de67e085a89e5d4bce0b0b5b6ea30bce39afc57066bae8c56451faf1c265228bd3e998e397 SHA512 05a543c150095c0125c3651632884945439f26d4959ff9dbbc503be461615362f3b9e24208c2b2faef72c73ffac6c848884478e8b7f2b2c8dcb4665196f03c83
-EBUILD commons-daemon-1.1.0.ebuild 1197 BLAKE2B fc07b31feb931246022a5633b253407d9cb9f8e9ae00b7f11b62b4efa4435ad9ed2ac430fb76f5955386d8d9f99419e107e37af7be2f9021c136732231936784 SHA512 60a4f508609fc201099ef8b8341c384ab1a5411ef4c6e9fda6e2586b87cc901eb83341154c5b7c9ad63f26861382aaa7a0eb520858236f74037322b7dea399a8
-MISC metadata.xml 233 BLAKE2B 2b385ca77219f08b2874b3a4a91a0c836d3cb45ec44b05babb33d590c56ceb5337ecb93a8450a37f8e6bbf4cfc1455892e8142d22e0a1d527d40361e2dce350b SHA512 1acc975a7dc3344bc63282d652ca00d8245970b58353b4fd00f09a4859db3eaba2dcd85e1537d424b7174e4f9c01c2ffb10ec6d107b5c895c9ca20730666de7f
+DIST commons-daemon-1.2.4-src.tar.gz 281929 BLAKE2B 877f1c31024a2f3e4796abdd11059bd636444f5c856b998a39761fb0b221467e986586fef43463a4d01b4d4f7a562f9f8c658b94a124cd356b0a70cc185c0030 SHA512 36e9cb3153ca763bfaaa71575a1584610254f1ce4c0f666ff7bbc628311405430536413525c9c777e4364eea62a247fb084750d837e84a62d9fce92a61909d56
+EBUILD commons-daemon-1.2.4.ebuild 1457 BLAKE2B 23a03bb678cbdf4f897f56e4058241bd7e97228fffc152f568dd7f96e889d1cfe032d06be13ed97d74b345f3c6412d18cf1a322d7c8a31cc0581cf86e9dd0338 SHA512 64b4f7eb81eb75719138513dfa8ab2e26623443bf264201bff0b1c4d81ee764ce79e267515e54ba6767650f5818b68cbbd0678d99037042e5941f7c5d652d8f4
+MISC metadata.xml 530 BLAKE2B 313ae727a7149cfaa5e962b1daa4831e77b5f168d8f8d7f2b1242b8fa36f9d2f0460541ec53b8e81cbfae209e3c5e57f5dc5895e881acb61ce9118110aace98b SHA512 738ded66dfc479b30f4c1b6aae4052a4a2de5bf68aa9001a6a1f8fb29203a17b3fe10e52c7f5d26b1de313a74b3713cd22db259a584875f8f91391437cea53e0
diff --git a/dev-java/commons-daemon/commons-daemon-1.0.15.ebuild b/dev-java/commons-daemon/commons-daemon-1.0.15.ebuild
deleted file mode 100644
index e97f26dfb42d..000000000000
--- a/dev-java/commons-daemon/commons-daemon-1.0.15.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-JAVA_PKG_IUSE="doc examples source"
-
-inherit autotools java-pkg-2 java-ant-2
-
-DESCRIPTION="Tools to allow Java programs to run as UNIX daemons"
-SRC_URI="mirror://apache/commons/daemon/source/${P}-src.tar.gz"
-HOMEPAGE="http://commons.apache.org/daemon/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~x86-solaris"
-
-CDEPEND="kernel_linux? ( sys-libs/libcap )"
-
-DEPEND="
-	${CDEPEND}
-	>=virtual/jdk-1.6
-	source? ( app-arch/zip )"
-
-RDEPEND="
-	${CDEPEND}
-	>=virtual/jre-1.6"
-
-S="${WORKDIR}/${P}-src"
-
-java_prepare() {
-	cd "${S}/src/native/unix" || die
-	sed -i "s/powerpc/powerpc|powerpc64/g" support/apsupport.m4 || die
-	eautoconf
-}
-
-src_configure() {
-	java-ant-2_src_configure
-	cd "${S}/src/native/unix" || die
-	default
-}
-
-src_compile() {
-	java-pkg-2_src_compile
-	cd "${S}/src/native/unix" || die
-	default
-}
-
-src_install() {
-	dobin src/native/unix/jsvc
-	java-pkg_newjar dist/*.jar
-
-	dodoc README RELEASE-NOTES.txt *.html src/native/unix/CHANGES.txt
-	use doc && java-pkg_dohtml -r dist/docs/*
-	use examples && java-pkg_doexamples src/samples
-	use source && java-pkg_dosrc src/main/java/*
-}
diff --git a/dev-java/commons-daemon/commons-daemon-1.1.0.ebuild b/dev-java/commons-daemon/commons-daemon-1.1.0.ebuild
deleted file mode 100644
index e7677061981d..000000000000
--- a/dev-java/commons-daemon/commons-daemon-1.1.0.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-JAVA_PKG_IUSE="doc examples source"
-
-inherit autotools java-pkg-2 java-ant-2
-
-DESCRIPTION="Tools to allow Java programs to run as UNIX daemons"
-SRC_URI="mirror://apache/commons/daemon/source/${P}-src.tar.gz"
-HOMEPAGE="https://commons.apache.org/daemon/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
-
-CDEPEND="kernel_linux? ( sys-libs/libcap )"
-
-DEPEND="
-	${CDEPEND}
-	>=virtual/jdk-1.6"
-
-RDEPEND="
-	${CDEPEND}
-	>=virtual/jre-1.6"
-
-S="${WORKDIR}/${P}-src"
-
-src_prepare() {
-	default
-	cd "${S}/src/native/unix" || die
-	sed -i "s/powerpc/powerpc|powerpc64/g" support/apsupport.m4 || die
-	eautoconf
-}
-
-src_configure() {
-	java-ant-2_src_configure
-	cd "${S}/src/native/unix" || die
-	default
-}
-
-src_compile() {
-	java-pkg-2_src_compile
-	cd "${S}/src/native/unix" || die
-	default
-}
-
-src_install() {
-	dobin src/native/unix/jsvc
-	java-pkg_newjar dist/*.jar
-
-	dodoc README RELEASE-NOTES.txt PROPOSAL.html
-	use doc && java-pkg_dohtml -r dist/docs/*
-	use examples && java-pkg_doexamples src/samples
-	use source && java-pkg_dosrc src/main/java/*
-}
diff --git a/dev-java/commons-daemon/commons-daemon-1.2.4.ebuild b/dev-java/commons-daemon/commons-daemon-1.2.4.ebuild
new file mode 100644
index 000000000000..8eb3ed4a1335
--- /dev/null
+++ b/dev-java/commons-daemon/commons-daemon-1.2.4.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Skeleton command:
+# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri mirror://apache/commons/daemon/source/commons-daemon-1.2.4-src.tar.gz --slot 0 --keywords "~amd64 ~ppc64 ~x86" --ebuild commons-daemon-1.2.4.ebuild
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source"
+MAVEN_ID="commons-daemon:commons-daemon:1.2.4"
+# JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple toolchain-funcs
+
+DESCRIPTION="Tools to allow Java programs to run as UNIX daemons"
+HOMEPAGE="https://commons.apache.org/proper/commons-daemon/"
+SRC_URI="mirror://apache/commons/daemon/source/${P}-src.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ppc64 x86"
+
+DEPEND="
+	>=virtual/jdk-1.8:*
+"
+
+RDEPEND="
+	>=virtual/jre-1.8:*
+"
+
+DOCS=( {CONTRIBUTING,README}.md {HOWTO-RELEASE,LICENSE,NOTICE,RELEASE-NOTES}.txt )
+HTML_DOCS=( PROPOSAL.html )
+
+S="${WORKDIR}/${P}-src"
+
+JAVA_ENCODING="iso-8859-1"
+
+JAVA_SRC_DIR="src/main/java"
+
+# There is only org/apache/commons/daemon/SimpleDaemon.java
+# which is not even run upstream ( mvn test ).
+# JAVA_TEST_GENTOO_CLASSPATH="junit-4"
+# JAVA_TEST_SRC_DIR="src/test/java"
+
+src_compile() {
+	java-pkg-simple_src_compile
+
+	pushd src/native/unix || die
+		./configure
+		emake AR="$(tc-getAR)"
+	popd
+}
+
+src_install() {
+	default # https://bugs.gentoo.org/789582
+	java-pkg-simple_src_install
+
+	dobin src/native/unix/jsvc
+}
diff --git a/dev-java/commons-daemon/metadata.xml b/dev-java/commons-daemon/metadata.xml
index 6021501589e0..4818627a6525 100644
--- a/dev-java/commons-daemon/metadata.xml
+++ b/dev-java/commons-daemon/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>java@gentoo.org</email>
-	<name>Java</name>
-</maintainer>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<longdescription>
+		Apache Commons Daemon software is a set of utilities and Java support classes for running Java applications as server processes. These are commonly known as 'daemon' processes in Unix terminology (hence the name). On Windows they are called 'services'
+	</longdescription>
 </pkgmetadata>