Updated extensions-patch to version 41. Added volctrl and lircsettings useflags.

Package-Manager: portage-2.1.4_rc11

4 files changed, 383 insertions, 9 deletions

diff --git a/media-video/vdr/ChangeLog b/media-video/vdr/ChangeLog
index 3d7afd3bc95b..88053c7352df 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.99 2007/11/27 11:50:06 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/ChangeLog,v 1.100 2007/12/23 19:48:07 zzam Exp $
+
+*vdr-1.4.7-r9 (23 Dec 2007)
+
+  23 Dec 2007; Matthias Schwarzott <zzam@gentoo.org> +vdr-1.4.7-r9.ebuild:
+  Updated extensions-patch to version 41. Added volctrl and lircsettings
+  useflags.
 
   27 Nov 2007; Matthias Schwarzott <zzam@gentoo.org> vdr-1.2.6-r1.ebuild:
   No longer install COPYING.
diff --git a/media-video/vdr/Manifest b/media-video/vdr/Manifest
index f47c7402bfcc..7129c2f10293 100644
--- a/media-video/vdr/Manifest
+++ b/media-video/vdr/Manifest
@@ -30,6 +30,7 @@ MD5 3c513d532141a2f07e1b219cbdb2f91a files/vdr-set-dumpable.diff 734
 RMD160 d5a261d121855ac4caa9cb47918850538dc26d88 files/vdr-set-dumpable.diff 734
 SHA256 4ae1734ef10893d573e2079c1604f890ed8ae0415cbf2a0de9843174a27eb442 files/vdr-set-dumpable.diff 734
 DIST VDR-Extensions-Patch-32.tar.bz2 217019 RMD160 43ec5662a51885589ecc37594b3806342b8e1698 SHA1 46c481f1c338979e62ec5c2623966fe918bd75bf SHA256 7d2caea7b47cc8eeb86b2539fea1dfeae1d0ec32d5162756f59c0ec6efb45ab1
+DIST VDR-Extensions-Patch-41.tar.bz2 261240 RMD160 21ee6bf535551bc7d39b981d48feb20638fcb5cf SHA1 0290f4e87b85abbd2cfd9c72eb24f7a4ff964f14 SHA256 f9f90bf352a8e5d1491124c0da74b7b731d4ed6708a9af14325a60328e191513
 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 gentoo-vdr-patchset-1.4.4-1.tar.bz2 188290 RMD160 27b7210395ddf9697b70e3f1e6065bb495093edb SHA1 97f79463374429c622f9b6ee21b6c901d9f753d0 SHA256 479153c6fc5b2b0eb7ddca17e12568c7469ad296929b874e75b4b58e59deb1cb
@@ -100,10 +101,14 @@ EBUILD vdr-1.4.7-r8.ebuild 8565 RMD160 53a1c162dda8a181f7f795a539d327dc0924a2d6
 MD5 40ca472ae6e1d2539f23f6ca1ae20468 vdr-1.4.7-r8.ebuild 8565
 RMD160 53a1c162dda8a181f7f795a539d327dc0924a2d6 vdr-1.4.7-r8.ebuild 8565
 SHA256 a0cb841fb4b8ffa6db749022f41098f631c2de62ee47a0fc594070373dda90c1 vdr-1.4.7-r8.ebuild 8565
-MISC ChangeLog 16723 RMD160 c94e21b68f03cad6f307e383800ac60e3e0a755c SHA1 4cf372227dae34ab0cc397f1dd5a673c9f85af57 SHA256 fd4c47c3e631a20a67c1fbdc1ced5a4157181dccfcdda23ba7bf1928feccdeec
-MD5 a1d7bf4c480dba222afee27bf166cdb4 ChangeLog 16723
-RMD160 c94e21b68f03cad6f307e383800ac60e3e0a755c ChangeLog 16723
-SHA256 fd4c47c3e631a20a67c1fbdc1ced5a4157181dccfcdda23ba7bf1928feccdeec ChangeLog 16723
+EBUILD vdr-1.4.7-r9.ebuild 8734 RMD160 62a2ea2eb18b9d5c960fc1f7a5e964e41c328756 SHA1 ec616fe814da5e74a17d5e60ef5a57ab22ad6311 SHA256 1a87415c53d4dbec54efa8066af9e029c6282f632b77b38d0b695830ba8bf261
+MD5 eed8d060ab105180ae4208b93cdad39a vdr-1.4.7-r9.ebuild 8734
+RMD160 62a2ea2eb18b9d5c960fc1f7a5e964e41c328756 vdr-1.4.7-r9.ebuild 8734
+SHA256 1a87415c53d4dbec54efa8066af9e029c6282f632b77b38d0b695830ba8bf261 vdr-1.4.7-r9.ebuild 8734
+MISC ChangeLog 16914 RMD160 4f7a3f9e515c247f5e44041c841c4cb26ac33ba3 SHA1 3f8700db79960bc4825bc11a2502febee7370038 SHA256 e00217b681ede37295f2d3efd580d6efa65700a8107bdbd7c97154d0d5c19be3
+MD5 8fecbd8603e0395b63e97c5816f3da1b ChangeLog 16914
+RMD160 4f7a3f9e515c247f5e44041c841c4cb26ac33ba3 ChangeLog 16914
+SHA256 e00217b681ede37295f2d3efd580d6efa65700a8107bdbd7c97154d0d5c19be3 ChangeLog 16914
 MISC metadata.xml 257 RMD160 8bee49b98c59996aaaa019fb2c764c08d8004507 SHA1 d2419394e7d5c7463d7dea33e9190ebd57484531 SHA256 0dd45fbbaf1c6173535e371e3ff8a3faa41f3f89123ac9dffe338998599ebe26
 MD5 116de98355049ce943c3b6fedc00b4a3 metadata.xml 257
 RMD160 8bee49b98c59996aaaa019fb2c764c08d8004507 metadata.xml 257
@@ -147,10 +152,13 @@ SHA256 9c438606038e5a89f7add5366ba93a079d8952891f2190d6cab462a53d1952ca files/di
 MD5 78f2b403f26bbd9e21fd9fd8064e1e7a files/digest-vdr-1.4.7-r8 512
 RMD160 56714e33c311804747e04ea6ad1ef2b7909fe0f6 files/digest-vdr-1.4.7-r8 512
 SHA256 9c438606038e5a89f7add5366ba93a079d8952891f2190d6cab462a53d1952ca files/digest-vdr-1.4.7-r8 512
+MD5 afdd86113658093cdd0f7ca487d6efd2 files/digest-vdr-1.4.7-r9 506
+RMD160 e5573f070cc627922ed1d640255e3aa3d52eec39 files/digest-vdr-1.4.7-r9 506
+SHA256 d76a5f7cb02d13b20a8ff59900d03b820b96f8d153d8ec12852e4ba7d944ad7e files/digest-vdr-1.4.7-r9 506
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.7 (GNU/Linux)
+Version: GnuPG v2.0.8 (GNU/Linux)
 
-iD8DBQFHTAR0t2vP6XvVdOcRAn/CAJ9lXyDp4EGHE0g7hjAJJnGGU6JQtwCfUjjT
-F6vxx+mKb0ZIURa9h2kj08M=
-=FUOA
+iEYEARECAAYFAkduu30ACgkQt2vP6XvVdOdUkACeMnxTP2lHf1WGC899cRNNgq5p
+A8YAn0QwE8Rf4JQEEqgtuMuvWKPbRjEk
+=COmw
 -----END PGP SIGNATURE-----
diff --git a/media-video/vdr/files/digest-vdr-1.4.7-r9 b/media-video/vdr/files/digest-vdr-1.4.7-r9
new file mode 100644
index 000000000000..b70c4df8c6ff
--- /dev/null
+++ b/media-video/vdr/files/digest-vdr-1.4.7-r9
@@ -0,0 +1,6 @@
+MD5 c09d8bd5acf565b9b8c1e26f39cc9892 VDR-Extensions-Patch-41.tar.bz2 261240
+RMD160 21ee6bf535551bc7d39b981d48feb20638fcb5cf VDR-Extensions-Patch-41.tar.bz2 261240
+SHA256 f9f90bf352a8e5d1491124c0da74b7b731d4ed6708a9af14325a60328e191513 VDR-Extensions-Patch-41.tar.bz2 261240
+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
diff --git a/media-video/vdr/vdr-1.4.7-r9.ebuild b/media-video/vdr/vdr-1.4.7-r9.ebuild
new file mode 100644
index 000000000000..e28d937cb80f
--- /dev/null
+++ b/media-video/vdr/vdr-1.4.7-r9.ebuild
@@ -0,0 +1,354 @@
+# 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-r9.ebuild,v 1.1 2007/12/23 19:48:07 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"
+
+IUSE="debug vanilla ${IUSE_EXTENSIONS}"
+
+EXT_V="41"
+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"
+
+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 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}"
+
+		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
+			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() {
+	emake install DESTDIR="${D}" || die "make install failed"
+
+	keepdir "${CONF_DIR}"/plugins
+	keepdir "${CONF_DIR}"/themes
+
+	keepdir "${PLUGIN_LIBDIR}"
+
+	dohtml *.html
+	dodoc MANUAL INSTALL README* HISTORY* CONTRIBUTORS
+
+	cd "${EXT_DIR}"
+	local f
+	rm *vdr-1.5* 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
+}