gentoo resync : 25.11.2020

3 files changed, 6 insertions, 95 deletions

diff --git a/kde-apps/kwave/Manifest b/kde-apps/kwave/Manifest
index 763fa2dd721d..8e5b3f6df132 100644
--- a/kde-apps/kwave/Manifest
+++ b/kde-apps/kwave/Manifest
@@ -1,5 +1,3 @@
-DIST kwave-20.04.3.tar.xz 6195772 BLAKE2B ddcc0080514bf3b096662d520540f8c5759f56bcd1c25b8f6775260cdb31d017c8fcaaf2e9428275c1345327a902cb43398f85653a03db58fb8976daade2b86c SHA512 f57712472ba19695c77904a804c7dd599cc762e7018fed1d16398746156c25832795215d71aa54b143671342db6a1e442f79bfaed491e16657b820e14ac1306d
-DIST kwave-20.08.1.tar.xz 6868340 BLAKE2B 90ea0a3ad3ba48291578fe42d7c57a34c9b03e6082df0830b6ef27ecb084600ccb3600e524c55f21e093d67242f779d0cbcdf300856979b5162cb054c70f8d03 SHA512 e5d53bdfce2953662ab25edb5c6c3886bb9d4dee6f15c7fb7c09f5a559c9b835bc0e7d6be62eca79c8db298c8e51646a3279c5e200ae3aa2117943d52692b0e1
-EBUILD kwave-20.04.3.ebuild 2093 BLAKE2B 541e4b97510f1159b9f957c9ea1fb0f38bda907475625adfebbbd9d95560062cedb3eebe8645734fec73bc6d34c1339f31db880c1020100faf878b6a2eec1f9c SHA512 e167e075158042eef82653f9656c94f9d88f5b8aa137c1a77aa1e81320abd14e0b9d52a03f0380620c0516f8053aada95b658b60184c3e1bbedcfa158dc48d62
-EBUILD kwave-20.08.1.ebuild 2096 BLAKE2B 735034fbbdb2e00ff189b4fd1d7512fa7d5654c037d45f5fd16a180587f6ac071cc64c075fbb42317298f18151d3a262d58147835c9e706223dd7cb7c3d59596 SHA512 0d7b2541447c28f9b4aef5cf751d9c88b0c9bcd8c5287ed1a673e4f2bbb76449dfa8a06e8712d6687d9b16053ad0226234146cc3108102a9c8caf63eed7f5c9c
+DIST kwave-20.08.3.tar.xz 6878552 BLAKE2B 1708bc448399b7fd71be9cd21ae949efdfc1f3d871fcfabd4330150ed91faa65acf5dda50c81c2a0d275dd252e324af09c051d8be6873f1cdb21428ba4d33206 SHA512 63829dc2b39e8c78168f7c436dbc60334fccb92ba5c18b37f3e91b117ef9c3c53cb4957862362841986f25cf6cae210cdb9e2dba74d8c9ac486756ef675d98c4
+EBUILD kwave-20.08.3.ebuild 2076 BLAKE2B ed853a3e1effda61e6c4c74371a78116596b97d915cb0e2f86d5d8ef814c1621d6038ce9eabb59cfec201baf2c958fe7ccf145c14462e8500233b6a75517e797 SHA512 e103b90e524dbf93e032f39bebfe0f10651f416c9abd59c0c52bc428cff097c983e871658475434fe7c9ecc5369d1deb9916726a846118d4344fc8dd44df9336
 MISC metadata.xml 690 BLAKE2B 6ad89adcaf160c4c895ebd8a0e1d4bc388dad90803b16673e66640cd3974bdbf608f64c2f97e7e1144c63372b951cebbc7e168985c3945775f08a300d6cbd177 SHA512 eea8bd3770532b13c64608cf89873c65abfbe31392956fb3e244abbd5675b1e920329f3e13befa9563878e8a2f7fbc52d0178045e5dba9ca76d2fc95fca1c4b7
diff --git a/kde-apps/kwave/kwave-20.08.1.ebuild b/kde-apps/kwave/kwave-20.08.1.ebuild
deleted file mode 100644
index 2f575cfef221..000000000000
--- a/kde-apps/kwave/kwave-20.08.1.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-KFMIN=5.72.0
-QTMIN=5.14.2
-inherit ecm kde.org
-
-DESCRIPTION="Sound editor built on KDE Frameworks 5 that can edit many types of audio files"
-HOMEPAGE="https://kde.org/applications/multimedia/org.kde.kwave"
-
-LICENSE="CC-BY-SA-3.0 CC0-1.0 GPL-2+ LGPL-2+ handbook? ( FDL-1.2 ) opus? ( BSD-2 )"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="alsa flac mp3 opus oss pulseaudio +qtmedia vorbis"
-
-BDEPEND="
-	sys-devel/gettext
-	handbook? ( || (
-		gnome-base/librsvg
-		virtual/imagemagick-tools[png,svg]
-	) )
-"
-RDEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	media-libs/audiofile:=
-	>=sci-libs/fftw-3
-	media-libs/libsamplerate
-	alsa? ( media-libs/alsa-lib )
-	flac? ( media-libs/flac )
-	mp3? (
-		media-libs/id3lib
-		media-libs/libmad
-		|| (
-			media-sound/lame
-			media-sound/toolame
-			media-sound/twolame
-		)
-	)
-	qtmedia? ( >=dev-qt/qtmultimedia-${QTMIN}:5 )
-	opus? (
-		media-libs/libogg
-		media-libs/opus
-	)
-	pulseaudio? ( media-sound/pulseaudio )
-	vorbis? (
-		media-libs/libogg
-		media-libs/libvorbis
-	)
-"
-DEPEND="${RDEPEND}
-	>=dev-qt/qtconcurrent-${QTMIN}:5
-"
-
-DOCS=( AUTHORS CHANGES LICENSES README TODO )
-
-src_configure() {
-	local mycmakeargs=(
-		-DDEBUG=$(usex debug)
-		-DWITH_ALSA=$(usex alsa)
-		-DWITH_DOC=$(usex handbook)
-		-DWITH_FLAC=$(usex flac)
-		-DWITH_MP3=$(usex mp3)
-		-DWITH_OGG_VORBIS=$(usex vorbis)
-		-DWITH_OGG_OPUS=$(usex opus)
-		-DWITH_OSS=$(usex oss)
-		-DWITH_PULSEAUDIO=$(usex pulseaudio)
-		-DWITH_QT_AUDIO=$(usex qtmedia)
-	)
-
-	ecm_src_configure
-}
diff --git a/kde-apps/kwave/kwave-20.04.3.ebuild b/kde-apps/kwave/kwave-20.08.3.ebuild
index 765fdb0afa88..fc0111913711 100644
--- a/kde-apps/kwave/kwave-20.04.3.ebuild
+++ b/kde-apps/kwave/kwave-20.08.3.ebuild
@@ -4,16 +4,16 @@
 EAPI=7
 
 ECM_HANDBOOK="forceoptional"
-KFMIN=5.70.0
-QTMIN=5.14.2
+KFMIN=5.74.0
+QTMIN=5.15.1
 inherit ecm kde.org
 
 DESCRIPTION="Sound editor built on KDE Frameworks 5 that can edit many types of audio files"
-HOMEPAGE="https://kde.org/applications/multimedia/org.kde.kwave"
+HOMEPAGE="https://apps.kde.org/en/kwave"
 
 LICENSE="CC-BY-SA-3.0 CC0-1.0 GPL-2+ LGPL-2+ handbook? ( FDL-1.2 ) opus? ( BSD-2 )"
 SLOT="5"
-KEYWORDS="amd64 arm64 x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
 IUSE="alsa flac mp3 opus oss pulseaudio +qtmedia vorbis"
 
 BDEPEND="