gentoo resync : 15.12.2019

3 files changed, 32 insertions, 30 deletions

diff --git a/kde-apps/kwave/Manifest b/kde-apps/kwave/Manifest
index e65a12620b11..9811c396a96e 100644
--- a/kde-apps/kwave/Manifest
+++ b/kde-apps/kwave/Manifest
@@ -1,5 +1,5 @@
-DIST kwave-19.04.3.tar.xz 6209860 BLAKE2B 67d25636f857b81bf4586ac7a77cca1837a0267b16c3ee4b239058f26e4b2319e37c873eb42f239d20a0b545178a464bcb996fa1020e9c86905bd2b11395ee55 SHA512 9f3c6a058c652164d610f53ec36f1dd4d1c255b99c71684d8c19357ddf3c74dbc66288d47292866f88ed81ef72aa440f07534f55c7b2d34093f6c2c58a9a86a7
 DIST kwave-19.08.3.tar.xz 6196324 BLAKE2B 33cbc85f3afb4c050f536819c799a7393d5883a7929b73cdbf782f43166990c1adad288e786755f5e9b35cbc7e72b0620d64f731fc6cd481da57aaf692d5084d SHA512 ad332004dbd9ab4b0a0c047a6012c071d44dbe1fe81dface3f68fbd556b52ac7ece5c5da66e704d87dab3db69cfb45a92f5fdecbb638decef7265db9c1945554
-EBUILD kwave-19.04.3.ebuild 1996 BLAKE2B 145d5b1a1d2c2bb8151851ccccdb734e99554855cd2e2c3bfd1be7d6ec000de8b6628abc65bf3ab9acc606cc6ddee3885f998b6af89bb37bdd0bc16f1c126602 SHA512 8bf633796debdbad762e404285cb11162e871cb7c6931fec928c74b341441ef00a4b1fd97382769bd178c4878a8de23c238d47bb76bfc82711e3c99fe713763e
-EBUILD kwave-19.08.3.ebuild 2160 BLAKE2B 655941749c1055087f8dc4dc3d71382b3fde156040d25bd6b3a935f12efbabf505cd1d53f9cdbce9a87be7e252eb8833bbea5f435a4faac88ba3e8bd2fae8ef3 SHA512 a517741681f3439ac542cd673b77aafdcd6fd45d55427488e479fddad954c093846183712bbfc588abfb0641c664bc7cf009c68a4f69ad685362983cfeb1e3dd
+DIST kwave-19.12.0.tar.xz 6188904 BLAKE2B c64e730e8901ee264e6e19c5d2bbf406ebf8e65271fd7ff85d790bbdc8c9fcdb2272dccbdb33afca06fa6c8a328a667dcde2b0d133c6fc9344763b36b4f9a445 SHA512 e0b06b43eb94030e15e3ced8c4aabea324960998657a129d19fc2c6a2da6c2aabde3466d71d3d1129190ce15d1ce36bb12cf774fa95d2c221f2279972e674281
+EBUILD kwave-19.08.3.ebuild 2157 BLAKE2B 204f0e6a500feba79c9471c84bfd08fc9d90645b700cc1bbbf961f17bfa4831679e566a6b82ceec16034441f68fc0c3277c01c0ec84b7523e824c3cfd25766e9 SHA512 bab3b01f5ed6d4cdaed5b4431e9aac65dcd722b40a2180b2c7d56d24a7456dfe786af41e65ff9f3d2b5addbe070c881b9a0e4cfbd8395311d5c824d0e5d6c18e
+EBUILD kwave-19.12.0.ebuild 2135 BLAKE2B 0df37e5211bec3b695d4ea7e6b483f607024b4d1bb9a523e64ed85c392434ddb2ad73af63e95009fff917ba9fb86e81737ab992754c76f650e9452c1028f5c5e SHA512 b2425e0cbbc4fbdf403032cf643b20dec32851b0142d0ecdc8a419e62e79b7a45081a385739023fc04e00be2ddce90d452a322f2fe84066e311d2686018eca12
 MISC metadata.xml 690 BLAKE2B 6ad89adcaf160c4c895ebd8a0e1d4bc388dad90803b16673e66640cd3974bdbf608f64c2f97e7e1144c63372b951cebbc7e168985c3945775f08a300d6cbd177 SHA512 eea8bd3770532b13c64608cf89873c65abfbe31392956fb3e244abbd5675b1e920329f3e13befa9563878e8a2f7fbc52d0178045e5dba9ca76d2fc95fca1c4b7
diff --git a/kde-apps/kwave/kwave-19.08.3.ebuild b/kde-apps/kwave/kwave-19.08.3.ebuild
index e1302c6a1b5a..b5b35fe791a5 100644
--- a/kde-apps/kwave/kwave-19.08.3.ebuild
+++ b/kde-apps/kwave/kwave-19.08.3.ebuild
@@ -16,7 +16,7 @@ LICENSE="CC-BY-SA-3.0 CC0-1.0 GPL-2+ LGPL-2+
 	opus? ( BSD-2 )
 "
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE="alsa flac mp3 opus oss pulseaudio +qtmedia vorbis"
 
 BDEPEND="
diff --git a/kde-apps/kwave/kwave-19.04.3.ebuild b/kde-apps/kwave/kwave-19.12.0.ebuild
index 6c01bb007425..0afe98ae4201 100644
--- a/kde-apps/kwave/kwave-19.04.3.ebuild
+++ b/kde-apps/kwave/kwave-19.12.0.ebuild
@@ -3,16 +3,18 @@
 
 EAPI=7
 
-KDE_HANDBOOK="forceoptional"
-inherit kde5
+ECM_HANDBOOK="forceoptional"
+PVCUT=$(ver_cut 1-3)
+KFMIN=5.63.0
+QTMIN=5.12.3
+inherit ecm kde.org
 
 DESCRIPTION="Sound editor built on KDE Frameworks 5 that can edit many types of audio files"
-HOMEPAGE="http://kwave.sourceforge.net/ https://kde.org/applications/multimedia/kwave/"
-LICENSE="CC-BY-SA-3.0 CC0-1.0 GPL-2+ LGPL-2+
-	handbook? ( FDL-1.2 )
-	opus? ( BSD-2 )
-"
-KEYWORDS="amd64 arm64 x86"
+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="
@@ -23,20 +25,20 @@ BDEPEND="
 	) )
 "
 RDEPEND="
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
+	>=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
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
 	media-libs/audiofile:=
 	>=sci-libs/fftw-3
 	media-libs/libsamplerate
@@ -47,7 +49,7 @@ RDEPEND="
 		media-libs/libmad
 		|| ( media-sound/lame media-sound/toolame media-sound/twolame )
 	)
-	qtmedia? ( $(add_qt_dep qtmultimedia) )
+	qtmedia? ( >=dev-qt/qtmultimedia-${QTMIN}:5 )
 	opus? (
 		media-libs/libogg
 		media-libs/opus
@@ -59,8 +61,8 @@ RDEPEND="
 	)
 "
 DEPEND="${RDEPEND}
-	$(add_kdeapps_dep poxml)
-	$(add_qt_dep qtconcurrent)
+	>=kde-apps/poxml-${PVCUT}:5
+	>=dev-qt/qtconcurrent-${QTMIN}:5
 "
 
 DOCS=( AUTHORS CHANGES LICENSES README TODO )
@@ -79,5 +81,5 @@ src_configure() {
 		-DWITH_QT_AUDIO=$(usex qtmedia)
 	)
 
-	kde5_src_configure
+	ecm_src_configure
 }