amd64/arm stable, remove old

(Portage version: 2.1.5.2)

4 files changed, 8 insertions, 65 deletions

diff --git a/media-video/ffmpegthumbnailer/ChangeLog b/media-video/ffmpegthumbnailer/ChangeLog
index ed09ee8b9452..caadf7742da8 100644
--- a/media-video/ffmpegthumbnailer/ChangeLog
+++ b/media-video/ffmpegthumbnailer/ChangeLog
@@ -1,6 +1,11 @@
 # 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.49 2008/05/29 19:18:34 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpegthumbnailer/ChangeLog,v 1.50 2008/05/31 17:04:41 drac Exp $
+
+  31 May 2008; Samuli Suominen <drac@gentoo.org>
+  -files/ffmpegthumbnailer-1.1.2-ffmpeg.patch,
+  -ffmpegthumbnailer-1.1.2.ebuild, ffmpegthumbnailer-1.2.5.ebuild:
+  amd64/arm stable, remove old
 
   29 May 2008; Raúl Porcel <armin76@gentoo.org>
   ffmpegthumbnailer-1.2.5.ebuild:
diff --git a/media-video/ffmpegthumbnailer/ffmpegthumbnailer-1.1.2.ebuild b/media-video/ffmpegthumbnailer/ffmpegthumbnailer-1.1.2.ebuild
deleted file mode 100644
index df88c31eafd1..000000000000
--- a/media-video/ffmpegthumbnailer/ffmpegthumbnailer-1.1.2.ebuild
+++ /dev/null
@@ -1,31 +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.2.ebuild,v 1.10 2007/08/25 14:18:27 vapier Exp $
-
-inherit autotools 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="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_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-ffmpeg.patch
-	eautoreconf
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed."
-	dodoc AUTHORS ChangeLog README TODO
-}
diff --git a/media-video/ffmpegthumbnailer/ffmpegthumbnailer-1.2.5.ebuild b/media-video/ffmpegthumbnailer/ffmpegthumbnailer-1.2.5.ebuild
index 78b39a5cfd5d..42f1eb5d4567 100644
--- a/media-video/ffmpegthumbnailer/ffmpegthumbnailer-1.2.5.ebuild
+++ b/media-video/ffmpegthumbnailer/ffmpegthumbnailer-1.2.5.ebuild
@@ -1,6 +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.5.ebuild,v 1.4 2008/05/29 19:18:34 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpegthumbnailer/ffmpegthumbnailer-1.2.5.ebuild,v 1.5 2008/05/31 17:04:41 drac Exp $
 
 DESCRIPTION="Lightweight video thumbnailer that can be used by file managers"
 HOMEPAGE="http://code.google.com/p/ffmpegthumbnailer"
@@ -8,7 +8,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"
+KEYWORDS="alpha amd64 arm ~hppa ia64 ~ppc ppc64 sparc x86"
 IUSE=""
 
 RDEPEND="media-libs/libpng
diff --git a/media-video/ffmpegthumbnailer/files/ffmpegthumbnailer-1.1.2-ffmpeg.patch b/media-video/ffmpegthumbnailer/files/ffmpegthumbnailer-1.1.2-ffmpeg.patch
deleted file mode 100644
index 2e825bf07a8c..000000000000
--- a/media-video/ffmpegthumbnailer/files/ffmpegthumbnailer-1.1.2-ffmpeg.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-diff -ur ffmpegthumbnailer-1.1.2.orig/configure.ac ffmpegthumbnailer-1.1.2/configure.ac
---- ffmpegthumbnailer-1.1.2.orig/configure.ac	2007-06-01 23:49:10.000000000 +0300
-+++ ffmpegthumbnailer-1.1.2/configure.ac	2007-06-27 16:49:30.000000000 +0300
-@@ -6,8 +6,14 @@
- AC_PROG_CXX
- AC_PROG_INSTALL
- 
--AC_CONFIG_FILES([
--	Makefile
--	src/Makefile
-+PKG_CHECK_MODULES(FFMPEG, libavutil libavformat libavcodec libswscale, HAVE_FFMPEG=yes, AC_MSG_ERROR([
-+Could not find ffmpeg. Please update PKG_CONFIG_PATH to point at ffmpeg include directory.
-+])
-+)
-+
-+AC_SUBST(FFMPEG_LIBS)
-+
-+AC_OUTPUT([
-+        Makefile
-+        src/Makefile
- ])
--AC_OUTPUT
-diff -ur ffmpegthumbnailer-1.1.2.orig/src/Makefile.am ffmpegthumbnailer-1.1.2/src/Makefile.am
---- ffmpegthumbnailer-1.1.2.orig/src/Makefile.am	2007-06-01 23:47:05.000000000 +0300
-+++ ffmpegthumbnailer-1.1.2/src/Makefile.am	2007-06-27 16:02:56.000000000 +0300
-@@ -7,4 +7,4 @@
- 							pngwriter.h pngwriter.cpp \
- 							stringoperations.h stringoperations.cpp
- 
--ffmpegthumbnailer_LDADD = -lavutil -lavcodec -lavformat -lpng
-+ffmpegthumbnailer_LDADD = @FFMPEG_LIBS@ -lpng