gentoo christmass resync : 25.12.2020

4 files changed, 2 insertions, 76 deletions

diff --git a/media-sound/din/Manifest b/media-sound/din/Manifest
index 9004978daac3..ecfebac70f82 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-48-makefile.patch 1886 BLAKE2B 091197f5d2bd421be5ebd2a6d9dc90d5a6f34a65c2e26bf3b639312b15017b61162922ff3834f3f00a7ad098eff2397ad312057c0ba712d0e9a88a83973d3e97 SHA512 f451ccdfdc7c17b975a3b0077bb92f5131c9e22bb9bf224d3b991c3e61679dfc602642311f05b47ecb0ad0963d554467e697e4ec0b15f775af93e9d3299d3369
 AUX din-49.1-makefile.patch 1888 BLAKE2B 89e5c6a81d97a56560ffddac770fba6aa0c476ceabec6fcd0983d9a21ba8579d61057bc56280163f2f5d15584541a15f07dd401eb9ce9f32f3da73f39d1f5997 SHA512 2e685ca57b8fba640d302868406ac573c1218da5fc0c40223e0420a60f31dc0baefcd07dff3b0c8627076cd7284655a3958f563a6ff73c20eef4d2570a035b59
-DIST din-48.tar.gz 3673917 BLAKE2B 90e29efcc159936e7dca5b1deba07d6ddf23fc6878053283c1723eaf73c9b06903d274e471c3043d57fb2cb923eb9516a06362590a6b555884dc1b7cb7b6e9c1 SHA512 3d54c3db23fe909a3664412f1bbba3898b83184d19c4b04f4432cd0bff0dede01d017cebe36980a3f8158ffbb663e09dd83a0de7206247b47fcc1a9f3b4cc940
 DIST din-49.1.tar.gz 3677087 BLAKE2B 7b696597327493d354c5efd31df243c70f23ec8d68514892c79212b9d3d398c7debb28ad95b6ccb04dc76ac0a9b01ee57d8245260dd4af99cd3f3b27bc2ecbcf SHA512 8f72fd1dce7197135e174bc8c4fb5325e7755e656d7817bbd82c964083ca48b0b5cc939472acf3464fd0404631767bbea1f20b7dea073b6829582e76d2879e04
-EBUILD din-48.ebuild 1076 BLAKE2B 5fc293baa092bfe143a36ea2b46c8765e10add99708f628878eefd549f5d9a0fec9d4b8f1df5a1e88f8d8ec35d2a60b91b81802364166a5a7b2262a734fb67a1 SHA512 6d54111f3e24d870cb93996502989da83a7c2012680d35476e01056910b00ab1e651870bee1c9c5dfc4ab10ee105a0fd1d79dde6ec9a03fbf9b5ff6a1189d885
-EBUILD din-49.1.ebuild 1081 BLAKE2B 80438b401f1556255c5b4bdf591317ef3c2c0bc92e7521fdc97aef7fa4101444d72ac1a31976fb9f511cc6d6c6a274ba64b3af738e802f5826b99f7d6335e1b4 SHA512 f662ed9a7ceaf0159570a36ed5c7f81d598907307a2cb8a5c2a677938b975013e5607dfb8f5f46dceae8f8541fb4e9c28dc756f0638fd9700a00dbf5a2cb3202
+EBUILD din-49.1.ebuild 1080 BLAKE2B 36e9fa12d77c754afe7bc74ba7ded2e2b30b6cda8dc2181b2348268499be0b015d3508420248918f80ddfbf4f6075eb54b39d574aff5f3c897073bafa27a5a2e SHA512 67bf71cc6c1ba1529173e992d79889627473163f74649fe694171fe3fd064d14aea4d17c78272e8409692299f4cc8f138dde535ca537f5b42e41d38a3cd8a369
 MISC metadata.xml 255 BLAKE2B 7a492321189530430d5c71d5598f8a99b548e020d8ace46bb200f1f18abb3a59c4d0dff84c8dc1f78297137c25684d42386d793b84a02e2363fab4d6dcedd4fa SHA512 9e74b875aa129f5b8108121402291772fde4ac18a157dc60f7b3e19c318ee54cd1be54e283a68bc61562f2dc3f5b338b161028d673ff7baa267192ff3b7e8dc8
diff --git a/media-sound/din/din-48.ebuild b/media-sound/din/din-48.ebuild
deleted file mode 100644
index 5be0674fc55e..000000000000
--- a/media-sound/din/din-48.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools eutils 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}/${P}-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-49.1.ebuild b/media-sound/din/din-49.1.ebuild
index b88be5f2c753..6872627e7dcb 100644
--- a/media-sound/din/din-49.1.ebuild
+++ b/media-sound/din/din-49.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/files/din-48-makefile.patch b/media-sound/din/files/din-48-makefile.patch
deleted file mode 100644
index 5a37359106da..000000000000
--- a/media-sound/din/files/din-48-makefile.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/src/Makefile.am b/src/Makefile.am
-index df480f2..d665bbf 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 drone.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