gentoo resync : 15.12.2019

4 files changed, 93 insertions, 90 deletions

diff --git a/kde-apps/kdenlive/Manifest b/kde-apps/kdenlive/Manifest
index 4aa5be9e9354..9aa270d5fd5e 100644
--- a/kde-apps/kdenlive/Manifest
+++ b/kde-apps/kdenlive/Manifest
@@ -1,7 +1,7 @@
 AUX kdenlive-19.08.3-qt-5.14-1.patch 7106 BLAKE2B c2c3e00603ec83fd98af7a4350f08e422e4e6e5f086119d30637608d10229f2cecde5789af060596bd51991c1f28bd88aafad945c1278266800fcf0282cc1194 SHA512 9076bd07c418be6376d83e223010bb0e64e159a0fb8aef9e58479811158ca851fedd9cd30c42086bfa13edb230dbcf61ad9bd1be4e6570c76d0abab92a685d9a
 AUX kdenlive-19.08.3-qt-5.14-2.patch 1038 BLAKE2B 2e45cbd32a81fd70eb6794ad4aeaf87f9f5dddce820237b00a4aceaea9a02c212cdd7727c414788c23baeebd52231e8fdbbb80a79b85ae89bbc93e0606bcf816 SHA512 0abd4615c6eaff86836220cb39b2785a40436324c701a253a4d1cc8f6aad37a7d11a3c75338f34a1f50cab68a869230af5c74d6d00e8827f77b4016cc877986e
-DIST kdenlive-19.04.3.tar.xz 11071112 BLAKE2B e43563e8ab679e08b7d654e38e7b092c9e919c46ec1f62374f29fb2210ba447ae8183afec2ff31472d64d557393e71f775175141e526923247c3624187bfc3fa SHA512 de8d7147a2d5f3b70bb1fe3f5e73acd3e3fe6289415c9fb68a5b4850e43ae55ac9e00d6143e1c717c5efc4e634be84626a2bbfcd460deee39e5638002f043aa3
 DIST kdenlive-19.08.3.tar.xz 12418064 BLAKE2B bf0765e28f374a21371a9bf3fbc6059d6ac81118d79b0978fd10a3c4959f1343d06773ae278cb6e9a3890c1c1daff79f0a709cebd186b1bc586318e5384ca5da SHA512 187651de7542b86f9332c3eb79e2a27b664f0b4ead19fbb6035963b7be41a2a53b65de37e8c18c50aa794145cfaa2ebaf1b9f721d379c014da9c5f9475048738
-EBUILD kdenlive-19.04.3.ebuild 2325 BLAKE2B db1e14709b4a783b29f717173368cfe8921a1cb62eba41511f76bd5aa20a45987f0edaf3abe63bb2d6dad8d4ddfffda7c15e2066c767a109d3768451d21b9ebb SHA512 afb7e58c574a5e1604be0afd15e76df587fa998f08d0e5ba80ac279aa0555ca49758b9191e6b25960685ba5c3e5d1e5cc2d7cfba451baab7f827cd18620b4d84
-EBUILD kdenlive-19.08.3.ebuild 2586 BLAKE2B eed47dbe78a92c6d6a735bf8bb5d7cebc51d913187af137b41223ec8a7ab306a3288696d36d7a7ccb4d32b42b911fa35a9f54815b8934a0b38356781f3b96be6 SHA512 e6aadb625f9659794ec3a64bb47f61929672215010e9b43b8f676fa578aaabb0ab52cff6ee6f26c1677146fb8c9d1fdd365e59b84df8b92bf8f0aa221ba21347
+DIST kdenlive-19.12.0.tar.xz 11428756 BLAKE2B e76153fea8be842cd130067d39ac8571d118267d3dfab15cc1e0346690ab2f0b2db16d7f64a59d96d89c4062859d6c1d379ce9cbeee0c63ba67fe2f8e0d2a875 SHA512 dc692db5dc4e0c7c8daa51fb8722d5d60efc22bb10b61c1048a67a50c15e9bac44bd009f6379153f1e1c21c12cb4b88f56ebe2db21a095c00bd068d0c1bbcb61
+EBUILD kdenlive-19.08.3.ebuild 2626 BLAKE2B 8ff4702ee1474f3e613c0f029a4594d93f5d4ccf9f24bd84bd54295b6839de19a79c26c216bcc2385b21491d195da291068adf3ff9e6df127c36d11aa78ff872 SHA512 75db879700acefe1283d8a6d13339a8ea197833edb4a7669fd05aad34d9a671dd0b48ad29ade1c3ae95c31f5e52d1de90150e9748b9887b7959f55e9c2b90ec6
+EBUILD kdenlive-19.12.0.ebuild 2509 BLAKE2B 821af763958da4998adeea67583ba051f6a38735a3c236fbd1651ac3bf608b8f2be142a23d7bd168bca96f53b865438bb6a467fc9fde32ccb85395b23705d49f SHA512 32ebc69d1a8c43280a004490855315849b220a783a4bf9ca42d5dc974a34334f84eef798335e3eb90b4fb17d717cc39b3df844814dab0a809c491a6f47cafbb9
 MISC metadata.xml 559 BLAKE2B 4fb6ac38398866a869611dcdc0d9513c5618e7b1864b221d155e5bf1200ffd1081ff8b7dc408d85a97be6146eaf60b1ff1ac695c02e22c2a1537b18a8a1d8f4c SHA512 b76a5322a9fe2a6b7597ac7a6c45525e921cd0102e156939e013c96d876b355b258c0bb917e72a73686819672a2a5a47e7c7d0232468c709e4e88f888ee26cbb
diff --git a/kde-apps/kdenlive/kdenlive-19.04.3.ebuild b/kde-apps/kdenlive/kdenlive-19.04.3.ebuild
deleted file mode 100644
index 701ef28aea80..000000000000
--- a/kde-apps/kdenlive/kdenlive-19.04.3.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_HANDBOOK="optional"
-KDE_TEST="true"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Non-linear video editing suite by KDE"
-HOMEPAGE="https://www.kdenlive.org/"
-
-LICENSE="GPL-2"
-KEYWORDS="amd64 arm64 x86"
-IUSE="freesound gles2 semantic-desktop share v4l"
-
-BDEPEND="
-	sys-devel/gettext
-"
-DEPEND="
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kbookmarks)
-	$(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 kdeclarative)
-	$(add_frameworks_dep kguiaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep knewstuff)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep knotifyconfig)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep solid)
-	$(add_qt_dep qtconcurrent)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui 'gles2=')
-	$(add_qt_dep qtmultimedia)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	dev-cpp/rttr
-	>=media-libs/mlt-6.14.0[ffmpeg,frei0r,kdenlive,melt,qt5,sdl,xml]
-	freesound? ( >=dev-qt/qtwebkit-5.212.0_pre20180120:5 )
-	semantic-desktop? ( $(add_frameworks_dep kfilemetadata) )
-	share? ( $(add_frameworks_dep purpose) )
-	v4l? ( media-libs/libv4l )
-"
-RDEPEND="${DEPEND}
-	$(add_qt_dep qtquickcontrols)
-	virtual/ffmpeg[encode,sdl,X]
-"
-
-RESTRICT+=" test" # segfaults, bug 684132
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package freesound Qt5WebKitWidgets)
-		$(cmake-utils_use_find_package semantic-desktop KF5FileMetaData)
-		$(cmake-utils_use_find_package share KF5Purpose)
-		$(cmake-utils_use_find_package v4l LibV4L2)
-	)
-
-	kde5_src_configure
-}
-
-pkg_postinst() {
-	kde5_pkg_postinst
-
-	# Gentoo bug 603168
-	if ! has_version "media-libs/mlt[fftw]" ; then
-		elog "For 'Crop and Transform/Rotate and Shear' effect, please build media-libs/mlt with USE=fftw enabled."
-	fi
-}
diff --git a/kde-apps/kdenlive/kdenlive-19.08.3.ebuild b/kde-apps/kdenlive/kdenlive-19.08.3.ebuild
index 8e7dadce7f30..e32cf708c943 100644
--- a/kde-apps/kdenlive/kdenlive-19.08.3.ebuild
+++ b/kde-apps/kdenlive/kdenlive-19.08.3.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://www.kdenlive.org/"
 
 LICENSE="GPL-2"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE="freesound gles2 semantic-desktop share v4l"
 
 BDEPEND="
@@ -66,6 +66,8 @@ RDEPEND="${DEPEND}
 	virtual/ffmpeg[encode,sdl,X]
 "
 
+RESTRICT+=" test" # segfaults, bug 684132
+
 PATCHES=( "${FILESDIR}"/${P}-qt-5.14-{1,2}.patch )
 
 src_configure() {
diff --git a/kde-apps/kdenlive/kdenlive-19.12.0.ebuild b/kde-apps/kdenlive/kdenlive-19.12.0.ebuild
new file mode 100644
index 000000000000..ebe92f742c62
--- /dev/null
+++ b/kde-apps/kdenlive/kdenlive-19.12.0.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="optional"
+ECM_TEST="true"
+KFMIN=5.63.0
+QTMIN=5.12.3
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Non-linear video editing suite by KDE"
+HOMEPAGE="https://kdenlive.org/en/"
+
+LICENSE="GPL-2"
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="freesound gles2 semantic-desktop share v4l"
+
+BDEPEND="
+	sys-devel/gettext
+"
+DEPEND="
+	dev-cpp/rttr
+	>=dev-qt/qtconcurrent-${QTMIN}:5
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5[gles2=]
+	>=dev-qt/qtmultimedia-${QTMIN}:5
+	>=dev-qt/qtnetwork-${QTMIN}:5
+	>=dev-qt/qtsvg-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
+	>=kde-frameworks/karchive-${KFMIN}:5
+	>=kde-frameworks/kbookmarks-${KFMIN}: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/kdeclarative-${KFMIN}:5
+	>=kde-frameworks/kguiaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kiconthemes-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/kitemviews-${KFMIN}:5
+	>=kde-frameworks/kjobwidgets-${KFMIN}:5
+	>=kde-frameworks/knewstuff-${KFMIN}:5
+	>=kde-frameworks/knotifications-${KFMIN}:5
+	>=kde-frameworks/knotifyconfig-${KFMIN}:5
+	>=kde-frameworks/kservice-${KFMIN}:5
+	>=kde-frameworks/ktextwidgets-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	>=kde-frameworks/solid-${KFMIN}:5
+	>=media-libs/mlt-6.18.0[ffmpeg,frei0r,kdenlive,melt,qt5,sdl,xml]
+	freesound? ( >=dev-qt/qtwebkit-5.212.0_pre20180120:5 )
+	semantic-desktop? ( >=kde-frameworks/kfilemetadata-${KFMIN}:5 )
+	share? ( >=kde-frameworks/purpose-${KFMIN}:5 )
+	v4l? ( media-libs/libv4l )
+"
+RDEPEND="${DEPEND}
+	>=dev-qt/qtquickcontrols-${QTMIN}:5
+	virtual/ffmpeg[encode,sdl,X]
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package freesound Qt5WebKitWidgets)
+		$(cmake_use_find_package semantic-desktop KF5FileMetaData)
+		$(cmake_use_find_package share KF5Purpose)
+		$(cmake_use_find_package v4l LibV4L2)
+	)
+
+	ecm_src_configure
+}
+
+pkg_postinst() {
+	ecm_pkg_postinst
+
+	# Gentoo bug 603168
+	if ! has_version "media-libs/mlt[fftw]" ; then
+		elog "For 'Crop and Transform/Rotate and Shear' effect, please build media-libs/mlt with USE=fftw enabled."
+	fi
+}