gentoo resync : 30.05.2020

3 files changed, 28 insertions, 29 deletions

diff --git a/media-sound/qjackctl/Manifest b/media-sound/qjackctl/Manifest
index 182a0f2cae77..e35832b51738 100644
--- a/media-sound/qjackctl/Manifest
+++ b/media-sound/qjackctl/Manifest
@@ -1,4 +1,4 @@
 DIST qjackctl-0.6.2.tar.gz 1027742 BLAKE2B d2db9e0496223844e3cb289aa8c4ae136011ad36578f3526fd54b44344606e14885d7272bd8e333035b2c908216e60ce2bfe7698c4c8395fd3b017da6b64f03f SHA512 a05f514d749b4f2344c7f0d57a2a0dd1ac6a97f35d0227827e78d3bd7abfbddc3201e2fc7e23f878cd318e408f169a4006a150dc0e43101086e9ba32004e5520
-EBUILD qjackctl-0.6.2.ebuild 1172 BLAKE2B f1a1d7d36f6924fe71d346fd9fc7de7be4fd91b00dd420b6b47b62bbeefcf0ad6f021fcbc9d8e0885437da30df8fef84dd684f1168c132f3dfdc655d3e23b701 SHA512 c3e57d66a72d86db0d02e916e057a0338306f00b03ed1475245811e59d20117a991662e83d9e69bb50ef424928e25f6865adcd5de0aca638255c26bacbcc783b
-EBUILD qjackctl-9999.ebuild 1226 BLAKE2B 4c340d964561fa9c34635d02220a7139882283ab5cd9a8b4ce0e0f799aea6c0116d2f2d3482f1febb234f7044c63a0dddd8b63da064238f4013f0e81c0f9f0b4 SHA512 f9f277ec117e06a8c1ef8f2210e6943c62141367c1328eb68d25af401749c180d84b4e54b4a8cb027d985415f93698bf6c7e6ad0d422d00107fdbcefdffc90da
+EBUILD qjackctl-0.6.2.ebuild 1227 BLAKE2B d620ddcc5f4e2fe0b691dbcc1bc22d1882597de0481366dfa2909be7b759d6ba1b301a8a75e839a5cdf6d7c9abd8e15222ca425b9593c5753e56d1475bab7711 SHA512 e06251755f474ad4e06a91feebd3f514eba6de3072d85f5a6c23667f0cde7304d5879a9a7b9d29f335220bd723e5e9e5803aee965e2d3293083c89fa5d00b0af
+EBUILD qjackctl-9999.ebuild 1280 BLAKE2B 601994fadff1a533cbb05935246832099648f5933dc79f6fa5bf26ed77239fd268e0c755d26aa148d73f936b3dccca2691e42f9627cc31a068241871dbb03d54 SHA512 c614e03bfa3c1d53d546d882b4f28d59f39401ca405f28c71520cd15606e6ba3040313573c569ece6dd6de4683d53ea63d0394173d9692685a0f1220e537ab71
 MISC metadata.xml 337 BLAKE2B 3e5fbbef544d83a92cee554b5704a648f10e326495e2091875d269b362201d2baff179db87cb36b602c474bb8750b63883440f3af8a8e75c71f66043cc39fdb9 SHA512 63b453a4eb2ebea78d8b2ce9d8f9ec8db5706d7605bd5bc8c2259a1179925c2aa7fcae0a221118b39a03030d8bf2a5df772b59d35be9e3ae7d602dc068b3baa9
diff --git a/media-sound/qjackctl/qjackctl-0.6.2.ebuild b/media-sound/qjackctl/qjackctl-0.6.2.ebuild
index f8c94e1fdd3a..c145f659e40b 100644
--- a/media-sound/qjackctl/qjackctl-0.6.2.ebuild
+++ b/media-sound/qjackctl/qjackctl-0.6.2.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit flag-o-matic qmake-utils xdg-utils
 
@@ -12,9 +12,9 @@ SRC_URI="mirror://sourceforge/qjackctl/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 x86"
-
 IUSE="alsa dbus debug portaudio"
 
+BDEPEND="dev-qt/linguist-tools:5"
 RDEPEND="
 	app-arch/gzip
 	dev-qt/qtcore:5
@@ -26,18 +26,18 @@ RDEPEND="
 	alsa? ( media-libs/alsa-lib )
 	dbus? ( dev-qt/qtdbus:5 )
 	portaudio? ( media-libs/portaudio )"
-DEPEND="${RDEPEND}
-	dev-qt/linguist-tools:5"
+DEPEND="${RDEPEND}"
 
 src_configure() {
 	append-cxxflags -std=c++11
-	econf \
-		$(use_enable alsa alsa-seq) \
-		$(use_enable dbus) \
-		$(use_enable debug) \
-		$(use_enable portaudio) \
+	local myeconfargs=(
+		$(use_enable alsa alsa-seq)
+		$(use_enable dbus)
+		$(use_enable debug)
+		$(use_enable portaudio)
 		--enable-jack-version
-
+	)
+	econf "${myeconfargs[@]}"
 	eqmake5 ${PN}.pro -o ${PN}.mak
 }
 
@@ -48,8 +48,8 @@ src_compile() {
 src_install() {
 	default
 
-	gunzip "${D}/usr/share/man/man1/qjackctl.fr.1.gz"
-	gunzip "${D}/usr/share/man/man1/qjackctl.1.gz"
+	gunzip "${D}/usr/share/man/man1/qjackctl.fr.1.gz" || die
+	gunzip "${D}/usr/share/man/man1/qjackctl.1.gz" || die
 }
 
 pkg_postinst() {
diff --git a/media-sound/qjackctl/qjackctl-9999.ebuild b/media-sound/qjackctl/qjackctl-9999.ebuild
index 87c768da8ec4..3d91bddef6f4 100644
--- a/media-sound/qjackctl/qjackctl-9999.ebuild
+++ b/media-sound/qjackctl/qjackctl-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit flag-o-matic qmake-utils autotools git-r3 xdg-utils
 
@@ -12,9 +12,9 @@ EGIT_REPO_URI="https://git.code.sf.net/p/qjackctl/code"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS=""
-
 IUSE="alsa dbus debug portaudio"
 
+BDEPEND="dev-qt/linguist-tools:5"
 RDEPEND="
 	app-arch/gzip
 	dev-qt/qtcore:5
@@ -26,24 +26,23 @@ RDEPEND="
 	alsa? ( media-libs/alsa-lib )
 	dbus? ( dev-qt/qtdbus:5 )
 	portaudio? ( media-libs/portaudio )"
-DEPEND="${RDEPEND}
-	dev-qt/linguist-tools:5"
+DEPEND="${RDEPEND}"
 
 src_prepare() {
-	eautoreconf
-
 	default
+	eautoreconf
 }
 
 src_configure() {
 	append-cxxflags -std=c++11
-	econf \
-		$(use_enable alsa alsa-seq) \
-		$(use_enable dbus) \
-		$(use_enable debug) \
-		$(use_enable portaudio) \
+	local myeconfargs=(
+		$(use_enable alsa alsa-seq)
+		$(use_enable dbus)
+		$(use_enable debug)
+		$(use_enable portaudio)
 		--enable-jack-version
-
+	)
+	econf "${myeconfargs[@]}"
 	eqmake5 ${PN}.pro -o ${PN}.mak
 }
 
@@ -54,8 +53,8 @@ src_compile() {
 src_install() {
 	default
 
-	gunzip "${D}/usr/share/man/man1/qjackctl.fr.1.gz"
-	gunzip "${D}/usr/share/man/man1/qjackctl.1.gz"
+	gunzip "${D}/usr/share/man/man1/qjackctl.fr.1.gz" || die
+	gunzip "${D}/usr/share/man/man1/qjackctl.1.gz" || die
 }
 
 pkg_postinst() {