gentoo resync : 04.05.2021

3 files changed, 2 insertions, 61 deletions

diff --git a/media-sound/din/Manifest b/media-sound/din/Manifest
index a82d277a5586..0508f1ba3aa5 100644
--- a/media-sound/din/Manifest
+++ b/media-sound/din/Manifest
@@ -2,8 +2,6 @@ AUX din-48-fix-random-constants.patch 667 BLAKE2B 2747a1c60f2f968cd4e173996900d8
 AUX din-49.1-makefile.patch 1888 BLAKE2B 89e5c6a81d97a56560ffddac770fba6aa0c476ceabec6fcd0983d9a21ba8579d61057bc56280163f2f5d15584541a15f07dd401eb9ce9f32f3da73f39d1f5997 SHA512 2e685ca57b8fba640d302868406ac573c1218da5fc0c40223e0420a60f31dc0baefcd07dff3b0c8627076cd7284655a3958f563a6ff73c20eef4d2570a035b59
 DIST din-50.1.tar.gz 3684686 BLAKE2B 3d73f31f91a57188b63f1f5fc9a68923c4fb6d9a14cbfd602510d0006ff4079ab60865e49118a02e46381aebd4cc4ee9415172bac724f8491655326147b6466b SHA512 c860c70bb9f3c3db66e05dd9f9048daecab1b0c9d0588fde901ce26723e291b56d23086f792180fb5fc688165e4ed7efdc302d0d3d02efa913be5f2d4a90f5eb
 DIST din-50.2.tar.gz 3687036 BLAKE2B b51923d755c5b4635d79c77f204bf42da9926fc247dde9d3ad175bc858a674a3064589608bfd67331ef40a417fdbbee4e90ae6a9bc2930355213738225fcd7e4 SHA512 4d60f26434559259b778181f2b46e2689af94179fc254b61e1ea623cafa49030736b69effd82fb2f62b8e908883cf272147dde884487c9a7beed9c26cf0a7498
-DIST din-50.tar.gz 3684789 BLAKE2B 31efae8f031e41b04d0e1cb9dea011572b9516ed9962687d863b5cd2f77ec409a9dc6b449a299869a89abc554e673aa05bae1350a06cc850b898b878c02e8daa SHA512 58796353df9180dc6b12bfe71579fb3dd2d7ab029dc5f8d09b4f8a3cb6938db054702dc4c7344b8d8852926e052f9bdf304b9a71e3d8faa9c6a209ef0b94ff4d
-EBUILD din-50.1.ebuild 1091 BLAKE2B c2792343dcaac7ea57369e6fe6034473d52564d63a48cdb4bc6a70e04cf049656151a8d51243ad781ff1d750395c83d2b20b337bfe2deeeb35353d5752adea35 SHA512 56a9fde6a578462cd93c2bff23fc0f0ea1a1aa80faf0aeff5c48201588c7e17988817eef39717eb3ef5dff10b0673ec135698ed556b08761ffe35361c55e36ba
+EBUILD din-50.1.ebuild 1089 BLAKE2B 7a526c3bdf99968fc2f4a252ce75e5d5010a40692eaa82aec6496ecd456b27386ac79e5bd99c0d17ce346eb98b4ebcb3ed74e3a89f475ef5b0ed1e0d30e38ad8 SHA512 bf941efa5b4983f111814938ec3f0e7bf3520f2b5efad146bbadfb8be3d69db873d476e1781d87ebd8f75da94eed2ebbbff2e94c055e69358f6eb4c8c2350f36
 EBUILD din-50.2.ebuild 1091 BLAKE2B c2792343dcaac7ea57369e6fe6034473d52564d63a48cdb4bc6a70e04cf049656151a8d51243ad781ff1d750395c83d2b20b337bfe2deeeb35353d5752adea35 SHA512 56a9fde6a578462cd93c2bff23fc0f0ea1a1aa80faf0aeff5c48201588c7e17988817eef39717eb3ef5dff10b0673ec135698ed556b08761ffe35361c55e36ba
-EBUILD din-50.ebuild 1089 BLAKE2B 7a526c3bdf99968fc2f4a252ce75e5d5010a40692eaa82aec6496ecd456b27386ac79e5bd99c0d17ce346eb98b4ebcb3ed74e3a89f475ef5b0ed1e0d30e38ad8 SHA512 bf941efa5b4983f111814938ec3f0e7bf3520f2b5efad146bbadfb8be3d69db873d476e1781d87ebd8f75da94eed2ebbbff2e94c055e69358f6eb4c8c2350f36
 MISC metadata.xml 255 BLAKE2B 7a492321189530430d5c71d5598f8a99b548e020d8ace46bb200f1f18abb3a59c4d0dff84c8dc1f78297137c25684d42386d793b84a02e2363fab4d6dcedd4fa SHA512 9e74b875aa129f5b8108121402291772fde4ac18a157dc60f7b3e19c318ee54cd1be54e283a68bc61562f2dc3f5b338b161028d673ff7baa267192ff3b7e8dc8
diff --git a/media-sound/din/din-50.1.ebuild b/media-sound/din/din-50.1.ebuild
index 4d68ab765afb..f2a1cb085d4b 100644
--- a/media-sound/din/din-50.1.ebuild
+++ b/media-sound/din/din-50.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-50.ebuild b/media-sound/din/din-50.ebuild
deleted file mode 100644
index f2a1cb085d4b..000000000000
--- a/media-sound/din/din-50.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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}-49.1-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}__"
-}