gentoo resync : 16.01.2021

4 files changed, 80 insertions, 7 deletions

diff --git a/media-sound/qsynth/Manifest b/media-sound/qsynth/Manifest
index 96d3b1225868..7b16925ef630 100644
--- a/media-sound/qsynth/Manifest
+++ b/media-sound/qsynth/Manifest
@@ -1,5 +1,7 @@
 AUX qsynth-0.9.1-cmake-no-git-version.patch 579 BLAKE2B 561d4fab7495335a9853968820f71508fe0ce340d829a36b74845b76a06c35abb815d40756d080efe9fecf8e8bcd9dfa347dc524aa4af2ccbb892ebc678fc861 SHA512 843467c9c6d13970ae7494a700830860783e48f4e9cc0bd74522921dfc2358e76d2e1b35436e2d04381e9e00c00692357526f3a0fa25c4d9205cd85ce73e97fd
 DIST qsynth-0.9.4.tar.gz 395550 BLAKE2B e25195755c52c63912b03a416878d248712b78ba0014414bc8b1d31cbd5bb75562640de4a0255d2727a40274a6ff3a84b201d39c93674140ff31ccc581bfd254 SHA512 764a90fd86451cd3a12c71f061f4a603cdce54ae80e6543d05fa66a97ea0b7c50bac0350f01f597ec93ed445a5433a9dea6d9c5a43ce385c231aaea8e13675d4
-EBUILD qsynth-0.9.4.ebuild 1411 BLAKE2B 224fb67d8c438ea03f47bdd1b11fd0f17992969582f46cabc67e36da7ec965d70f64b7ea926a29795ed7bf9cf2bf4e2cf40585761eeddf9fd2aceb1aa27a45c8 SHA512 ab5a4cdf1f9c2cd4aae7c6a5f81fc0824a25d8009a95d5495afcb43282a9916333d25c45bc5f8e97e8477d5d6ae2a344a76bc37b64b693cb8f2b19ebe80aa6ab
-EBUILD qsynth-9999.ebuild 1349 BLAKE2B 618267f9db7c94ad2defb4f0f3893cd4844270c3e9e9448c22738fb203f0e41cd83c47ed88354abf4fa215029953f2500c00b01193454ee2d29ced2ae8ff97bc SHA512 ba6afe5ac54f37fd1d4531b8971dc6272b8fb053209380953e0dfb494a91ed3c3783d3d681959a96d31d4f2aecf1b96c42c500707b48b45b3f8e765577354156
+DIST qsynth-0.9.5.tar.gz 331213 BLAKE2B 3973c2ea0599b8bf9f12c3ce1bb7eff00b5d20b4f051ebcb578f556dbfce714cbe0bf77038b553289f27cfedc521bd7e179af652c721375e6bedc4d22ce061d5 SHA512 157e49e8ebfcf550754379c4f2bae221354cffbfe47dcaea747749c00520339f59de5fe7f17e105674ecc6099a98af5f2326d2d258fe359c0c7522366f4267d4
+EBUILD qsynth-0.9.4.ebuild 1399 BLAKE2B 594db33af2cff57be2c05950bdadeae487ac4f931f213d4e528479972d594fdb842353e7248246e178310dd571869ded4587bdbb53cce8ed3cdc14753db01304 SHA512 7d1211bb2c892a6641dc5454be2accc3103be8bd0eefab1186d4aa62f218aee7c810d6f31b2da1458fe0dd56f2193a7641edbc5a170cd58840c6b51e533b6fdc
+EBUILD qsynth-0.9.5.ebuild 1413 BLAKE2B 94f3b565fe4092f371bcb9e668ce11403dd384ce2932846956d80fab08b7fb18d00892b4f1e0cdf40f17d002897e4076f701119b965dd7dbdf28bb564ecddff4 SHA512 d46ea096cdab2d24bd73e42f55c5056ac408baa42a0ba5d215683342605c04cfa4c6f404dfaa0e2d6a9c5fc1ec9954835c8af88e5e0a51fc60fa15817b5e7733
+EBUILD qsynth-9999.ebuild 1347 BLAKE2B f1e4103cd0ba4bbdb8e8b5e263d00027002501f0d8ad47045956722873959d7c3583bfd9793d44e2dd7f9cc7dcb9926daa7b5e9888dc5646aee72fa304b937a3 SHA512 6079d681effc6f56514d40d79be09c28edf24562e8348467182a06ae06649a3df11303f7832a02de59736993ec173ff9635aa3a7c966facdcaf53d8dbb270aa1
 MISC metadata.xml 756 BLAKE2B 41cdb1c211eca3b2ff4218987850219ccbf3b0cbc6d76ea1841044811b52dba32bf2ce48be9b10bb40f7778188e5ebd4df29e0e865fb3b0017acfc1a6965efe4 SHA512 3f1b3281eb2bd0bc7a4f3ab87354ef636c1e8acdd79d7392d1d54c49be7c6715ad6e054dd6c1c6f9bd1186c2dd8aa40662008bfd79f72816c8de6e9fe62dd626
diff --git a/media-sound/qsynth/qsynth-0.9.4.ebuild b/media-sound/qsynth/qsynth-0.9.4.ebuild
index a9c46977ac25..42c724b0c2e2 100644
--- a/media-sound/qsynth/qsynth-0.9.4.ebuild
+++ b/media-sound/qsynth/qsynth-0.9.4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit cmake desktop qmake-utils xdg
+inherit cmake desktop xdg
 
 DESCRIPTION="Qt application to control FluidSynth"
 HOMEPAGE="https://qsynth.sourceforge.io/"
diff --git a/media-sound/qsynth/qsynth-0.9.5.ebuild b/media-sound/qsynth/qsynth-0.9.5.ebuild
new file mode 100644
index 000000000000..802d146a7511
--- /dev/null
+++ b/media-sound/qsynth/qsynth-0.9.5.ebuild
@@ -0,0 +1,71 @@
+# 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-9999.ebuild b/media-sound/qsynth/qsynth-9999.ebuild
index f2e790dc5a2b..764b1b7b1cea 100644
--- a/media-sound/qsynth/qsynth-9999.ebuild
+++ b/media-sound/qsynth/qsynth-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit cmake desktop qmake-utils xdg
+inherit cmake desktop xdg
 
 DESCRIPTION="Qt application to control FluidSynth"
 HOMEPAGE="https://qsynth.sourceforge.io/"
@@ -52,7 +52,7 @@ src_install() {
 
 	# The desktop file is invalid, and we also change the command
 	# depending on useflags
-	rm "${D}/usr/share/applications/qsynth.desktop" || die
+	rm "${D}/usr/share/applications/org.rncbc.qsynth.desktop" || die
 
 	local cmd
 	if use jack; then