[gentoo-commits] repo/gentoo:master commit in: media-video/kffmpegthumbnailer/

[Johannes Huber]

commit:     c98d873fda6582bb9c58ba0bbf92f33ed7427357
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Fri May 27 08:21:20 2016 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Fri May 27 08:24:21 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c98d873f

media-video/kffmpegthumbnailer: Fix build with >=ffmpegthumbnailer-2.1.0

Gentoo-bug: 568606

Package-Manager: portage-2.3.0_rc1

 .../kffmpegthumbnailer/kffmpegthumbnailer-1.1.0-r3.ebuild     |  4 ++--
 ...ler-1.1.0-r3.ebuild => kffmpegthumbnailer-1.1.0-r4.ebuild} | 11 +++++++----
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/media-video/kffmpegthumbnailer/kffmpegthumbnailer-1.1.0-r3.ebuild b/media-video/kffmpegthumbnailer/kffmpegthumbnailer-1.1.0-r3.ebuild
index 61f9dd2..d96933d 100644
--- a/media-video/kffmpegthumbnailer/kffmpegthumbnailer-1.1.0-r3.ebuild
+++ b/media-video/kffmpegthumbnailer/kffmpegthumbnailer-1.1.0-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -16,7 +16,7 @@ KEYWORDS="amd64 x86"
 IUSE="debug"
 
 DEPEND="
-	>=media-video/ffmpegthumbnailer-2
+	<media-video/ffmpegthumbnailer-2.1.0
 "
 RDEPEND="${DEPEND}
 	$(add_kdeapps_dep kdebase-kioslaves)

diff --git a/media-video/kffmpegthumbnailer/kffmpegthumbnailer-1.1.0-r3.ebuild b/media-video/kffmpegthumbnailer/kffmpegthumbnailer-1.1.0-r4.ebuild
similarity index 80%
copy from media-video/kffmpegthumbnailer/kffmpegthumbnailer-1.1.0-r3.ebuild
copy to media-video/kffmpegthumbnailer/kffmpegthumbnailer-1.1.0-r4.ebuild
index 61f9dd2..68a4fab 100644
--- a/media-video/kffmpegthumbnailer/kffmpegthumbnailer-1.1.0-r3.ebuild
+++ b/media-video/kffmpegthumbnailer/kffmpegthumbnailer-1.1.0-r4.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 inherit kde4-base
 
@@ -12,11 +12,11 @@ SRC_URI="https://ffmpegthumbnailer.googlecode.com/files/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="4"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="debug"
 
 DEPEND="
-	>=media-video/ffmpegthumbnailer-2
+	>=media-video/ffmpegthumbnailer-2.1.0
 "
 RDEPEND="${DEPEND}
 	$(add_kdeapps_dep kdebase-kioslaves)
@@ -27,5 +27,8 @@ DOCS=( Changelog README )
 src_prepare() {
 	sed	-e  "/Encoding=UTF-8/d" \
 		-i  kffmpegthumbnailer.desktop || die "fixing .desktop file failed"
+
+	append-cxxflags -std=c++11
+
 	kde4-base_src_prepare
 }