Updated patchset to 1.3.45-2

(Portage version: 2.1_pre7-r5)

4 files changed, 259 insertions, 11 deletions

diff --git a/media-video/vdr/ChangeLog b/media-video/vdr/ChangeLog
index 413bab0671f5..1530a6955c59 100644
--- a/media-video/vdr/ChangeLog
+++ b/media-video/vdr/ChangeLog
@@ -1,6 +1,11 @@
 # 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.56 2006/03/30 09:00:12 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/ChangeLog,v 1.57 2006/04/10 21:17:36 zzam Exp $
+
+*vdr-1.3.45-r1 (10 Apr 2006)
+
+  10 Apr 2006; Matthias Schwarzott <zzam@gentoo.org> +vdr-1.3.45-r1.ebuild:
+  Updated patchset to 1.3.45-2
 
   30 Mar 2006; Matthias Schwarzott <zzam@gentoo.org>
   files/digest-vdr-1.3.45, Manifest:
diff --git a/media-video/vdr/Manifest b/media-video/vdr/Manifest
index 44e4119dee5a..099b73d2b957 100644
--- a/media-video/vdr/Manifest
+++ b/media-video/vdr/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 629cf5dc50f2633ecc62c94d35f2bfec ChangeLog 8567
 RMD160 94c467af18e5d2a5980f8c157beb810f28910312 ChangeLog 8567
 SHA256 2d9755247d49a632f4ea4c184ed2c83ed60dc191f5503416707bb5c3341b2c6f ChangeLog 8567
@@ -61,6 +58,9 @@ SHA256 3d38af99050babd1445c6e996aa4538f0d08fe5ff6280d60394e8f18a4271673 files/di
 MD5 db6913ef0f1bae4fe60bc81b7fe67999 files/digest-vdr-1.3.45 524
 RMD160 4430c68e85274ec874f612c21b06b28d6ef80c41 files/digest-vdr-1.3.45 524
 SHA256 4a6fdfc5af16b595b35f629968d3a61a52e3fb5e73d41bdd29590f71badb6c01 files/digest-vdr-1.3.45 524
+MD5 697fe8dcaa95342bfed3bf10d4a5a504 files/digest-vdr-1.3.45-r1 524
+RMD160 603afc4fe18b020dd1ee248dc0251c603ddb15db files/digest-vdr-1.3.45-r1 524
+SHA256 92ef7d82df941281068ea5a61d4cc92c2a1bbf0100aec61378d48a1e09c50f65 files/digest-vdr-1.3.45-r1 524
 MD5 aa8d0f66c8831be73c049584d6143c8b files/vdr-1.2.6-gentoo.diff 1995
 RMD160 e166ae3db608588fbc3b753764d1e5819a5c4549 files/vdr-1.2.6-gentoo.diff 1995
 SHA256 5c7380e402a1a835e91c5b13aeea6f5dbe589d7ed35b7b28753120d69998515c files/vdr-1.2.6-gentoo.diff 1995
@@ -127,13 +127,9 @@ SHA256 e89e49f001b83af595c52d7089eea064454c2f4fc0bedb757a2fc3ac74858e89 vdr-1.3.
 MD5 6779f839bd6d1de19abbe695118d3ad5 vdr-1.3.44.ebuild 4971
 RMD160 10c8bade9eda3663b8c2db35e5e4df7554bfb91e vdr-1.3.44.ebuild 4971
 SHA256 50ea4aa2eb6bac8ddafea7bba9049661b208210fe6aecc6fc600256e6d910d80 vdr-1.3.44.ebuild 4971
+MD5 2a74b2bbea655e5655e7a26feb4b76d2 vdr-1.3.45-r1.ebuild 5367
+RMD160 f03480117d8e18795bfcf597b15fa2afc19b6377 vdr-1.3.45-r1.ebuild 5367
+SHA256 28e3f7ac2554c9f72b9163be3c0fad70f84c54a88b8364aa44674c8ce6c07590 vdr-1.3.45-r1.ebuild 5367
 MD5 605cb84da22cd175dbcc0b5dd14b9b93 vdr-1.3.45.ebuild 5350
 RMD160 20cef96e0638f21435b74377f4867f14a68851c4 vdr-1.3.45.ebuild 5350
 SHA256 a167c1d2043b977001e331d5ed83870f5429447be99aa940df9a50c311bb562f vdr-1.3.45.ebuild 5350
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.2 (GNU/Linux)
-
-iD8DBQFEK55GZfSl1Kp5KmoRAm8+AJ9bzNnx7dwbhUt0hcpwOeqjTCndOACfVHrx
-TyosaVjk0z5c077o2kGYpjI=
-=zg60
------END PGP SIGNATURE-----
diff --git a/media-video/vdr/files/digest-vdr-1.3.45-r1 b/media-video/vdr/files/digest-vdr-1.3.45-r1
new file mode 100644
index 000000000000..1aad90716dc6
--- /dev/null
+++ b/media-video/vdr/files/digest-vdr-1.3.45-r1
@@ -0,0 +1,6 @@
+MD5 9c17c8bc45aa4c5f4d46585a09a05b76 gentoo-vdr-patchset-1.3.45-2.tar.bz2 166648
+RMD160 9d430c80950986e33587c4721299c697b952f468 gentoo-vdr-patchset-1.3.45-2.tar.bz2 166648
+SHA256 08b0aa33e0660c98603a014c9bb01c9a32bd5fdafc6051636d93e4b4862bf4e0 gentoo-vdr-patchset-1.3.45-2.tar.bz2 166648
+MD5 ce53ea8ec5ea459895ff62718639a43f vdr-1.3.45.tar.bz2 542366
+RMD160 d5a7e98a6a30df809b623b1dd54adc7caa653d75 vdr-1.3.45.tar.bz2 542366
+SHA256 e1e277cbae3daed9d299276f703b6637f9af8d0b3797b18bceb1f32fd30d78bd vdr-1.3.45.tar.bz2 542366
diff --git a/media-video/vdr/vdr-1.3.45-r1.ebuild b/media-video/vdr/vdr-1.3.45-r1.ebuild
new file mode 100644
index 000000000000..de0cbfd50238
--- /dev/null
+++ b/media-video/vdr/vdr-1.3.45-r1.ebuild
@@ -0,0 +1,241 @@
+# 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.45-r1.ebuild,v 1.1 2006/04/10 21:17:36 zzam Exp $
+
+inherit eutils flag-o-matic
+
+IUSE="debug vanilla aio bigpatch jumpplay dvbplayer lnbsharing sourcecaps"
+IUSE="${IUSE} child-protection yaepg setup-plugin submenu subtitles rotor rds-timeout"
+
+PATCHSET_V=2
+PATCHSET_NAME=gentoo-${PN}-patchset-${PV}-${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
+	!vanilla? ( mirror://gentoo/${PATCHSET_NAME}.tar.bz2 )"
+
+KEYWORDS="~amd64 ~ppc ~x86"
+SLOT="0"
+LICENSE="GPL-2"
+
+
+DEPEND="media-libs/jpeg
+	sys-apps/gawk
+	media-tv/linuxtv-dvb-headers
+	sys-libs/libcap"
+
+RDEPEND="${DEPEND}
+	dev-lang/perl
+	media-tv/vdrplugin-rebuild
+	!vanilla? ( >=media-tv/gentoo-vdr-scripts-0.2.3 )"
+
+# 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."
+
+
+pkg_setup() {
+	use debug && append-flags -g
+}
+
+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}
+	if [[ -n "${VDR_LOCAL_PATCHSET}" && -d "${ROOT}/${VDR_LOCAL_PATCHSET}" ]]; then
+		PATCHSET_DIR="${ROOT}/${VDR_LOCAL_PATCHSET}"
+	else
+		PATCHSET_DIR=${WORKDIR}/${PATCHSET_NAME}
+	fi
+
+	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
+
+	if use vanilla; then
+		ewarn "OK - You are on your own now!"
+		ewarn "no gentoo-patches will be applied!"
+	else
+		apply_vdr_patchset ${PATCHSET_DIR}
+
+		if use setup-plugin && use submenu; then
+			ewarn "Did not apply submenu-patch, can not be used at the same time as setup-plugin-patch."
+		fi
+	fi
+
+	# 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
+
+
+	if ! use vanilla; then
+		add_cap CAP_IRCTRL_RUNTIME_PARAM \
+			CAP_VFAT_RUNTIME_PARAM \
+			CAP_SHUTDOWN_SVDRP \
+			CAP_CHUID
+
+		echo -e ${CAPS} > ${CAP_FILE}
+	fi
+}
+
+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.*
+
+	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
+
+	if use setup-plugin; then
+		insinto /usr/share/vdr/setup
+		doins ${S}/menu.c
+
+		insinto /etc/vdr/plugins/setup
+		newins ${FILESDIR}/vdr-setup-menu-0.2.3.xml vdr-menu.xml
+	fi
+	chown -R vdr:vdr ${D}/${CONF_DIR}
+}
+
+pkg_postinst() {
+	einfo "It is a good idea to run vdrplugin-rebuild now"
+	if has_version "<media-video/vdr-1.3.36-r3"; then
+		ewarn "Upgrade Info:"
+		ewarn
+		ewarn "If you had used the use-flags lirc, rcu or vfat"
+		ewarn "then, you now have to enable the associated functionality"
+		ewarn "in /etc/conf.d/vdr"
+		ewarn
+		ewarn "vfat is now set with VFAT_FILENAMES."
+		ewarn "lirc/rcu are now set with IR_CTRL."
+		ebeep
+	fi
+
+	if use setup-plugin; then
+		echo
+		eerror "It is very important to emerge media-plugins/vdr-setup now"
+		eerror "and to have it activated in /etc/conf.de/vdr PLUGINS=\"\""
+	fi
+}