gentoo resync : 25.08.2020

3 files changed, 76 insertions, 7 deletions

diff --git a/media-sound/qsynth/Manifest b/media-sound/qsynth/Manifest
index 3cff203ab486..a992a942c4cd 100644
--- a/media-sound/qsynth/Manifest
+++ b/media-sound/qsynth/Manifest
@@ -1,5 +1,7 @@
 AUX qsynth-0.4.0-qt5-tagging.patch 372 BLAKE2B 2c0773d24939e103c2741de0498ee36963683c7004ef1039a7a45a935844b99c59072860227111eaf19fb0a75e1a17826867d8e2fbd0d131ecdc194d6ba7294d SHA512 158eb436d801d555ca5a481375553fa456d44c16f6bf706dbf99e6837f96c001bc2654405b7b5f55ccaedddee39ae4b44526eb05fe3f165ba9ea55518bef93c1
 DIST qsynth-0.6.2.tar.gz 383146 BLAKE2B 6e93a1d16dc57ce5cc180932eec049cbd62eb64d6667cbfc748c474fe2b751273ff50a94a5497f1d268e2d413831095bea92a2f086b417625f02fecf1bc6ec9d SHA512 6e6f5dc64c39ab18ad1a9e791376e0dcf6eea4882986b1723a5a2f7c53309ce166d443a198c62b33ac31ed3fc17100c3a4f8e3b1e474b70afcec0ffa7f1ffc08
+DIST qsynth-0.6.3.tar.gz 382990 BLAKE2B 37565c86b077602cd681b92aaea20d4aa07db1c4cf51d391562b5226ddde70dad0a3f641f0fcf54f35c6bb1a9e487a779c22237b0c8087666b7a2c1dea8a511e SHA512 7320a355b5fbb347b04b46fdfe86c13ab18b264cff09f2ed133e2b065febac27e58bd709eea284b4d0f98034059647ad6e9b97638fdd75edb1524fd3cf9f07a2
 EBUILD qsynth-0.6.2.ebuild 1400 BLAKE2B a1cb77b898f94ed280c1ba061bd6af65e7819fbcd204b1c52f6ed712f4b8b997eb1049c692a1b72c8a620eb4dcc118d44d8e42931a9adfab4f0bbab17bb6cf20 SHA512 cc3fa6b94b342d42541cb9b01aacaf349dee2cd9c73fab482c0ee8d78de5cb3dbecd2ca2924c7f6790ab565143690b324352a0bc1e19ca339252f9dec4e83f75
-EBUILD qsynth-9999.ebuild 1444 BLAKE2B 73fe5bb7f1217e209e80faeea59a0d250e49ab51b37bd3597650f3e68b3a84d8f4d1920a959a2a53bef6165175abed55d6ed6015d80b01028892503f82f4fdd4 SHA512 818faed6786b0369fa96d42493c9f99e27f0db9e45d7bfa709a95ff02f99e4712955e98316f19b14a2c309486f71c102db75b7b688c529f6c9ec50711dfb8fc9
+EBUILD qsynth-0.6.3.ebuild 1360 BLAKE2B 85c307a92f7b1168e5798740147434197642ebbc375b34e25c0ad67c81aee08a9ef92346a0d5e411ad6acad722c9291b982dd7eb0fc3270bb729897fe1a1db5c SHA512 697327bee1cdb81af3e3b68eaf2d247b7a26785d9c8ae89450deacf63dc9f391520eae1694de9ebef6569bf1a47c96b539bf31c42d80d5ee1268b2d470c231b3
+EBUILD qsynth-9999.ebuild 1399 BLAKE2B c37202cdc8cacadeccaff9256aa15d0d2877f2e69a2806d3d807b506ae1f8e17120f641f05c06a55322f080297b8fc5dfbf4a06234a6d8e86547d3605d83ca47 SHA512 5e58896d4ea6e3c85e6abcdf5d2f973e6e5c9f234814e3571d400cda70f82c257c1f7dab0a89c8ac6859bfb39f6fa09528602cef1eef9a81e852d51e07a5da1c
 MISC metadata.xml 755 BLAKE2B 34241e79896f3b24f562853d89374480f2c1f5c7a35bf8aaba623d6ee49a93074a1600c7290ffa7bf9147060482cf261962689c46f3f8b7eb38e17ede402c4ea SHA512 25f7c0ace8cd3b9ebe09ff93e9c39169f5345cb583646bcc146ff3b33c2cd4d689b665ae4e19f6ac588f47d5c691bfe3c16f0e67756847c7b45c090e586ab933
diff --git a/media-sound/qsynth/qsynth-0.6.3.ebuild b/media-sound/qsynth/qsynth-0.6.3.ebuild
new file mode 100644
index 000000000000..5cb416916d3d
--- /dev/null
+++ b/media-sound/qsynth/qsynth-0.6.3.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop qmake-utils xdg-utils
+
+DESCRIPTION="Qt application to control FluidSynth"
+HOMEPAGE="https://qsynth.sourceforge.io/"
+SRC_URI="mirror://sourceforge/qsynth/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="+alsa debug jack pulseaudio"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+
+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}"
+
+REQUIRED_USE="|| ( alsa jack pulseaudio )"
+
+PATCHES=( "${FILESDIR}/${PN}-0.4.0-qt5-tagging.patch" )
+
+src_configure() {
+	sed -e "/@gzip.*mandir)\/man1/d" -i Makefile.in || die
+	econf \
+		$(use_enable debug)
+
+	eqmake5 ${PN}.pro -o ${PN}.mak
+}
+
+src_install() {
+	emake DESTDIR="${D}" INSTALL_ROOT="${D}" install
+	einstalldocs
+
+	# 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 b8f87dedef2b..341c0c4efdbb 100644
--- a/media-sound/qsynth/qsynth-9999.ebuild
+++ b/media-sound/qsynth/qsynth-9999.ebuild
@@ -3,9 +3,9 @@
 
 EAPI=7
 
-inherit desktop flag-o-matic qmake-utils xdg-utils git-r3 autotools
+inherit desktop qmake-utils xdg-utils git-r3 autotools
 
-DESCRIPTION="A Qt application to control FluidSynth"
+DESCRIPTION="Qt application to control FluidSynth"
 HOMEPAGE="https://qsynth.sourceforge.io/"
 EGIT_REPO_URI="https://git.code.sf.net/p/qsynth/code"
 
@@ -31,13 +31,11 @@ REQUIRED_USE="|| ( alsa jack pulseaudio )"
 PATCHES=( "${FILESDIR}/${PN}-0.4.0-qt5-tagging.patch" )
 
 src_prepare() {
-	eautoreconf
-
 	default
+	eautoreconf
 }
 
 src_configure() {
-	append-cxxflags -std=c++11
 	sed -e "/@gzip.*mandir)\/man1/d" -i Makefile.in || die
 	econf \
 		$(use_enable debug)
@@ -51,7 +49,7 @@ src_install() {
 
 	# The desktop file is invalid, and we also change the command
 	# depending on useflags
-	rm "${ED}/usr/share/applications/qsynth.desktop" || die
+	rm "${D}/usr/share/applications/qsynth.desktop" || die
 
 	local cmd
 	if use jack; then