updated patchset, works now with setup-plugin

(Portage version: 2.1_pre3-r1)

4 files changed, 24 insertions, 18 deletions

diff --git a/media-video/vdr/ChangeLog b/media-video/vdr/ChangeLog
index dff25eabc4b4..4fb85d76bd70 100644
--- a/media-video/vdr/ChangeLog
+++ b/media-video/vdr/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-video/vdr
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/ChangeLog,v 1.39 2006/01/22 23:30:14 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/ChangeLog,v 1.40 2006/01/27 12:59:34 zzam Exp $
+
+  27 Jan 2006; Matthias Schwarzott <zzam@gentoo.org> vdr-1.3.36-r3.ebuild:
+  updated patchset, works now with setup-plugin
 
 *vdr-1.3.36-r3 (22 Jan 2006)
 
diff --git a/media-video/vdr/Manifest b/media-video/vdr/Manifest
index d3e64990db1a..04bb8ddffbe7 100644
--- a/media-video/vdr/Manifest
+++ b/media-video/vdr/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 716b92e93bc3aff4b3d4251fa5553243 ChangeLog 5964
 MD5 0d386d3861b6fc42122c42da4bef26f8 files/1.3.27/vdr-1.3.27-SourceCaps-lnb-sharing.diff 7138
 MD5 f45571c5192376c05c3acc204fbdfef8 files/1.3.27/vdr-1.3.27-SourceCaps.diff 7152
@@ -15,7 +12,7 @@ MD5 3d3b8b271925155442f660f5a9da86da files/digest-vdr-1.3.34-r2 366
 MD5 1a4dd7d813eaaa0a1b118bc6a9ec806b files/digest-vdr-1.3.36 366
 MD5 1a4dd7d813eaaa0a1b118bc6a9ec806b files/digest-vdr-1.3.36-r1 366
 MD5 1a4dd7d813eaaa0a1b118bc6a9ec806b files/digest-vdr-1.3.36-r2 366
-MD5 19760e68ceaa0223ee3f766a31321bab files/digest-vdr-1.3.36-r3 131
+MD5 b713aa341f35f53fb5c03778c8cc3d7b files/digest-vdr-1.3.36-r3 146
 MD5 aa8d0f66c8831be73c049584d6143c8b files/vdr-1.2.6-gentoo.diff 1995
 MD5 aa18122fb081cdc19d419d53ad1f63de files/vdr-1.2.6_CAN-2005-0071.patch 893
 MD5 472e23b8b78fd88b22e140386af74b3d files/vdr-1.3.32-daemon.patch 794
@@ -31,12 +28,5 @@ MD5 84538ae48b983c06e43d26f19f29b1ca vdr-1.3.34-r2.ebuild 4461
 MD5 c32310e782ca4a6b34f0ff48c3abb6d0 vdr-1.3.34.ebuild 4149
 MD5 514b263098bc3d78d509c7438f9e6c7d vdr-1.3.36-r1.ebuild 4761
 MD5 9e76461f9d483d585e3d6ac15598ce00 vdr-1.3.36-r2.ebuild 4821
-MD5 b47f7d73cdf197880c4988560ef79fe5 vdr-1.3.36-r3.ebuild 3950
+MD5 59fe7fb9d6c16f0b75b9ee517ddeadcd vdr-1.3.36-r3.ebuild 4268
 MD5 fc877f5af6daffeec70f1e60a4de19ae vdr-1.3.36.ebuild 4720
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFD1BW9ZfSl1Kp5KmoRAux1AJ4yx7C5NbXDdPBGP7LXfa1LIXtqMwCgvcFZ
-FCSOTDEIMMaWoir+v6n/YLI=
-=277c
------END PGP SIGNATURE-----
diff --git a/media-video/vdr/files/digest-vdr-1.3.36-r3 b/media-video/vdr/files/digest-vdr-1.3.36-r3
index 69dfb39f871b..4d858e0f7845 100644
--- a/media-video/vdr/files/digest-vdr-1.3.36-r3
+++ b/media-video/vdr/files/digest-vdr-1.3.36-r3
@@ -1,2 +1,2 @@
-MD5 9833dd9aa528ea8bf3854f38d30f2b34 vdr-1.3.36-patchset.tgz 259856
+MD5 e21beb7ffc842aa6ee3043a5cbfabecd vdr-1.3.36-gentoo-patchset-0.1.tar.bz2 174568
 MD5 43fd33cdc3980773543f83017f747148 vdr-1.3.36.tar.bz2 513639
diff --git a/media-video/vdr/vdr-1.3.36-r3.ebuild b/media-video/vdr/vdr-1.3.36-r3.ebuild
index 63abaf7cc8cd..cf973e030d83 100644
--- a/media-video/vdr/vdr-1.3.36-r3.ebuild
+++ b/media-video/vdr/vdr-1.3.36-r3.ebuild
@@ -1,15 +1,18 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/vdr-1.3.36-r3.ebuild,v 1.1 2006/01/22 23:30:14 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/vdr-1.3.36-r3.ebuild,v 1.2 2006/01/27 12:59:34 zzam Exp $
 
 inherit eutils
 
-IUSE="aio bigpatch jumpplay lnbsharing sourcecaps yaepg setup-plugin"
+IUSE="aio bigpatch jumpplay lnbsharing sourcecaps yaepg setup-plugin subtitles"
+
+PATCHSET_V=0.1
+PATCHSET_NAME=${P}-gentoo-patchset-${PATCHSET_V}
 
 DESCRIPTION="Video Disk Recorder - turns a pc into a powerful set top box for DVB"
 HOMEPAGE="http://www.cadsoft.de/vdr/"
 SRC_URI="ftp://ftp.cadsoft.de/vdr/Developer/${P}.tar.bz2
-	http://dev.gentoo.org/~zzam/${P}-patchset.tgz"
+	http://dev.gentoo.org/~zzam/distfiles/${PATCHSET_NAME}.tar.bz2"
 
 KEYWORDS="~amd64 ~ppc ~x86"
 SLOT="0"
@@ -102,7 +105,12 @@ apply_vdr_patchset() {
 
 src_unpack() {
 	unpack ${A}
-	PATCHSET_DIR=${WORKDIR}/${P}-patchset
+	if [[ -n "${LOCAL_VDR_PATCHSET}" && -d "${ROOT}/${LOCAL_VDR_PATCHSET}" ]]; then
+		PATCHSET_DIR="${ROOT}/${LOCAL_VDR_PATCHSET}"
+	else
+		PATCHSET_DIR=${WORKDIR}/${PATCHSET_NAME}
+	fi
+
 	cd ${S}
 
 	ebegin "Changing pathes for gentoo"
@@ -182,6 +190,11 @@ src_install() {
 		doins -r ${T}/source-tree/*
 		keepdir ${VDRSOURCE_DIR}/${P}/PLUGINS/lib
 	fi
+
+	if use setup-plugin; then
+		insinto /usr/share/vdr/setup
+		doins ${S}/menu.c
+	fi
 }
 
 pkg_postinst() {