Updated extensions patch. This adds menuorg patch.

Package-Manager: portage-2.1.3.12

4 files changed, 379 insertions, 8 deletions

diff --git a/media-video/vdr/ChangeLog b/media-video/vdr/ChangeLog
index 98f4e24cd91c..8e3064256bde 100644
--- a/media-video/vdr/ChangeLog
+++ b/media-video/vdr/ChangeLog
@@ -1,6 +1,11 @@
 # 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.93 2007/10/08 15:00:18 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/ChangeLog,v 1.94 2007/10/08 19:01:09 zzam Exp $
+
+*vdr-1.4.7-r6 (08 Oct 2007)
+
+  08 Oct 2007; Matthias Schwarzott <zzam@gentoo.org> +vdr-1.4.7-r6.ebuild:
+  Updated extensions patch. This adds menuorg patch.
 
   08 Oct 2007; Matthias Schwarzott <zzam@gentoo.org> vdr-1.3.36-r3.ebuild,
   vdr-1.4.1-r2.ebuild, vdr-1.4.3.ebuild, vdr-1.4.4.ebuild,
diff --git a/media-video/vdr/Manifest b/media-video/vdr/Manifest
index 2cde3a1ea330..b11f2bbfbfcb 100644
--- a/media-video/vdr/Manifest
+++ b/media-video/vdr/Manifest
@@ -46,6 +46,7 @@ DIST vdr-1.4.5.tar.bz2 560509 RMD160 0c002a3a7270af20524708c5f5dba91c41b8440b SH
 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
+DIST vdr-extensions-patch-34.2.tar.bz2 212582 RMD160 533e063149d16e2e4c15a63c9a675d8dd5a1aec1 SHA1 a74a8424c61286042485a0a6e77846fb2eef7e08 SHA256 16a0e7c2111dc7bb0c3c76cfb43a05413ef1736461229810e9b02ae6561b0f45
 EBUILD vdr-1.2.6-r1.ebuild 1240 RMD160 20dcaf30df0a4dd35a5b69a68ceecad094cc5317 SHA1 30c7f851d63c6d28b53e0879492628f9e8ebc9d4 SHA256 def2f096cec234cc02fcfe94da53defc5215528819b74fdf5c2d93ac019a4018
 MD5 b957d0ea5faf1b749f799a9f953a99c9 vdr-1.2.6-r1.ebuild 1240
 RMD160 20dcaf30df0a4dd35a5b69a68ceecad094cc5317 vdr-1.2.6-r1.ebuild 1240
@@ -86,10 +87,14 @@ EBUILD vdr-1.4.7-r5.ebuild 8477 RMD160 74c755c0bfc588f90e560ca2f0cee428fed77319
 MD5 15a01ea6587f4ba9f885b6dee9805306 vdr-1.4.7-r5.ebuild 8477
 RMD160 74c755c0bfc588f90e560ca2f0cee428fed77319 vdr-1.4.7-r5.ebuild 8477
 SHA256 0e06c75080b6d6bef0bb5d477b4c11f93cf53f5ce6b182617fd71d9aec4cc5fb vdr-1.4.7-r5.ebuild 8477
-MISC ChangeLog 15810 RMD160 0227e27cf289ffae02db27b95c4c29778fdb0f05 SHA1 c17009f5ceb4c98ec4c1b7755600d071d681983a SHA256 f12cdbf3ff1c1f66e2d5d41f2527174bf0423a38f0e58fdcb9fc61206f79747c
-MD5 60188450ae11f3e9dc120a7bad1b50a0 ChangeLog 15810
-RMD160 0227e27cf289ffae02db27b95c4c29778fdb0f05 ChangeLog 15810
-SHA256 f12cdbf3ff1c1f66e2d5d41f2527174bf0423a38f0e58fdcb9fc61206f79747c ChangeLog 15810
+EBUILD vdr-1.4.7-r6.ebuild 8566 RMD160 7b3b93608bf1097ee50be8af1e3fb9d3d7ae6d08 SHA1 8ab001cd144afe6d47b33d75541f145c12f4d80a SHA256 f1880390634c682b02f8edc0c30ff3c999bb72bc04af9f771fab94cf17b3d7e8
+MD5 7bee4a861ef04718036b71daf0c2249e vdr-1.4.7-r6.ebuild 8566
+RMD160 7b3b93608bf1097ee50be8af1e3fb9d3d7ae6d08 vdr-1.4.7-r6.ebuild 8566
+SHA256 f1880390634c682b02f8edc0c30ff3c999bb72bc04af9f771fab94cf17b3d7e8 vdr-1.4.7-r6.ebuild 8566
+MISC ChangeLog 15968 RMD160 103287d5c9ae0a664f9ec1ec6ad90d4dea3bc0d1 SHA1 3cc866c20ca5aec6babfa279a0d9b3a3e3e06d55 SHA256 85353e68a8d608b99156302e6f357d0de06480c277f7b17c4cc2c6a9c3c1b41a
+MD5 8a9a4a0f3a15ca9d7c97de7b1d25edb3 ChangeLog 15968
+RMD160 103287d5c9ae0a664f9ec1ec6ad90d4dea3bc0d1 ChangeLog 15968
+SHA256 85353e68a8d608b99156302e6f357d0de06480c277f7b17c4cc2c6a9c3c1b41a ChangeLog 15968
 MISC metadata.xml 257 RMD160 8bee49b98c59996aaaa019fb2c764c08d8004507 SHA1 d2419394e7d5c7463d7dea33e9190ebd57484531 SHA256 0dd45fbbaf1c6173535e371e3ff8a3faa41f3f89123ac9dffe338998599ebe26
 MD5 116de98355049ce943c3b6fedc00b4a3 metadata.xml 257
 RMD160 8bee49b98c59996aaaa019fb2c764c08d8004507 metadata.xml 257
@@ -124,10 +129,13 @@ SHA256 fecb439d6d003a5b3ef570010f79379dec3fee3eb0dd7ea821440a157d7f2a01 files/di
 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
+MD5 778f98d51947557e99bde7938ff94348 files/digest-vdr-1.4.7-r6 512
+RMD160 e4c451b8649e05db1d35cc86ae464b21ad2e141e files/digest-vdr-1.4.7-r6 512
+SHA256 8a904d6c2263f8ab2a72a039d06e33e49ced328195368cd0193fc3d19d74081a files/digest-vdr-1.4.7-r6 512
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFHCkYLt2vP6XvVdOcRAtNjAJ9ZB9GGsX1PNtMTIUEmTx9Phd9/eQCdEGDj
-/i7ddhapyTa6nqZ6KovscZQ=
-=1O6d
+iD8DBQFHCn5/t2vP6XvVdOcRAuEOAJ404LxXmvlYkKUvhdbOCGkG97rvmACfU8GU
++w2XES9JHNNLTllt+plqi18=
+=5V5Z
 -----END PGP SIGNATURE-----
diff --git a/media-video/vdr/files/digest-vdr-1.4.7-r6 b/media-video/vdr/files/digest-vdr-1.4.7-r6
new file mode 100644
index 000000000000..dcbed8835deb
--- /dev/null
+++ b/media-video/vdr/files/digest-vdr-1.4.7-r6
@@ -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 d3af0d358df130d5a8d863c40405f6dc vdr-extensions-patch-34.2.tar.bz2 212582
+RMD160 533e063149d16e2e4c15a63c9a675d8dd5a1aec1 vdr-extensions-patch-34.2.tar.bz2 212582
+SHA256 16a0e7c2111dc7bb0c3c76cfb43a05413ef1736461229810e9b02ae6561b0f45 vdr-extensions-patch-34.2.tar.bz2 212582
diff --git a/media-video/vdr/vdr-1.4.7-r6.ebuild b/media-video/vdr/vdr-1.4.7-r6.ebuild
new file mode 100644
index 000000000000..9947fac6a6ed
--- /dev/null
+++ b/media-video/vdr/vdr-1.4.7-r6.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-r6.ebuild,v 1.1 2007/10/08 19:01:09 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 menuorg 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.2"
+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
+	http://dev.gentoo.org/~zzam/distfiles/${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/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() {
+	use debug && append-flags -g
+	PLUGIN_LIBDIR="/usr/$(get_libdir)/vdr/plugins"
+}
+
+add_cap() {
+	local arg
+	for arg; do
+		CAPS="${CAPS}\n${arg}=1"
+	done
+}
+
+enable_patch() {
+	local arg
+	for arg; do
+		echo "${arg} = 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}"
+		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
+}