Stabilise latest on amd64 and x86 as it works. Migrate to virtual/ffmpeg and eapi4. Punt older.

(Portage version: 2.2.0_alpha33/cvs/Linux x86_64)

8 files changed, 19 insertions, 206 deletions

diff --git a/media-video/vdr2jpeg/ChangeLog b/media-video/vdr2jpeg/ChangeLog
index 4bdcc645d82c..eeb33eba4f55 100644
--- a/media-video/vdr2jpeg/ChangeLog
+++ b/media-video/vdr2jpeg/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-video/vdr2jpeg
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vdr2jpeg/ChangeLog,v 1.21 2010/11/27 15:46:43 hd_brummy Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/vdr2jpeg/ChangeLog,v 1.22 2011/05/15 15:30:21 scarabeus Exp $
+
+  15 May 2011; Tomáš Chvátal <scarabeus@gentoo.org> -vdr2jpeg-0.0.12.ebuild,
+  -files/vdr2jpeg-0.0.12-gcc43.patch, -vdr2jpeg-0.1.0.ebuild,
+  -vdr2jpeg-0.1.1.ebuild, -vdr2jpeg-0.1.1-r1.ebuild, vdr2jpeg-0.1.9.ebuild,
+  -files/ffmpeg-0.4.9_p20080326-new_header.diff:
+  Stabilise latest on amd64 and x86 as it works. Migrate to virtual/ffmpeg and
+  eapi4. Punt older.
 
 *vdr2jpeg-0.1.9 (27 Nov 2010)
 
diff --git a/media-video/vdr2jpeg/files/ffmpeg-0.4.9_p20080326-new_header.diff b/media-video/vdr2jpeg/files/ffmpeg-0.4.9_p20080326-new_header.diff
deleted file mode 100644
index 2608a0a6912a..000000000000
--- a/media-video/vdr2jpeg/files/ffmpeg-0.4.9_p20080326-new_header.diff
+++ /dev/null
@@ -1,18 +0,0 @@
-diff -Naur vdr2jpeg-0.1.0.orig/ffm.cpp vdr2jpeg-0.1.0/ffm.cpp
---- vdr2jpeg-0.1.0.orig/ffm.cpp	2008-03-29 17:06:41.000000000 +0100
-+++ vdr2jpeg-0.1.0/ffm.cpp	2008-03-29 17:07:42.000000000 +0100
-@@ -38,10 +38,10 @@
- #include <avformat.h>
- #include <swscale.h>
- #else
--#include <ffmpeg/avutil.h>
--#include <ffmpeg/avcodec.h>
--#include <ffmpeg/avformat.h>
--#include <ffmpeg/swscale.h>
-+#include <libavutil/avutil.h>
-+#include <libavcodec/avcodec.h>
-+#include <libavformat/avformat.h>
-+#include <libswscale/swscale.h>
- #endif
- }
- 
diff --git a/media-video/vdr2jpeg/files/vdr2jpeg-0.0.12-gcc43.patch b/media-video/vdr2jpeg/files/vdr2jpeg-0.0.12-gcc43.patch
deleted file mode 100644
index 7e1c9c98372d..000000000000
--- a/media-video/vdr2jpeg/files/vdr2jpeg-0.0.12-gcc43.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-add missing inlcudes for gcc-4.3.x
-bug 227167
-
-diff -ruN vdr2jpeg-0.0.12_orig/vdr2jpeg.cpp vdr2jpeg-0.0.12/vdr2jpeg.cpp
---- vdr2jpeg-0.0.12_orig/vdr2jpeg.cpp	2007-08-29 18:43:09.000000000 +0200
-+++ vdr2jpeg-0.0.12/vdr2jpeg.cpp	2008-06-15 14:51:05.000000000 +0200
-@@ -27,6 +27,7 @@
- #include <unistd.h>
- #include <stdio.h>
- #include <stdlib.h>
-+#include <string.h>
- #include <errno.h>
- #include <time.h>
- #include <iostream>
-
diff --git a/media-video/vdr2jpeg/vdr2jpeg-0.0.12.ebuild b/media-video/vdr2jpeg/vdr2jpeg-0.0.12.ebuild
deleted file mode 100644
index bf92d576c11a..000000000000
--- a/media-video/vdr2jpeg/vdr2jpeg-0.0.12.ebuild
+++ /dev/null
@@ -1,39 +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/vdr2jpeg/vdr2jpeg-0.0.12.ebuild,v 1.6 2008/06/15 21:20:17 hd_brummy Exp $
-
-inherit eutils
-
-RESTRICT="strip"
-
-DESCRIPTION="Addon needed for XXV - WWW Admin for the Video Disk Recorder"
-HOMEPAGE="http://xxv.berlios.de/content/view/27/42/"
-SRC_URI="mirror://berlios/xxv/${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 x86"
-IUSE=""
-
-RDEPEND=">=media-video/ffmpeg-0.4.9_p20070616"
-DEPEND="${RDEPEND}
-		dev-util/pkgconfig"
-
-src_unpack() {
-
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/${P}-gcc43.patch"
-
-	sed -i "s:usr/local:usr:" Makefile
-}
-
-src_compile() {
-
-	emake || die "emake failed"
-}
-
-src_install() {
-
-	dobin vdr2jpeg
-}
diff --git a/media-video/vdr2jpeg/vdr2jpeg-0.1.0.ebuild b/media-video/vdr2jpeg/vdr2jpeg-0.1.0.ebuild
deleted file mode 100644
index d8588e9b0cf4..000000000000
--- a/media-video/vdr2jpeg/vdr2jpeg-0.1.0.ebuild
+++ /dev/null
@@ -1,40 +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/vdr2jpeg/vdr2jpeg-0.1.0.ebuild,v 1.5 2008/06/25 16:28:15 hd_brummy Exp $
-
-inherit eutils
-
-RESTRICT="strip"
-
-DESCRIPTION="Addon needed for XXV - WWW Admin for the Video Disk Recorder"
-HOMEPAGE="http://xxv.berlios.de/content/view/27/42/"
-SRC_URI="mirror://berlios/xxv/${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=media-video/ffmpeg-0.4.9_p20080326"
-DEPEND="${RDEPEND}
-		dev-util/pkgconfig"
-
-src_unpack() {
-
-	unpack ${A}
-	cd "${S}"
-	sed -i "s:usr/local:usr:" Makefile
-
-	epatch "${FILESDIR}/ffmpeg-0.4.9_p20080326-new_header.diff"
-	epatch "${FILESDIR}/${P}-gcc43.patch"
-}
-
-src_compile() {
-
-	emake || die "emake failed"
-}
-
-src_install() {
-
-	dobin vdr2jpeg || die "dobin failed"
-}
diff --git a/media-video/vdr2jpeg/vdr2jpeg-0.1.1-r1.ebuild b/media-video/vdr2jpeg/vdr2jpeg-0.1.1-r1.ebuild
deleted file mode 100644
index d67b3b2aebad..000000000000
--- a/media-video/vdr2jpeg/vdr2jpeg-0.1.1-r1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vdr2jpeg/vdr2jpeg-0.1.1-r1.ebuild,v 1.1 2010/09/24 10:02:06 hd_brummy Exp $
-
-EAPI="2"
-
-inherit eutils
-
-RESTRICT="strip"
-
-DESCRIPTION="Addon needed for XXV - WWW Admin for the Video Disk Recorder"
-HOMEPAGE="http://xxv.berlios.de/content/view/20/42/"
-SRC_URI="mirror://berlios/xxv/${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=media-video/ffmpeg-0.4.9_p20081014"
-DEPEND="${RDEPEND}
-		dev-util/pkgconfig"
-
-src_prepare() {
-
-	sed -e "s:usr/local:usr:" \
-		-e "s:-o vdr2jpeg:\$(LDFLAGS) -o vdr2jpeg:" \
-		-i Makefile
-}
-
-src_compile() {
-
-	emake || die "emake failed"
-}
-
-src_install() {
-
-	dobin vdr2jpeg || die "dobin failed"
-}
diff --git a/media-video/vdr2jpeg/vdr2jpeg-0.1.1.ebuild b/media-video/vdr2jpeg/vdr2jpeg-0.1.1.ebuild
deleted file mode 100644
index ed9d57aed327..000000000000
--- a/media-video/vdr2jpeg/vdr2jpeg-0.1.1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vdr2jpeg/vdr2jpeg-0.1.1.ebuild,v 1.2 2009/05/12 20:00:10 fauli Exp $
-
-inherit eutils
-
-RESTRICT="strip"
-
-DESCRIPTION="Addon needed for XXV - WWW Admin for the Video Disk Recorder"
-HOMEPAGE="http://xxv.berlios.de/content/view/20/42/"
-SRC_URI="mirror://berlios/xxv/${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 x86"
-IUSE=""
-
-RDEPEND=">=media-video/ffmpeg-0.4.9_p20081014"
-DEPEND="${RDEPEND}
-		dev-util/pkgconfig"
-
-src_unpack() {
-
-	unpack ${A}
-	cd "${S}"
-	sed -i "s:usr/local:usr:" Makefile
-}
-
-src_compile() {
-
-	emake || die "emake failed"
-}
-
-src_install() {
-
-	dobin vdr2jpeg || die "dobin failed"
-}
diff --git a/media-video/vdr2jpeg/vdr2jpeg-0.1.9.ebuild b/media-video/vdr2jpeg/vdr2jpeg-0.1.9.ebuild
index de5f711ffce0..f709cb802d87 100644
--- a/media-video/vdr2jpeg/vdr2jpeg-0.1.9.ebuild
+++ b/media-video/vdr2jpeg/vdr2jpeg-0.1.9.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vdr2jpeg/vdr2jpeg-0.1.9.ebuild,v 1.1 2010/11/27 15:46:43 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vdr2jpeg/vdr2jpeg-0.1.9.ebuild,v 1.2 2011/05/15 15:30:21 scarabeus Exp $
 
-EAPI="2"
+EAPI=4
 
 inherit eutils
 
@@ -14,27 +14,21 @@ SRC_URI="mirror://berlios/xxv/${P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
-RDEPEND=">=media-video/ffmpeg-0.4.9_p20081014"
+RDEPEND="virtual/ffmpeg"
 DEPEND="${RDEPEND}
-		dev-util/pkgconfig"
+	dev-util/pkgconfig"
 
 src_prepare() {
-
-	sed -e "s:usr/local:usr:" \
+	sed -i \
+		-e "s:usr/local:usr:" \
 		-e "s:-o vdr2jpeg:\$(LDFLAGS) -o vdr2jpeg:" \
-		-i Makefile
-}
-
-src_compile() {
-
-	emake || die "emake failed"
+		Makefile || die
 }
 
 src_install() {
-
-	dobin vdr2jpeg || die "dobin failed"
+	dobin vdr2jpeg
 	dodoc README LIESMICH
 }