commit: 9f5a559d0c468c9b6338cd25fa87a64b3ca4ad27
Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Sat Nov 7 22:13:02 2015 +0000
Commit: Manuel Rüger <mrueg <AT> gentoo <DOT> org>
CommitDate: Sun Nov 8 12:24:31 2015 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=9f5a559d
kde-apps/ffmpegthumbs: Frameworks merged to master
Package-Manager: portage-2.2.20.1
.../ffmpegthumbs/ffmpegthumbs-15.08.49.9999.ebuild | 2 +-
kde-apps/ffmpegthumbs/ffmpegthumbs-5.9999.ebuild | 22 ----------------------
kde-apps/ffmpegthumbs/ffmpegthumbs-9999.ebuild | 14 ++++++++------
3 files changed, 9 insertions(+), 29 deletions(-)
diff --git a/kde-apps/ffmpegthumbs/ffmpegthumbs-15.08.49.9999.ebuild
b/kde-apps/ffmpegthumbs/ffmpegthumbs-15.08.49.9999.ebuild
index 17786aa..f1739b8 100644
--- a/kde-apps/ffmpegthumbs/ffmpegthumbs-15.08.49.9999.ebuild
+++ b/kde-apps/ffmpegthumbs/ffmpegthumbs-15.08.49.9999.ebuild
@@ -6,7 +6,7 @@ EAPI=5
inherit kde4-base
-DESCRIPTION="A FFmpeg based thumbnail Generator for Video Files"
+DESCRIPTION="An FFmpeg based thumbnail generator for video files"
KEYWORDS=""
IUSE="debug"
diff --git a/kde-apps/ffmpegthumbs/ffmpegthumbs-5.9999.ebuild
b/kde-apps/ffmpegthumbs/ffmpegthumbs-5.9999.ebuild
deleted file mode 100644
index 1eac824..0000000
--- a/kde-apps/ffmpegthumbs/ffmpegthumbs-5.9999.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-EGIT_BRANCH="frameworks"
-inherit kde5
-
-DESCRIPTION="A FFmpeg based thumbnail Generator for Video Files"
-KEYWORDS=""
-IUSE=""
-
-RDEPEND="
- $(add_frameworks_dep kio)
- dev-qt/qtgui:5
- virtual/ffmpeg"
-
-DEPEND="
- ${RDEPEND}
- virtual/pkgconfig
-"
diff --git a/kde-apps/ffmpegthumbs/ffmpegthumbs-9999.ebuild
b/kde-apps/ffmpegthumbs/ffmpegthumbs-9999.ebuild
index 17786aa..2d40cc9 100644
--- a/kde-apps/ffmpegthumbs/ffmpegthumbs-9999.ebuild
+++ b/kde-apps/ffmpegthumbs/ffmpegthumbs-9999.ebuild
@@ -4,15 +4,17 @@
EAPI=5
-inherit kde4-base
+inherit kde5
-DESCRIPTION="A FFmpeg based thumbnail Generator for Video Files"
+DESCRIPTION="An FFmpeg based thumbnail generator for video files"
KEYWORDS=""
-IUSE="debug"
+IUSE=""
-DEPEND="
+RDEPEND="
+ $(add_frameworks_dep kio)
+ dev-qt/qtgui:5
virtual/ffmpeg
"
-RDEPEND="${DEPEND}
- $(add_kdeapps_dep kdebase-kioslaves)
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
"
