Version bumped.

Package-Manager: portage-2.1.2_pre1-r3

4 files changed, 302 insertions, 8 deletions

diff --git a/media-video/vdr/ChangeLog b/media-video/vdr/ChangeLog
index 4d80c73f8c86..dbbdd9895ab0 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.69 2006/08/09 11:14:53 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/ChangeLog,v 1.70 2006/09/26 20:21:42 zzam Exp $
+
+*vdr-1.4.3 (26 Sep 2006)
+
+  26 Sep 2006; Matthias Schwarzott <zzam@gentoo.org> +vdr-1.4.3.ebuild:
+  Version bumped.
 
   09 Aug 2006; Matthias Schwarzott <zzam@gentoo.org> vdr-1.4.1-r2.ebuild:
   Marked stable on x86.
diff --git a/media-video/vdr/Manifest b/media-video/vdr/Manifest
index bd26f3df0fc7..a9724600ad17 100644
--- a/media-video/vdr/Manifest
+++ b/media-video/vdr/Manifest
@@ -63,6 +63,7 @@ DIST gentoo-vdr-patchset-1.4.0-2.tar.bz2 149824 RMD160 e4d3b05810e8c697229679f34
 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 gentoo-vdr-patchset-1.4.3-1.tar.bz2 175914 RMD160 4325ddb158834dd8208c5222d60339ef1a52b898 SHA1 f6ec90cc77bbd95c25f9ae0c59c7588d95d837e5 SHA256 e429f1e09cf416e5bb56ed8a4602e4713755e465692b4ea0a9cb604570b98e12
 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
@@ -82,6 +83,7 @@ DIST vdr-1.3.44.tar.bz2 540054 RMD160 2b2f1c309ba550e3b4f817f84f747f5058a501c9 S
 DIST vdr-1.3.45.tar.bz2 542366 RMD160 d5a7e98a6a30df809b623b1dd54adc7caa653d75 SHA1 470bc71eb0ffc732ed10005a932929498a3609a6 SHA256 e1e277cbae3daed9d299276f703b6637f9af8d0b3797b18bceb1f32fd30d78bd
 DIST vdr-1.4.0.tar.bz2 549076 RMD160 b836221d98af904886309a4e589c24b7b6b4faab SHA1 b520e27ca6a75479c2ecd7334dee77b6ebb39cb1 SHA256 64fbd4508bf9ff97a5493f64b450ac5918d49efc12ec53a4580b0ed24b008969
 DIST vdr-1.4.1.tar.bz2 553580 RMD160 d23eef3bce7e0604051633f8f93c39e7b046bd9b SHA1 fe77932dff4a92f547d9f7e3fdbd798a7ba27b67 SHA256 a4595c6a5d5f3008e93062444f8b69ca1bec2c977cc536f650c31418164722c7
+DIST vdr-1.4.3.tar.bz2 557370 RMD160 15d8d8bc4d235de30b0b5fc8abd03a7b29627e75 SHA1 7a3f17c242e557fc95921e6884adc194fc4620bb SHA256 ce39b57945321757f4ae743345b4abb37867bcf9a7dba5d8de3581bd49fad247
 DIST vdr-jumpplay-0.6-1.3.24.diff 18680 RMD160 264169e1016ca483c687a7dd1a300cf50208c69a SHA1 ab4b259575936bec842c0c1c3b5c5c32d26098d9 SHA256 d1d607134fe10240330b76842e2ff09430b569c33ff87fd5255c81e38c5d3d2b
 DIST vdr-jumpplay-0.6-1.3.29.diff 18904 RMD160 6269feeab7fcb254026f2715b1eda77bffaefa90 SHA1 68e6478b92a6e363e65acf244a90a51b4dbb7b48 SHA256 ba61a6aaa5df7d37d4e3626430345eba248a55ae08c595350eb9d15bbb047064
 EBUILD vdr-1.2.6-r1.ebuild 1226 RMD160 074ae28a3e18c317a2887738830641436ee49ee5 SHA1 27a58c4a7c34a39584e1c2c52a87f295eb96a89b SHA256 dfd58ca0e5fec3a188572eb15754459b90242ce4dd983928f7f007b718571412
@@ -164,10 +166,14 @@ EBUILD vdr-1.4.1.ebuild 6199 RMD160 23f8a5d9833ac24d792ff377a1bb712104c04b18 SHA
 MD5 f667c74b1286972e615e8a14f6d9d0b9 vdr-1.4.1.ebuild 6199
 RMD160 23f8a5d9833ac24d792ff377a1bb712104c04b18 vdr-1.4.1.ebuild 6199
 SHA256 47ee85bcecbbdc8d0f22ff6cf3d328cf064b8693719e46f075121c593c551485 vdr-1.4.1.ebuild 6199
-MISC ChangeLog 10538 RMD160 8f621a8df222a6fa10a60ff4e1e661328cb5c57d SHA1 698b2ae2aab995c4b480805f9c47f78ace3aa31d SHA256 8bb2680084fba4c831e562dd614a57455862df6b6b2f83b5d19179512d1126a3
-MD5 924ea9c3b027bcf355d1bc96f38c251b ChangeLog 10538
-RMD160 8f621a8df222a6fa10a60ff4e1e661328cb5c57d ChangeLog 10538
-SHA256 8bb2680084fba4c831e562dd614a57455862df6b6b2f83b5d19179512d1126a3 ChangeLog 10538
+EBUILD vdr-1.4.3.ebuild 6243 RMD160 2f2995de69baf70999925bbac79528cc5f52a095 SHA1 0e98ab419c020e3eedd2df593e5d0b802501009b SHA256 3911dbb7b9e3fbb1df351326a20daae05df7559ceb789df2fc2274f7f5b171c7
+MD5 e85896b87386bb5d790b3eba17af6896 vdr-1.4.3.ebuild 6243
+RMD160 2f2995de69baf70999925bbac79528cc5f52a095 vdr-1.4.3.ebuild 6243
+SHA256 3911dbb7b9e3fbb1df351326a20daae05df7559ceb789df2fc2274f7f5b171c7 vdr-1.4.3.ebuild 6243
+MISC ChangeLog 10655 RMD160 f2918ca252e8d8f2803f34476b951ce385438f7d SHA1 92262f1d9b3db2281fcc9e93c8931d9e7ff33f58 SHA256 cf73b14ca094a24035a0750b1ca9fd24addbcbcbdb3baff9176464a43c2ea1e3
+MD5 2bf8f45f4253d8179aedb0a170b5709e ChangeLog 10655
+RMD160 f2918ca252e8d8f2803f34476b951ce385438f7d ChangeLog 10655
+SHA256 cf73b14ca094a24035a0750b1ca9fd24addbcbcbdb3baff9176464a43c2ea1e3 ChangeLog 10655
 MISC metadata.xml 257 RMD160 8bee49b98c59996aaaa019fb2c764c08d8004507 SHA1 d2419394e7d5c7463d7dea33e9190ebd57484531 SHA256 0dd45fbbaf1c6173535e371e3ff8a3faa41f3f89123ac9dffe338998599ebe26
 MD5 116de98355049ce943c3b6fedc00b4a3 metadata.xml 257
 RMD160 8bee49b98c59996aaaa019fb2c764c08d8004507 metadata.xml 257
@@ -232,10 +238,13 @@ SHA256 5e00cf88de45cdb3fdb2e6ec985f53821b7e467a58e54bb22536d5336ede3247 files/di
 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
+MD5 f766ac06f51cd9b6d5db3eafb63b7c95 files/digest-vdr-1.4.3 518
+RMD160 9684253cb250e840ab51f2296ddf62dd1546fe61 files/digest-vdr-1.4.3 518
+SHA256 48f0e6b4ebbb980c39002ab219efe7a67c0dd9806f55cacb846440912f29fe28 files/digest-vdr-1.4.3 518
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFE2cO1t2vP6XvVdOcRAggyAKDZEDMzCJQGyu85yO/a0+BItDxKIACgkGZi
-WGHUUa1dBC93kl0K4nMmsIQ=
-=thrM
+iD4DBQFFGYvqt2vP6XvVdOcRAlGbAKChcrPGAKrS/biTBKc+ULMwmJpooACWKTr3
+yKhSgAUO9mexNGSrm0/PNw==
+=a38K
 -----END PGP SIGNATURE-----
diff --git a/media-video/vdr/files/digest-vdr-1.4.3 b/media-video/vdr/files/digest-vdr-1.4.3
new file mode 100644
index 000000000000..f8db760a5003
--- /dev/null
+++ b/media-video/vdr/files/digest-vdr-1.4.3
@@ -0,0 +1,6 @@
+MD5 7cf9257232c2f6ad4219624f6ca9d728 gentoo-vdr-patchset-1.4.3-1.tar.bz2 175914
+RMD160 4325ddb158834dd8208c5222d60339ef1a52b898 gentoo-vdr-patchset-1.4.3-1.tar.bz2 175914
+SHA256 e429f1e09cf416e5bb56ed8a4602e4713755e465692b4ea0a9cb604570b98e12 gentoo-vdr-patchset-1.4.3-1.tar.bz2 175914
+MD5 9bb82d1f090dad746d784d147dbb0126 vdr-1.4.3.tar.bz2 557370
+RMD160 15d8d8bc4d235de30b0b5fc8abd03a7b29627e75 vdr-1.4.3.tar.bz2 557370
+SHA256 ce39b57945321757f4ae743345b4abb37867bcf9a7dba5d8de3581bd49fad247 vdr-1.4.3.tar.bz2 557370
diff --git a/media-video/vdr/vdr-1.4.3.ebuild b/media-video/vdr/vdr-1.4.3.ebuild
new file mode 100644
index 000000000000..428f79855b32
--- /dev/null
+++ b/media-video/vdr/vdr-1.4.3.ebuild
@@ -0,0 +1,274 @@
+# 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.3.ebuild,v 1.1 2006/09/26 20:21:42 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=1
+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 ! use vanilla; then
+		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
+	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
+}