Version bump.

(Portage version: 2.2_rc67/cvs/Linux x86_64)

4 files changed, 14 insertions, 33 deletions

diff --git a/media-video/ffmpegthumbnailer/ChangeLog b/media-video/ffmpegthumbnailer/ChangeLog
index 2253095859f2..49e5384bce52 100644
--- a/media-video/ffmpegthumbnailer/ChangeLog
+++ b/media-video/ffmpegthumbnailer/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-video/ffmpegthumbnailer
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpegthumbnailer/ChangeLog,v 1.100 2010/08/06 13:53:50 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpegthumbnailer/ChangeLog,v 1.101 2010/08/06 14:35:39 ssuominen Exp $
+
+*ffmpegthumbnailer-2.0.4 (06 Aug 2010)
+
+  06 Aug 2010; Samuli Suominen <ssuominen@gentoo.org>
+  +ffmpegthumbnailer-2.0.4.ebuild:
+  Version bump.
 
 *ffmpegthumbnailer-2.0.3 (06 Aug 2010)
 
diff --git a/media-video/ffmpegthumbnailer/ffmpegthumbnailer-1.5.4.ebuild b/media-video/ffmpegthumbnailer/ffmpegthumbnailer-1.5.4.ebuild
index 2cbaea62ddb4..855c938bcb55 100644
--- a/media-video/ffmpegthumbnailer/ffmpegthumbnailer-1.5.4.ebuild
+++ b/media-video/ffmpegthumbnailer/ffmpegthumbnailer-1.5.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpegthumbnailer/ffmpegthumbnailer-1.5.4.ebuild,v 1.7 2009/09/27 16:10:53 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpegthumbnailer/ffmpegthumbnailer-1.5.4.ebuild,v 1.8 2010/08/06 14:35:39 ssuominen Exp $
 
 EAPI=2
 
@@ -10,7 +10,7 @@ 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 ~x86-fbsd"
+KEYWORDS="hppa ppc"
 IUSE="jpeg png"
 
 RDEPEND=">=media-video/ffmpeg-0.5
@@ -28,7 +28,7 @@ src_configure() {
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
+	emake DESTDIR="${D}" install || die
 	dodoc AUTHORS ChangeLog README
 	find "${D}"/usr -name '*.la' -delete
 }
diff --git a/media-video/ffmpegthumbnailer/ffmpegthumbnailer-2.0.3.ebuild b/media-video/ffmpegthumbnailer/ffmpegthumbnailer-2.0.4.ebuild
index a74a7a3ecff4..e7670c5de942 100644
--- a/media-video/ffmpegthumbnailer/ffmpegthumbnailer-2.0.3.ebuild
+++ b/media-video/ffmpegthumbnailer/ffmpegthumbnailer-2.0.4.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpegthumbnailer/ffmpegthumbnailer-2.0.3.ebuild,v 1.1 2010/08/06 13:53:50 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpegthumbnailer/ffmpegthumbnailer-2.0.4.ebuild,v 1.1 2010/08/06 14:35:39 ssuominen Exp $
 
 EAPI=2
-inherit autotools eutils
+inherit libtool
 
 DESCRIPTION="Lightweight video thumbnailer that can be used by file managers"
 HOMEPAGE="http://code.google.com/p/ffmpegthumbnailer/"
@@ -23,10 +23,7 @@ DEPEND="${COMMON_DEPEND}
 	dev-util/pkgconfig"
 
 src_prepare() {
-	if use gnome; then
-		epatch "${FILESDIR}"/${P}-asneeded.patch
-		eautoreconf
-	fi
+	elibtoolize
 }
 
 src_configure() {
diff --git a/media-video/ffmpegthumbnailer/files/ffmpegthumbnailer-2.0.3-asneeded.patch b/media-video/ffmpegthumbnailer/files/ffmpegthumbnailer-2.0.3-asneeded.patch
deleted file mode 100644
index 0a069254e882..000000000000
--- a/media-video/ffmpegthumbnailer/files/ffmpegthumbnailer-2.0.3-asneeded.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- configure.ac
-+++ configure.ac
-@@ -77,6 +77,8 @@
-     [ ENABLE_GNOME_VFS=$enableval ] )
- 
- if test "$ENABLE_GNOME_VFS" = "yes"; then
-+    AC_CHECK_LIB([dl], [dlopen], DL_LIBS="-ldl")
-+    AC_SUBST(DL_LIBS)
-     AC_DEFINE(HAVE_GNOME_VFS, [], "Gnome-vfs file uri support enabled")
- fi
- 
---- Makefile.am
-+++ Makefile.am
-@@ -39,7 +39,7 @@
- libffmpegthumbnailer_includedir         = $(includedir)/libffmpegthumbnailer
- libffmpegthumbnailer_la_CXXFLAGS        = $(AM_CXXFLAGS) $(FFMPEG_CFLAGS) $(PNG_CFLAGS)
- libffmpegthumbnailer_la_LDFLAGS         = -version-info 4:3:0
--libffmpegthumbnailer_la_LIBADD          = $(FFMPEG_LIBS) $(PNG_LIBS) $(JPEG_LIBS)
-+libffmpegthumbnailer_la_LIBADD          = $(DL_LIBS) $(FFMPEG_LIBS) $(PNG_LIBS) $(JPEG_LIBS)
- 
- bin_PROGRAMS = ffmpegthumbnailer
-