Update to extensions patch v72. Do not support streamdevext patch for now.

Package-Manager: portage-2.1.6.13/cvs/Linux i686

5 files changed, 504 insertions, 6 deletions

diff --git a/media-video/vdr/ChangeLog b/media-video/vdr/ChangeLog
index 1124fa4b0839..a974223d0ec8 100644
--- a/media-video/vdr/ChangeLog
+++ b/media-video/vdr/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-video/vdr
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/ChangeLog,v 1.129 2009/06/04 08:46:37 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/ChangeLog,v 1.130 2009/06/04 12:37:14 zzam Exp $
+
+*vdr-1.6.0_p2-r3 (04 Jun 2009)
+
+  04 Jun 2009; Matthias Schwarzott <zzam@gentoo.org>
+  +vdr-1.6.0_p2-r3.ebuild, +files/vdr-1.6.0-extensions-72-gcc-4.4.diff,
+  metadata.xml:
+  Update to extensions patch v72. Do not support streamdevext patch for now.
 
   04 Jun 2009; Matthias Schwarzott <zzam@gentoo.org> vdr-1.6.0_p2-r2.ebuild,
   +files/vdr-1.6.0-extensions-gcc-4.4.diff, +files/vdr-1.6.0-gcc-4.4.diff:
diff --git a/media-video/vdr/Manifest b/media-video/vdr/Manifest
index 279c5acfbdb8..1a252300a091 100644
--- a/media-video/vdr/Manifest
+++ b/media-video/vdr/Manifest
@@ -5,6 +5,7 @@ AUX vdr-1.4.7-gcc-4.3.diff 622 RMD160 cf470a13aed458c749b7753c30f62e1159f3782e S
 AUX vdr-1.4.7-makefile-destdir.diff 1554 RMD160 642ff610a1667d39b55736a6a702eba6e2eba4cf SHA1 f773f63d7aebc59133e4accd36c87bf6feefb189 SHA256 e926ca80b87585d59698c05b48b0464e4e72913c4adfbb912541ebacf58d3d25
 AUX vdr-1.4.7-makefile-install-header.diff 1001 RMD160 82aeac50445709f79da2e2536b9441d8dd24370f SHA1 7c195bad6928429fa198bf1788c523b3be837812 SHA256 12411dc054993209967d6e09677733430f3b3d963f565debdaae087bbc89e961
 AUX vdr-1.6.0-dxr3-subtitlehack.diff 758 RMD160 f329bc9a66db93b7b723352412e4b6404318223c SHA1 c796c9062d673b07123bf926717f0d1370a5f4bf SHA256 3c150749a01e70111395854a8741b4de4c0fbef92372fcfcfeaa7c10312e5053
+AUX vdr-1.6.0-extensions-72-gcc-4.4.diff 1387 RMD160 b5ec4e39d6dd243e9893f4c839ddd2470619171e SHA1 029e6a53fc62efed5854355d9b924d8c801144ec SHA256 bf225b66249e17635412a3211d024b341e53ef8c3715b8ca1a7aa63d32cc4a45
 AUX vdr-1.6.0-extensions-gcc-4.4.diff 1393 RMD160 d301519e1f4a994d04bc02a7fdf3aae9639a8615 SHA1 61cd7fcbdeca8135f2b3c068812898f94048979b SHA256 6fc5424efcb28dfc6fddf2bcff61f2ae387aea741ae8bfad7c3d93427f0ee0b2
 AUX vdr-1.6.0-gcc-4.4.diff 3334 RMD160 fbf6f3d1dd59bbbbdcd4c2cbf7bfafaf427cc433 SHA1 16dba475c55538ddf1703bdfbadb7bcc2e44f307 SHA256 f8b4a28b05eb87eb38e173220735cd0d6f9dd668b47d5cc907c3638287fec60d
 AUX vdr-1.6.0-makefile-install-header.diff 1064 RMD160 8be661d2eca9b9f02a7a31ed6c312f3731cf5aed SHA1 f96b5d2444c5b11a3374274f37492b741d1213de SHA256 e3d9d76d0ede46b93473abe72d05771b02b1e19c380d98c48375e94a5ecab0df
@@ -15,6 +16,7 @@ DIST VDR-Extensions-Patch-42.tar.bz2 260453 RMD160 1610f9c4d3bcca0361b7906e2d9ce
 DIST VDR-Extensions-Patch-54.tar.bz2 371669 RMD160 fb05d5ea424a310f1151b7c269bf092abcd16a92 SHA1 8497d2bc68cd8c7695bccbb95425410b7af7edf4 SHA256 34ecf440d0ef100a6f05b552be55bc4936727c5259995847b89e0e1ce8c1d7dd
 DIST VDR-Extensions-Patch-64.tar.bz2 297099 RMD160 676f26baa04f56801508dabcff59899fb2a68d73 SHA1 f60fe2c075dda3241ad631b9f323f60954073a7a SHA256 3ecf0cd58276b02a37938fa0f40874e20f106621f66a289a20f36f36b88c4ee6
 DIST VDR-Extensions-Patch-68.tar.bz2 404176 RMD160 72ae121ba96bf8139d43b47738c956c785ce692c SHA1 a5daebe7cabb56e8870cbf3f6d4a2e1285a93724 SHA256 598d814af0efb0d681e9c904ffdfae61f195ba4cd2a27d83838f90ff4611b2ca
+DIST VDR-Extensions-Patch-72.tar.bz2 445171 RMD160 7a7e3b37810878138af50b6debf6bb14ad746327 SHA1 32075286c7d53060183a931f5ac52fbdb5cdff36 SHA256 defad883a4f42ebc257c14e1a71ec559db2d4d1d2d37eeee04abca542efbcf8d
 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
@@ -26,13 +28,14 @@ EBUILD vdr-1.4.7-r10.ebuild 9466 RMD160 dacf69584d6f5f6994e0ca5dbfe9edc6d46f257d
 EBUILD vdr-1.4.7-r11.ebuild 9519 RMD160 66ebf373f0c2366979fa6fc5555dfe882e285c92 SHA1 a084307edbef3565b35bc54a84ff880f47dbd4bb SHA256 ecd85d25a9772a4251343321a631a125d16b745e43446de1a496af100f347bb1
 EBUILD vdr-1.4.7-r12.ebuild 9677 RMD160 65ae2c82dde3733cfbe2d4086c6e9be42585a988 SHA1 15d966284f1def599ceeb81da70b833a78be51fd SHA256 0fb9ec234ad2be31fdfbb9b16b2ba4b044dbd80c3d268ce47b287c0098eeefe6
 EBUILD vdr-1.6.0_p2-r2.ebuild 11614 RMD160 201682bfc58dd3eefab785dc09d3e13ebc16679c SHA1 db17c878ec0bff4b55e54573e6122349efa503eb SHA256 2d70a12db4a376c27e59f6254ccae06af91f38efd95cc570a5db228edd45cc62
+EBUILD vdr-1.6.0_p2-r3.ebuild 11675 RMD160 6004e71d39092990c783e17e072ff5e88e00dde8 SHA1 5a90ce4c15e43de44f006aca2ab4541e23ad3228 SHA256 646f00fed4b3b5cb3bd4fc7b275531744ef1654123dbfee504a5b7d448c2b0eb
 EBUILD vdr-1.6.0_p2.ebuild 10938 RMD160 214c0ea02b314c1405b75c84dba703c88c207065 SHA1 b24a428ff197d8fc7178d213cc36a8c7f1675027 SHA256 7c53292e775328133a1a85450e75598055cc1d93429c36e62f4c7339ebc2de57
-MISC ChangeLog 23183 RMD160 cb49ac8ff5a5f914648d3e09010c2af9d3c2eac7 SHA1 e5dae474a8c53d3f41d455b18478f3039c075954 SHA256 6af1ca8a944d80f172e6e52399315f9d9e7993ab8bf9272a67e5c74f35948fda
-MISC metadata.xml 5336 RMD160 93fd6e02c866a2352737ef9ba1341eb936cf1fb1 SHA1 ee5d48f2365ff041ea9c662700d72e2ed86a0c2a SHA256 85f7b3df4b10754161013da73dd1f473d0997e90def0106969d51c445af95230
+MISC ChangeLog 23434 RMD160 21acb76b8b4d81b51d0cd6694f39a8f30723b298 SHA1 6e8d6987e819c842c9f3e3d824ed4ed677351e08 SHA256 14a4f41cdca16e1a8851879e7541b7de50569bdb736c9cfb8c0ca75f98937611
+MISC metadata.xml 5397 RMD160 854794df314a24ce5c1f08c5731682fdcb668be0 SHA1 15acf882a2ba20406a94144eede03cfe2877018d SHA256 f15b57b9dc4ad15ff9601b842f03c4998bf639a4d44b93105d579eb2be92c7ba
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAkonifIACgkQt2vP6XvVdOdBAACgn2EdwHbLP6jSqvIAayIPBza7
-H8EAoOPZ6+8kfTScppZ3GTUklccou/bU
-=rznl
+iEYEARECAAYFAkonwAYACgkQt2vP6XvVdOdyVgCg3jWTXtKyHRKohjKR6/7i3BfH
+clUAoJpZP9ckf314kEjVFDGX6rZp30H3
+=uhq4
 -----END PGP SIGNATURE-----
diff --git a/media-video/vdr/files/vdr-1.6.0-extensions-72-gcc-4.4.diff b/media-video/vdr/files/vdr-1.6.0-extensions-72-gcc-4.4.diff
new file mode 100644
index 000000000000..a36d2b7f8774
--- /dev/null
+++ b/media-video/vdr/files/vdr-1.6.0-extensions-72-gcc-4.4.diff
@@ -0,0 +1,38 @@
+diff -ru vdr-1.6.0-orig/menu.c vdr-1.6.0/menu.c
+--- vdr-1.6.0-orig/menu.c	2009-06-04 10:55:14.481017158 +0200
++++ vdr-1.6.0/menu.c	2009-06-04 10:57:12.690998810 +0200
+@@ -777,14 +777,14 @@
+         }
+ #endif /* PINPLUGIN */
+ #ifdef USE_LIEMIEXT
+-     char* p = strrchr(data.file, '~');
++     const char* p = strrchr(data.file, '~');
+      if (p) {
+         p++;
+         Utf8Strn0Cpy(name, p, sizeof(name));
+         Utf8Strn0Cpy(path, data.file, sizeof(path));
+-        p = strrchr(path, '~');
+-        if (p)
+-           p[0] = 0;
++        char *p2 = strrchr(path, '~');
++        if (p2)
++           p2[0] = 0;
+         }
+      else {
+         Utf8Strn0Cpy(name, data.file, sizeof(name));
+diff -ru vdr-1.6.0-orig/videodir.c vdr-1.6.0/videodir.c
+--- vdr-1.6.0-orig/videodir.c	2009-06-04 10:55:14.477693736 +0200
++++ vdr-1.6.0/videodir.c	2009-06-04 10:55:24.531019647 +0200
+@@ -199,9 +199,10 @@
+ #ifdef USE_HARDLINKCUTTER
+ static bool StatNearestDir(const char *FileName, struct stat *Stat)
+ {
+-  cString Name(FileName);
++  char *Name = strdup(FileName);
++  cString Name_str(Name, true); /* manage free for us */
+   char *p;
+-  while ((p = strrchr((const char*)Name + 1, '/')) != NULL) {
++  while ((p = strrchr(Name + 1, '/')) != NULL) {
+         *p = 0; // truncate at last '/'
+         if (stat(Name, Stat) == 0) {
+            isyslog("StatNearestDir: Stating %s", (const char*)Name);
diff --git a/media-video/vdr/metadata.xml b/media-video/vdr/metadata.xml
index 97e2a01f4d16..5f4c80b3c451 100644
--- a/media-video/vdr/metadata.xml
+++ b/media-video/vdr/metadata.xml
@@ -45,6 +45,7 @@
 		<flag name="menuorg">Enables support for the menuorg-plugin</flag>
 		<flag name="noepg">Adds code to selectively disable epg-reception for specific channels</flag>
 		<flag name="osdmaxitems">Support for text2skin</flag>
+		<flag name="parentalrating">Support Parental Rating</flag>
 		<flag name="pinplugin">Support for pin plugin</flag>
 		<flag name="rotor">Enable support for plugin vdr-rotor for dish-positioner.</flag>
 		<flag name="settime">set system time per script instead of via syscal</flag>
diff --git a/media-video/vdr/vdr-1.6.0_p2-r3.ebuild b/media-video/vdr/vdr-1.6.0_p2-r3.ebuild
new file mode 100644
index 000000000000..9c6f2641c0d3
--- /dev/null
+++ b/media-video/vdr/vdr-1.6.0_p2-r3.ebuild
@@ -0,0 +1,449 @@
+# Copyright 1999-2009 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_p2-r3.ebuild,v 1.1 2009/06/04 12:37:14 zzam Exp $
+
+inherit eutils flag-o-matic multilib
+
+# Switches supported by extensions-patch
+EXT_PATCH_FLAGS="analogtv atsc cmdsubmenu cutterlimit cutterqueue cuttime ddepgentry
+	dolbyinrec dvbplayer dvbsetup dvdarchive dvdchapjump graphtft hardlinkcutter
+	jumpplay 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 em84xx
+	cmdreccmdi18n softosd parentalrating"
+
+# names of the use-flags
+EXT_PATCH_FLAGS_RENAMED="iptv liemikuutio"
+
+# names ext-patch uses internally, here only used for maintainer checks
+EXT_PATCH_FLAGS_RENAMED_EXT_NAME="pluginparam liemiext"
+
+IUSE="debug vanilla dxr3 ${EXT_PATCH_FLAGS} ${EXT_PATCH_FLAGS_RENAMED}"
+
+MY_PV="${PV%_p*}"
+MY_P="${PN}-${MY_PV}"
+S="${WORKDIR}/${MY_P}"
+
+EXT_V="72"
+EXT_P=VDR-Extensions-Patch-${EXT_V}
+EXT_DIR=${WORKDIR}/${EXT_P}/
+EXT_VDR_PV="${PV/_p/-}"
+
+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/${MY_P}.tar.bz2
+	ftp://ftp.cadsoft.de/vdr/Developer/${MY_P}-1.diff
+	ftp://ftp.cadsoft.de/vdr/Developer/${MY_P}-2.diff
+	http://www.zulu-entertainment.de/files/patches/${EXT_P}.tar.bz2"
+
+KEYWORDS="~amd64 ~ppc ~x86"
+SLOT="0"
+LICENSE="GPL-2"
+
+COMMON_DEPEND="media-libs/jpeg
+	sys-libs/libcap
+	>=media-libs/fontconfig-2.4.2
+	>=media-libs/freetype-2
+	sys-devel/gettext
+	dvdarchive? ( dvdchapjump? ( media-libs/libdvdnav ) )"
+
+DEPEND="${COMMON_DEPEND}
+	media-tv/linuxtv-dvb-headers
+	dev-util/unifdef"
+
+RDEPEND="${COMMON_DEPEND}
+	dev-lang/perl
+	>=media-tv/gentoo-vdr-scripts-0.4.5
+	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}"
+	# fix for wrong header include #263840 ; this need >libdvdread-0.9.7
+	sed -e "s:dvdread:dvdnav:g" -i "${EXT_DIR}/${PN}"-1.6.0-2_extensions.diff
+
+	#applying maintainace-patches
+	epatch "${DISTDIR}/${MY_P}-1.diff"
+	epatch "${DISTDIR}/${MY_P}-2.diff"
+	epatch "${FILESDIR}"/vdr-dvb-api-5-is-fine.diff
+
+	ebegin "Changing pathes for gentoo"
+
+	sed \
+	  -e 's-ConfigDirectory = VideoDirectory;-ConfigDirectory = CONFDIR;-' \
+	  -i vdr.c
+
+	local DVBDIR=/usr/include
+
+	cat > Make.config <<-EOT
+		#
+		# Generated by ebuild ${PF}
+		#
+		PREFIX			= /usr
+		DVBDIR			= ${DVBDIR}
+		PLUGINLIBDIR	= ${PLUGIN_LIBDIR}
+		CONFDIR			= ${CONF_DIR}
+		VIDEODIR		= /var/vdr/video
+		LOCDIR			= \$(PREFIX)/share/vdr/locale
+
+		DEFINES			+= -DCONFDIR=\"\$(CONFDIR)\"
+		INCLUDES		+= -I\$(DVBDIR)
+
+	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
+		epatch "${FILESDIR}"/vdr-1.6.0-gcc-4.4.diff
+	else
+
+		cd "${S}"
+		# Now apply extensions patch
+		local fname="${PN}-${EXT_VDR_PV:-${PV}}_extensions.diff"
+		epatch "${EXT_DIR}/${fname}"
+
+		# Fix typo in Make.config.template
+		sed -e 's/CMDRECMDI18N/CMDRECCMDI18N/' -i Make.config.template
+
+		# other gentoo patches
+		# epatch "${FILESDIR}/..."
+		epatch "${FILESDIR}"/vdr-1.6.0-gcc-4.4.diff
+		epatch "${FILESDIR}"/vdr-1.6.0-extensions-72-gcc-4.4.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 streamdevext"
+
+			extensions_all_defines > "${T}"/new.IUSE
+			echo $EXT_PATCH_FLAGS $EXT_PATCH_FLAGS_RENAMED_EXT_NAME \
+					$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
+
+		# patches that got renamed
+		use iptv && enable_patch pluginparam
+		use liemikuutio && enable_patch liemiext
+		eend 0
+
+		extensions_add_make_conf
+
+		ebegin "Make depend"
+		emake .dependencies >/dev/null
+		eend $? "make depend failed"
+
+		[[ -z "$NO_UNIFDEF" ]] && 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}/docs" || die "Could not cd into extensions-patch doc dir."
+
+	local f
+	rm *vdr-1.4* 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
+		local SOURCES_DEST="${VDRSOURCE_DIR}/${P/_p/-}"
+		einfo "Installing sources"
+		insinto "${SOURCES_DEST}"
+		doins -r "${T}"/source-tree/*
+		keepdir "${SOURCES_DEST}"/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=$?
+
+	has_version "<${CATEGORY}/${PN}-1.6.0"
+	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
+
+	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
+
+	if [[ $previous_less_than_1_6_0 = 0 ]]; then
+		elog "By default vdr is now started with utf8 character encoding"
+		elog
+		elog "To rename the old recordings to utf8 conforming names, do this:"
+		elog "\temerge app-text/convmv"
+		elog "\tconvmv -f latin1 -t utf8 -r --notest -i /var/vdr/video/"
+		elog
+		elog "To fix the descriptions of your recordings do this:"
+		elog "\tfind /var/vdr/video/ -name "info.vdr" -print0|xargs -0 recode latin1..utf8"
+	fi
+
+	elog "To get nice symbols in OSD we recommend to install"
+	elog "\t1. emerge media-fonts/vdrsymbols-ttf"
+	elog "\t2. select font VDRSymbolsSans in Setup"
+	elog ""
+	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"
+}