9 files changed, 25 insertions, 222 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/Manifest b/media-video/vdr2jpeg/Manifest
index daf8735e4b72..92f016abac01 100644
--- a/media-video/vdr2jpeg/Manifest
+++ b/media-video/vdr2jpeg/Manifest
@@ -1,25 +1,15 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX ffmpeg-0.4.9_p20080326-new_header.diff 526 RMD160 bb17e934760e294ec97f0415a87aa7e074a91cb7 SHA1 e99f22b528f798faae88a80d67d85e3f2dd9f7ec SHA256 8aff378769b57649063d653438a0df1256ad7d0d8ee7de062855a27e33f0749a
-AUX vdr2jpeg-0.0.12-gcc43.patch 425 RMD160 c42223d3e07f8b421d3f49fac8bc493d9a4e9c17 SHA1 6f6830048316529003a3a681e2bbc448760ac7c3 SHA256 01c2544d805b80e74425be5cd458c4db11f4ce36ad8e982b9d66617b62a618f5
 AUX vdr2jpeg-0.1.0-gcc43.patch 1252 RMD160 2f0007fe688eb966b8860d5398bd49b42264d1d8 SHA1 1122a3b6bc548620c386c86d952558a756706d5a SHA256 0569cdae060c33eac4b6f9afd0e473126409d749b36db44084ded97fbfcc1c57
-DIST vdr2jpeg-0.0.12.tgz 29742 RMD160 64416fc5c472ccf3d587ff1f7d571752dfec6871 SHA1 1ee43a930f7b01addad1d01b689ec8e4d1d0f9d9 SHA256 25e9e281eaa408404777a58a3a22c09476bd4b7596f9702836d5746d8b3a0aee
-DIST vdr2jpeg-0.1.0.tgz 30607 RMD160 01a58cf39af5f7b6b961bc6f6cbacf292d76d90c SHA1 02891b90ba59752de5467b19a5d48490da0fb057 SHA256 7ceeaadd302880dc26c129d383ab6d4dca2b7cb7c78bd5ea2d792e3463efc752
-DIST vdr2jpeg-0.1.1.tgz 27964 RMD160 c88b6832e92348c1cc658ce32e4d92a04372d284 SHA1 8e3ccedf46ad0c44a1ece9d602ea5313eb868677 SHA256 2ca1b0c676948f6067497d260eb9c9b0cc953130698da5c9ceaa189419f304c2
 DIST vdr2jpeg-0.1.9.tgz 31160 RMD160 b0d23fb734a1dd33f862dc8bc52ba75dba7636cf SHA1 0dcd3fa225c4eca4406f9cba9e639c76b8f298da SHA256 869250e411def669aa89170ceff6bfbfd08c522bee9a8967799b4af60010ea79
-EBUILD vdr2jpeg-0.0.12.ebuild 780 RMD160 4ebb9c2cfb6713ea0cb4ca91daa2db792c402c4c SHA1 6fbc1620c99d988ba5d1a0fdf17f11764ea12073 SHA256 fe060bab9fb58836bed54e4bf7b594ec63ef7a142b9709977239cc91f220a2fe
-EBUILD vdr2jpeg-0.1.0.ebuild 863 RMD160 7971161725d2ba5971526fa229d913c4b891559e SHA1 30345bb75b8593929dc1275edf34223996a6da8c SHA256 ca669e58964025a104b550fd421aa2134d69230fa09e20e0ef6af5a46376a2cd
-EBUILD vdr2jpeg-0.1.1-r1.ebuild 807 RMD160 6b5929c1db8f430ad0836c415ff7a14462963537 SHA1 f5204784a174f044aa4545d1c3b1643c4e39c6c8 SHA256 133a72808e53677c6570419d1e041d79fdb29a1ee1fd8ae8087f2c272ed1319d
-EBUILD vdr2jpeg-0.1.1.ebuild 757 RMD160 90ce45b02790ec970484e2dc878352edb1816899 SHA1 66556e69eb2639c2267d933477474ad57c3c3e57 SHA256 8a207af4119b8bfe0effbb8daecd6952faea905f77dfce8b88189da468e7a8ca
-EBUILD vdr2jpeg-0.1.9.ebuild 827 RMD160 0474bbf0b21b0287e97a4e2a165ff4ec9bd2d714 SHA1 416514a59b2f4869358713e8f832d6f30e9db75b SHA256 791e4c96959466b9242312e676978c6489f9162baabd49e8a24b06d95af75adc
-MISC ChangeLog 3825 RMD160 5f62b5802495ca8b7a8142f684af8d90c34e6f5f SHA1 410036a8916ab179240d0ea1208754df2a1b3711 SHA256 16ce9044ca0f1418e7b7884c4b4d7b67be18c9e05b0da18b79977be8bbd79cc6
+EBUILD vdr2jpeg-0.1.9.ebuild 738 RMD160 019412f297ffa68d3a47c8f6efdf95b6b30b7e57 SHA1 5e108f953b57cbb86fb36221bdbef74359831c4b SHA256 0b9f20826a0ddc61a0849e06385ede140092b742bbba11e971976aa984f66861
+MISC ChangeLog 4193 RMD160 97938aaa12410abcf9c738697ae4d8ad11c736e6 SHA1 723ecd020a8145ffa78779dc57ffcb6d992f6583 SHA256 830de06ac8b2c8d60f80917054f8ab4abc2ad2662af4cf880973f532a2f9ee78
 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
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iD8DBQFM8Sf+dn07HTTCgIoRAgGvAKC64lWc1lBigLS1aKDeyOkLmxFJHACgr98E
-3SlnHd0N9HjnlJMvwXpt120=
-=0VFr
+iEYEARECAAYFAk3P8ZIACgkQHB6c3gNBRYfNxQCfYaQ+yEwZCALuZQU5OeymXtmk
+hbgAnRuuaRfHaGy62tRLap/F4Iq5jaKY
+=pL+1
 -----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
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
 }