bump; cleanup; vdr-plugin-2.eclass; eapi=4; new homepage; use mirror; fixed use-flag check

(Portage version: 2.1.10.11/cvs/Linux i686)

6 files changed, 63 insertions, 128 deletions

diff --git a/media-plugins/vdr-pvr350/ChangeLog b/media-plugins/vdr-pvr350/ChangeLog
index cc878dc35dbf..dc07230076b4 100644
--- a/media-plugins/vdr-pvr350/ChangeLog
+++ b/media-plugins/vdr-pvr350/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for media-plugins/vdr-pvr350
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-pvr350/ChangeLog,v 1.19 2011/09/15 13:26:33 hd_brummy Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-pvr350/ChangeLog,v 1.20 2012/06/27 17:36:59 hd_brummy Exp $
+
+*vdr-pvr350-1.7.4 (27 Jun 2012)
+
+  27 Jun 2012; Joerg Bornkessel <hd_brummy@gentoo.org>
+  -files/vdr-pvr350-0.0.4.20070807-vdr-1.6.0.diff,
+  -files/vdr-pvr350-0.0.4_pre1-vdr-1.3.42.diff, vdr-pvr350-1.7.3.ebuild,
+  +vdr-pvr350-1.7.4.ebuild, -files/pvr-linux-headers.diff:
+  bump; cleanup; vdr-plugin-2.eclass; eapi=4; new homepage; use mirror; fixed
+  use-flag check
 
 *vdr-pvr350-1.7.3 (15 Sep 2011)
 
diff --git a/media-plugins/vdr-pvr350/files/pvr-linux-headers.diff b/media-plugins/vdr-pvr350/files/pvr-linux-headers.diff
deleted file mode 100644
index 93d6eb834fd9..000000000000
--- a/media-plugins/vdr-pvr350/files/pvr-linux-headers.diff
+++ /dev/null
@@ -1,25 +0,0 @@
-Index: pvr350-2007-08-07/pvr350ivtv.h
-===================================================================
---- pvr350-2007-08-07.orig/pvr350ivtv.h
-+++ pvr350-2007-08-07/pvr350ivtv.h
-@@ -22,7 +22,6 @@
- 
- #ifndef _PVR350_IVTV_H
- #define _PVR350_IVTV_H
--#include <linux/i2c-id.h>
- #ifndef __KERNEL__
- #define __user
- #endif
-Index: pvr350-2007-08-07/video.h
-===================================================================
---- pvr350-2007-08-07.orig/video.h
-+++ pvr350-2007-08-07/video.h
-@@ -24,8 +24,6 @@
- #ifndef _DVBVIDEO_H_
- #define _DVBVIDEO_H_
- 
--#include <linux/compiler.h>
--
- #ifdef __KERNEL__
- #include <linux/types.h>
- #else
diff --git a/media-plugins/vdr-pvr350/files/vdr-pvr350-0.0.4.20070807-vdr-1.6.0.diff b/media-plugins/vdr-pvr350/files/vdr-pvr350-0.0.4.20070807-vdr-1.6.0.diff
deleted file mode 100644
index 0e247b01cee3..000000000000
--- a/media-plugins/vdr-pvr350/files/vdr-pvr350-0.0.4.20070807-vdr-1.6.0.diff
+++ /dev/null
@@ -1,55 +0,0 @@
-Nur in pvr350-2007-08-07: libvdr-pvr350.so.
-Nur in pvr350-2007-08-07: libvdr-pvr350.so.1.6.0.
-Nur in pvr350-2007-08-07: patches.
-Nur in pvr350-2007-08-07: pvr350audio.o.
-Nur in pvr350-2007-08-07: pvr350device.o.
-Dateien pvr350-2007-08-07-orig/pvr350.o und pvr350-2007-08-07/pvr350.o sind verschieden.
-diff -ru pvr350-2007-08-07-orig/pvr350osd.c pvr350-2007-08-07/pvr350osd.c
---- pvr350-2007-08-07-orig/pvr350osd.c	2007-07-28 22:43:32.000000000 +0200
-+++ pvr350-2007-08-07/pvr350osd.c	2008-04-01 13:54:20.315786872 +0200
-@@ -24,8 +24,8 @@
- #include "pvr350device.h"
- 
- #if VDRVERSNUM >= 10307
--cPvr350Osd::cPvr350Osd(int Left, int Top,int fbfd, unsigned char *osdbuf)
--    :cOsd(Left, Top) 
-+cPvr350Osd::cPvr350Osd(int Left, int Top, uint level, int fbfd, unsigned char *osdbuf)
-+    :cOsd(Left, Top, level) 
- {
-     fd = fbfd;
-     osd = osdbuf; 
-@@ -130,9 +130,9 @@
-     osdfd  = fd;
- }
- 
--cOsd *cPvr350OsdProvider::CreateOsd(int Left, int Top)
-+cOsd *cPvr350OsdProvider::CreateOsd(int Left, int Top, uint level)
- {
--  return new cPvr350Osd(Left, Top, osdfd, osdBuf);
-+  return new cPvr350Osd(Left, Top, level, osdfd, osdBuf);
- }
- 
- #else
-diff -ru pvr350-2007-08-07-orig/pvr350osd.h pvr350-2007-08-07/pvr350osd.h
---- pvr350-2007-08-07-orig/pvr350osd.h	2007-07-26 23:11:20.000000000 +0200
-+++ pvr350-2007-08-07/pvr350osd.h	2008-04-01 13:40:03.000000000 +0200
-@@ -20,7 +20,7 @@
-     unsigned char *osd;
- 
- public:
--    cPvr350Osd(int Left, int Top,int fbfd, unsigned char *osdbuf);
-+    cPvr350Osd(int Left, int Top, uint level, int fbfd, unsigned char *osdbuf);
-     ~cPvr350Osd();
-     eOsdError CanHandleAreas(const tArea *Areas, int NumAreas);
-     void Flush(void);
-@@ -36,7 +36,7 @@
-     int            osdfd; 
- public:
-     cPvr350OsdProvider(int fd, unsigned char *buf);
--    virtual cOsd *CreateOsd(int Left, int Top);
-+    virtual cOsd *CreateOsd(int Left, int Top, uint level);
- };
- 
- #else
-Nur in pvr350-2007-08-07: pvr350osd.o.
-Nur in pvr350-2007-08-07: pvr350tools.o.
diff --git a/media-plugins/vdr-pvr350/files/vdr-pvr350-0.0.4_pre1-vdr-1.3.42.diff b/media-plugins/vdr-pvr350/files/vdr-pvr350-0.0.4_pre1-vdr-1.3.42.diff
deleted file mode 100644
index 0c081fc5f302..000000000000
--- a/media-plugins/vdr-pvr350/files/vdr-pvr350-0.0.4_pre1-vdr-1.3.42.diff
+++ /dev/null
@@ -1,31 +0,0 @@
-diff -ur pvr350-0.0.4pre1/device.c /tmp/pvr350-0.0.4pre1/device.c
---- a/pvr350-0.0.4pre1/device.c   2005-02-12 21:15:16.000000000 +0200
-+++ b//pvr350-0.0.4pre1/device.c      2006-04-05 09:08:54.000000000 +0300
-@@ -321,7 +321,11 @@
-    streams to find out the aspect ratio that's needed
- */
- #if VDRVERSNUM >= 10318
-+#if VDRVERSNUM >= 10342
-+int cPvr350Device::PlayAudio(const uchar *Data, int Length, uchar id )
-+#else
- int cPvr350Device::PlayAudio(const uchar *Data, int Length)
-+#endif
- {
-        return PlayVideo(Data,Length);
- }
-diff -ur pvr350-0.0.4pre1/device.h /tmp/pvr350-0.0.4pre1/device.h
---- a/pvr350-0.0.4pre1/device.h   2005-02-12 21:14:25.000000000 +0200
-+++ b/pvr350-0.0.4pre1/device.h      2006-04-05 09:11:46.000000000 +0300
-@@ -74,8 +74,12 @@
-     virtual void StillPicture(const uchar *Data, int Length);
-     virtual int PlayVideo(const uchar *Data, int Length);
- #if VDRVERSNUM > 10318
-+#if VDRVERSNUM >= 10342
-+    virtual int PlayAudio( const uchar *Data, int Length, uchar id );
-+#else
-     virtual int PlayAudio(const uchar *Data, int Length);
- #endif
-+#endif
-     virtual void SetVideoFormat(bool VideoFormat16_9);
-     virtual void SetVolumeDevice(int Volume);
- #if VDRVERSNUM < 10307
diff --git a/media-plugins/vdr-pvr350/vdr-pvr350-1.7.3.ebuild b/media-plugins/vdr-pvr350/vdr-pvr350-1.7.3.ebuild
index a3be6cf89c12..be1653c152ed 100644
--- a/media-plugins/vdr-pvr350/vdr-pvr350-1.7.3.ebuild
+++ b/media-plugins/vdr-pvr350/vdr-pvr350-1.7.3.ebuild
@@ -1,39 +1,38 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-pvr350/vdr-pvr350-1.7.3.ebuild,v 1.1 2011/09/15 13:26:33 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-pvr350/vdr-pvr350-1.7.3.ebuild,v 1.2 2012/06/27 17:36:59 hd_brummy Exp $
 
-EAPI="3"
+EAPI="4"
 
-inherit vdr-plugin eutils
+inherit vdr-plugin-2
 
-IUSE="yaepg"
+VERSION="995"
 
 DESCRIPTION="VDR plugin: use a PVR350 as output device"
-HOMEPAGE="http://drseltsam.device.name/vdr/pvr/src/pvr350/"
-SRC_URI="http://drseltsam.device.name/vdr/pvr/src/pvr350/${P}.tgz"
+HOMEPAGE="http://projects.vdr-developer.org/projects/plg-pvr350"
+SRC_URI="mirror://vdrdeveloper-org/${VERSION}/${P}.tgz"
+
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~x86"
-
-S="${WORKDIR}/${P#vdr-}"
+IUSE="yaepg"
 
 DEPEND=">=media-video/vdr-1.6.0
 	media-sound/mpg123
 	media-sound/twolame
-	media-libs/a52dec"
+	media-libs/a52dec
+	yaepg? ( >=media-video/vdr-1.6.0[yaepg] )"
 RDEPEND="${DEPEND}"
 
 DEPEND="${DEPEND}
 	|| ( >=sys-kernel/linux-headers-2.6.38 )"
 
+S="${WORKDIR}/${P#vdr-}"
+
 pkg_setup() {
-	vdr-plugin_pkg_setup
+	vdr-plugin-2_pkg_setup
 
 	if use yaepg; then
-		elog "Checking for patched vdr"
-		grep -q fontYaepg /usr/include/vdr/font.h
-		eend $? "You need to emerge vdr with use-flag yaepg set!" || die "Unpatched vdr detected!"
-
 		BUILD_PARAMS="SET_VIDEO_WINDOW=1"
 	fi
 }
diff --git a/media-plugins/vdr-pvr350/vdr-pvr350-1.7.4.ebuild b/media-plugins/vdr-pvr350/vdr-pvr350-1.7.4.ebuild
new file mode 100644
index 000000000000..fd8b23f3b497
--- /dev/null
+++ b/media-plugins/vdr-pvr350/vdr-pvr350-1.7.4.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-pvr350/vdr-pvr350-1.7.4.ebuild,v 1.1 2012/06/27 17:36:59 hd_brummy Exp $
+
+EAPI="4"
+
+inherit vdr-plugin-2
+
+VERSION="996"
+
+DESCRIPTION="VDR plugin: use a PVR350 as output device"
+HOMEPAGE="http://projects.vdr-developer.org/projects/plg-pvr350"
+SRC_URI="mirror://vdrdeveloper-org/${VERSION}/${P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86"
+IUSE="yaepg"
+
+DEPEND=">=media-video/vdr-1.6.0
+	media-sound/mpg123
+	media-sound/twolame
+	media-libs/a52dec
+	yaepg? ( >=media-video/vdr-1.6.0[yaepg] )"
+RDEPEND="${DEPEND}"
+
+DEPEND="${DEPEND}
+	|| ( >=sys-kernel/linux-headers-2.6.38 )"
+
+S="${WORKDIR}/${P#vdr-}"
+
+pkg_setup() {
+	vdr-plugin-2_pkg_setup
+
+	if use yaepg; then
+		BUILD_PARAMS="SET_VIDEO_WINDOW=1"
+	fi
+}