From 7f697c8b726dd1aea46deddf04b7c96ace2188ee Mon Sep 17 00:00:00 2001
From: Johannes Huber <johu@gentoo.org>
Date: Thu, 20 Sep 2012 09:54:38 +0000
Subject: Fix the .desktop file regression of last revision, bug #435520.

(Portage version: 2.2.0_alpha129/cvs/Linux x86_64)
---
 media-video/kffmpegthumbnailer/ChangeLog           |  8 +++++-
 .../kffmpegthumbnailer-1.1.0-r1.ebuild             | 31 ----------------------
 .../kffmpegthumbnailer-1.1.0-r2.ebuild             | 28 +++++++++++++++++++
 3 files changed, 35 insertions(+), 32 deletions(-)
 delete mode 100644 media-video/kffmpegthumbnailer/kffmpegthumbnailer-1.1.0-r1.ebuild
 create mode 100644 media-video/kffmpegthumbnailer/kffmpegthumbnailer-1.1.0-r2.ebuild

(limited to 'media-video/kffmpegthumbnailer')

diff --git a/media-video/kffmpegthumbnailer/ChangeLog b/media-video/kffmpegthumbnailer/ChangeLog
index a528b17baee9..2545ccb943e2 100644
--- a/media-video/kffmpegthumbnailer/ChangeLog
+++ b/media-video/kffmpegthumbnailer/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-video/kffmpegthumbnailer
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/kffmpegthumbnailer/ChangeLog,v 1.7 2012/08/25 20:53:16 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/kffmpegthumbnailer/ChangeLog,v 1.8 2012/09/20 09:54:38 johu Exp $
+
+*kffmpegthumbnailer-1.1.0-r2 (20 Sep 2012)
+
+  20 Sep 2012; Johannes Huber <johu@gentoo.org>
+  +kffmpegthumbnailer-1.1.0-r2.ebuild, -kffmpegthumbnailer-1.1.0-r1.ebuild:
+  Fix the .desktop file regression of last revision, bug #435520.
 
 *kffmpegthumbnailer-1.1.0-r1 (25 Aug 2012)
 
diff --git a/media-video/kffmpegthumbnailer/kffmpegthumbnailer-1.1.0-r1.ebuild b/media-video/kffmpegthumbnailer/kffmpegthumbnailer-1.1.0-r1.ebuild
deleted file mode 100644
index 8070b81e825b..000000000000
--- a/media-video/kffmpegthumbnailer/kffmpegthumbnailer-1.1.0-r1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/kffmpegthumbnailer/kffmpegthumbnailer-1.1.0-r1.ebuild,v 1.1 2012/08/25 20:53:16 creffett Exp $
-
-EAPI=4
-inherit kde4-base
-
-DESCRIPTION="A thumbnailer for KDE based on ffmpegthumbnailer"
-HOMEPAGE="http://code.google.com/p/ffmpegthumbnailer/"
-SRC_URI="http://ffmpegthumbnailer.googlecode.com/files/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="4"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug"
-
-DEPEND="
-	>=media-video/ffmpegthumbnailer-2
-"
-RDEPEND="${DEPEND}"
-
-DOCS=( Changelog README )
-
-src_prepare() {
-	sed -e "s:CacheThumbnail:X-CacheThumbnail:" \
-		-e "s:IgnoreMaximumSize:X-IgnoreMaximumSize:" \
-		-e "s:ThumbnailerVersion:X-ThumbnailerVersion:" \
-		-e  "/Encoding=UTF-8/d" \
-		-i  kffmpegthumbnailer.desktop || die "fixing .desktop file failed"
-	kde4-base_src_prepare
-}
diff --git a/media-video/kffmpegthumbnailer/kffmpegthumbnailer-1.1.0-r2.ebuild b/media-video/kffmpegthumbnailer/kffmpegthumbnailer-1.1.0-r2.ebuild
new file mode 100644
index 000000000000..825379652ff0
--- /dev/null
+++ b/media-video/kffmpegthumbnailer/kffmpegthumbnailer-1.1.0-r2.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/kffmpegthumbnailer/kffmpegthumbnailer-1.1.0-r2.ebuild,v 1.1 2012/09/20 09:54:38 johu Exp $
+
+EAPI=4
+inherit kde4-base
+
+DESCRIPTION="A thumbnailer for KDE based on ffmpegthumbnailer"
+HOMEPAGE="http://code.google.com/p/ffmpegthumbnailer/"
+SRC_URI="http://ffmpegthumbnailer.googlecode.com/files/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="4"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug"
+
+DEPEND="
+	>=media-video/ffmpegthumbnailer-2
+"
+RDEPEND="${DEPEND}"
+
+DOCS=( Changelog README )
+
+src_prepare() {
+	sed	-e  "/Encoding=UTF-8/d" \
+		-i  kffmpegthumbnailer.desktop || die "fixing .desktop file failed"
+	kde4-base_src_prepare
+}
-- 
cgit v1.2.3-65-gdbad