gentoo resync : 20.03.2021

3 files changed, 48 insertions, 21 deletions

diff --git a/media-sound/qjackctl/Manifest b/media-sound/qjackctl/Manifest
index 3b32774b2f70..99e366027244 100644
--- a/media-sound/qjackctl/Manifest
+++ b/media-sound/qjackctl/Manifest
@@ -1,6 +1,7 @@
-AUX qjackctl-0.9.0-disable-git.patch 543 BLAKE2B b4ddd7f6d85b5c93a99f1b7d5a32062a8a45cee77964b151e2aa686ee43fec0afe88e5188eb17f367234872eb555eee3b3a68a0b342622c154ca2d4bf6b614ba SHA512 5e30ab78dae12707615e8db396bd180b958713feeb738f711ab19908a51126bd85ddf733e1be04eb3bac54535bcaff6a20f51706802eb5373c96ab67c6fe8795
 AUX qjackctl-0.9.1-disable-git.patch 543 BLAKE2B 818b22b94d1869ca59545463382f254458d7707b33a8150fe29f607ffca72f54d599ab00904bb05b10ef61a2b461ca9c94160b257dd679fb00b0ce872298d488 SHA512 d8c01bb983df5507676433c0262e03b33e43396f421ce37761927489bd6e350dc7ec3b8fce673108ea02d5b13d2b4317dc476c43bb4e1fac14af31a2867fd570
 DIST qjackctl-0.9.1.tar.gz 1092787 BLAKE2B 1ae68d3b61591bb31f7c8c31f35f8a42f0048cf34c49ff0eadca9155c1a770d9880728582f6b7abdaf27a28ccb3d6a20ca87e3a6178b090579b6ead811f091f0 SHA512 7d3a6efdeedff9335897f9d943dd51d13bf7c48d55ee2bf31d53fe685cef88e281133c164cf6cdb95669b9fe394eb06d3544a78b9d760f4420a9acb3c800c612
+DIST qjackctl-0.9.2.tar.gz 1093486 BLAKE2B 43e3f3d48295727d7a3848ed6c59c72fb6c2947476720af802d53d152848a355aac79448d88fce78c2b12fbae54d64b4a1582f334b2a416f0b235cdf8d557e40 SHA512 87e5cbf241139b1e225ea2e2cc45b6f44f19fddf866560e5b9e690ef3a2f7a358ff6a28065841c9599b321568a85d5b4767907aff071c4a768608fc273a7e8fb
 EBUILD qjackctl-0.9.1.ebuild 969 BLAKE2B ea4a22964f1f02fd692be5e8ead07bc08b624a9d3605705df84090b8707fa9e602efea6c2216c8630ba51df8211d5aece717055ca1b7b2ca42bd1bac0e7452ab SHA512 8d1c56fb6f13cd30bfd54b05575c0467c3002bd38c852facbc7576c4d4fef7da41f6e08cc48a8a0261e6df31a928ce153e5731ca0a85a781f9517a2af1e0a0c9
+EBUILD qjackctl-0.9.2.ebuild 978 BLAKE2B 3e2107aef51bac45a53f2a5701a08f32c385626e93ac22b7f5b5657e2a62305b4eea241ae8a8afda524f7b5a339929924da74d79a5f2b6f5cb0a079126f63832 SHA512 e9c90266c949e5edd0b37ce436ae870cbc193aafd96b55658b44084c404243a8e5e7f782bf74900d48e225e1a6af6745a75651e98cd0ab4cd844d854a04d9e3c
 EBUILD qjackctl-9999.ebuild 920 BLAKE2B 33a4fb30c5fa508b6ff4a09c46d275b00b667fcbfcea612e02f1131e30afc0686515c5bbc29e8bc8bca114352d96f71c5ef086c64e31bf1a65958702f5df8b59 SHA512 a43bec74f96732cc57a86579662fb9ce524340fe3284a66a4c4c5c0e1333363a0eeadf7f04c77dbc16befb605ace0ece9e82e9c4a6fed185073adf3b3cfbc4cd
 MISC metadata.xml 337 BLAKE2B 3e5fbbef544d83a92cee554b5704a648f10e326495e2091875d269b362201d2baff179db87cb36b602c474bb8750b63883440f3af8a8e75c71f66043cc39fdb9 SHA512 63b453a4eb2ebea78d8b2ce9d8f9ec8db5706d7605bd5bc8c2259a1179925c2aa7fcae0a221118b39a03030d8bf2a5df772b59d35be9e3ae7d602dc068b3baa9
diff --git a/media-sound/qjackctl/files/qjackctl-0.9.0-disable-git.patch b/media-sound/qjackctl/files/qjackctl-0.9.0-disable-git.patch
deleted file mode 100644
index 08dd2e56ba8f..000000000000
--- a/media-sound/qjackctl/files/qjackctl-0.9.0-disable-git.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index f622eb9..2252e26 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -5,6 +5,7 @@ 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
-@@ -24,6 +25,7 @@ if (GIT_DESCRIBE_RESULT EQUAL 0)
-     set (VERSION "${VERSION} [${GIT_REVPARSE_OUTPUT}]")
-   endif ()
- endif ()
-+]]
- 
- set (PACKAGE_NAME "QjackCtl")
- set (PACKAGE_VERSION "${VERSION}")
diff --git a/media-sound/qjackctl/qjackctl-0.9.2.ebuild b/media-sound/qjackctl/qjackctl-0.9.2.ebuild
new file mode 100644
index 000000000000..15137741a070
--- /dev/null
+++ b/media-sound/qjackctl/qjackctl-0.9.2.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit xdg cmake
+
+DESCRIPTION="Qt GUI to control the JACK Audio Connection Kit and ALSA sequencer connections"
+HOMEPAGE="https://qjackctl.sourceforge.io/"
+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"
+DEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+	dev-qt/qtxml:5
+	virtual/jack
+	alsa? ( media-libs/alsa-lib )
+	dbus? ( dev-qt/qtdbus:5 )
+	portaudio? ( media-libs/portaudio )
+"
+RDEPEND="${DEPEND}
+	dev-qt/qtsvg:5
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.9.1-disable-git.patch"
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DCONFIG_ALSA_SEQ=$(usex alsa 1 0)
+		-DCONFIG_DBUS=$(usex dbus 1 0)
+		-DCONFIG_DEBUG=$(usex debug 1 0)
+		-DCONFIG_PORTAUDIO=$(usex portaudio 1 0)
+	)
+	cmake_src_configure
+}