Bumped patchset. Contains maintainance-patch 1.4.1-1 updated bigpatch and a few small optional patches controlled by dxr3-audio-denoise and dolby-record-switch.

Package-Manager: portage-2.1.1_pre1-r2

4 files changed, 301 insertions, 8 deletions

diff --git a/media-video/vdr/ChangeLog b/media-video/vdr/ChangeLog
index 34d9b4700a56..fc03b4d5c768 100644
--- a/media-video/vdr/ChangeLog
+++ b/media-video/vdr/ChangeLog
@@ -1,6 +1,13 @@
 # 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.64 2006/06/17 14:55:13 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/ChangeLog,v 1.65 2006/06/27 18:30:16 zzam Exp $
+
+*vdr-1.4.1-r2 (27 Jun 2006)
+
+  27 Jun 2006; Matthias Schwarzott <zzam@gentoo.org> +vdr-1.4.1-r2.ebuild:
+  Bumped patchset. Contains maintainance-patch 1.4.1-1 updated bigpatch and a
+  few small optional patches controlled by dxr3-audio-denoise and
+  dolby-record-switch.
 
 *vdr-1.4.1-r1 (17 Jun 2006)
 
diff --git a/media-video/vdr/Manifest b/media-video/vdr/Manifest
index 0e3ec3528b54..91b761789477 100644
--- a/media-video/vdr/Manifest
+++ b/media-video/vdr/Manifest
@@ -62,6 +62,7 @@ DIST gentoo-vdr-patchset-1.3.45-2.tar.bz2 166648 RMD160 9d430c80950986e33587c472
 DIST gentoo-vdr-patchset-1.4.0-2.tar.bz2 149824 RMD160 e4d3b05810e8c697229679f34d8452efb9bc23dd SHA1 b47f56296281f5d0416f92740349eb76abeb47b6 SHA256 7ce52fdb86b222dcb53edb67162194ec27c4e2f182188296f594bb3e495de80d
 DIST gentoo-vdr-patchset-1.4.0-3.tar.bz2 181435 RMD160 43a3f758c2cfa723d2c3780e635dd6ae0658aad2 SHA1 fbd3501fd958ae1ed8bc1a3b72c501551555ae0d SHA256 5035456f6737a4ad551c1934160f2b273313f4c299175dd56e71d4aa5cf57345
 DIST gentoo-vdr-patchset-1.4.1-1.tar.bz2 197293 RMD160 1d5a8d8d9425918e845a6eee7de7ad755244886e SHA1 2814fe522f65616a5ba30b18427b99d3508df588 SHA256 f99c7c45699483e3bd8e6a7cf83df609c6af74020b916aaa3c0663694f2ab933
+DIST gentoo-vdr-patchset-1.4.1-2.tar.bz2 174198 RMD160 cf4985f303dbd5b4923e67ab26f4654cb52d6e8b SHA1 8da1918018f9c169ed1d3f1d5d57606cd02842d1 SHA256 214ac208c8ad61065b23cc59b7ca60c2e9b5cccf742e2767ca8260de5b9e9d0f
 DIST vdr-1.2.6.tar.bz2 367069 RMD160 6780bedb49676cecfcea1275d9166e88fb93b97f SHA1 31896db8b3d98c54acdbee34338fd48c067a15bf SHA256 9d969043018d9578970c5d79e048e21870207042f6041a49996aad0c679b24d5
 DIST vdr-1.3.27-bigpatch-test4.diff.bz2 68563 RMD160 7cd1cd80f0e17e001ebab34134ebd3f02371fd46 SHA1 5a5210ab499c9b2a40a3aa4875685e9b13627050 SHA256 3eccc4b33d0d7948893e5fe49333dcac37680ffd6d3740fa2222216dc57f0ea6
 DIST vdr-1.3.27-enAIO-2.4.diff.gz 9821 RMD160 f383a27b1863a4184758dcb4227b7a91f0cde102 SHA1 8b06ea9651a0209eac9546225a5ffd44c7a711a6 SHA256 05dca2075f596dc74c235a568366b5cd57cec734e97d64190a4ad7cdae060861
@@ -155,14 +156,18 @@ EBUILD vdr-1.4.1-r1.ebuild 6185 RMD160 dc2154fddc06a578ce7e5aeefd055b1190b2e891
 MD5 8c5f1c6a5d4d90d7d3d77c2c069ca790 vdr-1.4.1-r1.ebuild 6185
 RMD160 dc2154fddc06a578ce7e5aeefd055b1190b2e891 vdr-1.4.1-r1.ebuild 6185
 SHA256 84723473f89c6dddaa407e9701ec70d356e90e67cbba0a750440e73e4cd9feb8 vdr-1.4.1-r1.ebuild 6185
+EBUILD vdr-1.4.1-r2.ebuild 6211 RMD160 7322fe8b68bde4d91a673064a3a4c19de3ea7f0c SHA1 e0e2105238217d718ac4de08746b8e049969cb19 SHA256 181e23eddd44b19c1b4b351fdc15f780051730067422bef7cef48fedc31cbbaf
+MD5 a4067c7e126e4c262f378bfe7b5c0097 vdr-1.4.1-r2.ebuild 6211
+RMD160 7322fe8b68bde4d91a673064a3a4c19de3ea7f0c vdr-1.4.1-r2.ebuild 6211
+SHA256 181e23eddd44b19c1b4b351fdc15f780051730067422bef7cef48fedc31cbbaf vdr-1.4.1-r2.ebuild 6211
 EBUILD vdr-1.4.1.ebuild 6163 RMD160 418878997bb7883c9e4af559edfe6ce16a431900 SHA1 e5cbe454697de9e1dd7a89065830e7af00c1f83a SHA256 70caf501e58f21feff88ca43ab3ec5d0b863e4d2daadd4253f889b06fa5ea229
 MD5 274915c640202c2bc78e2d961d4a3c63 vdr-1.4.1.ebuild 6163
 RMD160 418878997bb7883c9e4af559edfe6ce16a431900 vdr-1.4.1.ebuild 6163
 SHA256 70caf501e58f21feff88ca43ab3ec5d0b863e4d2daadd4253f889b06fa5ea229 vdr-1.4.1.ebuild 6163
-MISC ChangeLog 9754 RMD160 97a0db792071f658acd3d301cb0093dbb853bb4d SHA1 e4cc8dbce329f804993852d991ade6a6a52352f1 SHA256 a4d811600de951920e5dfa75093118ab15c74f12782485a05020bdf0d8e36aa1
-MD5 4186c1ab98e6e8371e6d4ed1b1df2604 ChangeLog 9754
-RMD160 97a0db792071f658acd3d301cb0093dbb853bb4d ChangeLog 9754
-SHA256 a4d811600de951920e5dfa75093118ab15c74f12782485a05020bdf0d8e36aa1 ChangeLog 9754
+MISC ChangeLog 10026 RMD160 7ebbcdf9d5955137856726f7aeb2063575cacbd6 SHA1 66433f95c3de44372c6d2eda37fd8bdd4d494b4d SHA256 1ab52ae98a1c33015cc1cb80bf6adafd61f71c3bd45096bf9c04bd12cdd1edd5
+MD5 1f6c390c8cdd76cf9879508accec2773 ChangeLog 10026
+RMD160 7ebbcdf9d5955137856726f7aeb2063575cacbd6 ChangeLog 10026
+SHA256 1ab52ae98a1c33015cc1cb80bf6adafd61f71c3bd45096bf9c04bd12cdd1edd5 ChangeLog 10026
 MISC metadata.xml 259 RMD160 cc3cadd479ce9fb1e22948ac9f01f5725da33fa6 SHA1 71c8f0604523f99ac8b7849a01d861d721a191fd SHA256 313f79a460281914a7f72cb73e91eec5f5cfec67c79f657743d49036d04951fe
 MD5 a973dfa1638779880ca99f1c1435cac7 metadata.xml 259
 RMD160 cc3cadd479ce9fb1e22948ac9f01f5725da33fa6 metadata.xml 259
@@ -224,10 +229,13 @@ SHA256 5e00cf88de45cdb3fdb2e6ec985f53821b7e467a58e54bb22536d5336ede3247 files/di
 MD5 41c048fc2621ae4875a60141b501e5ad files/digest-vdr-1.4.1-r1 518
 RMD160 adff5c10ff7c7d15701d94654fe79ad259b666ff files/digest-vdr-1.4.1-r1 518
 SHA256 5e00cf88de45cdb3fdb2e6ec985f53821b7e467a58e54bb22536d5336ede3247 files/digest-vdr-1.4.1-r1 518
+MD5 8335ea9ab24557870e7bf7d8052c8edd files/digest-vdr-1.4.1-r2 518
+RMD160 aa1f10a484b1cc48e384c4bfac18dcdd709eaa21 files/digest-vdr-1.4.1-r2 518
+SHA256 9337e798e1894d69e0d649837c273a477e306a55e78a91bf642b4e5214b5ffd8 files/digest-vdr-1.4.1-r2 518
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.3 (GNU/Linux)
 
-iD8DBQFElBfcZfSl1Kp5KmoRAhguAJ4m4n/UG3EyFuLaXW9TqIR0ekVsxgCfZTHL
-NmEl8U6NUYGhhwGV97yK3RU=
-=Dwj8
+iD8DBQFEoXlFZfSl1Kp5KmoRApfnAJ9uA6p1KboyjzMx9JdgYfVF5opjjwCgpzPl
+c7Ifgiv1YSdV1mNEZYwDVKI=
+=5547
 -----END PGP SIGNATURE-----
diff --git a/media-video/vdr/files/digest-vdr-1.4.1-r2 b/media-video/vdr/files/digest-vdr-1.4.1-r2
new file mode 100644
index 000000000000..64edd8274a30
--- /dev/null
+++ b/media-video/vdr/files/digest-vdr-1.4.1-r2
@@ -0,0 +1,6 @@
+MD5 ed2d9a3fe0763a6d66c15da8a879e2e6 gentoo-vdr-patchset-1.4.1-2.tar.bz2 174198
+RMD160 cf4985f303dbd5b4923e67ab26f4654cb52d6e8b gentoo-vdr-patchset-1.4.1-2.tar.bz2 174198
+SHA256 214ac208c8ad61065b23cc59b7ca60c2e9b5cccf742e2767ca8260de5b9e9d0f gentoo-vdr-patchset-1.4.1-2.tar.bz2 174198
+MD5 f17ab7d185f3c5426cc713c2ad4cc708 vdr-1.4.1.tar.bz2 553580
+RMD160 d23eef3bce7e0604051633f8f93c39e7b046bd9b vdr-1.4.1.tar.bz2 553580
+SHA256 a4595c6a5d5f3008e93062444f8b69ca1bec2c977cc536f650c31418164722c7 vdr-1.4.1.tar.bz2 553580
diff --git a/media-video/vdr/vdr-1.4.1-r2.ebuild b/media-video/vdr/vdr-1.4.1-r2.ebuild
new file mode 100644
index 000000000000..4258ef75d4f9
--- /dev/null
+++ b/media-video/vdr/vdr-1.4.1-r2.ebuild
@@ -0,0 +1,272 @@
+# 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.4.1-r2.ebuild,v 1.1 2006/06/27 18:30:16 zzam Exp $
+
+inherit eutils flag-o-matic multilib
+
+IUSE="debug vanilla aio bigpatch jumpplay dolby-record-switch dvbplayer
+	lnbsharing sourcecaps cmdsubmenu dxr3-audio-denoise
+	child-protection yaepg setup-plugin submenu subtitles rotor"
+
+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/${P}.tar.bz2
+	!vanilla? ( mirror://gentoo/${PATCHSET_NAME}.tar.bz2
+				http://dev.gentoo.org/~zzam/distfiles/${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.3.5 )"
+
+# Relevant Pathes for vdr on gentoo
+DVB_DIR=/usr/include
+VDR_INCLUDE_DIR=/usr/include/vdr
+PLUGIN_LIB_DIR=/usr/$(get_libdir)/vdr/plugins
+CONF_DIR=/etc/vdr
+CAP_FILE=${S}/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=0
+	local COUNT_USE=0
+	local CAP=""
+	local p="${1}"
+	debug-print "PATCH:"
+	debug-print "  $(basename ${p})"
+	local V1
+	local V2
+	while read V1 V2; do
+		case ${V1} in
+		GENTOO_USE:)
+			: $((COUNT_USE++))
+			if use_multi_and ${V2}; then
+				APPLY=1
+			fi
+			;;
+		GENTOO_CAP:)
+			CAP="${V2}"
+			;;
+		+++|---|diff|@@)
+			break;
+			;;
+		*)
+			;;
+		esac
+	done < "${p}"
+	if [[ ${COUNT_USE} -eq 0 ]]; then
+		APPLY=1
+	fi
+	[[ ${APPLY} == 0 ]] && return
+	debug-print "    --> applied"
+	epatch "${p}"
+	[[ -n "${CAP}" ]] && add_cap ${CAP}
+}
+
+# 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 ${P}.tar.bz2
+	if [[ -n "${VDR_LOCAL_PATCHSET}" && -d "${ROOT}/${VDR_LOCAL_PATCHSET}" ]]; then
+		ewarn "Using local developer patchset."
+		PATCHSET_DIR="${ROOT}/${VDR_LOCAL_PATCHSET}"
+	else
+		unpack ${PATCHSET_NAME}.tar.bz2
+		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
+	keepdir ${CONF_DIR}/themes
+
+	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 /usr/share/vdr
+	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
+
+	local keysfound=0
+	local key
+	local warn_keys="JumpFwd JumpRew JumpFwdSlow JumpRewSlow"
+	local remote_file=${ROOT}/etc/vdr/remote.conf
+
+	if [[ -e ${remote_file} ]]; then
+		for key in ${warn_jeys}; do
+			if grep -q -i "\.${key} " "${remote_file}"; then
+				keysfound=1
+				break
+			fi
+		done
+		if [[ ${keysfound} == 1 ]]; then
+			ewarn "Your /etc/vdr/remote.conf contains keys which are no longer usable"
+			ewarn "Please remove these keys or vdr will not start:"
+			ewarn "#  ${warn_keys}"
+		fi
+	fi
+}