Updated extensions-patch, this fixes some bugs with hlcutter. Added more quoting to ebuild.

Package-Manager: portage-2.1.3.11

4 files changed, 387 insertions, 5 deletions

diff --git a/media-video/vdr/ChangeLog b/media-video/vdr/ChangeLog
index db2e64d09b5d..46ac032199ed 100644
--- a/media-video/vdr/ChangeLog
+++ b/media-video/vdr/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-video/vdr
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/ChangeLog,v 1.86 2007/09/12 08:31:36 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/ChangeLog,v 1.87 2007/09/30 12:40:27 zzam Exp $
+
+*vdr-1.4.7-r5 (30 Sep 2007)
+
+  30 Sep 2007; Matthias Schwarzott <zzam@gentoo.org> +vdr-1.4.7-r5.ebuild:
+  Updated extensions-patch, this fixes some bugs with hlcutter. Added more
+  quoting to ebuild.
 
 *vdr-1.4.7-r4 (12 Sep 2007)
 
diff --git a/media-video/vdr/Manifest b/media-video/vdr/Manifest
index b837a7a26b42..14e8d2acbf22 100644
--- a/media-video/vdr/Manifest
+++ b/media-video/vdr/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX extensions-patch-32-plugin-link-error.diff 736 RMD160 b6d6b47ed63eff1d3ed73b32953d16cfea12e685 SHA1 37f7e514befa0db291610133f91daa2170c1550c SHA256 c28dc63ecb981a6bc21402c59011920ab139be85380e660e400ba1e3716af3fd
 MD5 73fdc3d37213e0b58500bbe6253a4e87 files/extensions-patch-32-plugin-link-error.diff 736
 RMD160 b6d6b47ed63eff1d3ed73b32953d16cfea12e685 files/extensions-patch-32-plugin-link-error.diff 736
@@ -46,6 +49,7 @@ DIST vdr-1.4.4.tar.bz2 559362 RMD160 436cbbfb09f4e31f34db4038771fa7bac11230a1 SH
 DIST vdr-1.4.5.tar.bz2 560509 RMD160 0c002a3a7270af20524708c5f5dba91c41b8440b SHA1 4693f6f5c9240c067de3b5f50a05dba5d2b25a41 SHA256 ca69b84ae30d7d63b2e54182c389639680ee0c88ab50b8458a994331072f89b2
 DIST vdr-1.4.6.tar.bz2 561236 RMD160 e8d5498b6935e67941bc10be46a0f3fa9ea7aa9d SHA1 084c6c937aa64fd3339f87d3f56b53fa701b0d28 SHA256 06dea8e028480fa59f04976db83beacd75592835d89058dd5206f4191d315c9c
 DIST vdr-1.4.7.tar.bz2 560888 RMD160 0e7a0d1cf133ee5e168afb6e2374e2ee6c229fcf SHA1 11e8976b3480a0c9cf2b2aec88c329e9bb0f701b SHA256 9e9f3687efc135d890cf8d70068221e661fea21d1efd7d8dc74bc4e810d4a464
+DIST vdr-extensions-patch-34.1.tar.bz2 209193 RMD160 13b69a7c5e60d7faf2da529406b50541bcb59fbb SHA1 965c59d94da84152ead2646a4117074d88ff33e3 SHA256 f497a3bc0db019fd830c5de9b9b4cbc1e1056d1fd528dc4bb73b1975ee1688f0
 EBUILD vdr-1.2.6-r1.ebuild 1226 RMD160 074ae28a3e18c317a2887738830641436ee49ee5 SHA1 27a58c4a7c34a39584e1c2c52a87f295eb96a89b SHA256 dfd58ca0e5fec3a188572eb15754459b90242ce4dd983928f7f007b718571412
 MD5 454443921854ebacbe677c5c81e31022 vdr-1.2.6-r1.ebuild 1226
 RMD160 074ae28a3e18c317a2887738830641436ee49ee5 vdr-1.2.6-r1.ebuild 1226
@@ -82,10 +86,14 @@ EBUILD vdr-1.4.7-r4.ebuild 8714 RMD160 9e65e3366dea3740387405e792ad44b7a4de5183
 MD5 3e4a7e0b76a3cd8a6dd5fed2ede550b3 vdr-1.4.7-r4.ebuild 8714
 RMD160 9e65e3366dea3740387405e792ad44b7a4de5183 vdr-1.4.7-r4.ebuild 8714
 SHA256 8fc0624d3fa9d0ef5d5ffa05b08bcfdff1547342d30c5e7ca28f013bf3d79b59 vdr-1.4.7-r4.ebuild 8714
-MISC ChangeLog 14494 RMD160 7fd53e6c93fc3ccc8e665444292c98dc7ff513c8 SHA1 2ec2d913b511b40ad276c604e72f8825ea68d88c SHA256 e2574b9dce8e833368cad361f5c8f425ac7723c9fac6091a2a126cfd5da7e9f3
-MD5 6a84cf68dcf9ca25833f25b211cfbcd6 ChangeLog 14494
-RMD160 7fd53e6c93fc3ccc8e665444292c98dc7ff513c8 ChangeLog 14494
-SHA256 e2574b9dce8e833368cad361f5c8f425ac7723c9fac6091a2a126cfd5da7e9f3 ChangeLog 14494
+EBUILD vdr-1.4.7-r5.ebuild 8464 RMD160 6778ba971f4fac13696c065d8fa0f4b4469d0f96 SHA1 cba95388efb36390dc2fe895aefcf59643720a11 SHA256 858c16a06387ca16e77fa8ba5c00a93debcedb7564f850bb84f5b8194ae8f5a1
+MD5 e84b3621b9002563d313685e14fc1759 vdr-1.4.7-r5.ebuild 8464
+RMD160 6778ba971f4fac13696c065d8fa0f4b4469d0f96 vdr-1.4.7-r5.ebuild 8464
+SHA256 858c16a06387ca16e77fa8ba5c00a93debcedb7564f850bb84f5b8194ae8f5a1 vdr-1.4.7-r5.ebuild 8464
+MISC ChangeLog 14690 RMD160 43664d2068cb6c183ca3e2da1e3afdf50746eca4 SHA1 6aca8e47106b414708f9a02392ef11850f80ea9b SHA256 adcbce21ebc907d56c7dbcef73cf06a40b171b57567a0770e0df3248bd3c6b27
+MD5 856d130487d3bf579f9b6af672297834 ChangeLog 14690
+RMD160 43664d2068cb6c183ca3e2da1e3afdf50746eca4 ChangeLog 14690
+SHA256 adcbce21ebc907d56c7dbcef73cf06a40b171b57567a0770e0df3248bd3c6b27 ChangeLog 14690
 MISC metadata.xml 257 RMD160 8bee49b98c59996aaaa019fb2c764c08d8004507 SHA1 d2419394e7d5c7463d7dea33e9190ebd57484531 SHA256 0dd45fbbaf1c6173535e371e3ff8a3faa41f3f89123ac9dffe338998599ebe26
 MD5 116de98355049ce943c3b6fedc00b4a3 metadata.xml 257
 RMD160 8bee49b98c59996aaaa019fb2c764c08d8004507 metadata.xml 257
@@ -117,3 +125,13 @@ SHA256 d1d7fcbddfa936238c4122254896089d7625a87aebb558897107dfcd1be0e400 files/di
 MD5 cef1c23ab322f01fe380f52c97b7800f files/digest-vdr-1.4.7-r4 506
 RMD160 35da6a2aef01521d519631749d398c62c9717ce3 files/digest-vdr-1.4.7-r4 506
 SHA256 fecb439d6d003a5b3ef570010f79379dec3fee3eb0dd7ea821440a157d7f2a01 files/digest-vdr-1.4.7-r4 506
+MD5 00228f82af33462b31279ac66c58d074 files/digest-vdr-1.4.7-r5 512
+RMD160 8b77893d4befd6e4b293495ea375cc701131d359 files/digest-vdr-1.4.7-r5 512
+SHA256 403d97ec261a17d22f71a77e4ded1e941b35dcf36819b9c79a8f5b0c2d98b1c1 files/digest-vdr-1.4.7-r5 512
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFG/5lIt2vP6XvVdOcRAjefAJ9oiErSu4wfE08CYYx8A83sqRzzowCgyPuZ
+E1nrqVaw5y0JI5Pb7fvcyIQ=
+=c36w
+-----END PGP SIGNATURE-----
diff --git a/media-video/vdr/files/digest-vdr-1.4.7-r5 b/media-video/vdr/files/digest-vdr-1.4.7-r5
new file mode 100644
index 000000000000..1ec74c8c313f
--- /dev/null
+++ b/media-video/vdr/files/digest-vdr-1.4.7-r5
@@ -0,0 +1,6 @@
+MD5 81be33a0edb93288ca3d235a04107ec4 vdr-1.4.7.tar.bz2 560888
+RMD160 0e7a0d1cf133ee5e168afb6e2374e2ee6c229fcf vdr-1.4.7.tar.bz2 560888
+SHA256 9e9f3687efc135d890cf8d70068221e661fea21d1efd7d8dc74bc4e810d4a464 vdr-1.4.7.tar.bz2 560888
+MD5 5b772f6e27e9249a90414f648625470d vdr-extensions-patch-34.1.tar.bz2 209193
+RMD160 13b69a7c5e60d7faf2da529406b50541bcb59fbb vdr-extensions-patch-34.1.tar.bz2 209193
+SHA256 f497a3bc0db019fd830c5de9b9b4cbc1e1056d1fd528dc4bb73b1975ee1688f0 vdr-extensions-patch-34.1.tar.bz2 209193
diff --git a/media-video/vdr/vdr-1.4.7-r5.ebuild b/media-video/vdr/vdr-1.4.7-r5.ebuild
new file mode 100644
index 000000000000..0cd19c22c177
--- /dev/null
+++ b/media-video/vdr/vdr-1.4.7-r5.ebuild
@@ -0,0 +1,352 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/vdr-1.4.7-r5.ebuild,v 1.1 2007/09/30 12:40:27 zzam Exp $
+
+inherit eutils flag-o-matic multilib
+
+IUSE_EXTENSIONS="cmdctrl cmdsubmenu cutterlimit cutterqueue cuttime ddepgentry
+	dolbyinrec dvbplayer dvbsetup dvdarchive dvdchapjump graphtft
+	jumpplay liemikuutio livebuffer lnbshare mainmenuhooks noepg osdmaxitems pinplugin
+	rotor settime setup sortrecords sourcecaps submenu
+	subtitles switchtimer timercmd timerinfo validinput wareagleicon yaepg
+	syncearly dvlfriendlyfnames dvlrecscriptaddon dvlvidprefer hardlinkcutter"
+
+IUSE="debug vanilla ${IUSE_EXTENSIONS}"
+
+EXT_V="34.1"
+EXT_P=vdr-extensions-patch-"${EXT_V}"
+EXT_DIR="${WORKDIR}/${EXT_P}/"
+# Set if != $PV
+#EXT_VDR_PV=1.5.3
+
+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
+	mirror://gentoo/${EXT_P}.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
+	dev-util/unifdef"
+
+RDEPEND="${DEPEND}
+	dev-lang/perl
+	media-tv/vdrplugin-rebuild
+	>=media-tv/gentoo-vdr-scripts-0.3.5"
+
+# pull in vdr-setup to get the xml files, else menu will not work
+PDEPEND="setup? ( >=media-plugins/vdr-setup-0.3.1-r1 )"
+
+# Relevant Pathes for vdr on gentoo
+DVB_DIR=/usr/include
+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
+	PLUGIN_LIBDIR="/usr/$(get_libdir)/vdr/plugins"
+}
+
+add_cap() {
+	while [ "$1" ]; do
+		CAPS="${CAPS}\n$1=1"
+		shift
+	done
+}
+
+enable_patch() {
+	local patch
+	while [ "$1" ]; do
+		patch="$1"
+		echo "$patch = 1" >> Make.config
+		shift
+	done
+}
+
+extensions_add_make_conf()
+{
+	# copy all ifdef for extensions-patch to Make.config
+	sed -e '1,/need to touch the following:/d' \
+		-e '/ifdef DVBDIR/,/^$/d' \
+		Make.config.template >> Make.config
+}
+
+extensions_all_defines() {
+	# extract all possible settings for extensions-patch
+	sed -e '/^#\?[A-Z].*= 1/!d' -e 's/^#\?//' -e 's/ .*//' \
+		Make.config.template \
+		| sort \
+		| tr '[:upper:]' '[:lower:]'
+}
+
+extensions_all_defines_unset() {
+	# extract all possible settings for extensions-patch
+	# and convert them to -U... for unifdef
+	sed -e '/^#\?[A-Z].*= 1/!d' -e 's/^#\?/-UUSE_/' -e 's/ .*//' \
+		Make.config.template \
+		| tr '\n' ' '
+}
+
+do_unifdef() {
+	ebegin "Unifdef sources"
+	local mf="Makefile.get"
+	cat <<'EOT' > $mf
+include Makefile
+show_def:
+	@echo $(DEFINES)
+show_src_files:
+	@echo $(OBJS:%.o=%.c)
+EOT
+
+	local DEFINES=$(extensions_all_defines_unset)
+
+	local RAW_DEFINES=$(make -f "$mf" show_def)
+	local VDR_SRC_FILES="$(make -f "$mf" show_src_files)"
+	local KEEP_FILES="genfontfile.c $(echo font*.c)"
+	rm "$mf"
+
+	local def
+	for def in $RAW_DEFINES; do
+		case "${def}" in
+			-DUSE*)
+				DEFINES="${DEFINES} ${def}"
+				;;
+		esac
+	done
+
+	local f
+	for f in *.c; do
+
+		# Removing the src files the Makefile does not use for compiling vdr
+		if ! has $f ${VDR_SRC_FILES} ${KEEP_FILES}; then
+			rm -f ${f} ${f%.c}.h
+			continue
+		fi
+
+		unifdef ${DEFINES} "$f" > "tmp.$f"
+		mv "tmp.$f" "$f"
+	done
+	for f in *.h; do
+		unifdef ${DEFINES} "$f" > "tmp.$f"
+		mv "tmp.$f" "$f"
+	done
+	eend 0
+}
+
+src_unpack() {
+
+	unpack ${A}
+	cd "${S}"
+
+	ebegin "Changing pathes for gentoo"
+
+	sed \
+	  -e 's-ConfigDirectory = VideoDirectory;-ConfigDirectory = CONFDIR;-' \
+	  -i vdr.c
+
+	cat > Make.config <<-EOT
+		#
+		# Generated by ebuild ${PF}
+		#
+		BINDIR			= /usr/bin
+		MANDIR			= /usr/share/man
+		DVBDIR			= ${DVB_DIR}
+		PLUGINLIBDIR	= ${PLUGIN_LIBDIR}
+		CONFDIR			= ${CONF_DIR}
+		VIDEODIR		= /var/vdr/video
+		HEADERDIR		= /usr/include
+
+		DEFINES			+= -DCONFDIR=\"\$(CONFDIR)\"
+
+	EOT
+	eend 0
+
+	epatch "${FILESDIR}"/vdr-1.4.7-makefile-destdir.diff
+	epatch "${FILESDIR}"/vdr-1.4.7-makefile-install-header.diff
+
+	sed -i Makefile \
+		-e 's/runvdr//' \
+		-e 's/ install-plugins//'
+
+	if ! use vanilla; then
+
+		cd "${S}"
+		epatch "${EXT_DIR}/${PN}-${EXT_VDR_PV:-${PV}}_extensions.diff"
+
+		epatch "${FILESDIR}/vdr-add-svdrp-down-0.1.diff"
+		add_cap CAP_SHUTDOWN_SVDRP
+
+		epatch "${FILESDIR}/vdr-set-dumpable.diff"
+
+		# This allows us to start even if some plugin does not exist
+		# or is not loadable.
+		enable_patch PLUGINMISSING
+
+		# Patch necessary for media-plugins/vdr-reelchannelscan
+		# it does not change anything when plugin is not used
+		enable_patch CHANNELSCAN
+
+		if [[ -n ${VDR_MAINTAINER_MODE} ]]; then
+			einfo "Doing maintainer checks:"
+
+			# these patches we do not support
+			# (or have them already hard enabled)
+			local IGNORE_PATCHES="channelscan pluginapi pluginmissing"
+
+			extensions_all_defines > "${T}"/new.IUSE
+			echo $IUSE_EXTENSIONS $IGNORE_PATCHES|tr ' ' '\n' |sort > "${T}"/old.IUSE
+			local DIFFS=$(diff -u "${T}"/old.IUSE "${T}"/new.IUSE|grep '^[+-][^+-]')
+			if [[ -z ${DIFFS} ]]; then
+				einfo "IUSE_EXTENSIONS is up to date."
+			else
+				ewarn "IUSE differences!"
+				local diff
+				for diff in $DIFFS; do
+					ewarn "$diff"
+				done
+			fi
+		fi
+
+		ebegin "Enabling selected patches"
+		local flag
+		for flag in $IUSE_EXTENSIONS; do
+			FLAG_UP=$(echo $flag|tr '[:lower:]' '[:upper:]')
+			use $flag && enable_patch ${FLAG_UP}
+		done
+		eend 0
+
+		extensions_add_make_conf
+
+		ebegin "Make fonts"
+		emake font >/dev/null
+		eend $? "make fonts failed"
+
+		ebegin "Make depend"
+		emake .dependencies >/dev/null
+		eend $? "make depend failed"
+
+		do_unifdef
+	fi
+
+	# apply local patches defined by variable VDR_LOCAL_PATCHES_DIR
+	if test -n "${VDR_LOCAL_PATCHES_DIR}"; then
+		local dir_tmp_var
+		local LOCALPATCHES_SUBDIR=${PV}
+		for dir_tmp_var in allversions-fallback ${PV%_p*} ${PV} ; do
+			if [[ -d ${VDR_LOCAL_PATCHES_DIR}/${dir_tmp_var} ]]; then
+				LOCALPATCHES_SUBDIR="${dir_tmp_var}"
+			fi
+		done
+
+		echo
+		if [[ ${LOCALPATCHES_SUBDIR} == ${PV} ]]; then
+			einfo "Applying local patches"
+		else
+			einfo "Applying local patches (Using subdirectory: ${LOCALPATCHES_SUBDIR})"
+		fi
+
+		for LOCALPATCH in ${VDR_LOCAL_PATCHES_DIR}/${LOCALPATCHES_SUBDIR}/*.{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_CHUID
+
+		echo -e ${CAPS} > "${CAP_FILE}"
+	fi
+}
+
+src_install() {
+	emake install DESTDIR="${D}"
+
+	keepdir "${CONF_DIR}"/plugins
+	keepdir "${CONF_DIR}"/themes
+
+	keepdir "${PLUGIN_LIBDIR}"
+
+	dohtml *.html
+	dodoc MANUAL INSTALL README* HISTORY*
+	dodoc TODO-enAIO-rm CONTRIBUTORS
+
+	cd "${EXT_DIR}"/doc
+	local f
+	for f in *; do
+		newdoc "${f}" "${f}".ExtensionsPatch || die "Could not install extensions-patch doc ${f}"
+	done
+
+	cd "${S}"
+
+	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; then
+		insinto /usr/share/vdr/setup
+		doins "${S}/menu.c"
+	fi
+	chown -R vdr:vdr "${D}/${CONF_DIR}"
+}
+
+pkg_postinst() {
+	elog "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; then
+		if ! has_version media-plugins/vdr-setup || \
+			! egrep -q '^setup$' "${ROOT}/etc/conf.d/vdr.plugins"; then
+
+			echo
+			ewarn "You have compiled media-video/vdr with USE=\"setup\""
+			ewarn "It is very important to emerge media-plugins/vdr-setup now!"
+			ewarn "and you have to loaded it in /etc/conf.d/vdr.plugins"
+		fi
+	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_keys}; 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
+}