Updated to extensions-patch version 57.

Package-Manager: portage-2.1.5_rc2

3 files changed, 395 insertions, 5 deletions

diff --git a/media-video/vdr/ChangeLog b/media-video/vdr/ChangeLog
index cea0be5d5217..3d3b1067c988 100644
--- a/media-video/vdr/ChangeLog
+++ b/media-video/vdr/ChangeLog
@@ -1,6 +1,11 @@
 # 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.106 2008/04/05 16:02:31 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/ChangeLog,v 1.107 2008/04/07 15:35:35 zzam Exp $
+
+*vdr-1.6.0-r2 (07 Apr 2008)
+
+  07 Apr 2008; Matthias Schwarzott <zzam@gentoo.org> +vdr-1.6.0-r2.ebuild:
+  Updated to extensions-patch version 57.
 
 *vdr-1.6.0-r1 (05 Apr 2008)
 
diff --git a/media-video/vdr/Manifest b/media-video/vdr/Manifest
index 267188022af3..0f8f0279475c 100644
--- a/media-video/vdr/Manifest
+++ b/media-video/vdr/Manifest
@@ -10,6 +10,7 @@ AUX vdr-set-dumpable.diff 734 RMD160 d5a261d121855ac4caa9cb47918850538dc26d88 SH
 DIST VDR-Extensions-Patch-42.tar.bz2 260453 RMD160 1610f9c4d3bcca0361b7906e2d9ce62dcfa066c2 SHA1 9b4af40ffa256b6f3eb5f762b1bebe908acc578e SHA256 18c4993b84b3e7aa02db4fc9929cf7c3c6ccbfe8b680f465bbff011c6fd31f80
 DIST VDR-Extensions-Patch-55.tar.bz2 129067 RMD160 a5c6fc1c74c89b1093c0b9270cca3005cc59c796 SHA1 66f356583eaa93e020ca5bb24e0a9b5e339d6511 SHA256 183fdb789c866ed049900ff8e956fe7c1e561ee0d9a7816da470c512d7371a56
 DIST VDR-Extensions-Patch-56.tar.bz2 137606 RMD160 39fff764016c96703131898124503ef424853bfa SHA1 93206a4e26d373525e2a2e8406a248e43eb63a84 SHA256 81e129b5e361802655a450955479d4d842a16fea2860bee99c082f775c1959bf
+DIST VDR-Extensions-Patch-57.tar.bz2 140007 RMD160 14cc6458365c2882edcb61338e19b80356fb2b8a SHA1 d3b306dd769c9fea5ca1ea63856906302c05f933 SHA256 180d99a7a81abb79c8dbc732707fd92d92506db2c3d9f0dec80614d63ddd643b
 DIST gentoo-vdr-patchset-1.4.6-1.tar.bz2 183896 RMD160 c122a082605841410fb5497cd5671f965bdfe3fe SHA1 c13bc1769f36ece50fe4c1a183f3d2bd9e871ca3 SHA256 68be18b4409211e3303eff3f67e75a4ac844f48a89d8fee453e19c143ae79f9a
 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
@@ -18,13 +19,14 @@ DIST vdr-extensions-patch-55-atsc.tar.bz2 32793 RMD160 685d9e7a9409a2465e7d8bad3
 EBUILD vdr-1.4.6.ebuild 5652 RMD160 7ff1ac174567addba81e261c15d1b4d7b21559cb SHA1 ebbd9ddeac7ad9234c512fbebfc2cfb9e7959a2f SHA256 a6eb0ac715f391f2738d29ba9eb1c123939831747fba2ec7f33ef4799542ae98
 EBUILD vdr-1.4.7-r10.ebuild 9129 RMD160 27c21054ebbca77d0cfbadbc2d8d76bed34f894c SHA1 61b82223bbeb594a1f06bde8ea285ac94d797837 SHA256 5fa7aa31af9f80b3c01f9cadb76e5009008d6b97ccdc11d254861bd0f8681d45
 EBUILD vdr-1.6.0-r1.ebuild 9376 RMD160 fd840d03d891996e1c7e4831c3b0be6b54c8e81b SHA1 8c1d265d4f8d5f3be64064f22fe62f5fdc565db6 SHA256 7abfbf24a030b1c61cd878da32b7f9bf277fa747cb4caaab55a2959607ccf293
+EBUILD vdr-1.6.0-r2.ebuild 9376 RMD160 c155eca528c412c0a84b5003a2355ed532236e09 SHA1 39e06571e1d180ea208bc308a2e0a7dd6e02fb79 SHA256 575c5e1444a83fc18abcdd5c72889b51565343437ec851600fe5aa178f779293
 EBUILD vdr-1.6.0.ebuild 9472 RMD160 f10698fd725efbf152b4363980b0a964d0e2d5e0 SHA1 da744f54fe09051a66155b9e2bb2ee65d4f3a6c0 SHA256 0ec1166d80edf15618849db2e28cb211950c29b7fb98b7166691c76b39c9c36f
-MISC ChangeLog 18408 RMD160 ba816a84c6a4573256ff190ef1fe040fe3ed1ced SHA1 1dc00cb6ba9417809a81c466e56ec9deceaccd28 SHA256 45c239b94fa46c8d4d9a8a52e7a82510b5f7610fac15de1b7a4e70836bc3a8ef
+MISC ChangeLog 18555 RMD160 9aa88a2f5ee1aa4c6377936bb9c0ef6b6ce5fb94 SHA1 6589b5abdfb3388135d815b1f608251dcb8baecd SHA256 cbb62e1fbc8e36f9538a711dafc4e1dedf12a0b6f586cb9ddba906eb477ff813
 MISC metadata.xml 257 RMD160 8bee49b98c59996aaaa019fb2c764c08d8004507 SHA1 d2419394e7d5c7463d7dea33e9190ebd57484531 SHA256 0dd45fbbaf1c6173535e371e3ff8a3faa41f3f89123ac9dffe338998599ebe26
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkf3op0ACgkQt2vP6XvVdOfCbACfZ/a1yE5OO8Rni+myXYghCccQ
-NvYAn17nGHFRBYBT/1pdT1Uq1Lc+7CsK
-=c0IS
+iEYEARECAAYFAkf6P00ACgkQt2vP6XvVdOdHsACfUdskk2PoKkTpJM0fs+aFDGVm
+P0UAnj6L+jEefCIhzaNpfeUil5peb09S
+=xHR+
 -----END PGP SIGNATURE-----
diff --git a/media-video/vdr/vdr-1.6.0-r2.ebuild b/media-video/vdr/vdr-1.6.0-r2.ebuild
new file mode 100644
index 000000000000..689683bc3192
--- /dev/null
+++ b/media-video/vdr/vdr-1.6.0-r2.ebuild
@@ -0,0 +1,383 @@
+# 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.6.0-r2.ebuild,v 1.1 2008/04/07 15:35:35 zzam Exp $
+
+inherit eutils flag-o-matic multilib
+
+# Switches supported by extensions-patch
+EXT_PATCH_FLAGS="atsc cmdsubmenu cutterlimit cutterqueue cuttime ddepgentry
+	dolbyinrec dvbplayer dvbsetup dvdarchive dvdchapjump graphtft hardlinkcutter iptv
+	jumpplay liemikuutio lnbshare mainmenuhooks menuorg noepg osdmaxitems pinplugin
+	rotor settime setup sortrecords sourcecaps livebuffer
+	ttxtsubs timercmd timerinfo validinput yaepg
+	syncearly dvlfriendlyfnames dvlrecscriptaddon dvlvidprefer
+	volctrl wareagleicon lircsettings deltimeshiftrec"
+
+IUSE="debug vanilla dxr3 ${EXT_PATCH_FLAGS}"
+
+EXT_V="57"
+EXT_P=VDR-Extensions-Patch-${EXT_V}
+EXT_DIR=${WORKDIR}/${EXT_P}/
+# Set if != $PV
+#EXT_VDR_PV=1.5.12
+
+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"
+
+KEYWORDS="~amd64 ~ppc ~x86"
+SLOT="0"
+LICENSE="GPL-2"
+
+DEPEND="media-libs/jpeg
+	sys-apps/gawk
+	media-tv/linuxtv-dvb-headers
+	sys-libs/libcap
+	>=media-libs/fontconfig-2.4.2
+	>=media-libs/freetype-2
+	dev-util/unifdef
+	sys-devel/gettext"
+
+RDEPEND="${DEPEND}
+	dev-lang/perl
+	>=media-tv/gentoo-vdr-scripts-0.4.2
+	media-fonts/corefonts"
+
+# pull in vdr-setup to get the xml files, else menu will not work
+PDEPEND="setup? ( >=media-plugins/vdr-setup-0.3.1-r1 )"
+
+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() {
+	if use menuorg && use setup; then
+		echo
+		eerror "Please use only one of this USE-Flags"
+		eerror "\tmenuorg setup"
+		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=""
+	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}
+		#
+		PREFIX			= /usr
+		DVBDIR			= /usr/include
+		PLUGINLIBDIR	= ${PLUGIN_LIBDIR}
+		CONFDIR			= ${CONF_DIR}
+		VIDEODIR		= /var/vdr/video
+		LOCDIR			= \$(PREFIX)/share/vdr/locale
+
+		DEFINES			+= -DCONFDIR=\"\$(CONFDIR)\"
+
+	EOT
+	eend 0
+
+	epatch "${FILESDIR}"/vdr-1.6.0-makefile-install-header.diff
+	if use dxr3; then
+		einfo "Applying dxr3 subtitle hack"
+		epatch "${FILESDIR}"/vdr-1.6.0-dxr3-subtitlehack.diff
+	fi
+
+	sed -i i18n-to-gettext.pl \
+		-e '/MSGIDBUGS/s/""/"automatically created from i18n.c by vdr-plugin.eclass <vdr\\@gentoo.org>"/'
+
+	# Do not install runvdr script and plugins
+	sed -i Makefile \
+		-e 's/runvdr//' \
+		-e 's/ install-plugins//'
+
+	if ! use vanilla; then
+
+		cd "${S}"
+		# Now apply extensions patch
+		local fname="${PN}-${EXT_VDR_PV:-${PV}}_extensions.diff"
+		epatch "${EXT_DIR}/${fname}"
+
+		# other gentoo patches
+		# epatch "${FILESDIR}/..."
+
+		# 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 $EXT_PATCH_FLAGS $IGNORE_PATCHES|tr ' ' '\n' |sort > "${T}"/old.IUSE
+			local DIFFS=$(diff -u "${T}"/old.IUSE "${T}"/new.IUSE|grep '^[+-][^+-]')
+			if [[ -z ${DIFFS} ]]; then
+				einfo "EXT_PATCH_FLAGS 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 $EXT_PATCH_FLAGS; do
+			use $flag && enable_patch ${flag}
+		done
+		eend 0
+
+		extensions_add_make_conf
+
+		ebegin "Make depend"
+		emake .dependencies >/dev/null
+		eend $? "make depend failed"
+
+		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
+
+	add_cap CAP_UTF8
+
+	add_cap CAP_IRCTRL_RUNTIME_PARAM \
+			CAP_VFAT_RUNTIME_PARAM \
+			CAP_CHUID \
+			CAP_SHUTDOWN_AUTO_RETRY
+
+	echo -e ${CAPS} > "${CAP_FILE}"
+}
+
+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}"
+
+	exeinto /usr/share/vdr/bin
+	doexe i18n-to-gettext.pl
+
+	dohtml *.html
+	dodoc MANUAL INSTALL README* HISTORY* CONTRIBUTORS
+
+	cd "${EXT_DIR}"
+	local f
+	rm *vdr-1.4* 2>/dev/null
+	for f in BUGS README* HISTORY* patch.list; do
+		[[ -f ${f} ]] || break
+		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
+
+	if use atsc; then
+		ewarn "ATSC is only supported by a rudimentary patch"
+		einfo "and need at least this patch and a plugin installed"
+		einfo "emerge media-plugins/vdr-atscepg"
+	fi
+}