gentoo resync : 12.05.2022

3 files changed, 2 insertions, 46 deletions

diff --git a/dev-java/icedtea-sound/Manifest b/dev-java/icedtea-sound/Manifest
index 84f481b2d27d..cb1ca05c2971 100644
--- a/dev-java/icedtea-sound/Manifest
+++ b/dev-java/icedtea-sound/Manifest
@@ -1,4 +1,3 @@
 DIST icedtea-sound-1.0.1.tar.xz 1515308 BLAKE2B 4d9939e1bc0e0b331b032c3a54244960d61354d6b85b83cbbce1aeb96f2748906d5bd0936b36e2aacac526bd7927dbc0686a47a0dd0f41568ca86e3805b943ea SHA512 505d02f5ce885d4c7638cde8042a686aa3651de9072d325db6fefb8c5bd3d7de73253b27162555396e827a65f50aeed8326e99099757d5efe18d14ccebc1c07a
-EBUILD icedtea-sound-1.0.1-r1.ebuild 846 BLAKE2B 79fc33dee581f71df125f08bcc2bbb81215424cff6490dd7fa698650d5ec6349a81b9df8ae4b12d2027aa4838fde55069fcfd1eff8f99385e31beb080e56d91e SHA512 603e0a81270603d300676900fa933b8a8e33c8417d7197a73cfd0a8c3050a560cc4fc7fc50a0bf6ae85fc6b241329fa76e72c20164b740632ac98284cfd08a54
-EBUILD icedtea-sound-1.0.1.ebuild 882 BLAKE2B f99da70389da19d3bb85e7562e818ceb900524e90b3ad250285834c2a7c3c0146c8e80b9436538166fc51cdeaf76e352d356ace0943dcb37503cb57d07f78409 SHA512 8f88bbd9d26a34067d4fce8c7fed64c4c3c84b7d6470cd4fc7a178b7bade00da3debcb62ba4157aaa8cc561b00e136a8d6eafaea7898c1c453c1850d1adac7b6
+EBUILD icedtea-sound-1.0.1-r1.ebuild 844 BLAKE2B 6246982262a7550b584bc6eaded9afa279ab7215c40281c197a4cab81d2d0bc27592c586932fa16af92ed3e6ee755660ff22abf14cc2a43991f85f000d1f3f5c SHA512 3535f1e228556f3aa7ad44b99a1013ba5170a0777bcbcf33d03bf23ab2a9d0c087a7c394878190442219e3d11dca4b6256b3c463b312815d188a00052351df3d
 MISC metadata.xml 383 BLAKE2B a8ad98d91ffcf88637ec7ca5e0634a0ddb1d03f0af1f6f1fce5fed2a166dc57b264284afa71cf473a121ab4cbb1ff75c36f730cdc4c1af7760e94aeae7f488a5 SHA512 ad4a47c9c3fbd92438837e90d25e5de2a7bb94669ddcf22e6787b9ee7d59925a6da3c3483d712a6cabd6555f48613717cd9da491f8ee7b0e09f76ba6e5a4e379
diff --git a/dev-java/icedtea-sound/icedtea-sound-1.0.1-r1.ebuild b/dev-java/icedtea-sound/icedtea-sound-1.0.1-r1.ebuild
index aeac8c929ed5..9990e63fba50 100644
--- a/dev-java/icedtea-sound/icedtea-sound-1.0.1-r1.ebuild
+++ b/dev-java/icedtea-sound/icedtea-sound-1.0.1-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://icedtea.classpath.org/download/source/${P}.tar.xz"
 
 LICENSE="GPL-2-with-linking-exception"
 SLOT="0"
-KEYWORDS="~amd64 ~arm arm64 ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 
 IUSE="+doc"
 
diff --git a/dev-java/icedtea-sound/icedtea-sound-1.0.1.ebuild b/dev-java/icedtea-sound/icedtea-sound-1.0.1.ebuild
deleted file mode 100644
index c480a1189a79..000000000000
--- a/dev-java/icedtea-sound/icedtea-sound-1.0.1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Build written by Andrew John Hughes (gnu_andrew@member.fsf.org)
-
-EAPI="5"
-
-inherit java-pkg-2 prefix
-
-DESCRIPTION="Plugins for javax.sound"
-HOMEPAGE="http://icedtea.classpath.org"
-SRC_URI="http://icedtea.classpath.org/download/source/${P}.tar.xz"
-
-LICENSE="GPL-2-with-linking-exception"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86"
-
-IUSE="+doc test"
-RESTRICT="!test? ( test )"
-
-COMMON_DEP="
-	>=virtual/jdk-1.6.0
-	>=media-sound/pulseaudio-0.9.11:="
-RDEPEND="${COMMON_DEP}"
-DEPEND="${COMMON_DEP}
-	app-arch/zip"
-
-pkg_setup() {
-	JAVA_PKG_WANT_SOURCE="1.6"
-	JAVA_PKG_WANT_TARGET="1.6"
-
-	java-pkg-2_pkg_setup
-}
-
-src_configure() {
-	econf --with-jdk-home="${JAVA_HOME}" \
-		$(use_enable doc docs) \
-		--htmldir="${EPREFIX%/}/usr/share/doc/${PF}/html"
-}
-
-src_compile() {
-	default
-}