Version bumped.

svn path=/testing/; revision=78

4 files changed, 228 insertions, 4 deletions

diff --git a/media-video/vdr/ChangeLog b/media-video/vdr/ChangeLog
index d2d85f7..af486f4 100644
--- a/media-video/vdr/ChangeLog
+++ b/media-video/vdr/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  05 Nov 2006; Matthias Schwarzott <zzam@gentoo.org> +vdr-1.4.4.ebuild:
+  Version bumped.
+
   01 Nov 2006; Matthias Schwarzott <zzam@gentoo.org> vdr-1.4.3_p4.ebuild:
   Updated patchset to v2 - bigpatch has noepg removed.
 
diff --git a/media-video/vdr/Manifest b/media-video/vdr/Manifest
index abc5939..68fe265 100644
--- a/media-video/vdr/Manifest
+++ b/media-video/vdr/Manifest
@@ -5,7 +5,9 @@ SHA256 487d380f3fe8cb9efff272e9bfffacde0c6f90bcb1d8522ef9533eabfaca5965 files/vd
 DIST gentoo-vdr-patchset-1.4.3_p2-1.tar.bz2 180438 RMD160 ff0ba03d904e87429939437f607e7e4c9819df8c SHA1 dd19917201458ccdbd2c58c866264c237f7c65ed SHA256 23dda72fcb4ba3d82933309e9401306d62962de854e8a876c28d51d686cd3085
 DIST gentoo-vdr-patchset-1.4.3_p3-2.tar.bz2 190710 RMD160 bc57433de65cb485ca644888dc8ddaa654495e55 SHA1 ebcf55b1b6f1d9afa67e5af0fe065f0fb13c8739 SHA256 265563e50fe6148ce78322785e976ffd11e6c66b5fb7dcc7657b3b3b961df7f1
 DIST gentoo-vdr-patchset-1.4.3_p4-2.tar.bz2 195272 RMD160 4e481750f1a2c7e6a570e27054254960483d40ba SHA1 eecf9254a3f8c69fe439c486a2b1b79798732c45 SHA256 6380526bdcb0b88bbaa3530b5540a91c810de1246321d6bba93f6740ab5dffd6
+DIST gentoo-vdr-patchset-1.4.4-1.tar.bz2 188290 RMD160 27b7210395ddf9697b70e3f1e6065bb495093edb SHA1 97f79463374429c622f9b6ee21b6c901d9f753d0 SHA256 479153c6fc5b2b0eb7ddca17e12568c7469ad296929b874e75b4b58e59deb1cb
 DIST vdr-1.4.3.tar.bz2 557370 RMD160 15d8d8bc4d235de30b0b5fc8abd03a7b29627e75 SHA1 7a3f17c242e557fc95921e6884adc194fc4620bb SHA256 ce39b57945321757f4ae743345b4abb37867bcf9a7dba5d8de3581bd49fad247
+DIST vdr-1.4.4.tar.bz2 559362 RMD160 436cbbfb09f4e31f34db4038771fa7bac11230a1 SHA1 7699291f28e63d126842c7ff79170856b2e0abb6 SHA256 d05ae4529d55ad577394239223b83d13a3d11c2c3aa0599896ccba8f67a01b36
 EBUILD vdr-1.4.3_p2.ebuild 6287 RMD160 f82484ce834ffa7e4edd883a2f6daa6d6e5e0477 SHA1 204c6a67abc2e309fe2ff0e736909fadcd0c1c09 SHA256 a4e9682251d91e32605a7d61f88cbc11d0c21e16b6b827b2015916bc7c4f58ec
 MD5 5e33a61bab185ffedc0d93c4570cc0d9 vdr-1.4.3_p2.ebuild 6287
 RMD160 f82484ce834ffa7e4edd883a2f6daa6d6e5e0477 vdr-1.4.3_p2.ebuild 6287
@@ -18,10 +20,14 @@ EBUILD vdr-1.4.3_p4.ebuild 4899 RMD160 47decff9014746f633a23d239f40177fc46ee2c5
 MD5 0e34d7d64aa506404319060ebdd6366a vdr-1.4.3_p4.ebuild 4899
 RMD160 47decff9014746f633a23d239f40177fc46ee2c5 vdr-1.4.3_p4.ebuild 4899
 SHA256 5d6b416db1d2a9f1261666f99ebe4727a4edcdfbbea9a73ff61c777976130714 vdr-1.4.3_p4.ebuild 4899
-MISC ChangeLog 709 RMD160 3c55e12869437e7fc5f83cdbf944f223dadec1d5 SHA1 dabce51b9703ca1369dd353825712fcfaae24676 SHA256 10ae5c8cc0a213144af3628122cafb350fae7e87234387a614eeec4c0c05a115
-MD5 624a6c120eba1003b7df281a1e363332 ChangeLog 709
-RMD160 3c55e12869437e7fc5f83cdbf944f223dadec1d5 ChangeLog 709
-SHA256 10ae5c8cc0a213144af3628122cafb350fae7e87234387a614eeec4c0c05a115 ChangeLog 709
+EBUILD vdr-1.4.4.ebuild 4807 RMD160 099e7286b597c62bc074aed62cfb68e3eb307461 SHA1 edbdc9f53f28bea22478cafe982bc5b321abe18c SHA256 eb01645285a4d767c89b2e911c1d098e1ef05da73fb46c7531b42146a991ec73
+MD5 ba8b415d2ff3c37655e3429f0701d263 vdr-1.4.4.ebuild 4807
+RMD160 099e7286b597c62bc074aed62cfb68e3eb307461 vdr-1.4.4.ebuild 4807
+SHA256 eb01645285a4d767c89b2e911c1d098e1ef05da73fb46c7531b42146a991ec73 vdr-1.4.4.ebuild 4807
+MISC ChangeLog 800 RMD160 eb91717b7d7f1ee403493027341c3cee40eddf21 SHA1 e6e4457318cfdffc4b166c080eb30d187148996a SHA256 60b084cd33e8076d8df8dbb88845f9562fdfaf46735e1f3f4a6fa5b5577ee81d
+MD5 74a5b4fe88423ab86210e02c8e471d57 ChangeLog 800
+RMD160 eb91717b7d7f1ee403493027341c3cee40eddf21 ChangeLog 800
+SHA256 60b084cd33e8076d8df8dbb88845f9562fdfaf46735e1f3f4a6fa5b5577ee81d ChangeLog 800
 MISC metadata.xml 257 RMD160 8bee49b98c59996aaaa019fb2c764c08d8004507 SHA1 d2419394e7d5c7463d7dea33e9190ebd57484531 SHA256 0dd45fbbaf1c6173535e371e3ff8a3faa41f3f89123ac9dffe338998599ebe26
 MD5 116de98355049ce943c3b6fedc00b4a3 metadata.xml 257
 RMD160 8bee49b98c59996aaaa019fb2c764c08d8004507 metadata.xml 257
@@ -35,3 +41,6 @@ SHA256 467d1f311d862b21f2b36f9b0752f4d3f56e329e2a8462ac63555851a538f9cf files/di
 MD5 f27ceb91a37d270fb83cc1197cb2c9ac files/digest-vdr-1.4.3_p4 527
 RMD160 51d54fd3ab51c140efa620ab65b352b63bced303 files/digest-vdr-1.4.3_p4 527
 SHA256 fd1a75872c884f841e62c61531b8e866e41133b9195112cc06a30c8d1fc08572 files/digest-vdr-1.4.3_p4 527
+MD5 037bc6e29c84cda485ef84ab2572b9d9 files/digest-vdr-1.4.4 518
+RMD160 151f05ce2c2c8ecef446b4349eaa8c10566491e7 files/digest-vdr-1.4.4 518
+SHA256 960cc3e53d0b21eaa87289393374f69bd68a516c5d7102a74e5960598fcc624e files/digest-vdr-1.4.4 518
diff --git a/media-video/vdr/files/digest-vdr-1.4.4 b/media-video/vdr/files/digest-vdr-1.4.4
new file mode 100644
index 0000000..e83cca5
--- /dev/null
+++ b/media-video/vdr/files/digest-vdr-1.4.4
@@ -0,0 +1,6 @@
+MD5 984e47983c8dc26e3b5adfebac790fdf gentoo-vdr-patchset-1.4.4-1.tar.bz2 188290
+RMD160 27b7210395ddf9697b70e3f1e6065bb495093edb gentoo-vdr-patchset-1.4.4-1.tar.bz2 188290
+SHA256 479153c6fc5b2b0eb7ddca17e12568c7469ad296929b874e75b4b58e59deb1cb gentoo-vdr-patchset-1.4.4-1.tar.bz2 188290
+MD5 3d5dbacda725f769099b774577d2e3af vdr-1.4.4.tar.bz2 559362
+RMD160 436cbbfb09f4e31f34db4038771fa7bac11230a1 vdr-1.4.4.tar.bz2 559362
+SHA256 d05ae4529d55ad577394239223b83d13a3d11c2c3aa0599896ccba8f67a01b36 vdr-1.4.4.tar.bz2 559362
diff --git a/media-video/vdr/vdr-1.4.4.ebuild b/media-video/vdr/vdr-1.4.4.ebuild
new file mode 100644
index 0000000..3a21400
--- /dev/null
+++ b/media-video/vdr/vdr-1.4.4.ebuild
@@ -0,0 +1,206 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+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 noepg"
+
+PATCHSET_V=1
+PATCHSET_NAME=gentoo-${PN}-patchset-${PV}-${PATCHSET_V}
+
+MY_P="${P%_p*}"
+S=${WORKDIR}/${MY_P}
+
+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/${MY_P}.tar.bz2
+	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
+	>=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
+}
+
+src_unpack() {
+	unpack ${MY_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
+
+	source ${PATCHSET_DIR}/apply_patchset.sh
+	apply_vdr_patchset "${PATCHSET_DIR}"
+
+	if use !vanilla; then
+		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
+}