gentoo resync : 02.08.2019

4 files changed, 3 insertions, 89 deletions

diff --git a/kde-apps/kdenlive/Manifest b/kde-apps/kdenlive/Manifest
index 2e3e96d075ef..7463147f2cdf 100644
--- a/kde-apps/kdenlive/Manifest
+++ b/kde-apps/kdenlive/Manifest
@@ -1,5 +1,3 @@
-DIST kdenlive-18.12.3.tar.xz 10209488 BLAKE2B 10773810d2f4b7195f91d21864549fe908d4fd4c0f19cb353a8cab9f1c4dc7edd692a4cb9fa2a37b7ee89ceb1e3e5dad3c68645efb12953bbda5c208647e8f30 SHA512 9a05a48d7b2b958cc34fc1fd673af519861a0275f28d5b6774280e1b5eff009fa90a920d888466b70d2b07aecb3129892b6762d75d93106051c51c7a440fbfdc
 DIST kdenlive-19.04.3.tar.xz 11071112 BLAKE2B e43563e8ab679e08b7d654e38e7b092c9e919c46ec1f62374f29fb2210ba447ae8183afec2ff31472d64d557393e71f775175141e526923247c3624187bfc3fa SHA512 de8d7147a2d5f3b70bb1fe3f5e73acd3e3fe6289415c9fb68a5b4850e43ae55ac9e00d6143e1c717c5efc4e634be84626a2bbfcd460deee39e5638002f043aa3
-EBUILD kdenlive-18.12.3.ebuild 2271 BLAKE2B 3ae16411f9347f42ded75f48d7a2ac3d70d2175b4e3270a52f2ce42bdced4f973310860229a0579615cde04f4b0b43146188048374e4038b255231b531dc621e SHA512 3ca176cd4d411dade2734df6d52e63e324adc21d644b78e6bb556cf3fe1d19cfe8719891c9ea184ea796240b60b08d3a04384bba473d3933799b6dacc209af97
-EBUILD kdenlive-19.04.3.ebuild 2328 BLAKE2B 84c18af6b1b29cb7a50d98764a8b10561b28554db8fec0921a150a37dbee656c890877a1ea662db2d6c333cf7fbcc0f5f8ee0222940108377ce6bc0b85159de0 SHA512 7ae9bc69033ebc1df2e1d94a8a4db7c8edeff17d904a48ab5fdb06a974dc92c06a2d578b0a451901aa1cc83d5e62a748053821f073f6868a902eddcaeb03b2d2
-MISC metadata.xml 631 BLAKE2B e31fe832d690c7c842a255697abcc15cf51546023a97ee121e918b2ec990e12555b3fcec1d585563c8bd75750cf84c66bcdab0d570d99c1ff85545753a698a00 SHA512 35e594ff05a23977e5f3944cff530c89404a4807db0f9a5f7454dca69de13b8e7df2cb18ec4a06292f4526fa4b27c0966d129a4c4b3f153de4eb3250ad3ceef9
+EBUILD kdenlive-19.04.3.ebuild 2325 BLAKE2B db1e14709b4a783b29f717173368cfe8921a1cb62eba41511f76bd5aa20a45987f0edaf3abe63bb2d6dad8d4ddfffda7c15e2066c767a109d3768451d21b9ebb SHA512 afb7e58c574a5e1604be0afd15e76df587fa998f08d0e5ba80ac279aa0555ca49758b9191e6b25960685ba5c3e5d1e5cc2d7cfba451baab7f827cd18620b4d84
+MISC metadata.xml 559 BLAKE2B 4fb6ac38398866a869611dcdc0d9513c5618e7b1864b221d155e5bf1200ffd1081ff8b7dc408d85a97be6146eaf60b1ff1ac695c02e22c2a1537b18a8a1d8f4c SHA512 b76a5322a9fe2a6b7597ac7a6c45525e921cd0102e156939e013c96d876b355b258c0bb917e72a73686819672a2a5a47e7c7d0232468c709e4e88f888ee26cbb
diff --git a/kde-apps/kdenlive/kdenlive-18.12.3.ebuild b/kde-apps/kdenlive/kdenlive-18.12.3.ebuild
deleted file mode 100644
index 1673ea78c444..000000000000
--- a/kde-apps/kdenlive/kdenlive-18.12.3.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_HANDBOOK="optional"
-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 jogshuttle semantic-desktop share v4l"
-
-BDEPEND="
-	sys-devel/gettext
-"
-COMMON_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 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 qtdbus)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui 'gles2=')
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	>=media-libs/mlt-6.10.0[ffmpeg,frei0r,kdenlive,melt,qt5,sdl,xml]
-	virtual/opengl
-	freesound? ( >=dev-qt/qtwebkit-5.212.0_pre20180120:5 )
-	semantic-desktop? ( $(add_frameworks_dep kfilemetadata) )
-	share? ( $(add_frameworks_dep purpose) )
-	v4l? ( media-libs/libv4l )
-"
-DEPEND="${COMMON_DEPEND}
-	$(add_qt_dep qtconcurrent)
-"
-RDEPEND="${COMMON_DEPEND}
-	$(add_qt_dep qtquickcontrols)
-	virtual/ffmpeg[encode,sdl,X]
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package freesound Qt5WebKitWidgets)
-		-DWITH_JogShuttle=$(usex jogshuttle)
-		$(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.04.3.ebuild b/kde-apps/kdenlive/kdenlive-19.04.3.ebuild
index 6a545cb1792d..701ef28aea80 100644
--- a/kde-apps/kdenlive/kdenlive-19.04.3.ebuild
+++ b/kde-apps/kdenlive/kdenlive-19.04.3.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Non-linear video editing suite by KDE"
 HOMEPAGE="https://www.kdenlive.org/"
 
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE="freesound gles2 semantic-desktop share v4l"
 
 BDEPEND="
diff --git a/kde-apps/kdenlive/metadata.xml b/kde-apps/kdenlive/metadata.xml
index 52110a0f7f7e..aacea79d5498 100644
--- a/kde-apps/kdenlive/metadata.xml
+++ b/kde-apps/kdenlive/metadata.xml
@@ -8,7 +8,6 @@
 	<use>
 		<flag name="freesound">Enable freesound.org credentials support via <pkg>dev-qt/qtwebkit</pkg> to download files</flag>
 		<flag name="gles2">Use GLES 2.0 or later instead of full OpenGL</flag>
-		<flag name="jogshuttle">Enable support for Jog-Shuttle devices</flag>
 		<flag name="share">Enable support for a share menu using <pkg>kde-frameworks/purpose</pkg></flag>
 	</use>
 </pkgmetadata>