gentoo resync : 25.03.2022

3 files changed, 2 insertions, 61 deletions

diff --git a/media-sound/din/Manifest b/media-sound/din/Manifest
index 14e53628afa4..44ce73cee4cc 100644
--- a/media-sound/din/Manifest
+++ b/media-sound/din/Manifest
@@ -1,7 +1,5 @@
 AUX din-48-fix-random-constants.patch 667 BLAKE2B 2747a1c60f2f968cd4e173996900d889b9c45f77af6aba035a4fe29ced8882178cc3fbfa925dc2bc02aced071648e008f409ecd9c6b3782838dec5344a8b71f4 SHA512 0805ea12a272276ba1883ab624c96566dbb71168bd9a0e4ecbe6f3373287e7d88d5a897c03e0385acf12a7fc79a4be73f1d66ec699790986cd2c863e6ca251bc
 AUX din-52-makefile.patch 1946 BLAKE2B 46535f179ae8c12c9eeb454b82acea990688e241e01a88b8cb10e61e9bf7de4152990b079ae62f9e2f9873062bf7e9309f3cab026dce67241ec828b7d740f2d2 SHA512 91adbbf10ac46b447e21db796b40b2f4925a20144584f7649a1e55b64d47361907d95deb1468b3df1af2b344253b79330a93e4d5e8828f3bc81570f500d3f258
 DIST din-53.1.tar.gz 3708022 BLAKE2B 882d4ae6cbe24c3d7fc326df3f3630d7ea7cd65b5d53c4751844dc3edcf9d533cd7cfe58fed4c46766fab6b4983e75f75145206b5362bceb27382d02705b9a36 SHA512 42058b00402e726869af8a5cb8eb9b34e7b1709185c972d3f3b633a980ad7de57a143ca0ce854ce681ec67b81cd6dd2b2b06023a15d3f1b1bd54c4ac643b6096
-DIST din-53.tar.gz 3707794 BLAKE2B f1631c4b923a5f737181120c2a20dd4079e31b9fe02552a9895cab0f0913b2e4d8185404611795e9379178755168c1975c7520b0ae549708f4916a67631b922c SHA512 b359eb84085be80c13f5cf2a5af0c15903778fec677f91c9aa9029849df39d4bda95e537d7f85f290a8bb38932ef0da35c240921154788b5e89e347d7ac90a7e
-EBUILD din-53.1.ebuild 1089 BLAKE2B f13e0c8b3c0e02ffb6817e2da3b32e4c4d3de3c3e59db322659c32f3db94bce061f8f3b9aa8fa9c2eea234e321ef6bb7c3dafc74b3449f2c11ac5250813b1f78 SHA512 1f12458f2a2801c61a00069e32071c27e1b1331ce5e9ac1fad9fb46fa6eaf36a9cc89ed5f2d25489c06eab896e7f6ba7b24bb4c2e65b57c261bd2d1b2e951315
-EBUILD din-53.ebuild 1087 BLAKE2B 7a67f19a58ad0555fa33921bee462e9be928e008b2cfd07c651143e5521cd2e0034ee3f738281ccbe2c327f20d6586ee75595717b962a7dca1c3c5349797d3d1 SHA512 097052995d6bc80e03e46d902ddc49d83cf8d2647ab30442b1f2391780de2876e795f41d5bd234060d35003abba4ee98e6e56c47567564ee44bedf0ba21a6fbe
+EBUILD din-53.1.ebuild 1087 BLAKE2B 7a67f19a58ad0555fa33921bee462e9be928e008b2cfd07c651143e5521cd2e0034ee3f738281ccbe2c327f20d6586ee75595717b962a7dca1c3c5349797d3d1 SHA512 097052995d6bc80e03e46d902ddc49d83cf8d2647ab30442b1f2391780de2876e795f41d5bd234060d35003abba4ee98e6e56c47567564ee44bedf0ba21a6fbe
 MISC metadata.xml 256 BLAKE2B 211ca90d8f704be5ca8a1994f0e8f1adbe1fd4937a10a301ced0b9be171dfdabb223661d168535cd7f5edfe0c8edca4620945e13dc3c43b5832ac183913188f0 SHA512 fde3b658512fa6742886d7dd84efc906331b43f5b0f8fdca353fe2280653381716d7143473c9237b9fe58b9df5889b38b008da34f6ce4b64336f38642d78e3dd
diff --git a/media-sound/din/din-53.1.ebuild b/media-sound/din/din-53.1.ebuild
index 1ff40dd5f7de..a12ad9ed2cc6 100644
--- a/media-sound/din/din-53.1.ebuild
+++ b/media-sound/din/din-53.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://archive.org/download/dinisnoise_source_code/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="+alsa jack"
 
 RDEPEND="
diff --git a/media-sound/din/din-53.ebuild b/media-sound/din/din-53.ebuild
deleted file mode 100644
index a12ad9ed2cc6..000000000000
--- a/media-sound/din/din-53.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools edos2unix xdg
-
-DESCRIPTION="a software musical instrument and audio synthesizer"
-HOMEPAGE="https://dinisnoise.org/"
-SRC_URI="https://archive.org/download/dinisnoise_source_code/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+alsa jack"
-
-RDEPEND="
-	dev-lang/tcl:0=
-	media-libs/libsdl:=
-	virtual/glu
-	virtual/opengl
-	alsa? ( media-libs/alsa-lib )
-	jack? ( virtual/jack )
-"
-DEPEND="
-	${RDEPEND}
-	dev-libs/boost
-"
-BDEPEND="
-	virtual/pkgconfig
-"
-
-REQUIRED_USE="|| ( alsa jack )"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-52-makefile.patch"
-	"${FILESDIR}/${PN}-48-fix-random-constants.patch"
-)
-
-src_prepare() {
-	default
-
-	edos2unix pixmaps/${PN}.desktop
-
-	use jack && (sed -i "s/-lasound/-ljack/g" src/Makefile.am || die "Failed to fix jack linking")
-
-	eautoreconf
-}
-
-src_configure() {
-	# Jack takes over alsa.
-	local sound_engine
-
-	use jack && sound_engine="UNIX_JACK" || sound_engine="LINUX_ALSA"
-
-	econf CXXFLAGS="${CXXFLAGS} -D__${sound_engine}__"
-}