Version bump, only change from 1.2.1 is that upstream applied our -Wl,--as-needed patch so we can avoid running eautomake.

(Portage version: 2.1.4.4)

4 files changed, 11 insertions, 41 deletions

diff --git a/media-video/ffmpegthumbnailer/ChangeLog b/media-video/ffmpegthumbnailer/ChangeLog
index bc58b5a01f02..5f712e04b4b6 100644
--- a/media-video/ffmpegthumbnailer/ChangeLog
+++ b/media-video/ffmpegthumbnailer/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for media-video/ffmpegthumbnailer
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpegthumbnailer/ChangeLog,v 1.31 2008/02/26 16:07:55 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpegthumbnailer/ChangeLog,v 1.32 2008/02/26 18:32:55 drac Exp $
+
+*ffmpegthumbnailer-1.2.2 (26 Feb 2008)
+
+  26 Feb 2008; Samuli Suominen <drac@gentoo.org>
+  -files/ffmpegthumbnailer-1.2.1-asneeded.patch,
+  -ffmpegthumbnailer-1.1.5.ebuild, -ffmpegthumbnailer-1.2.1.ebuild,
+  +ffmpegthumbnailer-1.2.2.ebuild:
+  Version bump, only change from 1.2.1 is that upstream applied our
+  -Wl,--as-needed patch so we can avoid running eautomake.
 
 *ffmpegthumbnailer-1.2.1 (26 Feb 2008)
 
diff --git a/media-video/ffmpegthumbnailer/ffmpegthumbnailer-1.1.5.ebuild b/media-video/ffmpegthumbnailer/ffmpegthumbnailer-1.1.5.ebuild
deleted file mode 100644
index d544c0aa850d..000000000000
--- a/media-video/ffmpegthumbnailer/ffmpegthumbnailer-1.1.5.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpegthumbnailer/ffmpegthumbnailer-1.1.5.ebuild,v 1.1 2008/02/16 14:25:25 drac Exp $
-
-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="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-RDEPEND="media-libs/libpng
-	>=media-video/ffmpeg-0.4.9_p20070330"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed."
-	dodoc AUTHORS ChangeLog README TODO
-}
diff --git a/media-video/ffmpegthumbnailer/ffmpegthumbnailer-1.2.1.ebuild b/media-video/ffmpegthumbnailer/ffmpegthumbnailer-1.2.2.ebuild
index 869baeff3510..f41462a4d024 100644
--- a/media-video/ffmpegthumbnailer/ffmpegthumbnailer-1.2.1.ebuild
+++ b/media-video/ffmpegthumbnailer/ffmpegthumbnailer-1.2.2.ebuild
@@ -1,8 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpegthumbnailer/ffmpegthumbnailer-1.2.1.ebuild,v 1.1 2008/02/26 16:07:55 drac Exp $
-
-inherit autotools eutils
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpegthumbnailer/ffmpegthumbnailer-1.2.2.ebuild,v 1.1 2008/02/26 18:32:55 drac Exp $
 
 DESCRIPTION="Lightweight video thumbnailer that can be used by file managers"
 HOMEPAGE="http://code.google.com/p/ffmpegthumbnailer"
@@ -19,13 +17,6 @@ RDEPEND="media-libs/libpng
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-asneeded.patch
-	eautomake
-}
-
 src_compile() {
 	econf --disable-dependency-tracking
 	emake || die "emake failed."
diff --git a/media-video/ffmpegthumbnailer/files/ffmpegthumbnailer-1.2.1-asneeded.patch b/media-video/ffmpegthumbnailer/files/ffmpegthumbnailer-1.2.1-asneeded.patch
deleted file mode 100644
index 8e80fc3b4c6e..000000000000
--- a/media-video/ffmpegthumbnailer/files/ffmpegthumbnailer-1.2.1-asneeded.patch
+++ /dev/null
@@ -1,8 +0,0 @@
-diff -ur ffmpegthumbnailer-1.2.1.orig/src/libffmpegthumbnailer/Makefile.am ffmpegthumbnailer-1.2.1/src/libffmpegthumbnailer/Makefile.am
---- ffmpegthumbnailer-1.2.1.orig/src/libffmpegthumbnailer/Makefile.am	2008-02-26 13:40:33.000000000 +0200
-+++ ffmpegthumbnailer-1.2.1/src/libffmpegthumbnailer/Makefile.am	2008-02-26 18:01:22.000000000 +0200
-@@ -11,3 +11,4 @@
- 
- libffmpegthumbnailer_includedir         = $(includedir)/libffmpegthumbnailer
- libffmpegthumbnailer_la_LDFLAGS         = -version-info 2:0:0
-+libffmpegthumbnailer_la_LIBADD          = $(FFMPEG_LIBS) $(PNG_LIBS) -ljpeg