Version bump. Our patches applied upstream, yay..

Package-Manager: portage-2.1.2.7

9 files changed, 26 insertions, 100 deletions

diff --git a/media-video/ffmpegthumbnailer/ChangeLog b/media-video/ffmpegthumbnailer/ChangeLog
index 962cb2de7f99..dfd9764a8b5b 100644
--- a/media-video/ffmpegthumbnailer/ChangeLog
+++ b/media-video/ffmpegthumbnailer/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for media-video/ffmpegthumbnailer
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpegthumbnailer/ChangeLog,v 1.9 2007/04/28 17:38:57 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpegthumbnailer/ChangeLog,v 1.10 2007/05/08 11:43:46 drac Exp $
+
+*ffmpegthumbnailer-1.1.1 (08 May 2007)
+
+  08 May 2007; Samuli Suominen <drac@gentoo.org>
+  -files/ffmpegthumbnailer-1.1-int.patch,
+  -files/ffmpegthumbnailer-1.1-inttypes.patch,
+  -ffmpegthumbnailer-1.1.ebuild, -ffmpegthumbnailer-1.1-r1.ebuild,
+  +ffmpegthumbnailer-1.1.1.ebuild:
+  Version bump.
 
   28 Apr 2007; nixnut <nixnut@gentoo.org> ffmpegthumbnailer-1.1-r1.ebuild:
   Added ~ppc wrt bug 175749
diff --git a/media-video/ffmpegthumbnailer/Manifest b/media-video/ffmpegthumbnailer/Manifest
index dd06344fc901..c6fa526ae3ba 100644
--- a/media-video/ffmpegthumbnailer/Manifest
+++ b/media-video/ffmpegthumbnailer/Manifest
@@ -1,31 +1,16 @@
-AUX ffmpegthumbnailer-1.1-int.patch 335 RMD160 7c971e123bfb435ce79f78aa573a6e902522ce56 SHA1 228e96dd393264c8899e51557ee299fcb808a729 SHA256 e55a264ea8a71aeebb6a74615b1d1b740d23aa17a78e4e59452256e420cad5b4
-MD5 ea8d3967b3b1eaf09c650edc1646deff files/ffmpegthumbnailer-1.1-int.patch 335
-RMD160 7c971e123bfb435ce79f78aa573a6e902522ce56 files/ffmpegthumbnailer-1.1-int.patch 335
-SHA256 e55a264ea8a71aeebb6a74615b1d1b740d23aa17a78e4e59452256e420cad5b4 files/ffmpegthumbnailer-1.1-int.patch 335
-AUX ffmpegthumbnailer-1.1-inttypes.patch 508 RMD160 ae0b00983ced61a80402bde236c437b6f201976f SHA1 476b4bbea1f3bac6f433f7e179a1b41e70c19e1d SHA256 e1a6e9f9f62b115e4150d0804007844374de19ed788e8982ec34dcfaf6a05265
-MD5 ccc099e50d7e4228bd5f466345e81438 files/ffmpegthumbnailer-1.1-inttypes.patch 508
-RMD160 ae0b00983ced61a80402bde236c437b6f201976f files/ffmpegthumbnailer-1.1-inttypes.patch 508
-SHA256 e1a6e9f9f62b115e4150d0804007844374de19ed788e8982ec34dcfaf6a05265 files/ffmpegthumbnailer-1.1-inttypes.patch 508
-DIST ffmpegthumbnailer-1.1.tar.gz 79940 RMD160 4ac4fd4dd19dd8d1e30d7157d08a216003d97f23 SHA1 16642b5d10bf42e28da70f484ce22be6a7ba8aa9 SHA256 6c9ab042d06ae183332117914521f4be323dd33aedf888efc4308d8b54679cf6
-EBUILD ffmpegthumbnailer-1.1-r1.ebuild 824 RMD160 51ee624cca71a5ec913140c8569ac4997c1d034c SHA1 66e4389a768583127c2c895be09b08bbcba93ea3 SHA256 d448681f72be9b68b7634e4ffe4284a46557da062b86a50521a3c103d874eee8
-MD5 941e72f654837eb80b944cb19106a7d3 ffmpegthumbnailer-1.1-r1.ebuild 824
-RMD160 51ee624cca71a5ec913140c8569ac4997c1d034c ffmpegthumbnailer-1.1-r1.ebuild 824
-SHA256 d448681f72be9b68b7634e4ffe4284a46557da062b86a50521a3c103d874eee8 ffmpegthumbnailer-1.1-r1.ebuild 824
-EBUILD ffmpegthumbnailer-1.1.ebuild 789 RMD160 030296b8ee28c72bf1b1fd82ac6381083d863114 SHA1 350cdcf638dc4ffa4948e8ea237c99431da23cf4 SHA256 757f55d1495520406e338f5dffdd58ef0a565c1e7bc0338734f7111c37d52ae7
-MD5 a48883d8d0441347747554bd0a000dcc ffmpegthumbnailer-1.1.ebuild 789
-RMD160 030296b8ee28c72bf1b1fd82ac6381083d863114 ffmpegthumbnailer-1.1.ebuild 789
-SHA256 757f55d1495520406e338f5dffdd58ef0a565c1e7bc0338734f7111c37d52ae7 ffmpegthumbnailer-1.1.ebuild 789
-MISC ChangeLog 1496 RMD160 05a982e05cf5541d3be18acbefd6cc2a8346c3cd SHA1 7f3792e076c2983b2d04a66ca4e0b9f9a413bfa2 SHA256 895ac3dda780cc5fbc32b250374c77d9dc9e8c353767ca0fc50d4d96d8701cac
-MD5 05140479ad8862e3bd920b4ec9df734c ChangeLog 1496
-RMD160 05a982e05cf5541d3be18acbefd6cc2a8346c3cd ChangeLog 1496
-SHA256 895ac3dda780cc5fbc32b250374c77d9dc9e8c353767ca0fc50d4d96d8701cac ChangeLog 1496
+DIST ffmpegthumbnailer-1.1.1.tar.gz 80116 RMD160 9793f0126a49321a23adfcaa35c7dc70e85e3c17 SHA1 2e14078f27faf595821315dcdb7f98b8021ddd3d SHA256 80b35f18b07d1409f8d860b36398ae6d11f929b6068ced2439ca53118d36e13e
+EBUILD ffmpegthumbnailer-1.1.1.ebuild 721 RMD160 73eb4ab511a774661ef9d19e1cfbedd71a1ce63d SHA1 3205dfffa35c971fbb6ed5caf21661247039ae93 SHA256 1c86a60cca7f4139f273bead75d306dc7e3198ced02a9d8c12732df1657eda2c
+MD5 b4f3073f5951e1514239a7e279b34911 ffmpegthumbnailer-1.1.1.ebuild 721
+RMD160 73eb4ab511a774661ef9d19e1cfbedd71a1ce63d ffmpegthumbnailer-1.1.1.ebuild 721
+SHA256 1c86a60cca7f4139f273bead75d306dc7e3198ced02a9d8c12732df1657eda2c ffmpegthumbnailer-1.1.1.ebuild 721
+MISC ChangeLog 1792 RMD160 fde2ef1364342c0327d5745d9c83d1c7c1e856b4 SHA1 60d24e006bb5b693ec14e162f95b1aa19a7c48ad SHA256 6047a7a85fc6e0409d93aa054fe5ac274feda4f7730fe6824fbb5a66a302a7e6
+MD5 84f11ba64e32d32f857900ed100d3500 ChangeLog 1792
+RMD160 fde2ef1364342c0327d5745d9c83d1c7c1e856b4 ChangeLog 1792
+SHA256 6047a7a85fc6e0409d93aa054fe5ac274feda4f7730fe6824fbb5a66a302a7e6 ChangeLog 1792
 MISC metadata.xml 216 RMD160 bf3331e57d3ead68586f1772afbbe4e0a2d6730c SHA1 4d4145f6b821dcd4501d62904bffe8927ce17b0c SHA256 891d6b3e01002001a70ec76ba1fc11af4970298db89286e0fe41c300054fe366
 MD5 1deb82e5c55a640277aa5fb9bb5ee915 metadata.xml 216
 RMD160 bf3331e57d3ead68586f1772afbbe4e0a2d6730c metadata.xml 216
 SHA256 891d6b3e01002001a70ec76ba1fc11af4970298db89286e0fe41c300054fe366 metadata.xml 216
-MD5 26f098688ea2d5a90351c0c70f985008 files/digest-ffmpegthumbnailer-1.1 262
-RMD160 fbafd8a4bd44ca47a449fd0963ee6dbe429032ae files/digest-ffmpegthumbnailer-1.1 262
-SHA256 af1ffb4d5d1640d05986f92118d38d8b253072be040ec2e354236441a1d24fd9 files/digest-ffmpegthumbnailer-1.1 262
-MD5 26f098688ea2d5a90351c0c70f985008 files/digest-ffmpegthumbnailer-1.1-r1 262
-RMD160 fbafd8a4bd44ca47a449fd0963ee6dbe429032ae files/digest-ffmpegthumbnailer-1.1-r1 262
-SHA256 af1ffb4d5d1640d05986f92118d38d8b253072be040ec2e354236441a1d24fd9 files/digest-ffmpegthumbnailer-1.1-r1 262
+MD5 97f412393acae5430febdc66b6f678ce files/digest-ffmpegthumbnailer-1.1.1 268
+RMD160 45148b5f2d23750061eacfc6b977e4ac24e3c4c6 files/digest-ffmpegthumbnailer-1.1.1 268
+SHA256 7eeea6beac40c1d6f8ab3e8b2742a299802b777c2374b8b6cce5a32cac20c828 files/digest-ffmpegthumbnailer-1.1.1 268
diff --git a/media-video/ffmpegthumbnailer/ffmpegthumbnailer-1.1-r1.ebuild b/media-video/ffmpegthumbnailer/ffmpegthumbnailer-1.1.1.ebuild
index 998dabfa0d66..cd732a1a0d3f 100644
--- a/media-video/ffmpegthumbnailer/ffmpegthumbnailer-1.1-r1.ebuild
+++ b/media-video/ffmpegthumbnailer/ffmpegthumbnailer-1.1.1.ebuild
@@ -1,8 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpegthumbnailer/ffmpegthumbnailer-1.1-r1.ebuild,v 1.3 2007/04/28 17:38:57 nixnut Exp $
-
-inherit eutils
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpegthumbnailer/ffmpegthumbnailer-1.1.1.ebuild,v 1.1 2007/05/08 11:43:46 drac Exp $
 
 DESCRIPTION="Lightweight video thumbnailer that can be used by file managers"
 HOMEPAGE="http://code.google.com/p/ffmpegthumbnailer"
@@ -17,12 +15,6 @@ RDEPEND="media-libs/libpng
 	>=media-video/ffmpeg-0.4.9_p20070330"
 DEPEND="${RDEPEND}"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-inttypes.patch
-}
-
 src_install() {
 	emake DESTDIR="${D}" install || die "emake install failed."
 	dodoc AUTHORS ChangeLog README TODO
diff --git a/media-video/ffmpegthumbnailer/ffmpegthumbnailer-1.1.ebuild b/media-video/ffmpegthumbnailer/ffmpegthumbnailer-1.1.ebuild
deleted file mode 100644
index c300ad60bcb4..000000000000
--- a/media-video/ffmpegthumbnailer/ffmpegthumbnailer-1.1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpegthumbnailer/ffmpegthumbnailer-1.1.ebuild,v 1.6 2007/04/03 17:12:32 gustavoz Exp $
-
-inherit eutils
-
-DESCRIPTION="Lightweight video thumbnailer that can be used by file managers"
-HOMEPAGE="http://code.google.com/p/ffmpegthumbnailer"
-SRC_URI="http://${PN}.googlecode.com/files/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~ppc64 ~sparc ~x86"
-IUSE=""
-
-RDEPEND="media-libs/libpng
-	media-video/ffmpeg"
-DEPEND="${RDEPEND}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-int.patch
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed."
-	dodoc AUTHORS ChangeLog README TODO
-}
diff --git a/media-video/ffmpegthumbnailer/files/digest-ffmpegthumbnailer-1.1 b/media-video/ffmpegthumbnailer/files/digest-ffmpegthumbnailer-1.1
deleted file mode 100644
index b3a505f69562..000000000000
--- a/media-video/ffmpegthumbnailer/files/digest-ffmpegthumbnailer-1.1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 20c6b80dbbcf7a2f73d8879dc9c94c93 ffmpegthumbnailer-1.1.tar.gz 79940
-RMD160 4ac4fd4dd19dd8d1e30d7157d08a216003d97f23 ffmpegthumbnailer-1.1.tar.gz 79940
-SHA256 6c9ab042d06ae183332117914521f4be323dd33aedf888efc4308d8b54679cf6 ffmpegthumbnailer-1.1.tar.gz 79940
diff --git a/media-video/ffmpegthumbnailer/files/digest-ffmpegthumbnailer-1.1-r1 b/media-video/ffmpegthumbnailer/files/digest-ffmpegthumbnailer-1.1-r1
deleted file mode 100644
index b3a505f69562..000000000000
--- a/media-video/ffmpegthumbnailer/files/digest-ffmpegthumbnailer-1.1-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 20c6b80dbbcf7a2f73d8879dc9c94c93 ffmpegthumbnailer-1.1.tar.gz 79940
-RMD160 4ac4fd4dd19dd8d1e30d7157d08a216003d97f23 ffmpegthumbnailer-1.1.tar.gz 79940
-SHA256 6c9ab042d06ae183332117914521f4be323dd33aedf888efc4308d8b54679cf6 ffmpegthumbnailer-1.1.tar.gz 79940
diff --git a/media-video/ffmpegthumbnailer/files/digest-ffmpegthumbnailer-1.1.1 b/media-video/ffmpegthumbnailer/files/digest-ffmpegthumbnailer-1.1.1
new file mode 100644
index 000000000000..23e8eba30ccd
--- /dev/null
+++ b/media-video/ffmpegthumbnailer/files/digest-ffmpegthumbnailer-1.1.1
@@ -0,0 +1,3 @@
+MD5 d1758d11def56f3d7367947f87606c27 ffmpegthumbnailer-1.1.1.tar.gz 80116
+RMD160 9793f0126a49321a23adfcaa35c7dc70e85e3c17 ffmpegthumbnailer-1.1.1.tar.gz 80116
+SHA256 80b35f18b07d1409f8d860b36398ae6d11f929b6068ced2439ca53118d36e13e ffmpegthumbnailer-1.1.1.tar.gz 80116
diff --git a/media-video/ffmpegthumbnailer/files/ffmpegthumbnailer-1.1-int.patch b/media-video/ffmpegthumbnailer/files/ffmpegthumbnailer-1.1-int.patch
deleted file mode 100644
index 21d5b182132e..000000000000
--- a/media-video/ffmpegthumbnailer/files/ffmpegthumbnailer-1.1-int.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ffmpegthumbnailer-1.1/src/moviedecoder.h.orig	2007-02-24 14:14:47.000000000 +0000
-+++ ffmpegthumbnailer-1.1/src/moviedecoder.h	2007-03-31 12:47:57.677823666 +0000
-@@ -1,8 +1,6 @@
- #ifndef MOVIEDECODER_H

- #define MOVIEDECODER_H

- 

--#define EMULATE_INTTYPES

--

- #include <string>
- #include <vector>

- #include <ffmpeg/avcodec.h>

diff --git a/media-video/ffmpegthumbnailer/files/ffmpegthumbnailer-1.1-inttypes.patch b/media-video/ffmpegthumbnailer/files/ffmpegthumbnailer-1.1-inttypes.patch
deleted file mode 100644
index ae3370e00146..000000000000
--- a/media-video/ffmpegthumbnailer/files/ffmpegthumbnailer-1.1-inttypes.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff -ur ffmpegthumbnailer-1.1.orig/src/moviedecoder.h ffmpegthumbnailer-1.1/src/moviedecoder.h
---- ffmpegthumbnailer-1.1.orig/src/moviedecoder.h	2007-02-24 16:14:47.000000000 +0200
-+++ ffmpegthumbnailer-1.1/src/moviedecoder.h	2007-04-13 16:48:13.000000000 +0300
-@@ -1,8 +1,11 @@
-+#define __STDC_CONSTANT_MACROS
-+#define INT64_C
-+
-+#include <inttypes.h>
-+
- #ifndef MOVIEDECODER_H

- #define MOVIEDECODER_H

- 

--#define EMULATE_INTTYPES

--

- #include <string>
- #include <vector>

- #include <ffmpeg/avcodec.h>