gentoo resync : 12.05.2022

3 files changed, 2 insertions, 75 deletions

diff --git a/media-sound/qsynth/Manifest b/media-sound/qsynth/Manifest
index f29d5a6a4218..3badab828179 100644
--- a/media-sound/qsynth/Manifest
+++ b/media-sound/qsynth/Manifest
@@ -1,7 +1,5 @@
 AUX qsynth-0.9.1-cmake-no-git-version.patch 579 BLAKE2B 561d4fab7495335a9853968820f71508fe0ce340d829a36b74845b76a06c35abb815d40756d080efe9fecf8e8bcd9dfa347dc524aa4af2ccbb892ebc678fc861 SHA512 843467c9c6d13970ae7494a700830860783e48f4e9cc0bd74522921dfc2358e76d2e1b35436e2d04381e9e00c00692357526f3a0fa25c4d9205cd85ce73e97fd
-DIST qsynth-0.9.6.tar.gz 334419 BLAKE2B daeb82f102a9a754b708b3d3ebc1963a1cf08180ec16971b4b6fb2ea3b35d7f1ca3a663bd9381d4c90052e1c781a6fef64c4cbf0d456f47ac12791da485979ea SHA512 4f596fefda29fad9298539aaf83bdcc699846416d10b1259041a414f3d89ecc76a6cad338742bac8ffa0ed78ff462fe70147e1ef6437c20241598bd7a1d41a84
 DIST qsynth-0.9.7.tar.gz 335564 BLAKE2B 7f74aebf0c635943e64be636035f86bb74e94514f97f199046cebed37675503c15225f626aba9bc862d07b13d941bb26bc3d3550f0f2c0dc32a8ed6db6c7f029 SHA512 1df8b96423a44d2a3db47417867319cea5df941e4e17e7b04c5b9c3839fff4c7d77cbc4a1ba86a2c17f5bbe13aefa59fc46a8769ecb1a2590c1f4c6c28ae6081
-EBUILD qsynth-0.9.6.ebuild 1409 BLAKE2B 3da591d928a9b272f52f4cb9a52701df395e07e6a5595b44bae22405c433de7a3d42f7831ad99e9a545e7abb50306bac1ef0f8b9ae170ba5200c29015bad303b SHA512 97c625f61f97787d161296943cd12582919faf498c44a09e43898bad69513dcf3b27bfd286cd0b48693b3aa4b62c4e7acf1dbba20fab8c1c029b7b4554a02310
-EBUILD qsynth-0.9.7.ebuild 1413 BLAKE2B 94f3b565fe4092f371bcb9e668ce11403dd384ce2932846956d80fab08b7fb18d00892b4f1e0cdf40f17d002897e4076f701119b965dd7dbdf28bb564ecddff4 SHA512 d46ea096cdab2d24bd73e42f55c5056ac408baa42a0ba5d215683342605c04cfa4c6f404dfaa0e2d6a9c5fc1ec9954835c8af88e5e0a51fc60fa15817b5e7733
+EBUILD qsynth-0.9.7.ebuild 1409 BLAKE2B 3da591d928a9b272f52f4cb9a52701df395e07e6a5595b44bae22405c433de7a3d42f7831ad99e9a545e7abb50306bac1ef0f8b9ae170ba5200c29015bad303b SHA512 97c625f61f97787d161296943cd12582919faf498c44a09e43898bad69513dcf3b27bfd286cd0b48693b3aa4b62c4e7acf1dbba20fab8c1c029b7b4554a02310
 EBUILD qsynth-9999.ebuild 1347 BLAKE2B 219e5066d51c2aa4216f883b2a8e59de6f081caa033cd9810a4037ed7aea15225937e2c9c38cbd6d970c9ed1678f2d95d3b0a8cee3f6994243f77029a13ccfec SHA512 e423e026864f91ac8da553c616be407843ce250c504c96a7616bdae9821483675e338374474d0555a62859aa9b10478e2b1504cc2985b39dea534ea74e0a0932
 MISC metadata.xml 756 BLAKE2B 41cdb1c211eca3b2ff4218987850219ccbf3b0cbc6d76ea1841044811b52dba32bf2ce48be9b10bb40f7778188e5ebd4df29e0e865fb3b0017acfc1a6965efe4 SHA512 3f1b3281eb2bd0bc7a4f3ab87354ef636c1e8acdd79d7392d1d54c49be7c6715ad6e054dd6c1c6f9bd1186c2dd8aa40662008bfd79f72816c8de6e9fe62dd626
diff --git a/media-sound/qsynth/qsynth-0.9.6.ebuild b/media-sound/qsynth/qsynth-0.9.6.ebuild
deleted file mode 100644
index adcfb131ef7b..000000000000
--- a/media-sound/qsynth/qsynth-0.9.6.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake desktop xdg
-
-DESCRIPTION="Qt application to control FluidSynth"
-HOMEPAGE="https://qsynth.sourceforge.io/"
-
-if [[ ${PV} == *9999* ]]; then
-	EGIT_REPO_URI="https://git.code.sf.net/p/qsynth/code"
-	inherit git-r3
-else
-	SRC_URI="mirror://sourceforge/qsynth/${P}.tar.gz"
-	KEYWORDS="amd64 ppc ppc64 x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="+alsa debug jack pulseaudio"
-
-REQUIRED_USE="|| ( alsa jack pulseaudio )"
-
-BDEPEND="
-	dev-qt/linguist-tools:5
-"
-DEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtwidgets:5
-	media-sound/fluidsynth:=[jack?,alsa?,pulseaudio?]
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=( "${FILESDIR}/${PN}-0.9.1-cmake-no-git-version.patch" )
-
-src_prepare() {
-	cmake_src_prepare
-
-	sed -e "/^find_package.*QT/s/Qt6 //" -i CMakeLists.txt || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DCONFIG_DEBUG=$(usex debug 1 0)
-	)
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-
-	# The desktop file is invalid, and we also change the command
-	# depending on useflags
-	rm "${D}/usr/share/applications/org.rncbc.qsynth.desktop" || die
-
-	local cmd
-	if use jack; then
-		cmd="qsynth"
-	elif use pulseaudio; then
-		cmd="qsynth -a pulseaudio"
-	elif use alsa; then
-		cmd="qsynth -a alsa"
-	else
-		cmd="qsynth -a oss"
-	fi
-
-	make_desktop_entry "${cmd}" Qsynth qsynth
-}
diff --git a/media-sound/qsynth/qsynth-0.9.7.ebuild b/media-sound/qsynth/qsynth-0.9.7.ebuild
index 802d146a7511..adcfb131ef7b 100644
--- a/media-sound/qsynth/qsynth-0.9.7.ebuild
+++ b/media-sound/qsynth/qsynth-0.9.7.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="mirror://sourceforge/qsynth/${P}.tar.gz"
-	KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+	KEYWORDS="amd64 ppc ppc64 x86"
 fi
 
 LICENSE="GPL-2"