5 files changed, 27 insertions, 236 deletions
diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index 462eb45b4bea..85df19844617 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/pulsemixer/Manifest b/media-sound/pulsemixer/Manifest
index 7f44ca0172ef..af1252b899d7 100644
--- a/media-sound/pulsemixer/Manifest
+++ b/media-sound/pulsemixer/Manifest
@@ -1,4 +1,5 @@
 DIST pulsemixer-1.5.1.tar.gz 21789 BLAKE2B 4a20be7b6499501adc64f5ac33b30ad1ea9418190104fbf452e1ed2bd3585552033c042554948b78b41e6a48c22ac62a42f4117b0311300bda738f7556ef1dc3 SHA512 c07b5e5fffa71ca60ed41e4c28a0f4ae5c8b5df9f269ea7376ed835b35536300f34504da724899bab5277f0c39a4c345654b99930ec8bdf4b43374d9b6d331be
+EBUILD pulsemixer-1.5.1-r1.ebuild 626 BLAKE2B 731a3552f6bcae581699019a02487027a99c9908e06bc724ce012c2a83305de0aad98e0dec9c705ea6f5ab4959eed0fc7c6124c50b77f20819aeba09188660ed SHA512 ff7edcd5e8186ec120d784dd5d5b97f1a4028867724347137981ea3a3b906a67c2cb0ead7846d5043ca4ee147d343aa6f3eec741129dc4ffc3793ea889086987
 EBUILD pulsemixer-1.5.1.ebuild 592 BLAKE2B 82627ca2e11ef115a98fd879f147901a93f71cfdf00e458b4850ea164ca25e4d93c142fe23de9edfb23ffe2bd7050c353ae57f93360611e9b8fccac29c0e07a6 SHA512 3a4bb11d20d6c6879fdfd5e22cff32231dce7c6fa09f6437ee4e227ef1a181987cea9c2bdee6a341ebd4f8b55a183c0c606f9ea6f8f8e70b4b837bfc77506cbf
 EBUILD pulsemixer-9999.ebuild 592 BLAKE2B 82627ca2e11ef115a98fd879f147901a93f71cfdf00e458b4850ea164ca25e4d93c142fe23de9edfb23ffe2bd7050c353ae57f93360611e9b8fccac29c0e07a6 SHA512 3a4bb11d20d6c6879fdfd5e22cff32231dce7c6fa09f6437ee4e227ef1a181987cea9c2bdee6a341ebd4f8b55a183c0c606f9ea6f8f8e70b4b837bfc77506cbf
 MISC metadata.xml 417 BLAKE2B 267271b586eec63c18fd18569725926390af968f2f0e2f97acec8de1d8ea2142e9141f9f10e1c2394503c6cde38708f827bb5c502881e3194f408a626692c8d2 SHA512 4df4b25df556c4cd5847d37cca815807c878027a49054a9a76b749981c649921100600daf9874ca1632628bde98a8a1ea4581ffa1907fb505c930009e1a5c26b
diff --git a/media-sound/pulsemixer/pulsemixer-1.5.1-r1.ebuild b/media-sound/pulsemixer/pulsemixer-1.5.1-r1.ebuild
new file mode 100644
index 000000000000..114d7ce451a3
--- /dev/null
+++ b/media-sound/pulsemixer/pulsemixer-1.5.1-r1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_REQ_USE="ncurses"
+
+inherit distutils-r1
+
+DESCRIPTION="CLI and curses mixer for PulseAudio"
+HOMEPAGE="https://github.com/GeorgeFilipkin/pulsemixer"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/GeorgeFilipkin/${PN}"
+else
+	SRC_URI="https://github.com/GeorgeFilipkin/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+
+RDEPEND="media-sound/pulseaudio"
diff --git a/media-sound/timidity++/Manifest b/media-sound/timidity++/Manifest
index 0b63edcc4df2..1ebcd53b3e1e 100644
--- a/media-sound/timidity++/Manifest
+++ b/media-sound/timidity++/Manifest
@@ -14,6 +14,5 @@ AUX timidity.desktop.2 257 BLAKE2B 6c7f88a3ccd9fc4ea90cd228e6d04d799430a78361d6d
 AUX timidity.service 190 BLAKE2B 909311fae666b9970a8b4d56e1848f907ffeff1fc9e0cacc7a89027ec1ce6a555ea01570328d75425b006752d6332cf278642ec9a7c27b9c9adb2cb7621e241e SHA512 1022c1e37e2a97fba414673860ec89bc146da208981dd50d9486c525b47c74ae146acef2d75ceec26335c3ab98b2c928ce480a161637990ecd737507a6c21b49
 AUX timidity.xpm 1522 BLAKE2B 9aee528dbf843d992d548adc923f817373013760128ae96df7becb6bc844a95ddc056b072dbaea1528d9db5c2d4836b09f8316b740c75033fc23a0bb76186fab SHA512 1630fc235e450e5420c598357ad98eed6f04b1d1035fd6284dfeb2e633ce5d80135f89ea593d58b4eac2b9405383787e4d891b9c22ff8b5ac3ece64e9abe7d4e
 DIST TiMidity++-2.15.0.tar.xz 1363040 BLAKE2B 63612dc96ddef9b24ca35a8fa24c22fee8b0573efb09543e6017070b2d0a68494bc34afe8ffc50b5f7fe2d95397a971d5dc7afd4c9adbb524b119012e716b7f7 SHA512 36c3c79d941903109d5d6d529963d12e8192a857e80402ad5ab0d1e223451a7cf5dc8fdd046b22ae7da96f413d68db8587a8fce348635838eba2f30f7019192f
-EBUILD timidity++-2.15.0-r4.ebuild 5954 BLAKE2B ef0b317663f00b5393a43bb71141906c0e31394e30a402f450aa070ec52922ab3723be1a9b37b267486a8d814c5454e44f019c42735de2620bc7dd520f9a1e12 SHA512 270ec08297c0ffa19fa1bcf8318d4283e40ef96416e5cbaf05ac374f27656209c8b545708b3aa6595841e87197b07e5512fe8039529a249790bec279905b22b1
 EBUILD timidity++-2.15.0-r5.ebuild 5991 BLAKE2B 90f322af98cb128d9fed68a4100004cb5fb0658b1cc9f2d9a9f47a21ec534bee00ba3a03e867d64bc6213c6f409331bd0a92ac7a2b7e9c143fce3406ef52c3a9 SHA512 b6522cc30aded35718924f7e72db792c410d32e65d7c1f937cad5f0b0713acbe99a07ae04be1fa0b873281561c77c35a0f4585e72ef2294c21d1a9fe56765894
 MISC metadata.xml 332 BLAKE2B 417167c38c5b331872b74c9dd82d3c386cf4ea5f963201eb20744ff043ff74943867190193f87d7c5220435b38550d6a01a2879803df12934ead428d5f684126 SHA512 5e8adfac2728f35a8bda3e042450c5554ab9aa4a5addbf3dd4fa4dbe3a426a98a9a79fa8cca64c27934707d3564a26bfdc9e5acdb4f79590681885e07cd32bbb
diff --git a/media-sound/timidity++/timidity++-2.15.0-r4.ebuild b/media-sound/timidity++/timidity++-2.15.0-r4.ebuild
deleted file mode 100644
index fe8c598bf3a6..000000000000
--- a/media-sound/timidity++/timidity++-2.15.0-r4.ebuild
+++ /dev/null
@@ -1,235 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools desktop elisp-common flag-o-matic systemd toolchain-funcs xdg
-
-MY_PV="${PV/_/-}"
-MY_P="TiMidity++-${MY_PV}"
-
-DESCRIPTION="A handy MIDI to WAV converter with OSS and ALSA output support"
-HOMEPAGE="http://timidity.sourceforge.net/"
-SRC_URI="mirror://sourceforge/timidity/${MY_P}.tar.xz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv sparc x86"
-IUSE="alsa ao emacs flac gtk jack motif nas ncurses ogg oss selinux slang speex tk vorbis X Xaw3d"
-
-REQUIRED_USE="tk? ( X )"
-
-DEPEND="
-	alsa? ( media-libs/alsa-lib )
-	ao? ( >=media-libs/libao-0.8.5 )
-	emacs? ( >=app-editors/emacs-23.1:* )
-	flac? ( media-libs/flac:= )
-	gtk? ( x11-libs/gtk+:2 )
-	jack? ( virtual/jack )
-	motif? ( >=x11-libs/motif-2.3:0 )
-	nas? ( >=media-libs/nas-1.4 )
-	ncurses? ( sys-libs/ncurses:0= )
-	ogg? ( media-libs/libogg )
-	slang? ( sys-libs/slang )
-	speex? ( media-libs/speex )
-	tk? ( dev-lang/tk:= )
-	vorbis? ( media-libs/libvorbis )
-	X? (
-		media-libs/libpng:=
-		x11-libs/libX11
-		x11-libs/libXext
-		Xaw3d? ( x11-libs/libXaw3d )
-		!Xaw3d? ( x11-libs/libXaw )
-	)
-"
-
-RDEPEND="
-	${DEPEND}
-	acct-group/audio
-	acct-group/nobody
-	acct-user/timidity
-	app-eselect/eselect-timidity
-	alsa? ( media-sound/alsa-utils )
-	selinux? ( sec-policy/selinux-timidity )
-"
-
-PDEPEND="|| ( media-sound/timidity-eawpatches media-sound/timidity-freepats )"
-
-SITEFILE=50${PN}-gentoo.el
-
-DOCS=( AUTHORS ChangeLog NEWS README "${FILESDIR}"/timidity.cfg-r1 )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.14.0-params.patch
-	"${FILESDIR}"/${PN}-2.14.0-ar.patch
-	"${FILESDIR}"/${PN}-2.14.0-configure-flags.patch
-	"${FILESDIR}"/${PN}-2.15.0-pkg-config.patch
-	"${FILESDIR}"/${PN}-2.14.0-CVE-2017-1154{6,7}.patch
-	"${FILESDIR}"/${PN}-2.15.0-lto-workaround.patch
-)
-
-src_prepare() {
-	default
-
-	mv configure.{in,ac} || die
-
-	eautoreconf
-}
-
-src_configure() {
-	export EXTRACFLAGS="${CFLAGS}" #385817
-
-	local audios
-	# List by preference
-	local xaw_provider=$(usex Xaw3d 'xaw3d' 'xaw')
-
-	# configure workarounds: configure.in here is written for an old version
-	# of autoconf and upstream seems quite dead.
-	#
-	# 1. Avoid janky configure test breaking
-	# ```checking for sys/wait.h that is POSIX.1 compatible... yes
-	# ./configure: 7995: test: =: unexpected operator```
-	export ac_cv_header_sys_time_h=yes
-	#
-	# 2. And yes, we expect standard header locations (this configure test is flaky for us too)
-	# This avoids a bunch of implicit decl. errors which only happen with USE=-Xaw3d(?!)
-	append-cppflags -DSTDC_HEADERS
-
-	local myeconfargs=(
-		--localstatedir=/var/state/${PN}
-		--with-module-dir="${EPREFIX}/usr/share/timidity"
-		--with-lispdir="${SITELISP}/${PN}"
-		--with-elf
-		--enable-server
-		--enable-network
-		--enable-dynamic
-		--enable-vt100
-		--enable-spline=cubic
-		$(use_enable emacs)
-		$(use_enable slang)
-		$(use_enable ncurses)
-		$(use_with X x)
-		$(use_enable X spectrogram)
-		$(use_enable X wrd)
-		$(use_enable X xskin)
-		$(use_enable X xaw)
-		$(use_enable gtk)
-		$(use_enable tk tcltk)
-		$(use_enable motif)
-		$(use_with Xaw3d xawlib ${xaw_provider})
-	)
-
-	use flac && audios+=",flac"
-	use speex && audios+=",speex"
-	use vorbis && audios+=",vorbis"
-	use ogg && audios+=",ogg"
-	use oss && audios+=",oss"
-	use jack && audios+=",jack"
-	use ao && audios+=",ao"
-
-	if use nas; then
-		audios+=",nas"
-		myeconfargs+=(
-			--with-nas-library="/usr/$(get_libdir)/libaudio.so"
-			--with-x
-		)
-		use X || ewarn "Basic X11 support will be enabled because required by nas."
-	fi
-
-	if use alsa; then
-		audios+=",alsa"
-		myeconfargs+=(
-			--with-default-output=alsa
-			--enable-alsaseq
-		)
-	fi
-
-	if use motif; then
-		myeconfargs+=(
-			--with-x
-		)
-		use X || ewarn "Basic X11 support will be enabled because required by motif."
-	fi
-
-	# needs to come after all audios have been collected
-	myeconfargs+=(
-		--enable-audio=${audios}
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	einstalldocs
-
-	# these are only for the ALSA sequencer mode
-	if use alsa; then
-		newconfd "${FILESDIR}"/conf.d.timidity.2 timidity
-		newinitd "${FILESDIR}"/init.d.timidity.4 timidity
-
-		systemd_dounit "${FILESDIR}"/timidity.service
-	fi
-
-	insinto /etc
-	newins "${FILESDIR}"/timidity.cfg-r1 timidity.cfg
-
-	dodir /usr/share/timidity
-	dosym ../../../etc/timidity.cfg /usr/share/timidity/timidity.cfg
-
-	if use emacs; then
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-	fi
-
-	doicon "${FILESDIR}"/timidity.xpm
-	newmenu "${FILESDIR}"/timidity.desktop.2 timidity.desktop
-
-	# Order of preference: gtk, X (Xaw), ncurses, slang
-	# Do not create menu item for terminal ones
-	local interface="-id"
-	local terminal="true"
-	local nodisplay="true"
-	if use gtk || use X; then
-		interface="-ia"
-		terminal="false"
-		nodisplay="false"
-		use gtk && interface="-ig"
-	elif use ncurses || use slang; then
-		local interface="-is"
-		use ncurses && interface="-in"
-	fi
-	sed -e "s/Exec=timidity/Exec=timidity ${interface}/" \
-		-e "s/Terminal=.*/Terminal=${terminal}/" \
-		-e "s/NoDisplay=.*/NoDisplay=${nodisplay}/" \
-		-i "${ED}"/usr/share/applications/timidity.desktop || die
-}
-
-pkg_preinst() {
-	xdg_pkg_preinst
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-
-	elog "A timidity config file has been installed in /etc/timidity.cfg."
-	elog "Do not edit this file as it will interfere with the eselect timidity tool."
-	elog "The tool 'eselect timidity' can be used to switch between installed patchsets."
-
-	if use alsa; then
-		elog "An init script for the alsa timidity sequencer has been installed."
-		elog "If you wish to use the timidity virtual sequencer, edit /etc/conf.d/timidity"
-		elog "and run 'rc-update add timidity <runlevel> && /etc/init.d/timidity start'"
-	fi
-
-	if use sparc; then
-		elog "Only saving to wave file and ALSA soundback has been tested working."
-	fi
-
-	xdg_pkg_postinst
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-	xdg_pkg_postrm
-}