From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-844793-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
by finch.gentoo.org (Postfix) with ESMTP id 24F4D1388C1
for <garchives@archives.gentoo.org>; Sun, 8 Nov 2015 12:24:48 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 68D2CE0879;
Sun, 8 Nov 2015 12:24:47 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id DC5CBE0879
for <gentoo-commits@lists.gentoo.org>; Sun, 8 Nov 2015 12:24:46 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 0150F3403C1
for <gentoo-commits@lists.gentoo.org>; Sun, 8 Nov 2015 12:24:46 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id E3A91226D
for <gentoo-commits@lists.gentoo.org>; Sun, 8 Nov 2015 12:24:42 +0000 (UTC)
From: "Manuel Rüger" <mrueg@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Manuel Rüger" <mrueg@gentoo.org>
Message-ID: <1446985471.9f5a559d0c468c9b6338cd25fa87a64b3ca4ad27.mrueg@gentoo>
Subject: [gentoo-commits] proj/kde:master commit in: kde-apps/ffmpegthumbs/
X-VCS-Repository: proj/kde
X-VCS-Files: kde-apps/ffmpegthumbs/ffmpegthumbs-15.08.49.9999.ebuild kde-apps/ffmpegthumbs/ffmpegthumbs-5.9999.ebuild kde-apps/ffmpegthumbs/ffmpegthumbs-9999.ebuild
X-VCS-Directories: kde-apps/ffmpegthumbs/
X-VCS-Committer: mrueg
X-VCS-Committer-Name: Manuel Rüger
X-VCS-Revision: 9f5a559d0c468c9b6338cd25fa87a64b3ca4ad27
X-VCS-Branch: master
Date: Sun, 8 Nov 2015 12:24:42 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: 032ef015-c270-4930-a460-7260dc35239c
X-Archives-Hash: 09d60caa9c51bd1cba696d3578fcc489
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
"