gentoo resync : 03.11.2019

4 files changed, 93 insertions, 8 deletions

diff --git a/media-sound/qsynth/Manifest b/media-sound/qsynth/Manifest
index adce643480d9..a3f9f4245895 100644
--- a/media-sound/qsynth/Manifest
+++ b/media-sound/qsynth/Manifest
@@ -1,6 +1,7 @@
 AUX qsynth-0.4.0-qt5-tagging.patch 372 BLAKE2B 2c0773d24939e103c2741de0498ee36963683c7004ef1039a7a45a935844b99c59072860227111eaf19fb0a75e1a17826867d8e2fbd0d131ecdc194d6ba7294d SHA512 158eb436d801d555ca5a481375553fa456d44c16f6bf706dbf99e6837f96c001bc2654405b7b5f55ccaedddee39ae4b44526eb05fe3f165ba9ea55518bef93c1
-DIST qsynth-0.5.5.tar.gz 269061 BLAKE2B e17bb0ced40764c5bef9ae7c793f7ba1ebfe4edd761f434ad129f338d30384c639f27d697ecfdaa93d7fff52c38bed0a3b95cf51fbdad25e13c14abe795d49dd SHA512 4e90b38d428c6b49a78b648ac9604e683f32623898205abe3a98c4136c5b29ab27c101cf63207dbbfdcba105913de2dcb5cc7669a6433def71d071f39cf68429
 DIST qsynth-0.5.6.tar.gz 269583 BLAKE2B 9b06f7be1aa39addebd0b088eff885bce39c6bc245461b64fe45243306afae8879d4b516bd46c30c2a8074e580e412c38a3c264d647a35ff5c81301703731067 SHA512 752b3ac7e478594ef873b2d1c9fcb1a1dcdd1fb33f34cab5f588f628d1f11f01ecd150c9d51021a41040794b68f0538ad6979751773d5c537f53a1f227b3bf88
-EBUILD qsynth-0.5.5.ebuild 1300 BLAKE2B 82eb320196d3d8646e3a9c8b1ae5fde1ef8dacc586055bd5eb4830b21d38dc26b72de819ccc29ff98509b73e32fb2c4c0d6038f846f3e04d16f4ff9ac5ea0eeb SHA512 0c94edb732c059066ffc3e99ec9250139a6ebdb697868e387c7fdad17e00473f63326048a5f8a9d1072d1026f8e8a9912041d8a2607d5e7e355f5c30a7eb2ed8
-EBUILD qsynth-0.5.6.ebuild 1301 BLAKE2B 433b215e3b3e3f2a8823a597611e98d78bb4f29a00982c48d78eb43ba88ea59054d3b931dec07443fe6985edb2d08db6115a71be43a1a45dfa024ce04064b94d SHA512 ba161548ecd67395bcf9ef33444c1be86eb7c0de64502875d4bff49995147b696559fd54576bccb70a6a272a5af901cfc22f69296e5479cc36bd446eeca80388
+DIST qsynth-0.6.0.tar.gz 316308 BLAKE2B d414c73d5baf3be1563c45390735de964c79774a4d7cc37ff4bc609a7fa4d291a5b0cba7f3b8ed52649c50325a3ba2fba7baad3943122cc76a98aa6cfdf2cb0f SHA512 34e15d283f403ec6633fef911285dc2d4d4b2c5a0cd3614bd38feefbf68cff5fd8e296f47d1bcd527658b8a9dab212106aa63ca71ea60cf49f8126adb7d28591
+EBUILD qsynth-0.5.6.ebuild 1301 BLAKE2B 23515c33c27d2768151b0cec68f74e3675734a97e3ae8b019e1e0aef9ae2e5cce2803cdc66235b31b29008eea3efd3d5933f64528ee2405aa8c76e863f24acd9 SHA512 3a062d818ba1c41a0731b97edd3f6c77e3706ee458155455677a73304e50ea9fdf9391156405459613b9fa635265cdcb8832047f765bcfea02ca7e1a9846c0d5
+EBUILD qsynth-0.6.0.ebuild 1398 BLAKE2B 4b092fd3449076f2a0367748ccba30bd248f19920c523f19fad6500b54c32ace09c7d7cd1ec80d0a8fb702c96a67d139e1b61abde3d4aacd6565d187b6636edc SHA512 c98170ff62b167524bbe0f7d2c8919205b2333f18eab12d160de3b21052089d1205bbfdf41da9d3ff8579dc6444ffb2a68f5019605ab437a52adc2270ddf773b
+EBUILD qsynth-9999.ebuild 1445 BLAKE2B 300936cbdee4140ada6df996741f2eb73850de8784e9f2eab596b16cdcae614d5cad3f448cdb32d405ebb7504b5db4ce1f4ee592c57940dbc553bfadb4c1051b SHA512 58da89e2efd524f4b522a136cba6ec536bc04ff0cd2fbdc30fcba0a4bc8757887b2749bd22432740d1f1bcd87da32032449aa698d578402cf557f9c3e4e55a2c
 MISC metadata.xml 755 BLAKE2B 34241e79896f3b24f562853d89374480f2c1f5c7a35bf8aaba623d6ee49a93074a1600c7290ffa7bf9147060482cf261962689c46f3f8b7eb38e17ede402c4ea SHA512 25f7c0ace8cd3b9ebe09ff93e9c39169f5345cb583646bcc146ff3b33c2cd4d689b665ae4e19f6ac588f47d5c691bfe3c16f0e67756847c7b45c090e586ab933
diff --git a/media-sound/qsynth/qsynth-0.5.6.ebuild b/media-sound/qsynth/qsynth-0.5.6.ebuild
index 2a0bd80ee1c0..d6e9dd919db4 100644
--- a/media-sound/qsynth/qsynth-0.5.6.ebuild
+++ b/media-sound/qsynth/qsynth-0.5.6.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 inherit desktop flag-o-matic qmake-utils
 
 DESCRIPTION="A Qt application to control FluidSynth"
-HOMEPAGE="http://qsynth.sourceforge.net/"
+HOMEPAGE="https://qsynth.sourceforge.io/"
 SRC_URI="mirror://sourceforge/qsynth/${P}.tar.gz"
 
 LICENSE="GPL-2"
diff --git a/media-sound/qsynth/qsynth-0.5.5.ebuild b/media-sound/qsynth/qsynth-0.6.0.ebuild
index 68c2993624bb..466ded54ecf1 100644
--- a/media-sound/qsynth/qsynth-0.5.5.ebuild
+++ b/media-sound/qsynth/qsynth-0.6.0.ebuild
@@ -3,16 +3,16 @@
 
 EAPI=7
 
-inherit desktop flag-o-matic qmake-utils
+inherit desktop flag-o-matic qmake-utils xdg-utils
 
 DESCRIPTION="A Qt application to control FluidSynth"
-HOMEPAGE="http://qsynth.sourceforge.net/"
+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 x86"
+IUSE="+alsa debug jack pulseaudio"
+KEYWORDS="~amd64 ~ppc ~x86"
 
 BDEPEND="
 	dev-qt/linguist-tools:5
@@ -60,3 +60,11 @@ src_install () {
 
 	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
new file mode 100644
index 000000000000..327a19853a99
--- /dev/null
+++ b/media-sound/qsynth/qsynth-9999.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop flag-o-matic qmake-utils xdg-utils git-r3 autotools
+
+DESCRIPTION="A Qt application to control FluidSynth"
+HOMEPAGE="https://qsynth.sourceforge.io/"
+EGIT_REPO_URI="https://git.code.sf.net/p/qsynth/code"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="+alsa debug jack pulseaudio"
+KEYWORDS=""
+
+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_prepare() {
+	eautoreconf
+
+	default
+}
+
+src_configure() {
+	append-cxxflags -std=c++11
+	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 "${ED}/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
+}