gentoo resync : 14.05.2020

3 files changed, 2 insertions, 74 deletions

diff --git a/media-sound/qsynth/Manifest b/media-sound/qsynth/Manifest
index 4e0e03f030c9..3cff203ab486 100644
--- a/media-sound/qsynth/Manifest
+++ b/media-sound/qsynth/Manifest
@@ -1,7 +1,5 @@
 AUX qsynth-0.4.0-qt5-tagging.patch 372 BLAKE2B 2c0773d24939e103c2741de0498ee36963683c7004ef1039a7a45a935844b99c59072860227111eaf19fb0a75e1a17826867d8e2fbd0d131ecdc194d6ba7294d SHA512 158eb436d801d555ca5a481375553fa456d44c16f6bf706dbf99e6837f96c001bc2654405b7b5f55ccaedddee39ae4b44526eb05fe3f165ba9ea55518bef93c1
-DIST qsynth-0.6.1.tar.gz 337277 BLAKE2B c0f160bc4a1db84a53fb96fe66212b335a07736f6659514a61a20e9d23a95e50bee5818443035095e262f45a38d09b59aff10062cfc121c75a20e2b57a488aef SHA512 597ec51f2f2bc45e717dd6e039d10ace3540c6e7332832cbd36a16fb05b88248a59e5ba107369c8bd66d29060c31d0daef13f4967794e2f7b55c85a64dcd6e0c
 DIST qsynth-0.6.2.tar.gz 383146 BLAKE2B 6e93a1d16dc57ce5cc180932eec049cbd62eb64d6667cbfc748c474fe2b751273ff50a94a5497f1d268e2d413831095bea92a2f086b417625f02fecf1bc6ec9d SHA512 6e6f5dc64c39ab18ad1a9e791376e0dcf6eea4882986b1723a5a2f7c53309ce166d443a198c62b33ac31ed3fc17100c3a4f8e3b1e474b70afcec0ffa7f1ffc08
-EBUILD qsynth-0.6.1.ebuild 1394 BLAKE2B 30f5874938401b92a150b5676dae7ab2005d5c7d6ff59e5c888c17e307f5a5e7c33df68390ab3831b1599d9b0d73556eebea77644d0d79ceed25d0048866c36e SHA512 205f48bca8f7c6803b60eee6cf5601b4de47095f1ec2beea19a1abd9a0dd70fb1af4d887b0fefce9af2f2cb1140d6ada7b27742c64c2d2d23b2d51b98b8c6bdc
-EBUILD qsynth-0.6.2.ebuild 1404 BLAKE2B cbca6d0987a24e3582205d1ef20c085a8c25624df2e64a3d31d8004910bdd3e2967cc332317ecc67b6608697db0751c35bf511b0483e2b52aa77f4d69a6d40e2 SHA512 a7cbd00ab28659b37d3ff33b81313ec34bd938a5ffcb102059b0dae9697329d87383bed02eddc8c21d5e54169488d736405257fa9f7f3e7d8a2f0e78825dd4e8
+EBUILD qsynth-0.6.2.ebuild 1400 BLAKE2B a1cb77b898f94ed280c1ba061bd6af65e7819fbcd204b1c52f6ed712f4b8b997eb1049c692a1b72c8a620eb4dcc118d44d8e42931a9adfab4f0bbab17bb6cf20 SHA512 cc3fa6b94b342d42541cb9b01aacaf349dee2cd9c73fab482c0ee8d78de5cb3dbecd2ca2924c7f6790ab565143690b324352a0bc1e19ca339252f9dec4e83f75
 EBUILD qsynth-9999.ebuild 1444 BLAKE2B 73fe5bb7f1217e209e80faeea59a0d250e49ab51b37bd3597650f3e68b3a84d8f4d1920a959a2a53bef6165175abed55d6ed6015d80b01028892503f82f4fdd4 SHA512 818faed6786b0369fa96d42493c9f99e27f0db9e45d7bfa709a95ff02f99e4712955e98316f19b14a2c309486f71c102db75b7b688c529f6c9ec50711dfb8fc9
 MISC metadata.xml 755 BLAKE2B 34241e79896f3b24f562853d89374480f2c1f5c7a35bf8aaba623d6ee49a93074a1600c7290ffa7bf9147060482cf261962689c46f3f8b7eb38e17ede402c4ea SHA512 25f7c0ace8cd3b9ebe09ff93e9c39169f5345cb583646bcc146ff3b33c2cd4d689b665ae4e19f6ac588f47d5c691bfe3c16f0e67756847c7b45c090e586ab933
diff --git a/media-sound/qsynth/qsynth-0.6.1.ebuild b/media-sound/qsynth/qsynth-0.6.1.ebuild
deleted file mode 100644
index afd6bb7009c6..000000000000
--- a/media-sound/qsynth/qsynth-0.6.1.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop flag-o-matic qmake-utils xdg-utils
-
-DESCRIPTION="A 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 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() {
-	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
-}
diff --git a/media-sound/qsynth/qsynth-0.6.2.ebuild b/media-sound/qsynth/qsynth-0.6.2.ebuild
index 8cf21bfa2aae..c820943f1db3 100644
--- a/media-sound/qsynth/qsynth-0.6.2.ebuild
+++ b/media-sound/qsynth/qsynth-0.6.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/qsynth/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 IUSE="+alsa debug jack pulseaudio"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ppc ppc64 x86"
 
 BDEPEND="
 	dev-qt/linguist-tools:5