gentoo resync : 25.11.2020

6 files changed, 21 insertions, 35 deletions

diff --git a/media-sound/din/Manifest b/media-sound/din/Manifest
index 615cc8e4f603..d9c0d564e954 100644
--- a/media-sound/din/Manifest
+++ b/media-sound/din/Manifest
@@ -1,9 +1,8 @@
-AUX din-43.0.1-fix-random-constants.patch 683 BLAKE2B b745da8778155f1e8330b54114f80b86e35d6d94e48d224fc615c20103dc2b18d63a331ef88c0ee8dfed50e6f4ae0feb9d62a89f8bbf1bf12e68b7b94c9eba48 SHA512 bc85b3150067b26faebc494146e60062658cd8c8110523becbf85ff2034e5a949103ef0a46ff4941338a035a299a7475c9a1bb208e3bdd1935e725723b42416f
-AUX din-47.1-makefile.patch 588 BLAKE2B 5afba801148decc167b4d7bf50ce1b0e770f37d6f85806b151a35958b43749ce7f7a3fd70fbd5028e2d301737011bdcf2fa9f58c7c91ef34f7859bb4071ec1d3 SHA512 d19c72a72b2e3d081e12eb46114a3176b4ea497687df1d017e8c4ba8f1a7a049df169384f4345b45d97688544c7dace2ccc339aa9f64d65ae90657d73a271fdd
 AUX din-48-fix-random-constants.patch 667 BLAKE2B 2747a1c60f2f968cd4e173996900d889b9c45f77af6aba035a4fe29ced8882178cc3fbfa925dc2bc02aced071648e008f409ecd9c6b3782838dec5344a8b71f4 SHA512 0805ea12a272276ba1883ab624c96566dbb71168bd9a0e4ecbe6f3373287e7d88d5a897c03e0385acf12a7fc79a4be73f1d66ec699790986cd2c863e6ca251bc
 AUX din-48-makefile.patch 1886 BLAKE2B 091197f5d2bd421be5ebd2a6d9dc90d5a6f34a65c2e26bf3b639312b15017b61162922ff3834f3f00a7ad098eff2397ad312057c0ba712d0e9a88a83973d3e97 SHA512 f451ccdfdc7c17b975a3b0077bb92f5131c9e22bb9bf224d3b991c3e61679dfc602642311f05b47ecb0ad0963d554467e697e4ec0b15f775af93e9d3299d3369
-DIST din-47.1.tar.gz 3667502 BLAKE2B 21621e4e0909d9da534901811ae28ac5adf226387e2ea47476576fd1d4c45925c460babff04489a54e5e51d1f9ea916389168315108d80965df7b89868150786 SHA512 883008fa54751cd626ee60a5c5a4785a82680c229adefc2c8a86bfa28bf6be6549500c1bfe4661028ae8a2015383a2d9e6fe1d8992476d49576a999eea26ba17
+AUX din-49.1-makefile.patch 1888 BLAKE2B 89e5c6a81d97a56560ffddac770fba6aa0c476ceabec6fcd0983d9a21ba8579d61057bc56280163f2f5d15584541a15f07dd401eb9ce9f32f3da73f39d1f5997 SHA512 2e685ca57b8fba640d302868406ac573c1218da5fc0c40223e0420a60f31dc0baefcd07dff3b0c8627076cd7284655a3958f563a6ff73c20eef4d2570a035b59
 DIST din-48.tar.gz 3673917 BLAKE2B 90e29efcc159936e7dca5b1deba07d6ddf23fc6878053283c1723eaf73c9b06903d274e471c3043d57fb2cb923eb9516a06362590a6b555884dc1b7cb7b6e9c1 SHA512 3d54c3db23fe909a3664412f1bbba3898b83184d19c4b04f4432cd0bff0dede01d017cebe36980a3f8158ffbb663e09dd83a0de7206247b47fcc1a9f3b4cc940
-EBUILD din-47.1.ebuild 1084 BLAKE2B 976f42912df993640acba0cfeb2f0d6ecd027f95ce4711df06afdf1e05a9458714cc05f434b1b00ad08fd591d3b13d2ee2c9c151307da283349cad9584b0cb9a SHA512 467cfccf073e867affbd1fe78c57acb5f13a0ff8b854bb1c8cb40c4c6bee22a042da30ac698ae16031b27a48cc4270a5c2b0178793b54cd23e9d9b322964c510
-EBUILD din-48.ebuild 1078 BLAKE2B 68d5d618a2a3d165f6ba9f31393244ccf583a216ae30e1d9aec081381ae255bec06d7b110feec5b1a4b12673a7ca2c4574158c2d668f239dfc605440b7e2ec2a SHA512 2fdf558fafff9ebead738b57f63b3b1e70f111e0ccfed2b05e0f4b4fec71d6746a6dcce0633d3fee3666a37646b12153d99323aa8e3b7bb8ee3eb5aada1101b7
+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 1082 BLAKE2B 71400c1f53cfb279b695c9b43902d9318177d7585c840fa66145c23b3e1cf2fdf44ba9129f2e27e06204480df87178a7240abcff47990445d7b3f38a414e1cb2 SHA512 ba7eec5911baaa664977596200220b28f24f16cad8fd507540ebbb4d2089b3cd40783416b42497811c46b9b5852f89654fd69067f2ad56497abc62bfce30d655
 MISC metadata.xml 255 BLAKE2B 7a492321189530430d5c71d5598f8a99b548e020d8ace46bb200f1f18abb3a59c4d0dff84c8dc1f78297137c25684d42386d793b84a02e2363fab4d6dcedd4fa SHA512 9e74b875aa129f5b8108121402291772fde4ac18a157dc60f7b3e19c318ee54cd1be54e283a68bc61562f2dc3f5b338b161028d673ff7baa267192ff3b7e8dc8
diff --git a/media-sound/din/din-48.ebuild b/media-sound/din/din-48.ebuild
index 14fecc8a11cf..5be0674fc55e 100644
--- a/media-sound/din/din-48.ebuild
+++ b/media-sound/din/din-48.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-47.1.ebuild b/media-sound/din/din-49.1.ebuild
index a67d55f2e191..08b3a14fa0f7 100644
--- a/media-sound/din/din-47.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="
@@ -34,7 +34,7 @@ REQUIRED_USE="|| ( alsa jack )"
 
 PATCHES=(
 	"${FILESDIR}/${P}-makefile.patch"
-	"${FILESDIR}/${PN}-43.0.1-fix-random-constants.patch"
+	"${FILESDIR}/${PN}-48-fix-random-constants.patch"
 )
 
 src_prepare() {
diff --git a/media-sound/din/files/din-43.0.1-fix-random-constants.patch b/media-sound/din/files/din-43.0.1-fix-random-constants.patch
deleted file mode 100644
index 29f75d35f496..000000000000
--- a/media-sound/din/files/din-43.0.1-fix-random-constants.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/include/random.h b/include/random.h
-index 99d79fb..91ed250 100644
---- a/include/random.h
-+++ b/include/random.h
-@@ -16,8 +16,8 @@
- const int N = 624;

- const int M = 397;

- const unsigned int MATRIX_A = 0x9908b0df; /* constant vector a */

--const int UPPER_MASK = 0x80000000; /* most significant w-r bits */

--const int LOWER_MASK = 0x7fffffff; /* least significant r bits */

-+const unsigned int UPPER_MASK = 0x80000000; /* most significant w-r bits */

-+const unsigned int LOWER_MASK = 0x7fffffff; /* least significant r bits */

- 

- static unsigned int mt[N]; /* the array for the state vector  */

- static int mti=N+1; /* mti==N+1 means mt[N] is not initialized */

diff --git a/media-sound/din/files/din-47.1-makefile.patch b/media-sound/din/files/din-47.1-makefile.patch
deleted file mode 100644
index 62e7229f0f50..000000000000
--- a/media-sound/din/files/din-47.1-makefile.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/src/Makefile.am b/src/Makefile.am
-index b24e856..a624610 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -1,5 +1,5 @@
--AM_CXXFLAGS = -I ../include -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 = -I ../include -Wall -D_THREAD_SAFE -DHAVE_OPENGL -D__LICENSED__ -D __SVG__ -D__GPL20__ -D __BOOST_TIME__ -DPREFIX=\"@prefix@\"
-+LIBS +=  -ltcl -lSDL -lGL -lpthread -lasound
- 
- AM_CFLAGS = -I ../include
- bin_PROGRAMS = din
diff --git a/media-sound/din/files/din-49.1-makefile.patch b/media-sound/din/files/din-49.1-makefile.patch
new file mode 100644
index 000000000000..0a96d894c2c0
--- /dev/null
+++ b/media-sound/din/files/din-49.1-makefile.patch
@@ -0,0 +1,14 @@
+diff --git a/src/Makefile.am b/src/Makefile.am
+index c7cc5ce..2b07a9b 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