cleanup, 0.0.12 stable on x86; version bump, masked by package.mask bug #214740

(Portage version: 2.1.4.4)

8 files changed, 37 insertions, 126 deletions

diff --git a/media-video/vdr2jpeg/ChangeLog b/media-video/vdr2jpeg/ChangeLog
index 554f90b90840..abd8453a4319 100644
--- a/media-video/vdr2jpeg/ChangeLog
+++ b/media-video/vdr2jpeg/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for media-video/vdr2jpeg
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vdr2jpeg/ChangeLog,v 1.11 2008/01/13 19:35:13 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vdr2jpeg/ChangeLog,v 1.12 2008/03/29 16:35:57 hd_brummy Exp $
+
+*vdr2jpeg-0.1.0 (29 Mar 2008)
+
+  29 Mar 2008; Joerg Bornkessel <hd_brummy@gentoo.org>
+  +files/ffmpeg-0.4.9_p20080326-new_header.diff,
+  -files/vdr2jpeg-ffmpeg.diff, -vdr2jpeg-0.0.8b.ebuild,
+  -vdr2jpeg-0.0.10.ebuild, -vdr2jpeg-0.0.10-r1.ebuild,
+  -vdr2jpeg-0.0.11.ebuild, vdr2jpeg-0.0.12.ebuild, +vdr2jpeg-0.1.0.ebuild:
+  cleanup, 0.0.12 stable on x86; version bump, masked by package.mask bug #214740
 
   13 Jan 2008; Joerg Bornkessel <hd_brummy@gentoo.org>
   vdr2jpeg-0.0.11.ebuild, vdr2jpeg-0.0.12.ebuild:
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
new file mode 100644
index 000000000000..2608a0a6912a
--- /dev/null
+++ b/media-video/vdr2jpeg/files/ffmpeg-0.4.9_p20080326-new_header.diff
@@ -0,0 +1,18 @@
+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-ffmpeg.diff b/media-video/vdr2jpeg/files/vdr2jpeg-ffmpeg.diff
deleted file mode 100644
index b5ca2433cbc9..000000000000
--- a/media-video/vdr2jpeg/files/vdr2jpeg-ffmpeg.diff
+++ /dev/null
@@ -1,10 +0,0 @@
---- ffm.cpp.org	2007-05-28 09:58:00.555083916 +0200
-+++ ffm.cpp	2007-05-28 09:55:55.074227146 +0200
-@@ -22,6 +22,7 @@
-  */
- 
- 
-+#define __STDC_CONSTANT_MACROS
- #include <stdio.h>
- #include <unistd.h>
- #include <errno.h>
diff --git a/media-video/vdr2jpeg/vdr2jpeg-0.0.10-r1.ebuild b/media-video/vdr2jpeg/vdr2jpeg-0.0.10-r1.ebuild
deleted file mode 100644
index 38a6753c32bd..000000000000
--- a/media-video/vdr2jpeg/vdr2jpeg-0.0.10-r1.ebuild
+++ /dev/null
@@ -1,37 +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/vdr2jpeg/vdr2jpeg-0.0.10-r1.ebuild,v 1.3 2007/11/27 11:34:56 zzam Exp $
-
-inherit eutils
-
-RESTRICT="strip"
-
-DESCRIPTION="Addon needed for XXV - WWW Admin for the Video Disk Recorder"
-HOMEPAGE="http://www.deltab.de/vdr/vdr2jpeg.html"
-SRC_URI="mirror://vdrfiles/${PN}/${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=">=media-video/ffmpeg-0.4.9_p20061016"
-
-src_unpack() {
-
-	unpack ${A}
-	cd "${S}"
-	sed -i "s:usr/local:usr:" Makefile
-
-	epatch "${FILESDIR}/vdr2jpeg-ffmpeg.diff"
-}
-
-src_compile() {
-
-	emake || die "emake failed"
-}
-
-src_install() {
-
-	dobin vdr2jpeg
-}
diff --git a/media-video/vdr2jpeg/vdr2jpeg-0.0.10.ebuild b/media-video/vdr2jpeg/vdr2jpeg-0.0.10.ebuild
deleted file mode 100644
index e92c8b7711a4..000000000000
--- a/media-video/vdr2jpeg/vdr2jpeg-0.0.10.ebuild
+++ /dev/null
@@ -1,36 +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/vdr2jpeg/vdr2jpeg-0.0.10.ebuild,v 1.4 2007/11/27 11:34:56 zzam Exp $
-
-inherit eutils
-
-RESTRICT="strip"
-
-DESCRIPTION="Addon needed for XXV - WWW Admin for the Video Disk Recorder"
-HOMEPAGE="http://www.deltab.de/vdr/vdr2jpeg.html"
-SRC_URI="mirror://vdrfiles/${PN}/${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 x86"
-IUSE=""
-
-DEPEND=">=media-video/ffmpeg-0.4.9_p20061016"
-
-src_unpack() {
-
-	unpack ${A}
-	cd "${S}"
-	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.0.12.ebuild b/media-video/vdr2jpeg/vdr2jpeg-0.0.12.ebuild
index e966aeafd4da..696e9d9ee46e 100644
--- a/media-video/vdr2jpeg/vdr2jpeg-0.0.12.ebuild
+++ b/media-video/vdr2jpeg/vdr2jpeg-0.0.12.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/vdr2jpeg/vdr2jpeg-0.0.12.ebuild,v 1.2 2008/01/13 19:35:13 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vdr2jpeg/vdr2jpeg-0.0.12.ebuild,v 1.3 2008/03/29 16:35:57 hd_brummy Exp $
 
 inherit eutils
 
@@ -12,7 +12,7 @@ SRC_URI="http://download.berlios.de/xxv/${P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE=""
 
 DEPEND=">=media-video/ffmpeg-0.4.9_p20070616
diff --git a/media-video/vdr2jpeg/vdr2jpeg-0.0.8b.ebuild b/media-video/vdr2jpeg/vdr2jpeg-0.0.8b.ebuild
deleted file mode 100644
index db035fc08451..000000000000
--- a/media-video/vdr2jpeg/vdr2jpeg-0.0.8b.ebuild
+++ /dev/null
@@ -1,35 +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/vdr2jpeg/vdr2jpeg-0.0.8b.ebuild,v 1.5 2007/11/27 11:34:56 zzam Exp $
-
-inherit eutils
-
-DESCRIPTION="Extract snapshots in jpeg-format from VDR-recordings"
-HOMEPAGE="http://www.deltab.de/vdr/vdr2jpeg.html"
-SRC_URI="http://www.deltab.de/vdr/${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86"
-IUSE=""
-
-DEPEND=">=media-video/ffmpeg-0.4.9"
-
-src_unpack() {
-
-	unpack ${A}
-	cd "${S}"
-	sed -i "s:usr/local:usr:" Makefile
-
-}
-
-src_compile() {
-
-	emake || die "emake failed"
-}
-
-src_install() {
-
-	dobin vdr2jpeg
-	dodoc README LIESMICH HISTORY
-}
diff --git a/media-video/vdr2jpeg/vdr2jpeg-0.0.11.ebuild b/media-video/vdr2jpeg/vdr2jpeg-0.1.0.ebuild
index 83b82f44714f..a44bcccd679a 100644
--- a/media-video/vdr2jpeg/vdr2jpeg-0.0.11.ebuild
+++ b/media-video/vdr2jpeg/vdr2jpeg-0.1.0.ebuild
@@ -1,21 +1,21 @@
 # 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.11.ebuild,v 1.4 2008/01/13 19:35:13 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vdr2jpeg/vdr2jpeg-0.1.0.ebuild,v 1.1 2008/03/29 16:35:57 hd_brummy Exp $
 
 inherit eutils
 
 RESTRICT="strip"
 
 DESCRIPTION="Addon needed for XXV - WWW Admin for the Video Disk Recorder"
-HOMEPAGE="http://www.deltab.de/vdr/vdr2jpeg.html"
-SRC_URI="mirror://vdrfiles/${PN}/${P}.tgz"
+HOMEPAGE="http://xxv.berlios.de/content/view/27/42/"
+SRC_URI="http://download.berlios.de/xxv/${P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-DEPEND=">=media-video/ffmpeg-0.4.9_p20070330
+DEPEND=">=media-video/ffmpeg-0.4.9_p20080326
 		dev-util/pkgconfig"
 
 src_unpack() {
@@ -23,6 +23,8 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 	sed -i "s:usr/local:usr:" Makefile
+
+	epatch "${FILESDIR}/ffmpeg-0.4.9_p20080326-new_header.diff"
 }
 
 src_compile() {