Added new patch-system with pre-built patchset. Removed use-flags lirc, rcu and vfat.

Package-Manager: portage-2.1_pre3-r1

4 files changed, 204 insertions, 5 deletions

diff --git a/media-video/vdr/ChangeLog b/media-video/vdr/ChangeLog
index d0043e69c2a6..dff25eabc4b4 100644
--- a/media-video/vdr/ChangeLog
+++ b/media-video/vdr/ChangeLog
@@ -1,6 +1,12 @@
 # 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.38 2006/01/17 19:33:06 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/ChangeLog,v 1.39 2006/01/22 23:30:14 zzam Exp $
+
+*vdr-1.3.36-r3 (22 Jan 2006)
+
+  22 Jan 2006; Matthias Schwarzott <zzam@gentoo.org> +vdr-1.3.36-r3.ebuild:
+  Added new patch-system with pre-built patchset. Removed use-flags lirc, rcu
+  and vfat.
 
   17 Jan 2006; Matthias Schwarzott <zzam@gentoo.org> vdr-1.3.36-r2.ebuild:
   Small changes to DEPEND.
diff --git a/media-video/vdr/Manifest b/media-video/vdr/Manifest
index e488a47e2110..d3e64990db1a 100644
--- a/media-video/vdr/Manifest
+++ b/media-video/vdr/Manifest
@@ -1,7 +1,7 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 f658c63ca6e79bc5c733be4786bdc9ba ChangeLog 5767
+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
 MD5 05d546888439560f03f1857d32af2062 files/1.3.34/SourceCaps-1.3.33-lnb-sharing.patch 7959
@@ -15,6 +15,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 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
@@ -30,11 +31,12 @@ 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 fc877f5af6daffeec70f1e60a4de19ae vdr-1.3.36.ebuild 4720
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFDzUadZfSl1Kp5KmoRAlQDAJ9dJJTQsLXj2mmfE+IGqk49TiQ8PACgxX11
-b1Wdlob5dIftH63oh3o4bqc=
-=U6pq
+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
new file mode 100644
index 000000000000..69dfb39f871b
--- /dev/null
+++ b/media-video/vdr/files/digest-vdr-1.3.36-r3
@@ -0,0 +1,2 @@
+MD5 9833dd9aa528ea8bf3854f38d30f2b34 vdr-1.3.36-patchset.tgz 259856
+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
new file mode 100644
index 000000000000..63abaf7cc8cd
--- /dev/null
+++ b/media-video/vdr/vdr-1.3.36-r3.ebuild
@@ -0,0 +1,189 @@
+# 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 $
+
+inherit eutils
+
+IUSE="aio bigpatch jumpplay lnbsharing sourcecaps yaepg setup-plugin"
+
+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"
+
+KEYWORDS="~amd64 ~ppc ~x86"
+SLOT="0"
+LICENSE="GPL-2"
+
+
+DEPEND="media-libs/jpeg
+	sys-apps/gawk
+	media-tv/linuxtv-dvb-headers"
+
+RDEPEND="${DEPEND}
+	dev-lang/perl
+	media-tv/vdrplugin-rebuild
+	>=media-tv/gentoo-vdr-scripts-0.2.2"
+
+# Relevant Pathes for vdr on gentoo
+DVB_DIR=/usr/include
+VDR_INCLUDE_DIR=/usr/include/vdr
+PLUGIN_LIB_DIR=/usr/lib/vdr/plugins
+CONF_DIR=/etc/vdr
+RC_DIR=/usr/lib/vdr/rcscript
+CAP_FILE=${S}/vdr-capabilities.sh
+CAPS="# Capabilities of the vdr-executable for use by startscript etc."
+
+add_cap() {
+	while [ "$1" ]; do
+		CAPS="${CAPS}\n$1=1"
+		shift
+	done
+}
+
+# works like use to check for active (and not active !abc) useflags
+# if more than one flag is given it returns that all flags are active
+#
+# "use_multi_and a b !c !d"
+# ==
+# "use a && use b && use !c && use !d"
+#
+use_multi_and() {
+	while [[ -n ${1} ]]; do
+		use ${1} || return 1
+
+		shift
+	done
+	return 0
+}
+
+# reads the line GENTOO_USE out of the beginning of the patch
+# example: GENTOO_USE: aio !bigpatch
+# and checks weather the useflags are set appropriate (via use_multi_and)
+# if check returns true the patch is applied
+#
+apply_vdr_patch() {
+	local APPLY=1
+	local p="${1}"
+	debug-print "PATCH:"
+	debug-print "  $(basename ${p})"
+	local V1
+	local V2
+	while read V1 V2; do
+		case ${V1} in
+		GENTOO_USE:)
+			APPLY=0
+			if use_multi_and ${V2}; then
+				APPLY=1
+				break
+			fi
+			;;
+		+++|---|diff|@@)
+			break;
+			;;
+		*)
+			;;
+		esac
+	done < "${p}"
+	[[ ${APPLY} == 0 ]] && return
+	debug-print "    --> applied"
+	epatch "${p}"
+}
+
+# call apply_vdr_patch for all patchfiles in given directory
+
+apply_vdr_patchset() {
+	local p
+	for p in ${1}/*.{diff,patch}; do
+		[[ -f "${p}" ]] || continue
+		apply_vdr_patch "${p}"
+	done
+}
+
+src_unpack() {
+	unpack ${A}
+	PATCHSET_DIR=${WORKDIR}/${P}-patchset
+	cd ${S}
+
+	ebegin "Changing pathes for gentoo"
+	sed -e 's-$(DVBDIR)/include-$(DVBDIR)-' -i Makefile
+
+	sed \
+	  -e 's-ConfigDirectory = VideoDirectory;-ConfigDirectory = CONFIGDIR;-' \
+	  -i vdr.c
+
+	cat > Make.config <<-EOT
+		#
+		# Generated by ebuild ${PF}
+		#
+		DVBDIR		 = ${DVB_DIR}
+		PLUGINLIBDIR = ${PLUGIN_LIB_DIR}
+		CONFIGDIR	 = ${CONF_DIR}
+
+		DEFINES		+= -DCONFIGDIR=\"\$(CONFIGDIR)\"
+	EOT
+	eend 0
+
+	apply_vdr_patchset ${PATCHSET_DIR}
+
+	# apply local patches defined by variable VDR_LOCAL_PATCHES_DIR
+	if test -n "${VDR_LOCAL_PATCHES_DIR}"; then
+		echo
+		einfo "Applying local patches"
+		for LOCALPATCH in ${VDR_LOCAL_PATCHES_DIR}/${PV}/*.{diff,patch}; do
+			test -f "${LOCALPATCH}" && epatch "${LOCALPATCH}"
+		done
+	fi
+
+	if [[ -n "${VDRSOURCE_DIR}" ]]; then
+		cp -r ${S} ${T}/source-tree
+	fi
+
+
+	add_cap CAP_IRCTRL_RUNTIME_PARAM \
+		CAP_VFAT_RUNTIME_PARAM \
+		CAP_SHUTDOWN_SVDRP
+
+	echo -e ${CAPS} > ${CAP_FILE}
+}
+
+src_install() {
+	exeinto /usr/bin
+	doexe vdr
+	doexe svdrpsend.pl
+
+	insinto ${VDR_INCLUDE_DIR}
+	doins *.h
+	doins Make.config
+
+	insinto ${VDR_INCLUDE_DIR}/libsi
+	doins libsi/*.h
+
+	keepdir ${CONF_DIR}/plugins
+
+	insinto ${CONF_DIR}
+	doins *.conf channels.conf.*
+
+	chown -R vdr:vdr ${D}/${CONF_DIR}
+	keepdir "${PLUGIN_LIB_DIR}"
+
+	doman vdr.1 vdr.5
+
+	dohtml *.html
+	dodoc MANUAL INSTALL README* HISTORY*
+	dodoc TODO-enAIO-rm CONTRIBUTORS
+
+	insinto ${RC_DIR}
+	doins ${CAP_FILE}
+
+	if [[ -n "${VDRSOURCE_DIR}" ]]; then
+		einfo "Installing sources"
+		insinto ${VDRSOURCE_DIR}/${P}
+		doins -r ${T}/source-tree/*
+		keepdir ${VDRSOURCE_DIR}/${P}/PLUGINS/lib
+	fi
+}
+
+pkg_postinst() {
+	einfo "It is a good idea to run vdrplugin-rebuild now"
+}