gentoo resync : 30.10.2021

5 files changed, 2 insertions, 119 deletions

diff --git a/media-sound/din/Manifest b/media-sound/din/Manifest
index 4d9f3b299184..6cc8897ace9d 100644
--- a/media-sound/din/Manifest
+++ b/media-sound/din/Manifest
@@ -1,9 +1,5 @@
 AUX din-48-fix-random-constants.patch 667 BLAKE2B 2747a1c60f2f968cd4e173996900d889b9c45f77af6aba035a4fe29ced8882178cc3fbfa925dc2bc02aced071648e008f409ecd9c6b3782838dec5344a8b71f4 SHA512 0805ea12a272276ba1883ab624c96566dbb71168bd9a0e4ecbe6f3373287e7d88d5a897c03e0385acf12a7fc79a4be73f1d66ec699790986cd2c863e6ca251bc
-AUX din-49.1-makefile.patch 1888 BLAKE2B 89e5c6a81d97a56560ffddac770fba6aa0c476ceabec6fcd0983d9a21ba8579d61057bc56280163f2f5d15584541a15f07dd401eb9ce9f32f3da73f39d1f5997 SHA512 2e685ca57b8fba640d302868406ac573c1218da5fc0c40223e0420a60f31dc0baefcd07dff3b0c8627076cd7284655a3958f563a6ff73c20eef4d2570a035b59
-AUX din-50.2-gcc11-rename-identifier.patch 1207 BLAKE2B 336f06a9e4baf9e7dcb44c86c40adef61caa2ea231d695e59720e600d2fba9c7f788be63c18b135ebefcfda879ea067b633066c80a7f9b8bb501c0c31bbbe16f SHA512 2496ac4026b70f0c3b00adcf3b295ddb77c25e10f436b0222432536f0a5d3efd1d5a8df4d5ba15643c7c29323e2d25dcd197649815e90c11e19fb28dd6a8eedc
 AUX din-51.1.1-makefile.patch 1906 BLAKE2B e620aa00b69c460a694de60a4e16539f6b6f123e38a282e59db6b2e2b623cbec3bd793df2f1e7d935d955314023f90dd4b2dd12f155bb0c261328456af46a1d9 SHA512 02f3080beeadb90d725e4f94d4e39bc944aa22287b2af3b78b8094c4200ad58ffd02ad0359c4b677c89a426874394e134b526347b53ea3efa76fe950b007eafb
-DIST din-50.2.tar.gz 3687036 BLAKE2B b51923d755c5b4635d79c77f204bf42da9926fc247dde9d3ad175bc858a674a3064589608bfd67331ef40a417fdbbee4e90ae6a9bc2930355213738225fcd7e4 SHA512 4d60f26434559259b778181f2b46e2689af94179fc254b61e1ea623cafa49030736b69effd82fb2f62b8e908883cf272147dde884487c9a7beed9c26cf0a7498
 DIST din-51.1.1.tar.gz 3700797 BLAKE2B 559a4476188ac6d9da596be011bdaa8b379bb336220b3f94edf04e3eeb9ca0100fbaaa0fc10f9a9f37d3efa436acddac5c06435c6b3ebb4d21afdbd7c65b2dc8 SHA512 ea5e1ab79cbc24abb80a9fd25d8304f36ab2345505ee98132196685cda73b31dd7db3f62cb1821cbdc9694703d3454bd58d733833710d492ecebffee23732a0f
-EBUILD din-50.2.ebuild 1145 BLAKE2B ad96be1ff43ee274ffc8d7605024888952ea6f2cdf9dc8c11dd27b6192d065bf7e4e66cfeff4abdcc2514934ebe55795a33f185f59c81f147e95540a21edba8e SHA512 1050c39d47fbf190f35f410220a5c38f637c32d7bda5fd33efb896df8fc2ee2348a52f084b3f8261b912a7869008fb1a13fb0f901d9c9f13e26ba3baf285f34e
-EBUILD din-51.1.1.ebuild 1085 BLAKE2B 7daf285ccbd334752a8ce0fb3d8799c3fd987aa6d4cd0d660674494e65d2a5aed96d4c71a96ee6e1c678d45d8f50f5beb3a0da62a8cdfb3dad3ea9be2ba04cac SHA512 fa516a25c9ba70aedb1f214b474fad340f0ff3865089b7b37767ca02222ab1be6fd58b54878c4a931a00ee323501a14cdf878c3b7dfc0162b694e9ba097b1e12
+EBUILD din-51.1.1.ebuild 1083 BLAKE2B 474d674d77d7350c744a50d61863b12cba148e73afd6d56d52f30d293b7a89659d658a3ede854dd0de281ade1d26e399aca940b90565a9980537acce5737b780 SHA512 d9bc8d1038e6f30e3fb6c1cc608b6760135e4df33fc8da7525df75b4fadd22d4676083e6c3abb05300cc562444fa7a1503c49209a90b5765130ac8ef6b166736
 MISC metadata.xml 256 BLAKE2B 211ca90d8f704be5ca8a1994f0e8f1adbe1fd4937a10a301ced0b9be171dfdabb223661d168535cd7f5edfe0c8edca4620945e13dc3c43b5832ac183913188f0 SHA512 fde3b658512fa6742886d7dd84efc906331b43f5b0f8fdca353fe2280653381716d7143473c9237b9fe58b9df5889b38b008da34f6ce4b64336f38642d78e3dd
diff --git a/media-sound/din/din-50.2.ebuild b/media-sound/din/din-50.2.ebuild
deleted file mode 100644
index 31e46f323352..000000000000
--- a/media-sound/din/din-50.2.ebuild
+++ /dev/null
@@ -1,58 +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"
-	"${FILESDIR}/${PN}-50.2-gcc11-rename-identifier.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-51.1.1.ebuild b/media-sound/din/din-51.1.1.ebuild
index 4c4933184e27..43999113438b 100644
--- a/media-sound/din/din-51.1.1.ebuild
+++ b/media-sound/din/din-51.1.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-49.1-makefile.patch b/media-sound/din/files/din-49.1-makefile.patch
deleted file mode 100644
index 0a96d894c2c0..000000000000
--- a/media-sound/din/files/din-49.1-makefile.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-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
diff --git a/media-sound/din/files/din-50.2-gcc11-rename-identifier.patch b/media-sound/din/files/din-50.2-gcc11-rename-identifier.patch
deleted file mode 100644
index 8245a5cb021b..000000000000
--- a/media-sound/din/files/din-50.2-gcc11-rename-identifier.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-https://bugs.gentoo.org/787185
-
-From 9ea918cfdfcd99fbcac64a820ddbaefb562c11a0 Mon Sep 17 00:00:00 2001
-From: Sam James <sam@gentoo.org>
-Date: Mon, 14 Jun 2021 15:06:58 +0000
-Subject: [PATCH] src/help.h: Rename __help identifier
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-__help is reserved, so we need to rename it to fix a build failure with GCC 11:
-
-	"In addition to the names documented in this manual, reserved names include all
-	external identifiers (global functions and variables) that begin with an
-	underscore (‘_’) and all identifiers regardless of use that begin with either
-	two underscores or an underscore followed by a capital letter are reserved names."
-	-- glibc manual, 1.3.3 Reserved Names
-
-Signed-off-by: Sam James <sam@gentoo.org>
----
- src/help.h | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/help.h b/src/help.h
-index ae0954b..af7f178 100644
---- a/src/help.h
-+++ b/src/help.h
-@@ -5,8 +5,8 @@
- * For more information, please visit https://dinisnoise.org/

- */

- 

--#ifndef __help

--#define __help

-+#ifndef DIN_help

-+#define DIN_help

- #include <string>

- #include <vector>

- struct help {

--- 
-2.32.0
-