gentoo resync : 22.01.2021

4 files changed, 141 insertions, 15 deletions

diff --git a/media-sound/qsynth/Manifest b/media-sound/qsynth/Manifest
index 3d8144d08f05..a7aefeb786ad 100644
--- a/media-sound/qsynth/Manifest
+++ b/media-sound/qsynth/Manifest
@@ -1,5 +1,8 @@
 AUX qsynth-0.4.0-qt5-tagging.patch 372 BLAKE2B 2c0773d24939e103c2741de0498ee36963683c7004ef1039a7a45a935844b99c59072860227111eaf19fb0a75e1a17826867d8e2fbd0d131ecdc194d6ba7294d SHA512 158eb436d801d555ca5a481375553fa456d44c16f6bf706dbf99e6837f96c001bc2654405b7b5f55ccaedddee39ae4b44526eb05fe3f165ba9ea55518bef93c1
+AUX qsynth-0.9.0-cmake-no-git-version.patch 1328 BLAKE2B 32294aacf7e17696ab4e42e4de642fd47c3fbe0bef093fce9dbee9733ef1994d295c225fba82352885bae78baec2cd1180e5b6aa53aa3a1787d892dad2618221 SHA512 a6295a89bba8d1b5a770c8f7a6f0dc6346750ae0004f772b7d7e1afa6f014a3b9f2f6bbf8252d5109f67bc77ecb42353004934dc652fd27499b03079213f4627
 DIST qsynth-0.6.3.tar.gz 382990 BLAKE2B 37565c86b077602cd681b92aaea20d4aa07db1c4cf51d391562b5226ddde70dad0a3f641f0fcf54f35c6bb1a9e487a779c22237b0c8087666b7a2c1dea8a511e SHA512 7320a355b5fbb347b04b46fdfe86c13ab18b264cff09f2ed133e2b065febac27e58bd709eea284b4d0f98034059647ad6e9b97638fdd75edb1524fd3cf9f07a2
+DIST qsynth-0.9.0.tar.gz 383118 BLAKE2B d9464a2f122d7281ff69171c431fff72d05886ec130d20aae8d8f122e1cefd1180b8bcdc157f324c5cdbc7e2c524c82a9cc7f481efc8b69912ce61912e73ed58 SHA512 5cc0e099cd05f3639ded81642bde80205c8921b65d22dcb32d40ac874107043edeb672e69d7e4734e0fd37a498be2e5b787f0b8c1707be45e39cfab616fd522c
 EBUILD qsynth-0.6.3.ebuild 1356 BLAKE2B 2d396d07ec3843126aa2b5b71a052da811c8fa56629f45990b5b7e3fddbd6282595fce10e1df195964ff5576191fb63941608c50c28c6a611e0eb8a2001b2241 SHA512 17d3439d50c5352298faeb06c0065abb4c306372ebae87d933532c80b09fbe4a789109a7b776006f86319bf9012905c6ddc40303fba06e53cddceb82b7e6177f
-EBUILD qsynth-9999.ebuild 1342 BLAKE2B 50e392bce3538d4575431df3b0254d0f9d757673288d85acef014a7054e6929bcc7f2a5af6fc74d27ab90fe2bacb3a3460349de3b8bc46979ea550d62c89e298 SHA512 442cc6f5eeb08d94fb4113cf710d1f22218e57fee336110ba8a9462174655fc04971bbb63d10a5957f2671ddb2155f415fffd7e21c0952877737c8bb4c59aed2
+EBUILD qsynth-0.9.0.ebuild 1498 BLAKE2B 65b8adab715e5e13665cbc3c7a3f2007b809ccdd444a8c54707cf1a67b6aca3b181b2c016841a21cf9f178532026c635ed125bc9f86183d9f375510433d51bf1 SHA512 3a3dad1db15066763d3348e26e5ebe00384825c5e42e7729935cb3aee188d9f0affbd96ba7f60b0b86885bf733a8b82660f8d917660c2740b80618496114cb98
+EBUILD qsynth-9999.ebuild 1505 BLAKE2B 7d046b273b82d9c8b20000f58da63d4495558f7744b12519bd8e5ed62fd7e12f30d07e53398b664f9372449da1d64dea12db82d44fcd742ebd6096febbfd8cd6 SHA512 48ce86791a12d402d0c0bbd2c80345c25c4f2a84519bcc590a5ba6004744516075df2acbcfd106ebfbb47cd7145596371a96d3923c454fad3d7e3d45a133d46a
 MISC metadata.xml 755 BLAKE2B 34241e79896f3b24f562853d89374480f2c1f5c7a35bf8aaba623d6ee49a93074a1600c7290ffa7bf9147060482cf261962689c46f3f8b7eb38e17ede402c4ea SHA512 25f7c0ace8cd3b9ebe09ff93e9c39169f5345cb583646bcc146ff3b33c2cd4d689b665ae4e19f6ac588f47d5c691bfe3c16f0e67756847c7b45c090e586ab933
diff --git a/media-sound/qsynth/files/qsynth-0.9.0-cmake-no-git-version.patch b/media-sound/qsynth/files/qsynth-0.9.0-cmake-no-git-version.patch
new file mode 100644
index 000000000000..11091ba11660
--- /dev/null
+++ b/media-sound/qsynth/files/qsynth-0.9.0-cmake-no-git-version.patch
@@ -0,0 +1,37 @@
+From 7ddf562dfc92174f47e3da95a1e18e5b1af83bfc Mon Sep 17 00:00:00 2001
+From: Christoph Karl <pampelmuse@gmx.at>
+Date: Dec 31 2020 15:42:42 +0000
+Subject: Fix version number in about dialog
+
+
+---
+
+diff -rupN a/CMakeLists.txt b/CMakeLists.txt
+--- a/CMakeLists.txt     2020-12-31 16:31:19.395906813 +0100
++++ b/CMakeLists.txt 2020-12-31 16:37:42.293523588 +0100
+@@ -5,25 +5,6 @@ cmake_minimum_required(VERSION 3.1)
+ set (VERSION "0.9.0")
+ 
+ set (CONFIG_VERSION ${VERSION})
+-execute_process (
+-  COMMAND git describe --tags --dirty --abbrev=6
+-  OUTPUT_VARIABLE GIT_DESCRIBE_OUTPUT
+-  RESULT_VARIABLE GIT_DESCRIBE_RESULT
+-  OUTPUT_STRIP_TRAILING_WHITESPACE)
+-if (GIT_DESCRIBE_RESULT EQUAL 0)
+-  set (VERSION "${GIT_DESCRIBE_OUTPUT}")
+-  string (REGEX REPLACE "^[^0-9]+" "" VERSION "${VERSION}")
+-  string (REGEX REPLACE "-g"   "git." VERSION "${VERSION}")
+-  string (REGEX REPLACE "[_|-]+"  "." VERSION "${VERSION}")
+-  execute_process (
+-    COMMAND git rev-parse --abbrev-ref HEAD
+-    OUTPUT_VARIABLE GIT_REVPARSE_OUTPUT
+-    RESULT_VARIABLE GIT_REVPARSE_RESULT
+-    OUTPUT_STRIP_TRAILING_WHITESPACE)
+-  if (GIT_REVPARSE_RESULT EQUAL 0 AND NOT GIT_REVPARSE_OUTPUT STREQUAL "master")
+-    set (VERSION "${VERSION} [${GIT_REVPARSE_OUTPUT}]")
+-  endif ()
+-endif ()
+ 
+ set (PACKAGE_NAME "Qsynth")
+ set (PACKAGE_VERSION "${VERSION}")
diff --git a/media-sound/qsynth/qsynth-0.9.0.ebuild b/media-sound/qsynth/qsynth-0.9.0.ebuild
new file mode 100644
index 000000000000..70d95bac46aa
--- /dev/null
+++ b/media-sound/qsynth/qsynth-0.9.0.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake desktop qmake-utils xdg-utils
+
+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}/${P}-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/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
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
diff --git a/media-sound/qsynth/qsynth-9999.ebuild b/media-sound/qsynth/qsynth-9999.ebuild
index 7866d934551b..e7d76b663936 100644
--- a/media-sound/qsynth/qsynth-9999.ebuild
+++ b/media-sound/qsynth/qsynth-9999.ebuild
@@ -1,18 +1,26 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit desktop qmake-utils xdg-utils git-r3 autotools
+inherit cmake desktop qmake-utils xdg-utils
 
 DESCRIPTION="Qt application to control FluidSynth"
 HOMEPAGE="https://qsynth.sourceforge.io/"
-EGIT_REPO_URI="https://git.code.sf.net/p/qsynth/code"
+
+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"
-KEYWORDS=""
+
+REQUIRED_USE="|| ( alsa jack pulseaudio )"
 
 BDEPEND="
 	dev-qt/linguist-tools:5
@@ -26,24 +34,23 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
-REQUIRED_USE="|| ( alsa jack pulseaudio )"
+PATCHES=( "${FILESDIR}/${PN}-0.9.0-cmake-no-git-version.patch" )
 
 src_prepare() {
-	default
-	eautoreconf
+	cmake_src_prepare
+
+	sed -e "/^find_package.*QT/s/Qt6 //" -i CMakeLists.txt || die
 }
 
 src_configure() {
-	sed -e "/@gzip.*mandir)\/man1/d" -i Makefile.in || die
-	econf \
-		$(use_enable debug)
-
-	eqmake5 ${PN}.pro -o ${PN}.mak
+	local mycmakeargs=(
+		-DCONFIG_DEBUG=$(usex debug 1 0)
+	)
+	cmake_src_configure
 }
 
 src_install() {
-	emake DESTDIR="${D}" INSTALL_ROOT="${D}" install
-	einstalldocs
+	cmake_src_install
 
 	# The desktop file is invalid, and we also change the command
 	# depending on useflags