gentoo resync : 16.01.2021

4 files changed, 3 insertions, 77 deletions

diff --git a/media-sound/din/Manifest b/media-sound/din/Manifest
index b2c89077c96b..783f4ad2d361 100644
--- a/media-sound/din/Manifest
+++ b/media-sound/din/Manifest
@@ -1,8 +1,5 @@
 AUX din-48-fix-random-constants.patch 667 BLAKE2B 2747a1c60f2f968cd4e173996900d889b9c45f77af6aba035a4fe29ced8882178cc3fbfa925dc2bc02aced071648e008f409ecd9c6b3782838dec5344a8b71f4 SHA512 0805ea12a272276ba1883ab624c96566dbb71168bd9a0e4ecbe6f3373287e7d88d5a897c03e0385acf12a7fc79a4be73f1d66ec699790986cd2c863e6ca251bc
-AUX din-51.1.1-makefile.patch 1906 BLAKE2B e620aa00b69c460a694de60a4e16539f6b6f123e38a282e59db6b2e2b623cbec3bd793df2f1e7d935d955314023f90dd4b2dd12f155bb0c261328456af46a1d9 SHA512 02f3080beeadb90d725e4f94d4e39bc944aa22287b2af3b78b8094c4200ad58ffd02ad0359c4b677c89a426874394e134b526347b53ea3efa76fe950b007eafb
 AUX din-52-makefile.patch 1946 BLAKE2B 46535f179ae8c12c9eeb454b82acea990688e241e01a88b8cb10e61e9bf7de4152990b079ae62f9e2f9873062bf7e9309f3cab026dce67241ec828b7d740f2d2 SHA512 91adbbf10ac46b447e21db796b40b2f4925a20144584f7649a1e55b64d47361907d95deb1468b3df1af2b344253b79330a93e4d5e8828f3bc81570f500d3f258
-DIST din-51.1.1.tar.gz 3700797 BLAKE2B 559a4476188ac6d9da596be011bdaa8b379bb336220b3f94edf04e3eeb9ca0100fbaaa0fc10f9a9f37d3efa436acddac5c06435c6b3ebb4d21afdbd7c65b2dc8 SHA512 ea5e1ab79cbc24abb80a9fd25d8304f36ab2345505ee98132196685cda73b31dd7db3f62cb1821cbdc9694703d3454bd58d733833710d492ecebffee23732a0f
 DIST din-52.tar.gz 3706694 BLAKE2B 054d3857bed1b4f4affbeffa0fc5c27ef356f200a60f9d6c5145327311accc5f0b1c8deaf425b745ea4cd2c1accee1195b2e840e9125d105edf67e09062b8574 SHA512 c2ec779746d07ad6579aeebadff45e218fd29715ac446f00840b513d3f9c8d1ef79f556a1f5c7d931adb3451b547f58fb58d6da699170755ae62f25d70b95158
-EBUILD din-51.1.1.ebuild 1083 BLAKE2B 474d674d77d7350c744a50d61863b12cba148e73afd6d56d52f30d293b7a89659d658a3ede854dd0de281ade1d26e399aca940b90565a9980537acce5737b780 SHA512 d9bc8d1038e6f30e3fb6c1cc608b6760135e4df33fc8da7525df75b4fadd22d4676083e6c3abb05300cc562444fa7a1503c49209a90b5765130ac8ef6b166736
-EBUILD din-52.ebuild 1085 BLAKE2B e7a1c6e4c4e4efaa825733da31a56d19b50d71842ed3343fc8d3a9b9c2050af7f2c7aac993095799e77460404661cc74d7370a9d299497789eb6efa05f516273 SHA512 e0184a6602de34393f51e1cb42597ced4ca5a0c2acf7a0a87a0f1a486ce13e9661eac05de895a342aaa253956f562da596670bdb19076378f1e80428c5a6eb0a
+EBUILD din-52.ebuild 1083 BLAKE2B 005a89e65bbcb9dfadd2cb706847700f3408741b72b19417d54d6c77876af4594994999d3a67be207231fac9362d1e68bc6d3f98a04a2325549bce3af81f6aa0 SHA512 ce85c7e29d1fa3d0d3d3fbd7e4410601faea27f7902fbe63abaf0c6983a7c1cae82b3514b17d91541d8d450a1894bbff377c9e9a3e48ecd41056d1bc504c6ca6
 MISC metadata.xml 256 BLAKE2B 211ca90d8f704be5ca8a1994f0e8f1adbe1fd4937a10a301ced0b9be171dfdabb223661d168535cd7f5edfe0c8edca4620945e13dc3c43b5832ac183913188f0 SHA512 fde3b658512fa6742886d7dd84efc906331b43f5b0f8fdca353fe2280653381716d7143473c9237b9fe58b9df5889b38b008da34f6ce4b64336f38642d78e3dd
diff --git a/media-sound/din/din-51.1.1.ebuild b/media-sound/din/din-51.1.1.ebuild
deleted file mode 100644
index 43999113438b..000000000000
--- a/media-sound/din/din-51.1.1.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}/${P}-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}__"
-}
diff --git a/media-sound/din/din-52.ebuild b/media-sound/din/din-52.ebuild
index 69a4da0ac755..13c24db52183 100644
--- a/media-sound/din/din-52.ebuild
+++ b/media-sound/din/din-52.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -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/files/din-51.1.1-makefile.patch b/media-sound/din/files/din-51.1.1-makefile.patch
deleted file mode 100644
index 9909080a9b54..000000000000
--- a/media-sound/din/files/din-51.1.1-makefile.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/src/Makefile.am b/src/Makefile.am
-index 377dc4c..b086c0c 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -1,7 +1,7 @@
- #dinincludedir = $(pkgsrcdir)
- 
--AM_CXXFLAGS = -I /usr/include/tcl8.6 -Wall -D_THREAD_SAFE -DHAVE_OPENGL -D__LICENSED__ -D __SVG__ -D__GPL20__ -D __BOOST_TIME__ -DPREFIX=\"@prefix@\"
--LIBS +=  -ltcl8.6 -lSDL -lGL -lpthread -lasound
-+AM_CXXFLAGS = -Wall -D_THREAD_SAFE -DHAVE_OPENGL -D__LICENSED__ -D __SVG__ -D__GPL20__ -D __BOOST_TIME__ -DPREFIX=\"@prefix@\"
-+LIBS +=  -ltcl -lSDL -lGL -lpthread -lasound
- 
- bin_PROGRAMS = din
- din_SOURCES = alarm.cc arrow_button.cc audio.cc authors_note.cc ball.cc ball_ops.cc basic_editor.cc beat2value.cc binaural_drone.cc binaural_drones.cc bit_display.cc box_selector.cc button.cc capturer.cc checkbutton.cc chrono.cc circler.cc command.cc compressor.cc console.cc console_iterator.cc countries.cc cross_button.cc curve.cc curve_display.cc curve_editor.cc curve_library.cc curve_mixer.cc curve_picker.cc curve_samples.cc custom_periodic.cc delay.cc din.cc din_info.cc drawrrow.cc drone.cc eval.cc fader.cc fft.cc field.cc filled_button.cc font.cc font_editor.cc fractaliser.cc globals.cc glyph.cc gravity.cc hit.cc help.cc item_list.cc keyboard_keyboard.cc label.cc levels.cc line.cc lissajous.cc listeners.cc main.cc menu.cc mesh.cc midi_in.cc minus_button.cc mocap.cc modulator.cc mondrian.cc morpher.cc morse_code.cc mouse_slider.cc multi_curve.cc note.cc noiser.cc number.cc oscilloscope.cc phrasor.cc play.cc plugin.cc plugin_browser.cc plus_button.cc point_modulator.cc range.cc recorder.cc rect.cc rose_milker.cc scale_info.cc scale_notes.cc scalelist.cc separator.cc settings.cc sine_mixer.cc slit.cc solver.cc spiraler.cc starrer.cc superformula.cc tap_bpm.cc tcl_interp.cc textboard.cc tokenizer.cc trail.cc triggered_note.cc ui.cc ui_sin_cos_radius.cc viewwin.cc warper.cc widget.cc kiss_fft.c RtAudio.cpp RtMidi.cpp