Version bump.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

5 files changed, 18 insertions, 38 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/Manifest b/media-video/ffmpegthumbnailer/Manifest
index 6f1f4c30d695..75299fc2d993 100644
--- a/media-video/ffmpegthumbnailer/Manifest
+++ b/media-video/ffmpegthumbnailer/Manifest
@@ -1,9 +1,8 @@
-AUX ffmpegthumbnailer-2.0.3-asneeded.patch 783 RMD160 81f6a1c94010dcd08e023afdeb295795415eb644 SHA1 256975ed7c5eeaab22b595afe1c2e93fd9ad479e SHA256 1c49ab0abdbcb174a6d181aafccb4c917baa6ec0c94cf0bd2ffe84a68dc0a5fd
 DIST ffmpegthumbnailer-1.5.4.tar.gz 329969 RMD160 17221b4d42598acd21dee8cc5666190aeeb408c5 SHA1 e926814d241267d61e1d43979219533e949f195f SHA256 f09b97a35e9417fa68531b5a15529087589589d9f2d4edd2135257e03b57dbd8
 DIST ffmpegthumbnailer-2.0.2.tar.gz 339386 RMD160 077599abc5df30b04fe9978d57f31037b5cc389a SHA1 71024afb50e26217dc5de59a34f299551cb6816a SHA256 389bd60d0723df9e7d84219e21496500bd4fab320574d55462bb8e880c357780
-DIST ffmpegthumbnailer-2.0.3.tar.gz 343119 RMD160 cd50dbef3b7673f86e71e6572d33effa1da9dcd2 SHA1 37bb826fc972946d5921b508ec40b95200aed1f1 SHA256 5c071e23c20a5059291752627df68f21e91d50ca8b539e91c84a66bb54b69ff8
-EBUILD ffmpegthumbnailer-1.5.4.ebuild 956 RMD160 a760eea4e63436dd7f84e089bb8629b9db75b41a SHA1 8fba505cbc6047efc192bf5768420e9c94190a0d SHA256 101392c73514c9a0fc4e40d544d425198eb927a609acb11b6d9b99525cbc8a55
+DIST ffmpegthumbnailer-2.0.4.tar.gz 343282 RMD160 a7a9af78f316d181a678ed85098c233aaa0808aa SHA1 ce1e55d9a207ec4eacc963e054ac5a08b9e051df SHA256 05871ee318c6a4afa1fc88503e51680390e4730c76ae0acf5b3791f3ea955d5e
+EBUILD ffmpegthumbnailer-1.5.4.ebuild 889 RMD160 9d14946b72d01caf37558323ed0ccb74fc4985e9 SHA1 89b3fe055004a1af42a867b2e1fe08cbfa5367a8 SHA256 72e214d5a7db0745f6c31e6a4b32c249974603eb50642e9cdb1cc218daa0eae7
 EBUILD ffmpegthumbnailer-2.0.2.ebuild 940 RMD160 47a2080c8af392c72de5208b565859e8d82442ef SHA1 c6806d742a4400f063bf5ab1c6ca06b4b7406d1c SHA256 e703d87b6fbe241e16cb11d86e9cab3109aa503ccaa5a554ed2f6a4843b8b80c
-EBUILD ffmpegthumbnailer-2.0.3.ebuild 1186 RMD160 366f026325971f40865f1a6bddcd0ba545cf7a64 SHA1 df7baea70d3b19345c475c8c94cdaa98c31eff59 SHA256 838620be91a097f0c2f6827604b14ab42a0e2b74c0097dabed0bf33674bc569a
-MISC ChangeLog 14525 RMD160 e9b6e77cebc616ccc98afcdf2ea68d4773737555 SHA1 da5ef21ecba93da59c879a2d74439d2be478376b SHA256 cc8f63124915446e37991c22978374405530ae18b7692c047cdd66d0f4bbfe99
+EBUILD ffmpegthumbnailer-2.0.4.ebuild 1109 RMD160 ef1f15ff54d188ff6daefdee4e37619d4e302ec0 SHA1 c0affd90a3434a9a8f1921c1c8180c9852ff92c8 SHA256 e23cb488f792ddef18fa884c84683bbeead76d90844a508f513a6822679f3722
+MISC ChangeLog 14671 RMD160 dc3e56fc5cd6fe9ecd17e0b3038454c546c5fb32 SHA1 a8fdad3e76215f5e4a081e22799c43395418adbc SHA256 8800d871fbfeda6b5e53014dd7930d02b6abe49a20209a9cb0e8a4244052bec0
 MISC metadata.xml 233 RMD160 e62d18211d353ab6d54c1bdabe20fad0705dfa37 SHA1 25063adc119eb9992ced7996faa60e0cb45ad60f SHA256 2e54b419554b54671e04a167f2fa56d52d8f0b509157ba98695c01d860b3196a
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
-