Added use-flag shutdown_rewrite to use the new shutdown code of vdr-1.5 and newer.

Package-Manager: portage-2.2_rc1/cvs/Linux 2.6.25-tuxonice-r4 i686

3 files changed, 400 insertions, 5 deletions

diff --git a/media-video/vdr/ChangeLog b/media-video/vdr/ChangeLog
index ecd0613d15be..245ee8876f03 100644
--- a/media-video/vdr/ChangeLog
+++ b/media-video/vdr/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-video/vdr
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/ChangeLog,v 1.117 2008/06/27 13:09:00 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/ChangeLog,v 1.118 2008/06/29 13:32:41 zzam Exp $
+
+*vdr-1.4.7-r12 (29 Jun 2008)
+
+  29 Jun 2008; Matthias Schwarzott <zzam@gentoo.org> +vdr-1.4.7-r12.ebuild:
+  Added use-flag shutdown_rewrite to use the new shutdown code of vdr-1.5
+  and newer.
 
 *vdr-1.4.7-r11 (27 Jun 2008)
 
diff --git a/media-video/vdr/Manifest b/media-video/vdr/Manifest
index a40a69c0bc61..7ec5702d6ed6 100644
--- a/media-video/vdr/Manifest
+++ b/media-video/vdr/Manifest
@@ -23,17 +23,18 @@ DIST vdr-extensions-patch-55-atsc.tar.bz2 32793 RMD160 685d9e7a9409a2465e7d8bad3
 EBUILD vdr-1.4.6.ebuild 5905 RMD160 25c10566e7a49ff87ef9c65a5294197bb7d9439c SHA1 829636d304c3761cce232948f13680659551fcbe SHA256 702d24c25615a8d6da1cdada8435d67c98db5b75e96129d964fc322104896cfb
 EBUILD vdr-1.4.7-r10.ebuild 9380 RMD160 88d4140f2984b08297cc26a2aaae9220af399dce SHA1 547464a951ef7c1d6141606419557bf148124052 SHA256 5e8ed19032aa0b1d2f56355bf1db07c87b152623b35f4923643d289f867242bc
 EBUILD vdr-1.4.7-r11.ebuild 9425 RMD160 9a701964f457939c07be32f004a4b5fa36194540 SHA1 8ed9b173cec80c0ef317f58dc76e1ba4e07d9363 SHA256 a1ea63bccd94fb7966ccab4a9b3e6dad3126baf09e6f3c9dbaab80ce88dca5b3
+EBUILD vdr-1.4.7-r12.ebuild 9584 RMD160 357fb52d587f7350cacae9f59354c8d5c8fbc261 SHA1 b579daf5fcffac46987f34e00bf7f2112ca56f98 SHA256 d7fbaffb52f4e5b761922d3f0e13bbb8cc57e2a9627a544ac742277469fd6dcb
 EBUILD vdr-1.6.0-r1.ebuild 9627 RMD160 10a687fe89372c3146dd4d08188ebe731994f61f SHA1 2a81c3092a64f9ce6a5d18ff0b14213061f5fda9 SHA256 09c6db71c056c9dbce461005646f1874ffaedf12c842a7c5bece36ab55c84e30
 EBUILD vdr-1.6.0-r2.ebuild 9789 RMD160 173130274c5051193dafac74f31a9ffd4608b091 SHA1 64bd4695f47f18f9fb7f7d55a49165ebeb5b9815 SHA256 2991a7a74e09808a6c4942b6ee3e33de50b21d797080eb39e1c8f377cac92db4
 EBUILD vdr-1.6.0.ebuild 9723 RMD160 cee50aa80f6e828b2f30ad04f132e7fa16843ee7 SHA1 5bd44ac51df344d8a5e413ebfe397f3066571b99 SHA256 6f9bdf75b7f3d12b0deec27d9d42234ec7dd6d9dcca4d7e3d5b7ddd4505f1cc2
 EBUILD vdr-1.6.0_p1-r1.ebuild 10159 RMD160 d4b4281498a62e71afca2c18f17157afb00602f8 SHA1 d8e80ca7081099127ad30fd80d25baddf92a95a6 SHA256 7b85b2dd51d06508c9c3a38ec734fa3b5756b16755894c243e777347bb0bcfc0
 EBUILD vdr-1.6.0_p1.ebuild 10059 RMD160 eb16d27043ff95ee6c16ac5e41827e644d7d2ee9 SHA1 749acfd635b6aa02353baa98b32970d5e305b432 SHA256 f611826e4f46c99c3a83c17ac0911d3bb1965d03f7e43858d8e6f06cd5704d0e
-MISC ChangeLog 20698 RMD160 ad6392f4399b2d2268362c69f5e31ce8f6e3e7b1 SHA1 f137781485506430e7749c552cae385a743329a1 SHA256 9efea04d705f0465b3ffb7e73dbc644e583e05cc8d45af8c69a073f43fdcc034
+MISC ChangeLog 20892 RMD160 b608ecb311d2bbe1173e1fa49f5060ca683c23f8 SHA1 348d743d25d83c39d2df253a8c30a129aeb6decc SHA256 36f4d5802441bf36c2d13b5ed545390ad7ed08b5d60b20ad0388f64fc418cd9d
 MISC metadata.xml 257 RMD160 8bee49b98c59996aaaa019fb2c764c08d8004507 SHA1 d2419394e7d5c7463d7dea33e9190ebd57484531 SHA256 0dd45fbbaf1c6173535e371e3ff8a3faa41f3f89123ac9dffe338998599ebe26
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkhk5nYACgkQt2vP6XvVdOec+ACeILyY90643rH6ydv/VnQwORLA
-9xQAn13qcSC3HLl+D4na0GbhY6viTYa0
-=kvAX
+iEYEARECAAYFAkhnjwYACgkQt2vP6XvVdOeV/gCfZmLA+gv+kMzSpQp6YPUO2L2e
+DaoAoI1ezFPg8WRup4D4eR75fWBNC7lW
+=gOXA
 -----END PGP SIGNATURE-----
diff --git a/media-video/vdr/vdr-1.4.7-r12.ebuild b/media-video/vdr/vdr-1.4.7-r12.ebuild
new file mode 100644
index 000000000000..0eef1ddff402
--- /dev/null
+++ b/media-video/vdr/vdr-1.4.7-r12.ebuild
@@ -0,0 +1,388 @@
+# Copyright 1999-2008 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-r12.ebuild,v 1.1 2008/06/29 13:32:41 zzam Exp $
+
+inherit eutils flag-o-matic multilib
+
+IUSE_EXTENSIONS="cmdctrl cmdsubmenu cutterlimit cutterqueue cuttime ddepgentry
+	dolbyinrec dvbplayer dvbsetup dvdarchive dvdchapjump graphtft iptv
+	jumpplay liemikuutio livebuffer lnbshare mainmenuhooks menuorg noepg osdmaxitems pinplugin
+	rotor settime setup sortrecords sourcecaps submenu
+	subtitles switchtimer timercmd timerinfo validinput wareagleicon yaepg
+	syncearly dvlfriendlyfnames dvlrecscriptaddon dvlvidprefer hardlinkcutter
+	volctrl lircsettings deltimeshiftrec"
+
+IUSE="debug vanilla shutdown_rewrite ${IUSE_EXTENSIONS}"
+
+EXT_V="54"
+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
+	http://www.zulu-entertainment.de/files/patches/${EXT_P}.tar.bz2"
+
+#http://dev.gentoo.org/~zzam/extensions-patch/${EXT_P}.tar.bz2"
+
+KEYWORDS="~amd64 ~ppc ~x86"
+SLOT="0"
+LICENSE="GPL-2"
+
+COMMON_DEPEND="media-libs/jpeg
+	sys-libs/libcap"
+
+DEPEND="${COMMON_DEPEND}
+	media-tv/linuxtv-dvb-headers
+	dev-util/unifdef"
+
+RDEPEND="${COMMON_DEPEND}
+	dev-lang/perl
+	|| ( >=media-tv/gentoo-vdr-scripts-0.4.2 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() {
+	check_menu_flags
+
+	use debug && append-flags -g
+	PLUGIN_LIBDIR="/usr/$(get_libdir)/vdr/plugins"
+}
+
+check_menu_flags () {
+
+	count=0
+
+	for flag in menuorg setup submenu; do
+		use $flag && count=$((count+1))
+	done
+
+	if [ $count -gt 1 ] ; then
+		echo
+		eerror "Please use only one of these USE-Flags"
+		eerror "submenu setup menuorg"
+		die "multiple menu manipulation"
+	fi
+}
+
+add_cap() {
+	local arg
+	for arg; do
+		CAPS="${CAPS}\n${arg}=1"
+	done
+}
+
+enable_patch() {
+	local arg ARG_UPPER
+	for arg; do
+		ARG_UPPER=$(echo $arg|tr '[:lower:]' '[:upper:]')
+		echo "${ARG_UPPER} = 1" >> Make.config
+	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"
+		[[ -s $f ]] || rm "$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}"
+		local fname="${PN}-${EXT_VDR_PV:-${PV}}_extensions.diff"
+		epatch "${EXT_DIR}/${fname}"
+
+		if use shutdown_rewrite; then
+			epatch "${EXT_DIR}/vdr-1.4.7-ext44_shutdown-rewrite.diff"
+			add_cap CAP_SHUTDOWN_AUTO_RETRY
+		else
+			epatch "${FILESDIR}/vdr-add-svdrp-down-0.1.diff"
+			add_cap CAP_SHUTDOWN_SVDRP
+		fi
+
+		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
+			use $flag && enable_patch ${flag}
+		done
+		eend 0
+
+		extensions_add_make_conf
+
+		ebegin "Make depend"
+		emake .dependencies >/dev/null || die "make depend failed"
+		eend 0
+
+		do_unifdef
+
+		use iptv && sed -i sources.conf -e 's/^#P/P/'
+	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() {
+	# trick makefile not to create a videodir by supplying it with an existing
+	# directory
+	emake install DESTDIR="${D}" VIDEODIR="/" || die "emake install failed"
+
+	keepdir "${CONF_DIR}"/plugins
+	keepdir "${CONF_DIR}"/themes
+
+	keepdir "${PLUGIN_LIBDIR}"
+
+	dohtml *.html
+	dodoc MANUAL INSTALL README* HISTORY* CONTRIBUTORS
+
+	cd "${EXT_DIR}/docs" || die "Could not cd into extensions-patch doc dir."
+
+	local f
+	rm *vdr-1.5* 2>/dev/null
+	for f in *; do
+		[[ -f ${f} ]] || continue
+		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_preinst() {
+	has_version "<${CATEGORY}/${PN}-1.3.36-r3"
+	previous_less_than_1_3_36_r3=$?
+}
+
+pkg_postinst() {
+	elog "It is a good idea to run vdrplugin-rebuild now."
+	if [[ $previous_less_than_1_3_36_r3 = 0 ]] ; 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
+	elog "To get an idea how to proceed now, have a look at our vdr-guide:"
+	elog "\thttp://www.gentoo.org/doc/en/vdr-guide.xml"
+}