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

Package-Manager: portage-2.1.4.4

9 files changed, 53 insertions, 136 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/Manifest b/media-video/vdr2jpeg/Manifest
index 796f1e098db4..aeb536093ebc 100644
--- a/media-video/vdr2jpeg/Manifest
+++ b/media-video/vdr2jpeg/Manifest
@@ -1,12 +1,18 @@
-AUX vdr2jpeg-ffmpeg.diff 220 RMD160 44f93f25949417c016968164bdf311304cfd8a5a SHA1 1069384fcdb02e80e948fb484583d8d0eda3f1f8 SHA256 ebfe58da0e7ed762d5ef9eb9f530c9bc1a5536185fb19a435e8baba35153cc01
-DIST vdr2jpeg-0.0.10.tgz 32832 RMD160 994240a0360594806ebe0d8e20afcb510ae1ecf4 SHA1 be993c7e9497e9e126541b9f19034e7e04e45da7 SHA256 c91e67b9b4d2bbff086c064e5ed002de30833b5955685baa4f868edb534d40ab
-DIST vdr2jpeg-0.0.11.tgz 28840 RMD160 2ed62979b3ee4d320ba2345fcf14c8f175ad3743 SHA1 c5896c017fcf3c2bfeaf5c3b861836b36cc40d57 SHA256 6b47411cc3ba66e353c3ba11c626ecc92c02a5798dec90b5297703d585a1cdf2
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX ffmpeg-0.4.9_p20080326-new_header.diff 526 RMD160 bb17e934760e294ec97f0415a87aa7e074a91cb7 SHA1 e99f22b528f798faae88a80d67d85e3f2dd9f7ec SHA256 8aff378769b57649063d653438a0df1256ad7d0d8ee7de062855a27e33f0749a
 DIST vdr2jpeg-0.0.12.tgz 29742 RMD160 64416fc5c472ccf3d587ff1f7d571752dfec6871 SHA1 1ee43a930f7b01addad1d01b689ec8e4d1d0f9d9 SHA256 25e9e281eaa408404777a58a3a22c09476bd4b7596f9702836d5746d8b3a0aee
-DIST vdr2jpeg-0.0.8b.tgz 24201 RMD160 4a3b26eda62db7e7d8ceff14bdf6ddac1729d9bf SHA1 430118d0983a6f5c66686aa631e36dc8d92a45b4 SHA256 d5b32fa5b47f4639f0d6e76881a0fbbc2adff0c739f65f494561a6cb20dd86c6
-EBUILD vdr2jpeg-0.0.10-r1.ebuild 741 RMD160 c8cea8a9ddf840b7c2d9f9acf78361ea338e540f SHA1 555abd4aa7d303b4f86a21fc7548c789133943dd SHA256 1adf24cfb4c180b8b4750c0ca7d3c164871b21d3186fa8ec6dce753dcac6e513
-EBUILD vdr2jpeg-0.0.10.ebuild 694 RMD160 c7f52137c338bce18f090f753b23c5930c3b0a9a SHA1 ce583fd8c1e3529c0e19604ea22e45e069afa5e4 SHA256 cb4d9da7ba7eb7187cd80c0b2147764146559ea61a6d47b72546674f5a22ffa9
-EBUILD vdr2jpeg-0.0.11.ebuild 719 RMD160 bb76fe589427dd911fd86a3bb7fd739f26c022d6 SHA1 b690d73bb77b2a86ab34a7935730b347f85d76eb SHA256 4d2c504bc17e02f4ff334218aca88f7f086845aafa18a736e57f37d07ad168e7
-EBUILD vdr2jpeg-0.0.12.ebuild 731 RMD160 899d7c1cab15b39675e5f1a52beaf8deab5b5eed SHA1 dff29d0adc0bfc16fda89d69c94508eceb4b6a7d SHA256 0de152b6a751e4b459dd46dce5ea8be84035d29f8ae5835715c7349815f77710
-EBUILD vdr2jpeg-0.0.8b.ebuild 683 RMD160 fa22b7b08fae6f9b6d292c40d0bcc301cd841295 SHA1 db8070bb594c7867dac3059dfd24f52cc0412bd8 SHA256 df60630b47d288c14e7e9627c4e9b76fc518f96da883d51e4084fddc176dd1b0
-MISC ChangeLog 2028 RMD160 e8ee3e2d9798d009f478f72ff8c12b6e9e516120 SHA1 f43d494c5d5583dec0c6af94d763f8a21557763b SHA256 4dd987e959156943379829ff9a6ef6fd97593011f9a0f899c1bd6f3d5e3cae9c
+DIST vdr2jpeg-0.1.0.tgz 30607 RMD160 01a58cf39af5f7b6b961bc6f6cbacf292d76d90c SHA1 02891b90ba59752de5467b19a5d48490da0fb057 SHA256 7ceeaadd302880dc26c129d383ab6d4dca2b7cb7c78bd5ea2d792e3463efc752
+EBUILD vdr2jpeg-0.0.12.ebuild 730 RMD160 69eadabd7f66f162179b13a5361e8d559c1abd69 SHA1 4afd084151150fe3e68934c95f5108d6cddec55f SHA256 9c9123bd1497850513ca79b587ba510b85bb28eefdb857e2c7aceb4d8e6ae895
+EBUILD vdr2jpeg-0.1.0.ebuild 791 RMD160 2993884469b3771757707b2df5457c74003c9860 SHA1 88e63d6cd74966f1335f76ad837b9186055d890d SHA256 4a65ce416e4b7267fad8de5e2f4bbf00c318f60374656c34819eb3b2d48c752a
+MISC ChangeLog 2432 RMD160 e8116b4018125726f08a87a28088da1550c81b7a SHA1 5c4bb6f4ed45d56332cd1c32a6d36e4ad4f86d72 SHA256 62c2a20dd910c9782a3ede3c75b81226e6a7046484607e8bf6776660dc4e9bd1
 MISC metadata.xml 419 RMD160 bd2a9a036df1d8bca95a8a85af2f099919526ff6 SHA1 531deb1056f4eb7cb3190c551d78156a20b564c4 SHA256 da5fe630b58a0c3d2bc786901eda3cb8c875db655389a608438a6af30fa7a306
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.5 (GNU/Linux)
+Comment: added by hd_brummy@gentoo.org
+
+iD8DBQFH7nAAdn07HTTCgIoRAjdvAJ4lPtd6HTF26+zGfn/1iH7TehZtHACfcn1s
+6UJvONauU3AjNtOQHuWg7lA=
+=zXfd
+-----END PGP SIGNATURE-----
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() {