gentoo (valentine's day) resync : 14.02.2021

6 files changed, 127 insertions, 58 deletions

diff --git a/media-sound/qjackctl/Manifest b/media-sound/qjackctl/Manifest
index a41ae6bd9220..2bc3ffa5b6de 100644
--- a/media-sound/qjackctl/Manifest
+++ b/media-sound/qjackctl/Manifest
@@ -1,4 +1,8 @@
+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.0.tar.gz 1088061 BLAKE2B 3be89091b6efb34d2dffee92fdfda5dabadc8b6e9f9a248cc5cd60df423482dc65342e9758a98f34c5c01bfba74eac64039e3ec2de157df0e03f8bf09a7a14fc SHA512 5aa6f3e86b6a5c528daa5fdb71b5400d5882fea6569d585a86bb6b9fa66b62699472fd82999a6f4eb1a375c70e684a20214240c1fc3b44239c22d182e3ae1b1c
-EBUILD qjackctl-0.9.0.ebuild 1137 BLAKE2B 798e9cf2a60f5a6463e632a6b65244e43e759b67a0631bbd5362f8d4d9c3f4b9da3c6bc88d573e6bb8e775a868866c7e12230ab1a082d3989fc799cf14ec4654 SHA512 7c08e0553a0589b4649683a60a9d3c57ba4d6d8649736f355b2bd25645d2f015359a570eae08129646fddd79d39607ab65769f5fce996a4a78747e27b07c3a21
-EBUILD qjackctl-9999.ebuild 1190 BLAKE2B 07f1dd83705cd04140dfb771d32c03d8e81733d84ac5bf92e8d419d1fa1563357aaf0254fcac2fd776d7a59528dc5d0acd506daa2f5832dbc1909b35d5688ddd SHA512 4c5553ca1e7a4e9c79492d94281aa5c0a91680ed2fbe4fd356f05fbf72b717502b3d15648abfbcc7537b3703aab7db2c6c45ab361d6724d9b3022c1812b094f2
+DIST qjackctl-0.9.1.tar.gz 1092787 BLAKE2B 1ae68d3b61591bb31f7c8c31f35f8a42f0048cf34c49ff0eadca9155c1a770d9880728582f6b7abdaf27a28ccb3d6a20ca87e3a6178b090579b6ead811f091f0 SHA512 7d3a6efdeedff9335897f9d943dd51d13bf7c48d55ee2bf31d53fe685cef88e281133c164cf6cdb95669b9fe394eb06d3544a78b9d760f4420a9acb3c800c612
+EBUILD qjackctl-0.9.0.ebuild 995 BLAKE2B f910da6191b27a80d6029907f39cf3314f8c48041f711c90371ea7c89948b740b71ea3da8fca973227e80f3f9c3e15da15a052d8ba8aa0362b254d57e55d85a0 SHA512 074d7812b57af254f640d693638eebb734eb585e6c1e7156d8b25ee79f037e4a231bde8d45fc58a27fc7f6da8163463c7886f860161733c6b9cef77fae080852
+EBUILD qjackctl-0.9.1.ebuild 971 BLAKE2B 04a7faf6c36d97efa75ec83ef3fee84b462267188ed5c6967ea950de891d78bfe5bbc1c5cf33715656b4e858cbac66b612443d64a0aa9d6e55262b2b81680a91 SHA512 1d2d18668e30da8e46964870361fc1df5cdbf6c3de98f129b536f32f7eb6f91d0d2e28f9aae57074b7be7e644579ee54ad813672c2183ba5e9059c1a3c102145
+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
new file mode 100644
index 000000000000..08dd2e56ba8f
--- /dev/null
+++ b/media-sound/qjackctl/files/qjackctl-0.9.0-disable-git.patch
@@ -0,0 +1,20 @@
+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/files/qjackctl-0.9.1-disable-git.patch b/media-sound/qjackctl/files/qjackctl-0.9.1-disable-git.patch
new file mode 100644
index 000000000000..6761d53599d2
--- /dev/null
+++ b/media-sound/qjackctl/files/qjackctl-0.9.1-disable-git.patch
@@ -0,0 +1,21 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 7a1098f..f83ed7b 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -6,6 +6,7 @@ project(qjackctl
+   LANGUAGES C CXX)
+ 
+ set (CONFIG_VERSION ${PROJECT_VERSION})
++#[[
+ execute_process (
+   COMMAND git describe --tags --dirty --abbrev=6
+   OUTPUT_VARIABLE GIT_DESCRIBE_OUTPUT
+@@ -27,6 +28,8 @@ if (GIT_DESCRIBE_RESULT EQUAL 0)
+ else ()
+   set (VERSION "${PROJECT_VERSION}")
+ endif ()
++]]
++set (VERSION "${PROJECT_VERSION}")
+ 
+ set (PACKAGE_NAME "QjackCtl")
+ set (PACKAGE_VERSION "${VERSION}")
diff --git a/media-sound/qjackctl/qjackctl-0.9.0.ebuild b/media-sound/qjackctl/qjackctl-0.9.0.ebuild
index 1479ddaa98aa..13ebdc3b69bd 100644
--- a/media-sound/qjackctl/qjackctl-0.9.0.ebuild
+++ b/media-sound/qjackctl/qjackctl-0.9.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit flag-o-matic qmake-utils xdg
+inherit xdg cmake
 
 DESCRIPTION="Qt GUI to control the JACK Audio Connection Kit and ALSA sequencer connections"
 HOMEPAGE="https://qjackctl.sourceforge.io/"
@@ -15,39 +15,33 @@ KEYWORDS="amd64 x86"
 IUSE="alsa dbus debug portaudio"
 
 BDEPEND="dev-qt/linguist-tools:5"
-RDEPEND="
-	app-arch/gzip
+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 )"
-DEPEND="${RDEPEND}"
+	portaudio? ( media-libs/portaudio )
+"
+RDEPEND="${DEPEND}
+	dev-qt/qtsvg:5
+"
+
+PATCHES=(
+	"${FILESDIR}/${P}-disable-git.patch"
+)
 
 src_configure() {
-	append-cxxflags -std=c++11
-	local myeconfargs=(
-		$(use_enable alsa alsa-seq)
-		$(use_enable dbus)
-		$(use_enable debug)
-		$(use_enable portaudio)
-		--enable-jack-version
+	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)
+		-DCONFIG_JACK_VERSION=1
 	)
-	econf "${myeconfargs[@]}"
-	eqmake5 ${PN}.pro -o ${PN}.mak
-}
-
-src_compile() {
-	emake -f ${PN}.mak
-}
-
-src_install() {
-	default
-
-	gunzip "${D}/usr/share/man/man1/qjackctl.1.gz" || die
-	gunzip "${D}/usr/share/man/fr/man1/qjackctl.1.gz" || die
+	cmake_src_configure
 }
diff --git a/media-sound/qjackctl/qjackctl-0.9.1.ebuild b/media-sound/qjackctl/qjackctl-0.9.1.ebuild
new file mode 100644
index 000000000000..2a7d2e5c22cd
--- /dev/null
+++ b/media-sound/qjackctl/qjackctl-0.9.1.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}/${P}-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
+}
diff --git a/media-sound/qjackctl/qjackctl-9999.ebuild b/media-sound/qjackctl/qjackctl-9999.ebuild
index 55ceab1b20dc..7a871d8a3a0b 100644
--- a/media-sound/qjackctl/qjackctl-9999.ebuild
+++ b/media-sound/qjackctl/qjackctl-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit flag-o-matic qmake-utils autotools git-r3 xdg
+inherit xdg cmake git-r3
 
 DESCRIPTION="Qt GUI to control the JACK Audio Connection Kit and ALSA sequencer connections"
 HOMEPAGE="https://qjackctl.sourceforge.io/"
@@ -15,44 +15,28 @@ KEYWORDS=""
 IUSE="alsa dbus debug portaudio"
 
 BDEPEND="dev-qt/linguist-tools:5"
-RDEPEND="
-	app-arch/gzip
+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 )"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	default
-	eautoreconf
-}
+	portaudio? ( media-libs/portaudio )
+"
+RDEPEND="${DEPEND}
+	dev-qt/qtsvg:5
+"
 
 src_configure() {
-	append-cxxflags -std=c++11
-	local myeconfargs=(
-		$(use_enable alsa alsa-seq)
-		$(use_enable dbus)
-		$(use_enable debug)
-		$(use_enable portaudio)
-		--enable-jack-version
+	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)
 	)
-	econf "${myeconfargs[@]}"
-	eqmake5 ${PN}.pro -o ${PN}.mak
-}
-
-src_compile() {
-	emake -f ${PN}.mak
-}
-
-src_install() {
-	default
-
-	gunzip "${D}/usr/share/man/man1/qjackctl.1.gz" || die
-	gunzip "${D}/usr/share/man/fr/man1/qjackctl.1.gz" || die
+	cmake_src_configure
 }