Fix the .desktop file regression of last revision, bug #435520.

Package-Manager: portage-2.2.0_alpha129/cvs/Linux x86_64

3 files changed, 18 insertions, 11 deletions

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/Manifest b/media-video/kffmpegthumbnailer/Manifest
index 16981efb105f..f2b1d18eb46d 100644
--- a/media-video/kffmpegthumbnailer/Manifest
+++ b/media-video/kffmpegthumbnailer/Manifest
@@ -2,14 +2,18 @@
 Hash: SHA256
 
 DIST kffmpegthumbnailer-1.1.0.tar.gz 9098 SHA256 5b488a4e77229847c7d92f7fc5f7760ba3e4977c83565b741446202a0073f2b2 SHA512 e5d801728636f5de1a5c4a4c7ac47e96b66d9cb59b093b5113b145303363f97c1290b455309519b94546054e0317ca2fb2d35bd0c65be924d4b79bd9c0356cc5 WHIRLPOOL 5587983c89ec63f0c6706d7810e08b63f3e4deda98f50db6c4932662a73d65e9896f3a3e3887339356c773c3e1b9799b0d380dd540fdc3fcdda575b2bdb532dc
-EBUILD kffmpegthumbnailer-1.1.0-r1.ebuild 907 SHA256 2302073625649ea33b6895932dbe8f27223e16c3aff83b87ec4159faff4e9ba7 SHA512 1625a247ea0fc505a3e450fecde9444fc18b19304b0d19a574dbedddae2dd6e4972c8ec8168dc9ca2160f7c3c0de816f4aa86bae88667a03a7b00e2a59c5e341 WHIRLPOOL 7457a110582efe3fa729fb43da7713d3496d864e13a87c9dbeb756e980d562b231b17aa2dc6676a56bc26df4b5bd5dfd70555aba04ee1148918e1574a1c222f6
+EBUILD kffmpegthumbnailer-1.1.0-r2.ebuild 757 SHA256 7a005be4630200a7ba5abc031f27235de586acdba1085fea75ebb6d8f8d17866 SHA512 f50367453a0100989744f37e04369093c492ca4570af7e96bab535163b295fc362707c7bdb046e70a91263f68dccc5d5d743fe095dbf0664e391c065322537e5 WHIRLPOOL 1ac6f3baeef3d268a13165098c6b711df885ee374a55e4c56a2861e07c0fc33ece937b710ffb8f144f05db54f9b334e5be8e62177695911aa66028dbae5f549e
 EBUILD kffmpegthumbnailer-1.1.0.ebuild 594 SHA256 01cabdf02e890e0a546a205dbb1978c8365ef36bddb77ef3ac27c0cb00bcd320 SHA512 b1c9e6bd6df64ef7b7986ff1ec0a9de9971bd2c477252f8fa6f2fd9a2ede22213ecf300e7d4e5c78b0dfb651a7456d657a340319dd9694cba7ab52add63e355c WHIRLPOOL 6f7a259c011fc719a077060c9b94cfe8e31fda13357545fb4f67b5892b1c32c898328d1ac484e0c2397f5bb6cc77da522539ad6912ab81a1e56c37012aa0c450
-MISC ChangeLog 1232 SHA256 914a692927eb3b2d929ea492c40359a4829388cbe9b4ebfb5280adb535e684ad SHA512 70130e70f89ef1a17753183228fa4bc26bd27b6191544cc435586884808bf913e2ea460564889e2da21d697dacf2acd74036703ff55179269b63bc6531ed7044 WHIRLPOOL ef2210d449a9c8a31194cb16b033fb1b1bbbf8af087ef14d939b6e14f798e19348a8aca258a7dad173daf8b03651a750aee623341bf0f0bcb1533e0bfbbc996b
+MISC ChangeLog 1463 SHA256 43d73af2cb93056f763180f90dcc4f1c6ea6c7895cdf2e464d68097ec48298ab SHA512 ced275276bec663e54465671b5423080c171d7fb494ef4cd35d2a6b552e3821e967c2f9a483a2e84ac63ac95ed105b0a89f832ac7b497fc5eb9bb26f07f0adac WHIRLPOOL 151595c88b28cdfa65b23b78d5156bb7e719e808332784ec1a4299bcb00c22c7a1bdd4b996bf965280c6570db11a4e95bbe4e9f45d10fbd8468d58c64ea36a1a
 MISC metadata.xml 333 SHA256 30b490726b6d0543902e9196d62be2da6a8432c38eb8914d103c19a0406a3ff5 SHA512 35bd2ddaf5ed06c47cbe4c7061aa2b87c28ed6bfb67f51e05bd6c61d5adbf00d37939cc81b277185ace596c7cb21b9abe270b1e3ecb76c82fed50bd779280e95 WHIRLPOOL 44ee4557e6e56622dd0ca92714227bfe15068916b2f34beb670d939c783aa383c456e18cde33e198fb7545711116f9f1061d066aa21d55c10943b1fbbb511ebb
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlA5OzwACgkQ23laikJhg1RUoQCffKrM1Rtp2kdH03+fsKWWJbF4
-Le8AoKLAUV+hu1iOkuWbX8lFZiMiMvQJ
-=OmWn
+iQEcBAEBCAAGBQJQWufpAAoJEO+t9ga+3I3aQn4IAMD8sQSJEbEqKy0PG0ZmCQnO
+kIx+0gWM83Epin+lgFaZVtQ2Yb2MaZuWV9ULCrCduYxZaEI9jW1xCgsyzPDntcyt
+eZMEYfQuN8V8ibh9nQ61awITw3SiiSxEY24zZCiUBapKpt8VsHFl8S6DoOljt2so
+BnhE8CcCToh0cyGFK9KXVoj3cUve/V2CCrFQef7RP38K+2b0C0Lxh70d7kPIlELU
+uBLqPilzE0MTlQXSUmnPG31R1KmKP/Bbfb709gRI3uoBT9CcnPQbUJHtKaIhxaRN
+DdFV3hJksUwy/icpE/NQDY5q6Z67PkBnKDRexTI0NaBI4jFSfPDHyAqRj0dQpao=
+=6ZEa
 -----END PGP SIGNATURE-----
diff --git a/media-video/kffmpegthumbnailer/kffmpegthumbnailer-1.1.0-r1.ebuild b/media-video/kffmpegthumbnailer/kffmpegthumbnailer-1.1.0-r2.ebuild
index 8070b81e825b..825379652ff0 100644
--- a/media-video/kffmpegthumbnailer/kffmpegthumbnailer-1.1.0-r1.ebuild
+++ b/media-video/kffmpegthumbnailer/kffmpegthumbnailer-1.1.0-r2.ebuild
@@ -1,6 +1,6 @@
 # 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 $
+# $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
@@ -22,10 +22,7 @@ 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" \
+	sed	-e  "/Encoding=UTF-8/d" \
 		-i  kffmpegthumbnailer.desktop || die "fixing .desktop file failed"
 	kde4-base_src_prepare
 }