gentoo resync : 09.07.2022

3 files changed, 2 insertions, 63 deletions

diff --git a/dev-java/commons-daemon/Manifest b/dev-java/commons-daemon/Manifest
index 97e503a7aa5c..dbe031efc216 100644
--- a/dev-java/commons-daemon/Manifest
+++ b/dev-java/commons-daemon/Manifest
@@ -1,6 +1,4 @@
 AUX commons-daemon-1.3.1-Make.patch 508 BLAKE2B a7645b93b44f15b4ebb9a0864a3c467999bcb0becf006f2806f897a26435140017384fb8cf14151e3a7b969c9397c4047f47e2a35f53904a9a013d5f085ab04c SHA512 f01c485a0832aef27b1fa6b681c7f66096a0206d6e75e702e32bd6131eb1ea4d85fb363d12eb6d29c386d2af773ca0ff17f14ea7a6ebc8469e641b0760e9a82f
-DIST commons-daemon-1.2.4-src.tar.gz 281929 BLAKE2B 877f1c31024a2f3e4796abdd11059bd636444f5c856b998a39761fb0b221467e986586fef43463a4d01b4d4f7a562f9f8c658b94a124cd356b0a70cc185c0030 SHA512 36e9cb3153ca763bfaaa71575a1584610254f1ce4c0f666ff7bbc628311405430536413525c9c777e4364eea62a247fb084750d837e84a62d9fce92a61909d56
 DIST commons-daemon-1.3.1-src.tar.gz 287642 BLAKE2B 02e85a5534af7f804a0374789506ee25ee8313987c68153974aa938b983745ae44d579f17deb362764d1a03b04bc552115bd69ef28b4f7d3bbb06f3bb4199814 SHA512 b810ac152f8296d980a4fb3786eff9d147b234dc2377df5fe1bded0824c694c9e82a7ef50b0a63c3e6432dfc4684a3aa2ce8d583aacb740bd4664c3dfb8b8f16
-EBUILD commons-daemon-1.2.4.ebuild 1457 BLAKE2B 23a03bb678cbdf4f897f56e4058241bd7e97228fffc152f568dd7f96e889d1cfe032d06be13ed97d74b345f3c6412d18cf1a322d7c8a31cc0581cf86e9dd0338 SHA512 64b4f7eb81eb75719138513dfa8ab2e26623443bf264201bff0b1c4d81ee764ce79e267515e54ba6767650f5818b68cbbd0678d99037042e5941f7c5d652d8f4
-EBUILD commons-daemon-1.3.1.ebuild 1562 BLAKE2B 8e8c3682b31e078cad4ae0ac7cf7b0bd4d8305a6f18ae28851ed4a49d18492514aebc0a402c7e16cfb40a0dbe6a3a78a22858c982ec7c8ebe4dd4c56f8cd7ba7 SHA512 106a2392838629feda046d9ae75e7e287d52d8a84bac4d26783b5b8e0094763421e9419bdf88242e76b0bbb682f6172b080b2cebbd38cdf35c829419d3207476
+EBUILD commons-daemon-1.3.1.ebuild 1559 BLAKE2B fc04c3bff7ab689fafc90dcc7e90b3ae34a1d4662d7ee597ce9616a5191b628c4581e69df342970ddd3fb2e9a278d2bcb23a944fda72db3e045d192ca052433d SHA512 7518da1a0efa66f76d9f601429329e690f2447f60903d0c520de07be7a366045c282bc9998d0aa5d9443352702fff5549534cbbc70339dc0729f077a49f337ec
 MISC metadata.xml 530 BLAKE2B 313ae727a7149cfaa5e962b1daa4831e77b5f168d8f8d7f2b1242b8fa36f9d2f0460541ec53b8e81cbfae209e3c5e57f5dc5895e881acb61ce9118110aace98b SHA512 738ded66dfc479b30f4c1b6aae4052a4a2de5bf68aa9001a6a1f8fb29203a17b3fe10e52c7f5d26b1de313a74b3713cd22db259a584875f8f91391437cea53e0
diff --git a/dev-java/commons-daemon/commons-daemon-1.2.4.ebuild b/dev-java/commons-daemon/commons-daemon-1.2.4.ebuild
deleted file mode 100644
index 8eb3ed4a1335..000000000000
--- a/dev-java/commons-daemon/commons-daemon-1.2.4.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# 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/commons-daemon-1.3.1.ebuild b/dev-java/commons-daemon/commons-daemon-1.3.1.ebuild
index f739750e8965..baa152a4895a 100644
--- a/dev-java/commons-daemon/commons-daemon-1.3.1.ebuild
+++ b/dev-java/commons-daemon/commons-daemon-1.3.1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://apache/commons/daemon/source/${P}-src.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="amd64 ppc64 x86"
 
 DEPEND="
 	>=virtual/jdk-1.8:*