Version bump. Our patches applied upstream, yay..

(Portage version: 2.1.2.7)

8 files changed, 14 insertions, 73 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/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>