15 files changed, 156 insertions, 403 deletions
diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index 2e177291d9f1..09bb3b4783b6 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/din/Manifest b/media-sound/din/Manifest
index 0197f6c4e9ca..b0d80a0e82e1 100644
--- a/media-sound/din/Manifest
+++ b/media-sound/din/Manifest
@@ -1,5 +1,8 @@
 AUX din-48-fix-random-constants.patch 667 BLAKE2B 2747a1c60f2f968cd4e173996900d889b9c45f77af6aba035a4fe29ced8882178cc3fbfa925dc2bc02aced071648e008f409ecd9c6b3782838dec5344a8b71f4 SHA512 0805ea12a272276ba1883ab624c96566dbb71168bd9a0e4ecbe6f3373287e7d88d5a897c03e0385acf12a7fc79a4be73f1d66ec699790986cd2c863e6ca251bc
 AUX din-52-makefile.patch 1946 BLAKE2B 46535f179ae8c12c9eeb454b82acea990688e241e01a88b8cb10e61e9bf7de4152990b079ae62f9e2f9873062bf7e9309f3cab026dce67241ec828b7d740f2d2 SHA512 91adbbf10ac46b447e21db796b40b2f4925a20144584f7649a1e55b64d47361907d95deb1468b3df1af2b344253b79330a93e4d5e8828f3bc81570f500d3f258
+AUX din-55-makefile.patch 564 BLAKE2B fb483ef0182b5bed5131a2915204c1a564ac31acef1faaa780804a46f3d23717d3af8222702b3d6846fdccf2a7370546d6f586add8a42a3fa2bff130b9c9b9f7 SHA512 e37d9bdec42df1abff6be2ffe80d4b46838d451e015a0d557f387922dddd54718733353e7f5cb198bf4d56b45754a933657a182b8420b81770fc5e2435719b6d
 DIST din-54.tar.gz 3710611 BLAKE2B 2a7540d9a413c0f83b2cfc7373b1c0fdd40012ae725f162810e4d3165e3bc669661860fd653eaed8c7f2eeed7f015ff50ce6082ce8de04bd035bf395ca018d6a SHA512 8831e6d838ba06373b13574701929f96a508f2899618509b3e79f23cb0aa11c34b347fa00b4fa765a7668c7db54733be2c9146b8e783d3fe07e3ea4ce2707bd8
+DIST din-55.tar.gz 3711327 BLAKE2B 2c6ba4a877c512a950fb7c731f20d285019da1c7cd4ab5c7ff8d75e3c25eaa4ea08ca865b37e12fa1cefc1175baaa1c7ce27a44c7fa7c0b6c59b0ccbf6ab7a39 SHA512 432a53e71d1cf96c9ed62694fb23d1264d2e80b34620ebf0f1f33f3d4787cc7358c42038b2a45aa9d3ba9f59828eaaebd521a046fd5a51919a13f1bffad16a22
 EBUILD din-54.ebuild 1087 BLAKE2B 7a67f19a58ad0555fa33921bee462e9be928e008b2cfd07c651143e5521cd2e0034ee3f738281ccbe2c327f20d6586ee75595717b962a7dca1c3c5349797d3d1 SHA512 097052995d6bc80e03e46d902ddc49d83cf8d2647ab30442b1f2391780de2876e795f41d5bd234060d35003abba4ee98e6e56c47567564ee44bedf0ba21a6fbe
+EBUILD din-55.ebuild 1085 BLAKE2B 47d21494c31e240d4aa34ac472bc5b225bb52e8b3530caaa00b03966654f78f0c232a84dc8038843734bfaaf5935ec3f407fd627e33731176d8b9bec94a3377f SHA512 1de77358914c36b81d4196f27ef7056207d6a11dacddc50d21446c5ce88adc3c65357462f5e5bd60f54e90bd6137407132003549cedf96776181bc9e439f3e1d
 MISC metadata.xml 256 BLAKE2B 211ca90d8f704be5ca8a1994f0e8f1adbe1fd4937a10a301ced0b9be171dfdabb223661d168535cd7f5edfe0c8edca4620945e13dc3c43b5832ac183913188f0 SHA512 fde3b658512fa6742886d7dd84efc906331b43f5b0f8fdca353fe2280653381716d7143473c9237b9fe58b9df5889b38b008da34f6ce4b64336f38642d78e3dd
diff --git a/media-sound/din/din-55.ebuild b/media-sound/din/din-55.ebuild
new file mode 100644
index 000000000000..a214eed23a5a
--- /dev/null
+++ b/media-sound/din/din-55.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/files/din-55-makefile.patch b/media-sound/din/files/din-55-makefile.patch
new file mode 100644
index 000000000000..5ce81bd0c1f8
--- /dev/null
+++ b/media-sound/din/files/din-55-makefile.patch
@@ -0,0 +1,14 @@
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 1c54f03..db187eb 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
+ 
diff --git a/media-sound/fluidsynth/Manifest b/media-sound/fluidsynth/Manifest
index 23b8b46dbe8e..5cb3439bbdd5 100644
--- a/media-sound/fluidsynth/Manifest
+++ b/media-sound/fluidsynth/Manifest
@@ -1,5 +1,3 @@
-DIST fluidsynth-2.2.8.tar.gz 1751615 BLAKE2B 7eaee4cc1c2f49e464cda2852890ec8e96bd86c258a39246ec5c84ea3e57c9869d1e88963daecc3fa8957df1d55ff6c6633a4900de3d6fc0a1adf830865adda0 SHA512 8173f2d368a214cf1eb7faae2f6326db43fb094ec9c83e652f953290c3f29c34ebd0b92cbb439bea8d814d3a7e4f9dc0c18c648df1d414989d5d8b4700c79535
 DIST fluidsynth-2.2.9.tar.gz 1750977 BLAKE2B a6b4a19737d01e86a80084cdf88897da9af7d2c50be80fb0227a1d70effb8551667ae27f43ce63591830acfdef31ff0d99d51e3160b9b09c274637b259a82833 SHA512 90f44f6d7a4ed504eea5e2d39d8da2e0072bef746f3d969e367f0bab36a4cff479a98e795dc8b6b58b565fb266c44a137a14e98c7e4c77d1be3b300b8c066600
-EBUILD fluidsynth-2.2.8.ebuild 3392 BLAKE2B 1fa6acdd1ea5d223df74ba0c3b1106676ee9bb0c518a2eed129ecd4c6b49ff8d691cc67702dba1663869daefab6687a12eb776069f45f44b953dd129f9c46df2 SHA512 b5369a6033e7dd4bdb73f93c794ebe47824fd425ad08c97d10fc2352d4d74bbc98bc6300ca85eff72f255d248735bc7579f4311950a48f7d195af1b6ad1df3bd
 EBUILD fluidsynth-2.2.9.ebuild 3392 BLAKE2B 1fa6acdd1ea5d223df74ba0c3b1106676ee9bb0c518a2eed129ecd4c6b49ff8d691cc67702dba1663869daefab6687a12eb776069f45f44b953dd129f9c46df2 SHA512 b5369a6033e7dd4bdb73f93c794ebe47824fd425ad08c97d10fc2352d4d74bbc98bc6300ca85eff72f255d248735bc7579f4311950a48f7d195af1b6ad1df3bd
 MISC metadata.xml 431 BLAKE2B f739f538274e2e63b1977673b0766a594db59982ab71d6552d1e841434c4040bb7af29d441b1d9e8ce61385dbdb8e522b5591f6826a4c52f085bf004f9fe8426 SHA512 c8085e7652a504610fb841e302ee380de58a67a16a9b874447c00ee20c2d56119254eed954704e8bd4cf8e574980da2dd2f90baa5c99e59cd534e26245af67bb
diff --git a/media-sound/fluidsynth/fluidsynth-2.2.8.ebuild b/media-sound/fluidsynth/fluidsynth-2.2.8.ebuild
deleted file mode 100644
index 440a94c7dbb4..000000000000
--- a/media-sound/fluidsynth/fluidsynth-2.2.8.ebuild
+++ /dev/null
@@ -1,119 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake-multilib systemd toolchain-funcs
-
-DESCRIPTION="Software real-time synthesizer based on the Soundfont 2 specifications"
-HOMEPAGE="https://www.fluidsynth.org"
-SRC_URI="https://github.com/FluidSynth/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1+"
-SLOT="0/3"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~riscv sparc x86"
-IUSE="alsa dbus debug examples ipv6 jack ladspa lash network oss portaudio pulseaudio +readline sdl +sndfile systemd threads"
-
-BDEPEND="
-	virtual/pkgconfig
-"
-DEPEND="
-	dev-libs/glib:2[${MULTILIB_USEDEP}]
-	alsa? (
-		media-libs/alsa-lib[${MULTILIB_USEDEP}]
-		lash? ( media-sound/lash[${MULTILIB_USEDEP}] )
-	)
-	dbus? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
-	jack? ( virtual/jack[${MULTILIB_USEDEP}] )
-	ladspa? (
-		media-libs/ladspa-sdk[${MULTILIB_USEDEP}]
-		media-plugins/cmt-plugins[${MULTILIB_USEDEP}]
-	)
-	portaudio? ( media-libs/portaudio[${MULTILIB_USEDEP}] )
-	pulseaudio? ( media-sound/pulseaudio[${MULTILIB_USEDEP}] )
-	readline? ( sys-libs/readline:0=[${MULTILIB_USEDEP}] )
-	sdl? ( media-libs/libsdl2[${MULTILIB_USEDEP}] )
-	sndfile? ( media-libs/libsndfile[${MULTILIB_USEDEP}] )
-"
-RDEPEND="${DEPEND}"
-
-DOCS=( AUTHORS ChangeLog README.md THANKS TODO doc/fluidsynth-v20-devdoc.txt )
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_C_COMPILER="$(tc-getCC)"
-		-Denable-alsa=$(usex alsa)
-		-Denable-aufile=ON
-		-Denable-dbus=$(usex dbus)
-		-Denable-debug=$(usex debug)
-		-Denable-dsound=OFF # Windows
-		-Denable-floats=OFF # loat instead of double for DSP samples
-		-Denable-fpe-check=$(usex debug)
-		-Denable-ipv6=$(usex ipv6)
-		-Denable-jack=$(usex jack)
-		-Denable-ladspa=$(usex ladspa)
-		-Denable-libinstpatch=ON # https://github.com/swami/libinstpatch
-		-Denable-midishare=OFF # http://midishare.sourceforge.net/
-		-Denable-network=$(usex network)
-		-Denable-opensles=OFF
-		-Denable-oboe=OFF # requires OpenSLES and/or AAudio
-		-Denable-oss=$(usex oss)
-		-Denable-libsndfile=$(usex sndfile)
-		-Denable-pkgconfig=ON
-		-Denable-portaudio=$(usex portaudio)
-		-Denable-profiling=$(usex debug)
-		-Denable-pulseaudio=$(usex pulseaudio)
-		-Denable-readline=$(usex readline)
-		-Denable-sdl2=$(usex sdl)
-		-Denable-systemd=$(usex systemd)
-		-Denable-threads=$(usex threads)
-		-Denable-trap-on-fpe=$(usex debug)
-		-Denable-ubsan=OFF # compile and link against UBSan (for debugging fluidsynth internals)
-		-Denable-waveout=OFF # Windows
-		-Denable-winmidi=OFF # Windows
-	)
-
-	if use alsa; then
-		mycmakeargs+=( -Denable-lash=$(usex lash) )
-	else
-		mycmakeargs+=( -Denable-lash=OFF )
-	fi
-
-	if use systemd; then
-		mycmakeargs+=( -DFLUID_DAEMON_ENV_FILE="/etc/fluidsynth.conf" )
-	fi
-
-	cmake-multilib_src_configure
-}
-
-install_systemd_files() {
-	if multilib_is_native_abi; then
-		systemd_dounit "${BUILD_DIR}/fluidsynth.service"
-		insinto /etc
-		doins "${BUILD_DIR}/fluidsynth.conf"
-	fi
-}
-
-multilib_src_test() {
-	eninja check
-}
-
-src_install() {
-	cmake-multilib_src_install
-
-	docinto pdf
-	dodoc doc/*.pdf
-
-	if use examples; then
-		docinto examples
-		dodoc doc/examples/*.c
-	fi
-
-	if use systemd; then
-		multilib_foreach_abi install_systemd_files
-
-		elog "When using fluidsynth as a systemd service, make sure"
-		elog "to configure your fluidsynth settings globally in "
-		elog "/etc/fluidsynth.conf or per-user in ~/.config/fluidsynth"
-	fi
-}
diff --git a/media-sound/qtractor/Manifest b/media-sound/qtractor/Manifest
index 2e1b3076f9ae..6cb98c415212 100644
--- a/media-sound/qtractor/Manifest
+++ b/media-sound/qtractor/Manifest
@@ -1,5 +1,3 @@
-DIST qtractor-0.9.27.tar.gz 1995105 BLAKE2B 08b3a18d37eb700960e24741178079deb728f909f80fc00491abbe832c1d1966022ec6bd2c24469047b53b168a7e084a7d76da96e587afff78662f2f1c9b1d26 SHA512 2bcd4c5676fda58c7cf9ad9a9dcc139eda11c69b1c608812ff912ff63da56fbd0ba6b76828b326038365c9d84519bc752c54572e8edbf573e6cd0d068a17faf6
 DIST qtractor-0.9.28.tar.gz 2000685 BLAKE2B aa0d71732b9d214da22a97ca15d0c54eb61b7c35656f827bd0e39f5b55981b0c0d29645d5d3c4280ccba6aab971171615ef099f1cea1f3a8c381ac0dfffd2ca8 SHA512 db63766bcfd5a744a532d68cbe6f3153f9dd02208bca5098b27cda1cbec694b2981b3eb6a7912324c07327c000087cb5f5ba46dccc96398d051e011ce563fc67
-EBUILD qtractor-0.9.27-r1.ebuild 2503 BLAKE2B 82e268d7cc532cfa54937bf76cce36751f546ceb924d5cf07908f0423529ed93a4c3ed526a17ae472781b26a04977da2f0892656516ba3da906bbb981f87c5c1 SHA512 a029c76b6386ff1e10eddefa0738591a51b60b0564266f5defe2a26c6aeb25d2b6719c62a97396cfb5e1df7a49ee25dc6212bd5835b7afaae55605ccb891d912
 EBUILD qtractor-0.9.28.ebuild 2503 BLAKE2B 82e268d7cc532cfa54937bf76cce36751f546ceb924d5cf07908f0423529ed93a4c3ed526a17ae472781b26a04977da2f0892656516ba3da906bbb981f87c5c1 SHA512 a029c76b6386ff1e10eddefa0738591a51b60b0564266f5defe2a26c6aeb25d2b6719c62a97396cfb5e1df7a49ee25dc6212bd5835b7afaae55605ccb891d912
 MISC metadata.xml 891 BLAKE2B c85e76d86b5e559e2de880a440e8bdddfb8d67de2b7216a42ebb1ec7cce7b9a4dc8ccf20732e4b4ea489a14fcf5584aecef193e9fe3ac2bb0159011002607a60 SHA512 fcc0f8b61f0b9d9fd3d49c5f00f46b739012a6e8e4f7664bf08ae277b279d282d11056f9ca986788a7e444da53a17aeab46c2ee30fa945eb54dd271b11cf4a55
diff --git a/media-sound/qtractor/qtractor-0.9.27-r1.ebuild b/media-sound/qtractor/qtractor-0.9.27-r1.ebuild
deleted file mode 100644
index 57db29bd6746..000000000000
--- a/media-sound/qtractor/qtractor-0.9.27-r1.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake xdg
-
-DESCRIPTION="Audio/MIDI multi-track sequencer written in C++ with the Qt framework"
-HOMEPAGE="https://qtractor.sourceforge.io"
-SRC_URI="mirror://sourceforge/qtractor/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-IUSE="aubio cpu_flags_x86_sse debug dssi ladspa libsamplerate mad osc rubberband vorbis zlib"
-REQUIRED_USE="dssi? ( ladspa )"
-
-BDEPEND="
-	dev-qt/linguist-tools:5
-	virtual/pkgconfig
-"
-DEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtsvg:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
-	dev-qt/qtx11extras:5
-	media-libs/alsa-lib
-	media-libs/libsndfile
-	media-libs/lilv
-	media-libs/lv2
-	media-libs/suil
-	virtual/jack
-	x11-libs/libxcb:=
-	aubio? ( media-libs/aubio:= )
-	dssi? ( media-libs/dssi )
-	ladspa? ( media-libs/ladspa-sdk )
-	libsamplerate? ( media-libs/libsamplerate )
-	mad? ( media-libs/libmad )
-	osc? ( media-libs/liblo )
-	rubberband? ( media-libs/rubberband )
-	vorbis? (
-		media-libs/libogg
-		media-libs/libvorbis
-	)
-	zlib? ( sys-libs/zlib )
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DCONFIG_DSSI=$(usex dssi 1 0)
-		-DCONFIG_GRADIENT=1
-		-DCONFIG_JACK_LATENCY=1
-		-DCONFIG_JACK_METADATA=1
-		-DCONFIG_JACK_SESSION=1
-		-DCONFIG_LADSPA=$(usex ladspa 1 0)
-		-DCONFIG_LIBAUBIO=$(usex aubio 1 0)
-		-DCONFIG_LIBLILV=1
-		-DCONFIG_LIBLO=$(usex osc 1 0)
-		-DCONFIG_LIBMAD=$(usex mad 1 0)
-		-DCONFIG_LIBRUBBERBAND=$(usex rubberband 1 0)
-		-DCONFIG_LIBSAMPLERATE=$(usex libsamplerate 1 0)
-		-DCONFIG_LIBVORBIS=$(usex vorbis 1 0)
-		-DCONFIG_LIBZ=$(usex zlib 1 0)
-		-DCONFIG_LV2=1
-		-DCONFIG_LV2_UI_GTK2=0
-		-DCONFIG_NSM=0
-		-DCONFIG_SSE=$(usex cpu_flags_x86_sse 1 0)
-		-DCONFIG_STACKTRACE=$(usex debug 1 0)
-		-DCONFIG_VESTIGE=1
-		-DCONFIG_VST=1
-		-DCONFIG_VST3=0
-		-DCONFIG_XUNIQUE=0
-	)
-	# Following options are left to the default
-	# CONFIG_LV2_ATOM
-	# CONFIG_LV2_BUF_SIZE
-	# CONFIG_LV2_CVPORT
-	# CONFIG_LV2_EVENT
-	# CONFIG_LV2_EXTERNAL_UI
-	# CONFIG_LV2_MIDNAM
-	# CONFIG_LV2_OPTIONS
-	# CONFIG_LV2_PARAMETERS
-	# CONFIG_LV2_PATCH
-	# CONFIG_LV2_PORT_EVENT
-	# CONFIG_LV2_PRESETS
-	# CONFIG_LV2_PROGRAMS
-	# CONFIG_LV2_STATE
-	# CONFIG_LV2_STATE_FILES
-	# CONFIG_LV2_STATE_MAKE_PATH
-	# CONFIG_LV2_TIME
-	# CONFIG_LV2_TIME_POSITION
-	# CONFIG_LV2_UI
-	# CONFIG_LV2_UI_IDLE
-	# CONFIG_LV2_UI_REQ_VALUE
-	# CONFIG_LV2_UI_SHOW
-	# CONFIG_LV2_UI_TOUCH
-	# CONFIG_LV2_WORKER
-	# CONFIG_LV2_UI_X11
-	cmake_src_configure
-}
diff --git a/media-sound/schismtracker/Manifest b/media-sound/schismtracker/Manifest
index 21a59fc4bd65..136c55df136d 100644
--- a/media-sound/schismtracker/Manifest
+++ b/media-sound/schismtracker/Manifest
@@ -1,5 +1,3 @@
-DIST schismtracker-20220807.tar.gz 1278129 BLAKE2B 86cb727e4b797ffcf87b7a0dee93d364a93f2c73bd66856af5bdf0c8ef72157824d04141a11a884d3d286cecb5fcdf2a24f91fcb3421e6831b5fdde6681b5100 SHA512 36944581ef88ba256764d1acec0f6d38fb83027ebca7bfea7d313693d9e4062bd217ba6c4dee6a262753b186398b89035d371c5428b35c33eaf95e901bd7304d
 DIST schismtracker-20220905.tar.gz 1278816 BLAKE2B 6f461732c99a01c8f4a17afbac61b9b52686cd6c0e58c99f75337b4e33e187b5465f9adf5422ec3a455e9448f1beac845080816001af02cf2afa5740b9f384a7 SHA512 2429e6a3ed6004a0d327ddb8ae7c379fbed4e4d2e2fe87be225fb85c990327fa3008115f9dbdcf08b3691c50411bf5aad04e97264a2f9ef6c05c7cfdc6231bda
-EBUILD schismtracker-20220807.ebuild 1305 BLAKE2B defbd3cca41714e6a2f75392a07c0ef44765ae146e28887f628dd7ab3caebb4b21a502eb8693ddadcfa7904f6b60b695a6bb766b2aaaa281050d0b2b649fdda1 SHA512 b37529e6702b49fd6a4ea7a1332ff4fc898ccf71c4ff1b33e7c2b1153409c8da91bde1489b82fad2d873a9454041ef2c7cd09ce44a69deff5704c3016d1d145a
 EBUILD schismtracker-20220905.ebuild 1305 BLAKE2B defbd3cca41714e6a2f75392a07c0ef44765ae146e28887f628dd7ab3caebb4b21a502eb8693ddadcfa7904f6b60b695a6bb766b2aaaa281050d0b2b649fdda1 SHA512 b37529e6702b49fd6a4ea7a1332ff4fc898ccf71c4ff1b33e7c2b1153409c8da91bde1489b82fad2d873a9454041ef2c7cd09ce44a69deff5704c3016d1d145a
 MISC metadata.xml 356 BLAKE2B d0dafca63357e3b8b2fd8658b79f4f3e62202273f63dd59fbe1cdd7255a66ac2199854ee1adc870cb5b82ae18c294e65a5504163347920480e851a914dcc1fb6 SHA512 5c0f821a6f33b5a06ea18319e989c38714d2cc06bd2049b4e52fef62fdfe93b2e1a2e2c97c4776ebcd9cc10ecd3039b1f805faf5acc63cd20d60d3b4d05d4e3d
diff --git a/media-sound/schismtracker/schismtracker-20220807.ebuild b/media-sound/schismtracker/schismtracker-20220807.ebuild
deleted file mode 100644
index f487591fc429..000000000000
--- a/media-sound/schismtracker/schismtracker-20220807.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools desktop xdg
-
-DESCRIPTION="Free implementation of Impulse Tracker, a tool used to create high quality music"
-HOMEPAGE="http://schismtracker.org/"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2 LGPL-2 public-domain"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="
-	media-libs/libsdl2[X]
-	x11-libs/libX11
-	x11-libs/libXv
-"
-DEPEND="${RDEPEND}
-	virtual/os-headers
-	x11-base/xorg-proto
-"
-
-src_prepare() {
-	default
-	eautoreconf
-
-	# workaround for temporary files (missing directory). Fixes:
-	# sh ./scripts/build-font.sh . font/default-lower.fnt font/default-upper-alt.fnt font/default-upper-itf.fnt font/half-width.fnt >auto/default-font.c
-	# /bin/sh: auto/default-font.c: No such file or directory
-	mkdir auto
-
-	#   sys-devel/binutils[multitarget] provides ${CHOST}-windres
-	#   wine provides /usr/bin/windres
-	# and schismtracker fails to use it properly:
-	# sys/win32/schismres.rc:2:20: fatal error: winver.h: No such file or directory
-	[[ ${CHOST} = *mingw32* ]] || export WINDRES= ac_cv_prog_WINDRES= ac_cv_prog_ac_ct_WINDRES=
-}
-
-src_install() {
-	default
-
-	domenu sys/fd.org/*.desktop
-	doicon icons/schism{,-itf}-icon-128.png
-}
diff --git a/media-sound/strawberry/Manifest b/media-sound/strawberry/Manifest
index 5835196ad6b5..9bf081710bd1 100644
--- a/media-sound/strawberry/Manifest
+++ b/media-sound/strawberry/Manifest
@@ -1,6 +1,4 @@
-DIST strawberry-1.0.8.tar.xz 11222136 BLAKE2B b11b4a082eb2c2d180d7d217884ac498c692df1d76e54ca41e83ea3ab456c4920d3348ee0b154f02d22902b84263fb0afb86c5e125d669fc54b6ffce1719abb3 SHA512 7d43a80d4aac16379929e147a4cc7af8b2866a3a14adee8716ff89ff255859eca197f448ff605e255f0d3d74a8e0d1babf4534cfd58b5247533c37dfae6f96e3
 DIST strawberry-1.0.9.tar.xz 11226840 BLAKE2B 4d7619a4161b422c417a69be1eede54068279a5829070a9d84d02d05c7504813710758d639901073b9567183be61ff66a6cd3aec9585b0ec2371d12440e8284b SHA512 ccfd9e451b719cc9aeca5ce2fd260681e649edfae14cfee2d7f9b2f978b3d111e8d449f16af4869c95c96f657a7d61b4d2353ed0b0fbe6734eb31271a1577ea4
-EBUILD strawberry-1.0.8.ebuild 3019 BLAKE2B f90ce6144be7f24a66d09d114f4ec9b4f28bd6c12e37a423b785973b8391f06dff2c35eca6e344c6b1ce82dd64e65f0d894e8de1e8eb1bf7cb5c08bce72a604b SHA512 6b803a3b98994f7628d2cb8f729ca189c7d72d865a76087f0fda8f00d8922844d3e16516e27bca8c3b547a3608f0074c999707472ecb3c2c2aab37344d04f2e9
 EBUILD strawberry-1.0.9.ebuild 3019 BLAKE2B f90ce6144be7f24a66d09d114f4ec9b4f28bd6c12e37a423b785973b8391f06dff2c35eca6e344c6b1ce82dd64e65f0d894e8de1e8eb1bf7cb5c08bce72a604b SHA512 6b803a3b98994f7628d2cb8f729ca189c7d72d865a76087f0fda8f00d8922844d3e16516e27bca8c3b547a3608f0074c999707472ecb3c2c2aab37344d04f2e9
 EBUILD strawberry-9999.ebuild 3021 BLAKE2B 626e0dce302219386fc8cddc66d0f11127718685392fbd0324610ea2099c581376871db28d214cbf00c906d697a067713f02e24034ccc2aa93d799ed184a1c44 SHA512 5c5c18f84ebcc125638f590631f92c20103dc4ea344358f2f8b9eb3f3f2932589936a45a25ad13ea2aa664bdedb96b960a74decbba91973d8175407ee421a7a4
 MISC metadata.xml 473 BLAKE2B 87bfc0758ce3a886e370384baf5bf4832c0e94f27a1789bce62c73f69c8f6ceda5c2cf36295412b751ae55aeb7c5c52f695e96b363e72d91f4019fe4a81af945 SHA512 88779d17c969b36adc7cc1ead94940643e1842e081d5c370c9190da1bbe1b0b152211d249a1b06d99a9638930a44e48e54a89c6b4139793cb23bcaf136e24813
diff --git a/media-sound/strawberry/strawberry-1.0.8.ebuild b/media-sound/strawberry/strawberry-1.0.8.ebuild
deleted file mode 100644
index b14411677be9..000000000000
--- a/media-sound/strawberry/strawberry-1.0.8.ebuild
+++ /dev/null
@@ -1,120 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake flag-o-matic plocale xdg
-
-PLOCALES="ca cs de es es_AR es_ES es_MX fi fr hu id it ja ko nb nl pl pt_BR ru sv uk zh_CN"
-
-DESCRIPTION="Modern music player and library organizer based on Clementine and Qt"
-HOMEPAGE="https://www.strawberrymusicplayer.org/"
-if [[ ${PV} == *9999* ]]; then
-	EGIT_REPO_URI="https://github.com/strawberrymusicplayer/strawberry"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/strawberrymusicplayer/strawberry/releases/download/${PV}/${P}.tar.xz"
-	KEYWORDS="amd64 ~ppc64 x86"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="cdda debug +gstreamer ipod moodbar mtp pulseaudio +udisks vlc"
-
-BDEPEND="
-	dev-qt/linguist-tools:5
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-COMMON_DEPEND="
-	dev-db/sqlite:=
-	dev-libs/glib:2
-	dev-libs/protobuf:=
-	dev-qt/qtconcurrent:5
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5[ssl]
-	dev-qt/qtsql:5[sqlite]
-	dev-qt/qtwidgets:5
-	dev-qt/qtx11extras:5
-	media-libs/alsa-lib
-	media-libs/taglib
-	x11-libs/libX11
-	cdda? ( dev-libs/libcdio:= )
-	gstreamer? (
-		media-libs/chromaprint:=
-		media-libs/gstreamer:1.0
-		media-libs/gst-plugins-base:1.0
-	)
-	ipod? ( media-libs/libgpod )
-	moodbar? ( sci-libs/fftw:3.0 )
-	mtp? ( media-libs/libmtp )
-	pulseaudio? ( media-sound/pulseaudio )
-	vlc? ( media-video/vlc )
-"
-# Note: sqlite driver of dev-qt/qtsql is bundled, so no sqlite use is required; check if this can be overcome someway;
-RDEPEND="${COMMON_DEPEND}
-	gstreamer? (
-		media-plugins/gst-plugins-meta:1.0
-		media-plugins/gst-plugins-soup:1.0
-		media-plugins/gst-plugins-taglib:1.0
-	)
-	mtp? ( gnome-base/gvfs[mtp] )
-	udisks? ( sys-fs/udisks:2 )
-"
-DEPEND="${COMMON_DEPEND}
-	dev-cpp/gtest
-	dev-libs/boost
-	dev-qt/qttest:5
-"
-
-DOCS=( Changelog README.md )
-
-REQUIRED_USE="
-	cdda? ( gstreamer )
-	|| ( gstreamer vlc )
-"
-
-src_prepare() {
-	plocale_find_changes "src/translations" "" ".po"
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	# spotify is not in portage
-	local mycmakeargs=(
-		-DBUILD_WERROR=OFF
-		# avoid automagically enabling of ccache (bug #611010)
-		-DCCACHE_EXECUTABLE=OFF
-		-DENABLE_GIO=ON
-		-DLINGUAS="$(plocale_get_locales)"
-		-DENABLE_AUDIOCD="$(usex cdda)"
-		-DENABLE_GSTREAMER="$(usex gstreamer)"
-		-DENABLE_LIBGPOD="$(usex ipod)"
-		-DENABLE_LIBMTP="$(usex mtp)"
-		-DENABLE_LIBPULSE="$(usex pulseaudio)"
-		-DENABLE_MOODBAR="$(usex moodbar)"
-		-DENABLE_MUSICBRAINZ="$(usex gstreamer)"
-		-DENABLE_SONGFINGERPRINTING="$(usex gstreamer)"
-		-DENABLE_UDISKS2="$(usex udisks)"
-		-DENABLE_VLC="$(usex vlc)"
-		# Disable until we have qt6 in the tree
-		-DWITH_QT6=OFF
-	)
-
-	use !debug && append-cppflags -DQT_NO_DEBUG_OUTPUT
-
-	cmake_src_configure
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	if use gstreamer ; then
-		elog "Note that list of supported formats is controlled by media-plugins/gst-plugins-meta "
-		elog "USE flags. You may be interested in setting aac, flac, mp3, ogg or wavpack USE flags "
-		elog "depending on your preferences"
-	fi
-}
diff --git a/media-sound/terminatorx/Manifest b/media-sound/terminatorx/Manifest
index 381427de3f03..d30900ec0ebe 100644
--- a/media-sound/terminatorx/Manifest
+++ b/media-sound/terminatorx/Manifest
@@ -1,4 +1,7 @@
 AUX terminatorx-4.1.0-metadata-dir.patch 438 BLAKE2B 848b76d7c86b049964cbdf0b3070491f78430c8b613f9860824ea550a32c9a4309da656d6c970ebda52819cbea21cc3dad75666f02b8f4f4cbf5c5b1d223a35b SHA512 263bda47b9376b5de8c056999be92655658355ef2c0557ecf84fa7f84542c78580071cb04e46907df028bd4badf72547084ffee1bea31809c0e9c294d8f00e05
+AUX terminatorx-4.2.0-metadata-dir.patch 437 BLAKE2B 78b272688db7c4a4e63059a1cffd8015dba5ec8e69089ada1d3ef03a7efbda2056004114e5e691f01ce7dd77fed288fe99353e4ff839ad61807214de990572fb SHA512 64043f16cc362df72fb6661195586b93c5ef806e79461a093eb71e3a8103bddc4d1ebd2f47fa7668ba62bd33f3d438d214f02d99dd16eb1c053244da9317210c
 DIST terminatorX-4.1.0.tar.bz2 1832295 BLAKE2B a328d05bb0c3c88719eb711dcf3f50eac08cd140e3225f42633744b39ce49f3e074263997ec21b2cc245740fa3f672a19b89d929fad1d0131981988fc80f37fc SHA512 2dc87bdbb4f4d24e10f0c8fac99b4ccecac6036c6dc950184cbdd1d05fe0a4c723ea1b04c49837fb0aa8f149ca9d2fb5d2c42f5109031184980a14fe549312fc
+DIST terminatorX-4.2.0.tar.bz2 1821474 BLAKE2B dc86555bdb0d837d12144b392cf6a1cdf707268a3634940bed66792432ef014d168dbee2fd540a253ad369ff4aeaf5d0b7dfb252f3c97550a2c4af5ad1a58945 SHA512 e10ac7acd91441dabad80ae7c144b56f39ebfb4c76f0e3bfab093937c69d2c6b0834a68a0a216994898ae05a7f9ae5ebac0b1fa52d65d627b7ed01785fc55941
 EBUILD terminatorx-4.1.0.ebuild 1542 BLAKE2B 7e7adf5a9aba6a1859099c3b0a47c6b9b8f5d11a5187b37e1e03f3740298055b257cedbefaffb50731090fd765c7dff99840d7107928ffe674f317225f09b25a SHA512 67de59ffdb9c6bce6011d9b9a31dc73e1eb5fe0b1f66504c3a9179cda2b5fd8b5a0ccf0ae47f64e42645c80bf61b53de4406bd792efa87d54c546f7cc54b1b37
+EBUILD terminatorx-4.2.0.ebuild 1526 BLAKE2B f65e94f798be8210de3335ca6af708a648fac261cd619f1a0a9cc482dc7de36e547b3a642e6360182414207da5bcef7d3369d61d7be48b7a12baeb34a7d7e6b8 SHA512 4496f8eb697e4fea65414bd1c23defae297465d55d0a6e016dde1044fd4b516dd290fd64c227007a39b4c278f4a703dacaa339e2fb8c819f8171d6dc6b03f078
 MISC metadata.xml 256 BLAKE2B 211ca90d8f704be5ca8a1994f0e8f1adbe1fd4937a10a301ced0b9be171dfdabb223661d168535cd7f5edfe0c8edca4620945e13dc3c43b5832ac183913188f0 SHA512 fde3b658512fa6742886d7dd84efc906331b43f5b0f8fdca353fe2280653381716d7143473c9237b9fe58b9df5889b38b008da34f6ce4b64336f38642d78e3dd
diff --git a/media-sound/terminatorx/files/terminatorx-4.2.0-metadata-dir.patch b/media-sound/terminatorx/files/terminatorx-4.2.0-metadata-dir.patch
new file mode 100644
index 000000000000..6fe84c945d09
--- /dev/null
+++ b/media-sound/terminatorx/files/terminatorx-4.2.0-metadata-dir.patch
@@ -0,0 +1,13 @@
+diff --git a/Makefile.in b/Makefile.in
+index 7c7e2ba..98f4fc8 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -367,7 +367,7 @@ EXTRA_DIST = COPYING-DOCS\
+ # Destkop Entry
+ desktopdir = $(datadir)/applications
+ desktop_DATA = terminatorX.desktop
+-appdatadir = $(datarootdir)/appdata
++appdatadir = $(datarootdir)/metadata
+ appdata_DATA = terminatorX.appdata.xml
+ mimedir = $(datadir)/mime-info
+ mime_DATA = terminatorX.mime terminatorX.keys
diff --git a/media-sound/terminatorx/terminatorx-4.2.0.ebuild b/media-sound/terminatorx/terminatorx-4.2.0.ebuild
new file mode 100644
index 000000000000..ca8785ba193d
--- /dev/null
+++ b/media-sound/terminatorx/terminatorx-4.2.0.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit gnome2
+
+MY_P=${P/terminatorx/terminatorX}
+
+DESCRIPTION="Realtime audio synthesizer allowing you to 'scratch' on sampled audio data"
+HOMEPAGE="https://www.terminatorx.org/"
+# this is the original location but there is an issue with their certificate so mirroring the file
+#SRC_URI="https://www.terminatorx.org/dist/${MY_P}.tar.bz2"
+SRC_URI="https://dev.gentoo.org/~fordfrog/distfiles/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+# Making X optional fails when disabled: https://bugs.gentoo.org/636832
+IUSE="+alsa debug jack mad pulseaudio vorbis sox"
+
+REQUIRED_USE="|| ( alsa jack pulseaudio )"
+
+RDEPEND="
+	dev-libs/glib:2
+	dev-libs/libxml2:2
+	media-libs/audiofile:=
+	media-libs/ladspa-sdk
+	media-libs/liblrdf
+	media-plugins/cmt-plugins
+	x11-libs/gtk+:3
+	x11-libs/libXi
+	x11-libs/libXxf86dga
+	alsa? ( media-libs/alsa-lib )
+	jack? ( virtual/jack )
+	mad? ( media-sound/madplay )
+	pulseaudio? ( media-sound/pulseaudio )
+	vorbis? ( media-libs/libvorbis )
+	sox? (
+		media-sound/sox
+		media-sound/mpg123
+	)
+"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto
+"
+BDEPEND="
+	virtual/pkgconfig
+"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	"${FILESDIR}/${P}-metadata-dir.patch"
+)
+
+src_configure() {
+	gnome2_src_configure \
+		--enable-x11 \
+		$(use_enable alsa) \
+		$(use_enable debug) \
+		$(use_enable jack) \
+		$(use_enable mad) \
+		$(use_enable pulseaudio pulse) \
+		$(use_enable vorbis) \
+		$(use_enable sox)
+}