11 files changed, 191 insertions, 371 deletions
diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index 66da2a0790fb..35dfb5ebf399 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/ardour/Manifest b/media-sound/ardour/Manifest
index 547aa4bd4324..e31efdbc0200 100644
--- a/media-sound/ardour/Manifest
+++ b/media-sound/ardour/Manifest
@@ -1,5 +1,7 @@
 AUX ardour-6.8-metadata.patch 653 BLAKE2B 3929d825fd8de5205d0f5aa8d0172e6374ca9ffd195789386b756ae540e1842a9902592b8b6d74019c52f134e8cb9886085e23277ef022883c4425dc580c5bc9 SHA512 963f3cfcd00a3fb15cb9875f7fc31a8294058898b6fab94feb32f786369643139b1e8787ecc47a4ea6a33dabe6bd90f564b6009e0d6e482d8e5129534c789972
 DIST Ardour-6.9.0.tar.bz2 12297369 BLAKE2B 62037130b9f2d15a7f527b549c552a281105298dc85e3019d0f7ac09cb791f2b5460c4a7bd2f2098ccade6b87c70a16e6414691d90ec4baafeb6065f26d10a66 SHA512 ace45f5bfe6d0c9e4bb1712ae53ebaee2f15f883045650cae3ddcae251d4fd2f645ba745effb739b47c73a0568ae9e8ae443b711dd610584e04575fd9046b234
-EBUILD ardour-6.9-r2.ebuild 4880 BLAKE2B f0bda35454e1bf344a4296e822a32bcebfabc1f5ddbf4b76f33f69c5ef9d8ccaa4b6ead7228324f0c828bd1dd4538698bcdfbc2f1d18d9b2c51a91e6280f7845 SHA512 a0b544100e88708818ff809f85251981c490033e7d7ea11d9558326e9138bed9ed66f0d79a3108bb91256485505f0b5cae3341de9b7f481b5cc559d806005a25
-EBUILD ardour-9999.ebuild 5045 BLAKE2B 59ce5767e5dbcadfd948af2de5c8284540ef73321de6b4725185fe285db315710f14304ef31b4899811428375535c02d3d8c285fb50f8513ef1a55a8d4e994a7 SHA512 be4ea4500bcaa8aae369429ea6da1474842f6528a398f63d80238189233845684d98d8334bd8242dc999dc71961d31d22d153856f01d802cd255656abdf49372
+DIST Ardour-7.0.0.tar.bz2 12681139 BLAKE2B 7549c627ca085f40b4224ecd8a8f6e2a7a8a9a662e8a97048e9af3a0c6a0463ce69cea8ea20b867ae98649c3ab1b5940efed39978579b6b319b29ba5beb75d4d SHA512 5eeb84973f9a08e3bd2fbf9b829e902e001137ce330bcb26404f7a9da4ab3e89fdecca867511df7ae7bd3c744f7f2a5f9235b3de56c0d0c90d0a95dd6c043a27
+EBUILD ardour-6.9-r2.ebuild 4827 BLAKE2B 5b801194b7b30aacb4e3420e4cb1dd417b24f226a5651a495207b73716f0934fe16c67ede13e9efbdefb4df8d40c8f29fcb0b9eceb4b5deae1ed6b5c281b9907 SHA512 295c8cfaa174ca3a20f021b9139706fb1a987524468e6c574d3ecd1248ff66ba0fd445a11fc65116650d2c89788b66324c28a09344fbaadbdb9f96fece716f69
+EBUILD ardour-7.0.ebuild 4992 BLAKE2B 01f4753ac88da4d77d70cc5e1f0f78d93b0ac0f2ce5bed40d5dcf76fd61ccc221cc4e1414cd14e3ef8d16670a19fe9517b0681e870d86ec303ff4973e7c72366 SHA512 38bc166884bf5ec47071a5216ba0c53f8a2963a97714c5be9c0d6f5154c519b7f737ca63408a614959ce1893f50c742a48372875cd6727b572290451e2d26e9d
+EBUILD ardour-9999.ebuild 4992 BLAKE2B 01f4753ac88da4d77d70cc5e1f0f78d93b0ac0f2ce5bed40d5dcf76fd61ccc221cc4e1414cd14e3ef8d16670a19fe9517b0681e870d86ec303ff4973e7c72366 SHA512 38bc166884bf5ec47071a5216ba0c53f8a2963a97714c5be9c0d6f5154c519b7f737ca63408a614959ce1893f50c742a48372875cd6727b572290451e2d26e9d
 MISC metadata.xml 451 BLAKE2B 0ed571ca79f0d4b92239239982f04abf725365df169290e4a02f6d8f580cf801f70d8bc93414b4549c8172ff43864d5c49fa987caeec58e1b2331ffe01a69ae6 SHA512 504bd817356c7ee57c64193584b3fc5b3bc70f5224d5a531ac5ecf8fb974728639e75b77bb9e7c5ad77cf6099123361b9ec6211b855edb4761acd95b8cb7abcb
diff --git a/media-sound/ardour/ardour-6.9-r2.ebuild b/media-sound/ardour/ardour-6.9-r2.ebuild
index 21e7af85210c..3f85c9a41e8f 100644
--- a/media-sound/ardour/ardour-6.9-r2.ebuild
+++ b/media-sound/ardour/ardour-6.9-r2.ebuild
@@ -58,7 +58,7 @@ RDEPEND="
 	media-libs/lilv
 	media-libs/sratom
 	dev-libs/sord
-	|| ( >=media-libs/suil-0.10.16-r1[gtk2] <media-libs/suil-0.10.16-r1[gtk] )
+	media-libs/suil[gtk2]
 	media-libs/lv2"
 #	!bundled-libs? ( media-sound/fluidsynth ) at least libltc is missing to be able to unbundle...
 
diff --git a/media-sound/ardour/ardour-7.0.ebuild b/media-sound/ardour/ardour-7.0.ebuild
new file mode 100644
index 000000000000..463082c09921
--- /dev/null
+++ b/media-sound/ardour/ardour-7.0.ebuild
@@ -0,0 +1,185 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{8..11} )
+PYTHON_REQ_USE='threads(+)'
+PLOCALES="cs de el en_GB es eu fr it ja nn pl pt pt_PT ru sv zh"
+inherit toolchain-funcs flag-o-matic plocale python-any-r1 waf-utils desktop xdg
+
+DESCRIPTION="Digital Audio Workstation"
+HOMEPAGE="https://ardour.org/"
+
+if [[ ${PV} == *9999* ]]; then
+	EGIT_REPO_URI="https://git.ardour.org/ardour/ardour.git"
+	inherit git-r3
+else
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://dev.gentoo.org/~fordfrog/distfiles/Ardour-${PV}.0.tar.bz2"
+	S="${WORKDIR}/Ardour-${PV}.0"
+fi
+
+LICENSE="GPL-2"
+SLOT="7"
+IUSE="doc jack nls phonehome pulseaudio cpu_flags_ppc_altivec cpu_flags_x86_sse cpu_flags_x86_mmx cpu_flags_x86_3dnow"
+
+RDEPEND="
+	dev-cpp/glibmm:2
+	dev-cpp/gtkmm:2.4
+	dev-libs/boost:=
+	dev-libs/glib:2
+	dev-libs/libsigc++:2
+	dev-libs/libxml2:2
+	dev-libs/libxslt
+	>=gnome-base/libgnomecanvas-2
+	media-libs/alsa-lib
+	media-libs/aubio
+	media-libs/flac:=
+	media-libs/freetype:2
+	media-libs/libart_lgpl
+	media-libs/liblo
+	media-libs/liblrdf
+	media-libs/libsamplerate
+	media-libs/libsndfile
+	media-libs/libsoundtouch
+	media-libs/raptor:2
+	media-libs/rubberband
+	media-libs/taglib
+	media-libs/vamp-plugin-sdk
+	net-misc/curl
+	sys-libs/readline:0=
+	sci-libs/fftw:3.0[threads]
+	virtual/libusb:1
+	x11-libs/cairo
+	x11-libs/gtk+:2
+	x11-libs/pango
+	jack? ( virtual/jack )
+	pulseaudio? ( media-sound/pulseaudio )
+	media-libs/lilv
+	media-libs/sratom
+	dev-libs/sord
+	media-libs/suil[gtk2]
+	media-libs/lv2"
+#	!bundled-libs? ( media-sound/fluidsynth ) at least libltc is missing to be able to unbundle...
+
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	dev-util/itstool
+	sys-devel/gettext
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen[dot] )
+	jack? ( virtual/jack )"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-6.8-metadata.patch"
+)
+
+pkg_pretend() {
+	[[ $(tc-getLD) == *gold* ]] && (has_version sci-libs/fftw[openmp] || has_version sci-libs/fftw[threads]) && \
+		ewarn "Linking with gold linker might produce broken executable, see bug #733972"
+}
+
+pkg_setup() {
+	if has_version \>=dev-libs/libsigc++-2.6 ; then
+		append-cxxflags -std=c++11
+	fi
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	xdg_src_prepare
+
+	sed 's/'full-optimization\'\ :\ \\[.*'/'full-optimization\'\ :\ \'\','/' -i "${S}"/wscript || die
+	MARCH=$(get-flag march)
+	OPTFLAGS=""
+	if use cpu_flags_x86_sse; then
+		if [[ ${MARCH} == "i686" ]] || [[ ${MARCH} == "i486" ]]; then
+			elog "You enabled sse but use an march that does not support sse!"
+			elog "We add -msse to the flags now, but please consider switching your march in make.conf!"
+		fi
+		OPTFLAGS="sse"
+	fi
+	if use cpu_flags_x86_mmx; then
+		if [[ ${MARCH} == "i486" ]]; then
+			elog "You enabled mmx with i486 set as march! You have been warned!"
+		fi
+		OPTFLAGS="${OPTFLAGS} mmx"
+	fi
+	if use cpu_flags_x86_3dnow; then
+		OPTFLAGS="${OPTFLAGS} 3dnow"
+	fi
+	sed 's/flag_line\ =\ o.*/flag_line\ =\ \": '"${OPTFLAGS}"' just some place holders\"/' \
+		-i "${S}"/wscript || die
+	sed 's/cpu\ ==\ .*/cpu\ ==\ "LeaveMarchAsIs":/' -i "${S}"/wscript || die
+	append-flags "-lboost_system"
+	python_fix_shebang "${S}"/wscript
+	python_fix_shebang "${S}"/waf
+	my_lcmsg() {
+		rm -f {gtk2_ardour,gtk2_ardour/appdata,libs/ardour,libs/gtkmm2ext}/po/${1}.po
+	}
+	plocale_for_each_disabled_locale my_lcmsg
+}
+
+src_configure() {
+	# avoid bug https://bugs.gentoo.org/800067
+	local -x AS="$(tc-getCC) -c"
+
+	local backends="alsa,dummy"
+	use jack && backends+=",jack"
+	use pulseaudio && backends+=",pulseaudio"
+
+	tc-export CC CXX
+	mkdir -p "${D}"
+	local myconf=(
+		--configdir=/etc
+		--freedesktop
+		--noconfirm
+		--optimize
+		--with-backends=${backends}
+		$({ use cpu_flags_ppc_altivec || use cpu_flags_x86_sse; } && echo "--fpu-optimization" || echo "--no-fpu-optimization")
+		$(usex doc "--docs" '')
+		$(usex nls "--nls" "--no-nls")
+		$(usex phonehome "--phone-home" "--no-phone-home")
+		# not possible right now  --use-external-libs
+	)
+
+	waf-utils_src_configure "${myconf[@]}"
+}
+
+src_compile() {
+	waf-utils_src_compile
+	use nls && waf-utils_src_compile i18n
+}
+
+src_install() {
+	local s
+
+	waf-utils_src_install
+
+	mv ${PN}.1 ${PN}${SLOT}.1 || die
+	doman ${PN}${SLOT}.1
+
+	for s in 16 22 32 48 256 512; do
+		newicon -s ${s} gtk2_ardour/resources/Ardour-icon_${s}px.png ardour${SLOT}.png
+	done
+
+	# the build system still installs ardour6.png files so we get rid of those to not conflict with ardour:6
+	find "${D}/usr/share/icons/" -name ardour6.png -delete
+
+	sed -i \
+		-e "s/\(^Name=\).*/\1Ardour ${SLOT}/" \
+		-e 's/;AudioEditing;/;X-AudioEditing;/' \
+		build/gtk2_ardour/ardour${SLOT}.desktop || die
+	domenu build/gtk2_ardour/ardour${SLOT}.desktop
+
+	insinto /usr/share/mime/packages
+	newins build/gtk2_ardour/ardour.xml ardour${SLOT}.xml
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	elog "Please do _not_ report problems with the package to ${PN} upstream."
+	elog "If you think you've found a bug, check the upstream binary package"
+	elog "before you report anything to upstream."
+}
diff --git a/media-sound/ardour/ardour-9999.ebuild b/media-sound/ardour/ardour-9999.ebuild
index 6b4cd2f9e9be..463082c09921 100644
--- a/media-sound/ardour/ardour-9999.ebuild
+++ b/media-sound/ardour/ardour-9999.ebuild
@@ -58,7 +58,7 @@ RDEPEND="
 	media-libs/lilv
 	media-libs/sratom
 	dev-libs/sord
-	|| ( >=media-libs/suil-0.10.16-r1[gtk2] <media-libs/suil-0.10.16-r1[gtk] )
+	media-libs/suil[gtk2]
 	media-libs/lv2"
 #	!bundled-libs? ( media-sound/fluidsynth ) at least libltc is missing to be able to unbundle...
 
diff --git a/media-sound/clementine/Manifest b/media-sound/clementine/Manifest
index 370bffab132e..5b114fd3e119 100644
--- a/media-sound/clementine/Manifest
+++ b/media-sound/clementine/Manifest
@@ -1,8 +1,4 @@
-AUX clementine-1.4.0_rc1-QPainterPath_include.patch 1395 BLAKE2B e95d24a03e8a7ce2ff2465d37615a1b7a5ce2d435af4795a7e22f3550807dd939f21993b3c2fd69318326ab4a07ce9a8125177958d0e5ac307cead3a707db5c5 SHA512 ca8125e10712d06ffdbb28311eca33c914dff0fc34e1edc8be4b06778443d4097aad86315360e9915bcb6829f70e33c652ff0745754e02ef4e44860660beac54
-AUX clementine-1.4.0_rc1-gcc11-fix-static-assertion-failure.patch 3349 BLAKE2B dcea69040e8de44746e7e83d9d8024d1133e68915c110e397b262294239b9a8151784ec13d3d5871553c6ba5e5b43d4638dcd3f69a5599ba22696c4ab8fd42f8 SHA512 60dfe7f5e28ede7e1cc5c91fffb2690cd17407e8a4f59e29008d6025e36e38d8f80eb67d49c1c3f4c982c4eea5821c11bd9760cc8d1dadc4706ae7bcc9232d79
 DIST clementine-1.4.0_rc2.tar.gz 9073685 BLAKE2B a2376f1a895c651c2eb089419e20b9ce6050739f1342a6fdf1ebad0a14b65a08f56cc846eb79ad7facb77d6ee2cac74f9e374bd8e284a2a7f87d7c117779a08d SHA512 403093386efabd52e649c0e379abbf4873c4b2f8d0af72cda2b7e0255f90c60259f961045e7b51d0e5bf35425d678ff6b018c9191845ebbd156d9216d8bd7722
-DIST clementine-1.4.0rc1.tar.xz 5593564 BLAKE2B 894d86903df1ba43fca2f07c83d92bcb5d65a0103a4ecd1b321d44259534930c977f0caeaf0c93446dbec4422937f2ddc7f665daa7cb41e5c183fa7f16571809 SHA512 c74102a3ca4a99c3627b718389478e5ca79ba71ce45eccd232ca2eb3fb60a1632afa62908a2831244d6c35154ad6a8b4fa2b2485b4440b9685a0521bfacaabdb
-EBUILD clementine-1.4.0_rc1.ebuild 4988 BLAKE2B a80aeb5d542e72bd762471bcbd8b20d36792f9d3d4aa8fe154da4992f9fbe1390b637138720fa9654f4ba475510c957eaa7851d0ce0e1c3fd62fe5365bc811eb SHA512 d80d92da2256cc0ef44556bd2989627710eab6225d9ee4413514d71eaec02e0e112cb6191d5cb5e142a41ff8a00806c0fc7a26dbfed7a7a5839f7c29dc597b98
 EBUILD clementine-1.4.0_rc2.ebuild 4558 BLAKE2B 223403e458f81593ae949508af89828f82d6938b04d42a29caebce70f899f1bb80d5c1d1e64f8f379ce5ea1d9deabb09d534aa1585179544c67862da754bbb6f SHA512 c8550c75dffddf2c617a1f3104641947abb31e7935fd6225d87a81b28af3d8d7a6ec0e6db6e2d7ee81835251d573635c9dcfc9d5271b8229d06af43fdf631e60
 EBUILD clementine-9999.ebuild 4560 BLAKE2B bdf832ce35ef4f0ea23f9ece7b9d676fd35a4f84a5a13d0913e22a923efd724f3746a866bb4a3fc06b83edd68371247ddc31e5e3c11c794fb0023214b992b3c2 SHA512 5efe80cfcf9c56d55e40e061400fa9b8077c9617ec1f9f50ba1b9fc14795be6bd362af787177a78ab7ca951b4a539f7c53d56dee700901fc0da87500eea7eea6
 MISC metadata.xml 1205 BLAKE2B 385d0f742772f036d1d0e03913aa1e38fe165dfeec7a6773fa5685992f9bbc348437bd759c24c54686d19f8dfbadc8bf208909788bc1e0dd957e47bb659fb832 SHA512 58d908699a52724401f167ae20fa05327aa4fd5b705856a43292c98e898b2f13d11c9db6fac6def35eede0c356071ff38e22883ca233a1005173ded18e69ca92
diff --git a/media-sound/clementine/clementine-1.4.0_rc1.ebuild b/media-sound/clementine/clementine-1.4.0_rc1.ebuild
deleted file mode 100644
index 20ab0d44c70d..000000000000
--- a/media-sound/clementine/clementine-1.4.0_rc1.ebuild
+++ /dev/null
@@ -1,181 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PLOCALES="af ar be bg bn br bs ca cs cy da de el en en_CA en_GB eo es et eu fa fi fr ga gl he he_IL hi hr hu hy ia id is it ja ka kk ko lt lv mk_MK mr ms my nb nl oc pa pl pt pt_BR ro ru si_LK sk sl sr sr@latin sv te tr tr_TR uk uz vi zh_CN zh_TW"
-
-inherit cmake flag-o-matic plocale virtualx xdg
-
-MY_P="${P/_}"
-if [[ ${PV} == *9999* ]]; then
-	EGIT_REPO_URI="https://github.com/clementine-player/Clementine.git"
-	inherit git-r3
-else
-	S="${WORKDIR}/${P/_}"
-	SRC_URI_BASE="https://github.com/clementine-player/${PN^}"
-	COMMIT=""
-	if [[ -n "${COMMIT}" ]] ; then
-		SRC_URI="${SRC_URI_BASE}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-		S="${WORKDIR}/${PN^}-${COMMIT}"
-	elif [[ $(ver_cut 3) -gt 90 ]] ; then
-		SRC_URI="${SRC_URI_BASE}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	else
-		SRC_URI="${SRC_URI_BASE}/releases/download/${PV/_}/${P/_}.tar.xz"
-	fi
-	KEYWORDS="amd64 ~arm64 ~ppc64 x86"
-fi
-DESCRIPTION="Modern music player and library organizer based on Amarok 1.4 and Qt"
-HOMEPAGE="https://www.clementine-player.org https://github.com/clementine-player/Clementine"
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="box cdda +dbus debug dropbox googledrive ipod lastfm mms moodbar mtp projectm pulseaudio seafile skydrive test +udisks wiimote"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="
-	udisks? ( dbus )
-	wiimote? ( dbus )
-"
-
-BDEPEND="
-	>=dev-cpp/gtest-1.8.0
-	dev-qt/linguist-tools:5
-	sys-devel/gettext
-	virtual/pkgconfig
-	test? (
-		dev-qt/qttest:5
-		gnome-base/gsettings-desktop-schemas
-	)
-"
-COMMON_DEPEND="
-	app-crypt/qca:2[qt5(+)]
-	dev-db/sqlite:=
-	dev-libs/crypto++:=
-	dev-libs/glib:2
-	dev-libs/libxml2
-	dev-libs/protobuf:=
-	dev-qt/qtconcurrent:5
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5[ssl]
-	dev-qt/qtsql:5[sqlite]
-	dev-qt/qtwidgets:5
-	media-libs/chromaprint:=
-	media-libs/gstreamer:1.0
-	media-libs/gst-plugins-base:1.0
-	>=media-libs/libmygpo-qt-1.0.9[qt5(+)]
-	>=media-libs/taglib-1.11.1_p20181028
-	sys-libs/zlib
-	virtual/glu
-	x11-libs/libX11
-	cdda? ( dev-libs/libcdio:= )
-	dbus? ( dev-qt/qtdbus:5 )
-	ipod? ( >=media-libs/libgpod-0.8.0 )
-	lastfm? ( >=media-libs/liblastfm-1.1.0_pre20150206 )
-	moodbar? ( sci-libs/fftw:3.0 )
-	mtp? ( >=media-libs/libmtp-1.0.0 )
-	projectm? (
-		media-libs/glew:=
-		>=media-libs/libprojectm-3.1.12:0=
-		virtual/opengl
-	)
-"
-RDEPEND="${COMMON_DEPEND}
-	media-plugins/gst-plugins-meta:1.0
-	media-plugins/gst-plugins-soup:1.0
-	media-plugins/gst-plugins-taglib:1.0
-	mms? ( media-plugins/gst-plugins-libmms:1.0 )
-	mtp? ( gnome-base/gvfs[mtp] )
-	udisks? ( sys-fs/udisks:2 )
-"
-DEPEND="${COMMON_DEPEND}
-	dev-libs/boost
-	dev-qt/qtopengl:5
-	dev-qt/qtx11extras:5
-	dev-qt/qtxml:5
-	box? ( dev-cpp/sparsehash )
-	dropbox? ( dev-cpp/sparsehash )
-	googledrive? ( dev-cpp/sparsehash )
-	pulseaudio? ( media-sound/pulseaudio )
-	seafile? ( dev-cpp/sparsehash )
-	skydrive? ( dev-cpp/sparsehash )
-"
-
-RESTRICT="test"
-
-DOCS=( Changelog README.md )
-
-PATCHES=(
-	"${FILESDIR}/${P}-QPainterPath_include.patch" #725678
-	"${FILESDIR}/${P}-gcc11-fix-static-assertion-failure.patch" #788607
-)
-
-src_prepare() {
-	plocale_find_changes "src/translations" "" ".po"
-
-	cmake_src_prepare
-	# some tests fail or hang
-	sed -i \
-		-e '/add_test_file(translations_test.cpp/d' \
-		tests/CMakeLists.txt || die
-
-	if ! use test; then
-		sed -e "/find_package.*Qt5/s:\ Test::" -i CMakeLists.txt || die
-		cmake_comment_add_subdirectory tests
-	fi
-
-	rm -r 3rdparty/{libmygpo-qt,libmygpo-qt5,taglib} || die
-}
-
-src_configure() {
-	# spotify is not in portage
-	local mycmakeargs=(
-		-DBUILD_WERROR=OFF
-		# force to find crypto++ see bug #548544
-		-DCRYPTOPP_LIBRARIES="cryptopp"
-		-DCRYPTOPP_FOUND=ON
-		# avoid automagically enabling of ccache (bug #611010)
-		-DCCACHE_EXECUTABLE=OFF
-		-DENABLE_BREAKPAD=OFF  #< disable crash reporting
-		-DENABLE_DEVICEKIT=OFF
-		-DENABLE_GIO=ON
-		-DENABLE_SPOTIFY_BLOB=OFF
-		-DUSE_SYSTEM_GMOCK=ON
-		-DUSE_SYSTEM_PROJECTM=ON
-		-DBUNDLE_PROJECTM_PRESETS=OFF
-		-DLINGUAS="$(plocale_get_locales)"
-		-DENABLE_BOX="$(usex box)"
-		-DENABLE_AUDIOCD="$(usex cdda)"
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5DBus=$(usex !dbus)
-		-DENABLE_DROPBOX="$(usex dropbox)"
-		-DENABLE_GOOGLE_DRIVE="$(usex googledrive)"
-		-DENABLE_LIBGPOD="$(usex ipod)"
-		-DENABLE_LIBLASTFM="$(usex lastfm)"
-		-DENABLE_MOODBAR="$(usex moodbar)"
-		-DENABLE_LIBMTP="$(usex mtp)"
-		-DENABLE_VISUALISATIONS="$(usex projectm)"
-		-DENABLE_SEAFILE="$(usex seafile)"
-		-DENABLE_SKYDRIVE="$(usex skydrive)"
-		-DENABLE_LIBPULSE="$(usex pulseaudio)"
-		-DENABLE_UDISKS2="$(usex udisks)"
-		-DENABLE_WIIMOTEDEV="$(usex wiimote)"
-	)
-
-	use !debug && append-cppflags -DQT_NO_DEBUG_OUTPUT
-
-	cmake_src_configure
-}
-
-src_test() {
-	cd "${CMAKE_BUILD_DIR}" || die
-	virtx emake test
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	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"
-}
diff --git a/media-sound/clementine/files/clementine-1.4.0_rc1-QPainterPath_include.patch b/media-sound/clementine/files/clementine-1.4.0_rc1-QPainterPath_include.patch
deleted file mode 100644
index 3a441412ba26..000000000000
--- a/media-sound/clementine/files/clementine-1.4.0_rc1-QPainterPath_include.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From 7715ae5c01528213a97369e14d5461efd264cc27 Mon Sep 17 00:00:00 2001
-From: SDNick484 <SDNick484@gmail.com>
-Date: Thu, 28 May 2020 10:34:31 +0200
-Subject: [PATCH] Adds missing QPainterPath include
-
----
- src/widgets/freespacebar.cpp | 1 +
- src/widgets/osdpretty.cpp    | 1 +
- src/widgets/sliderwidget.cpp | 1 +
- 3 files changed, 3 insertions(+)
-
-diff --git a/src/widgets/freespacebar.cpp b/src/widgets/freespacebar.cpp
-index 3067f722b..c9789d353 100644
---- a/src/widgets/freespacebar.cpp
-+++ b/src/widgets/freespacebar.cpp
-@@ -20,6 +20,7 @@
- 
- #include <QLinearGradient>
- #include <QPainter>
-+#include <QPainterPath>
- 
- const int FreeSpaceBar::kBarHeight = 20;
- const int FreeSpaceBar::kBarBorderRadius = 8;
-diff --git a/src/widgets/osdpretty.cpp b/src/widgets/osdpretty.cpp
-index 9d95716d8..30cef7dae 100644
---- a/src/widgets/osdpretty.cpp
-+++ b/src/widgets/osdpretty.cpp
-@@ -26,6 +26,7 @@
- #include <QLayout>
- #include <QMouseEvent>
- #include <QPainter>
-+#include <QPainterPath>
- #include <QSettings>
- #include <QTimer>
- #include <QTimeLine>
-diff --git a/src/widgets/sliderwidget.cpp b/src/widgets/sliderwidget.cpp
-index 581a0de7b..96bbc0e5e 100644
---- a/src/widgets/sliderwidget.cpp
-+++ b/src/widgets/sliderwidget.cpp
-@@ -27,6 +27,7 @@
- #include <QSize>
- #include <QTimer>
- #include <QStyle>
-+#include <QtGui>
- #include <QMenu>
- #include <QWheelEvent>
- #include <QMouseEvent>
--- 
-2.27.0.rc2
-
diff --git a/media-sound/clementine/files/clementine-1.4.0_rc1-gcc11-fix-static-assertion-failure.patch b/media-sound/clementine/files/clementine-1.4.0_rc1-gcc11-fix-static-assertion-failure.patch
deleted file mode 100644
index 1a492fe5664c..000000000000
--- a/media-sound/clementine/files/clementine-1.4.0_rc1-gcc11-fix-static-assertion-failure.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-From cfcd0a956e6758624fab0ff20aee9eb08b3df0b3 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Robert-Andr=C3=A9=20Mauchin?= <zebob.m@gmail.com>
-Date: Wed, 16 Dec 2020 20:03:26 +0100
-Subject: [PATCH] Drop -std=c++0x and -U__STRICT_ANSI__
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-This was causing compilation failures, static assertion failed, with GCC 11.
-
-Fix #6865
-
-Signed-off-by: Robert-André Mauchin <zebob.m@gmail.com>
----
- ext/clementine-spotifyblob/CMakeLists.txt | 2 +-
- ext/clementine-tagreader/CMakeLists.txt   | 2 +-
- src/CMakeLists.txt                        | 2 +-
- tests/CMakeLists.txt                      | 2 +-
- 4 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/ext/clementine-spotifyblob/CMakeLists.txt b/ext/clementine-spotifyblob/CMakeLists.txt
-index e5342ee5b..6fd551d57 100644
---- a/ext/clementine-spotifyblob/CMakeLists.txt
-+++ b/ext/clementine-spotifyblob/CMakeLists.txt
-@@ -7,7 +7,7 @@ include_directories(${CMAKE_SOURCE_DIR}/ext/libclementine-spotifyblob)
- include_directories(${CMAKE_SOURCE_DIR}/ext/libclementine-common)
- include_directories(${CMAKE_SOURCE_DIR}/src)
- 
--set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Woverloaded-virtual -Wall -Wno-sign-compare -Wno-deprecated-declarations -Wno-unused-local-typedefs -Wno-unused-private-field -Wno-unknown-warning-option --std=c++0x -U__STRICT_ANSI__")
-+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Woverloaded-virtual -Wall -Wno-sign-compare -Wno-deprecated-declarations -Wno-unused-local-typedefs -Wno-unused-private-field -Wno-unknown-warning-option")
- 
- link_directories(${SPOTIFY_LIBRARY_DIRS})
- 
-diff --git a/ext/clementine-tagreader/CMakeLists.txt b/ext/clementine-tagreader/CMakeLists.txt
-index 855e390cf..a48b01450 100644
---- a/ext/clementine-tagreader/CMakeLists.txt
-+++ b/ext/clementine-tagreader/CMakeLists.txt
-@@ -7,7 +7,7 @@ include_directories(${CMAKE_BINARY_DIR}/ext/libclementine-tagreader)
- include_directories(${CMAKE_SOURCE_DIR}/src)
- include_directories(${CMAKE_BINARY_DIR}/src)
- 
--set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} --std=c++0x -U__STRICT_ANSI__")
-+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
- 
- set(EXECUTABLE_OUTPUT_PATH ${CMAKE_BINARY_DIR})
- 
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 627b2e7cb..0bbc775ba 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -1,6 +1,6 @@
- 
- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall")
--set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Woverloaded-virtual -Wall -Wno-sign-compare -Wno-deprecated-declarations -Wno-unused-local-typedefs -Wno-unused-private-field -Wno-unknown-warning-option --std=c++0x -U__STRICT_ANSI__")
-+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Woverloaded-virtual -Wall -Wno-sign-compare -Wno-deprecated-declarations -Wno-unused-local-typedefs -Wno-unused-private-field -Wno-unknown-warning-option")
- 
- option(BUILD_WERROR "Build with -Werror" ON)
- 
-diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
-index 4474e7be5..ff571fc19 100644
---- a/tests/CMakeLists.txt
-+++ b/tests/CMakeLists.txt
-@@ -1,6 +1,6 @@
- cmake_minimum_required(VERSION 2.8.11)
- 
--set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x -fpermissive -Wno-c++11-narrowing -U__STRICT_ANSI__")
-+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fpermissive -Wno-c++11-narrowing")
- 
- if(USE_SYSTEM_GMOCK)
-   include_directories(${GMOCK_INCLUDE_DIRS} ${GTEST_INCLUDE_DIRS})
diff --git a/media-sound/yoshimi/Manifest b/media-sound/yoshimi/Manifest
index d489e574d8e1..76fe021a354b 100644
--- a/media-sound/yoshimi/Manifest
+++ b/media-sound/yoshimi/Manifest
@@ -1,5 +1,3 @@
-DIST yoshimi-2.2.1.tar.gz 8039881 BLAKE2B 8ef8851b6e0808190f8bf97fc6502448d703cd910726f44c8c1f839299badcd858872291f54d4d219d12e11acc31ec1d342f5df5009d71b0fc1d8eae2f6cb7d1 SHA512 9f1895273b8e6ecedf503d59f351f568c189a03d5111d3bc7de8cc0c025f89f48383540f462184b9fad9487ea3cc18c0cc6cb6b1ba7ccd2619ddb2c28c4c66f0
 DIST yoshimi-2.2.2.1.tar.gz 8038479 BLAKE2B a33d231770981dcc4f2215941c60b3d959eaa93f883cda483d8d97452e37676b8dc1397b4c45bf2e2e63f1da1454c4187ea1709e58d867471ef1fa028f255512 SHA512 edabf5130c71c5fc303f6825e0323cd00b341079e61577772c547f104413646623b5c2a86a0ffd573013b4b84b6fa724161f851ead6d525e7f630d95ab724987
-EBUILD yoshimi-2.2.1.ebuild 1193 BLAKE2B 423cb8e0224ad1beafe1a7f5ecb11a5a731342737e0fdd8ce9c78e9d4efaf8dd6516a5f3a20409d21f07e499adee505bf81bb539b9bb010eb2a569428aff107e SHA512 df0a44b3bcf0d780910fd2dabfc8237d3690093115bc8065dd238f4188afb77c39a66a877d5e2642de6db6dc48028af09130df1fdb43e5a983920fd43f9fe173
 EBUILD yoshimi-2.2.2.1.ebuild 1193 BLAKE2B 423cb8e0224ad1beafe1a7f5ecb11a5a731342737e0fdd8ce9c78e9d4efaf8dd6516a5f3a20409d21f07e499adee505bf81bb539b9bb010eb2a569428aff107e SHA512 df0a44b3bcf0d780910fd2dabfc8237d3690093115bc8065dd238f4188afb77c39a66a877d5e2642de6db6dc48028af09130df1fdb43e5a983920fd43f9fe173
 MISC metadata.xml 1414 BLAKE2B 4dab154682ec4f0dfe9f4ee1f2b1510f020ef9bf8ce8b871c7bae3709a505faff8e07a2af20cedc3de357dd01c5a2bc192b2776153c1fb028894db732e0215dc SHA512 0ae6d64001643cc80c58929a4d28af6c3c4e0433b31567091e495dd34c350f7fa8908bf89d9aea1b3f004b40e7c8b60ec36025d04fa510f93af17f2316833c61
diff --git a/media-sound/yoshimi/yoshimi-2.2.1.ebuild b/media-sound/yoshimi/yoshimi-2.2.1.ebuild
deleted file mode 100644
index d37c7559c8db..000000000000
--- a/media-sound/yoshimi/yoshimi-2.2.1.ebuild
+++ /dev/null
@@ -1,60 +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 xdg
-
-DESCRIPTION="Software synthesizer based on ZynAddSubFX"
-HOMEPAGE="https://yoshimi.github.io/"
-SRC_URI="https://github.com/${PN^}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+lv2"
-
-BDEPEND="virtual/pkgconfig"
-DEPEND="
-	dev-libs/mxml
-	media-libs/alsa-lib
-	media-libs/fontconfig
-	media-libs/libsndfile
-	sci-libs/fftw:3.0=
-	sys-libs/ncurses:0=
-	sys-libs/readline:0=
-	sys-libs/zlib
-	virtual/jack
-	x11-libs/cairo[X]
-	x11-libs/fltk:1[opengl]
-	lv2? ( media-libs/lv2 )
-"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${P}/src"
-
-DOCS=( ../Changelog ../README.txt )
-
-src_prepare() {
-	cmake_src_prepare
-	sed -e "/^install.*doc.*DATAROOTDIR/s/${PN}/${PF}/" -i CMakeLists.txt || die
-	append-cxxflags -lpthread
-	append-cppflags -lpthread
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DLV2Plugin=$(usex lv2)
-	)
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-
-	# unpack Histories.tar.bz2 to avoid QA issues
-	pushd "${ED}/usr/share/doc/${PF}" || die
-	tar xvf Histories.tar.bz2 || die
-	rm Histories.tar.bz2
-	popd
-}