gentoo resync : 01.12.2017

3 files changed, 2 insertions, 81 deletions

diff --git a/kde-apps/kdenlive/Manifest b/kde-apps/kdenlive/Manifest
index 89dfd56c3d1b..a79cb2c71c7c 100644
--- a/kde-apps/kdenlive/Manifest
+++ b/kde-apps/kdenlive/Manifest
@@ -1,5 +1,3 @@
-DIST kdenlive-17.04.3.tar.xz 9371152 SHA256 85ec8ee9b110a6d16b5ba82b5218894bd99c0a10d49c3126057c8298af089dd8 SHA512 dfbe90e06394b36722a1f4e6986709bfffee926e3c18300140fad73af8b656bf2a3ea119a59554cb71d1b11ddfdf81e5ab407248ba8d8d7409e8923f1630379d WHIRLPOOL 169dd795d4f52e697489bf97fd9e17fc3665865491a5f39a62826d3602ced1b0566491a43c1ffd007af824695155d58122fdde1d20bcf16d4499e0060b9e8a4f
 DIST kdenlive-17.08.3.tar.xz 9372560 SHA256 bd3c1757c538e4ebb3416b7b88cb62b6364dbd6ba8caccf6a5ff903c7b6506da SHA512 6ab18d380dec19d82824e461d9cfc345cc82790efc93d6608472c6dea26e5392a143b8fb2185dd69802133479994d9899b4bb400b92ba2de0473bf7bd48c0575 WHIRLPOOL e0d65ce6c0ba7e4ed970e1bb9484afd9927b0e0002d78e384a38d22eda227212eaa69185aeeb894ec9739e4adb596c29a6692da9a64b1f6b0e453735e89dbac2
-EBUILD kdenlive-17.04.3.ebuild 2087 BLAKE2B bfe2559334b875ae082270aa176adb3600c3e22fa531c9ce20919e251b310473bb44f496cacbfc1ea04d307d265e399f06003e6184e670e241ca2a9a3043c3ca SHA512 55424c3fd8cc859b43fc89f8f547d110f418e59a4a9022f114d4097b7d1d24fafa59bc3b38f03d281202a01a6a6c1cd14346d7db66ef32f0bbd70391bcb46406
-EBUILD kdenlive-17.08.3.ebuild 2089 BLAKE2B a77daa13a75490297e89e9a964cae7487a6b7ced954c9e43154023cc55b2111718fe6758716a5ea943aec798e1c8886e65c4815ba9045c7b374e9a5d7e6a779e SHA512 e3d2c2f86932d8253cc5ee48d31623e777b0e191eac845426feaaeb7a90e05bdde275b13f962ad10cd5a0590e2b2ec650a6cfce184668f56a563faec9359871e
+EBUILD kdenlive-17.08.3.ebuild 2087 BLAKE2B bfe2559334b875ae082270aa176adb3600c3e22fa531c9ce20919e251b310473bb44f496cacbfc1ea04d307d265e399f06003e6184e670e241ca2a9a3043c3ca SHA512 55424c3fd8cc859b43fc89f8f547d110f418e59a4a9022f114d4097b7d1d24fafa59bc3b38f03d281202a01a6a6c1cd14346d7db66ef32f0bbd70391bcb46406
 MISC metadata.xml 531 BLAKE2B 2418fe9902d1e4253198b8ccb70ce23cee258143c0da3d99198328e02d2a1ce3ca1e327afd5beaa4ec3a41c04a5c5cd6c2b8d0943fa4b33599ddc3e9eaf59737 SHA512 f3658592c4023a1c101a2faff25018061f7514d5110794e137f72b31106021d581a5b9fbf85b460e55b541a2d11af77a074d702896cb6ab07c4e46740832fea6
diff --git a/kde-apps/kdenlive/kdenlive-17.04.3.ebuild b/kde-apps/kdenlive/kdenlive-17.04.3.ebuild
deleted file mode 100644
index e594d7be4f84..000000000000
--- a/kde-apps/kdenlive/kdenlive-17.04.3.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="optional"
-inherit kde5
-
-DESCRIPTION="Non-linear video editing suite by KDE"
-HOMEPAGE="https://www.kdenlive.org/"
-
-LICENSE="GPL-2"
-KEYWORDS="amd64 x86"
-IUSE="freesound gles2 jogshuttle semantic-desktop v4l"
-
-RDEPEND="
-	$(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 qtquickcontrols)
-	$(add_qt_dep qtscript)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	>=media-libs/mlt-6.4.0[ffmpeg,kdenlive,melt,qt5,sdl,xml]
-	virtual/ffmpeg[encode,sdl,X]
-	virtual/opengl
-	freesound? ( $(add_qt_dep qtwebkit) )
-	semantic-desktop? ( $(add_frameworks_dep kfilemetadata) )
-	v4l? ( media-libs/libv4l )
-"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-"
-
-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 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-17.08.3.ebuild b/kde-apps/kdenlive/kdenlive-17.08.3.ebuild
index 555d04f610ce..e594d7be4f84 100644
--- a/kde-apps/kdenlive/kdenlive-17.08.3.ebuild
+++ b/kde-apps/kdenlive/kdenlive-17.08.3.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="Non-linear video editing suite by KDE"
 HOMEPAGE="https://www.kdenlive.org/"
 
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="freesound gles2 jogshuttle semantic-desktop v4l"
 
 RDEPEND="