fixed gcc-4.7 compile; cleanup; strip-linguas en fixing

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

6 files changed, 33 insertions, 483 deletions

diff --git a/media-video/vdr/ChangeLog b/media-video/vdr/ChangeLog
index efe0a4ac0b1b..a14acc94daff 100644
--- a/media-video/vdr/ChangeLog
+++ b/media-video/vdr/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-video/vdr
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/ChangeLog,v 1.162 2012/06/03 13:54:26 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/ChangeLog,v 1.163 2012/06/10 16:00:03 hd_brummy Exp $
+
+  10 Jun 2012; Joerg Bornkessel <hd_brummy@gentoo.org> -vdr-1.6.0_p2-r9.ebuild,
+  vdr-1.6.0_p2-r10.ebuild, +files/vdr-1.6.0_p2_gcc-4.7.patch,
+  -files/vdr-1.6.0_p2_linguas.diff:
+  fixed gcc-4.7 compile; cleanup; strip-linguas en fixing
 
   03 Jun 2012; Joerg Bornkessel <hd_brummy@gentoo.org> vdr-1.6.0_p2-r10.ebuild:
   fixed code executes g++ instead of ${CHOST}-g++
diff --git a/media-video/vdr/Manifest b/media-video/vdr/Manifest
index 347e3082afd5..a758696286af 100644
--- a/media-video/vdr/Manifest
+++ b/media-video/vdr/Manifest
@@ -8,23 +8,22 @@ AUX vdr-1.6.0-makefile-install-header.diff 1064 RMD160 8be661d2eca9b9f02a7a31ed6
 AUX vdr-1.6.0-shared-tinyxml.diff 1215 RMD160 ee1133b6dcdaa1600c38ef0bbebb4a49b58778a2 SHA1 5341a0c998608df9fdc0fa6dfe84e14ed09183ea SHA256 3f23bb66125a1fc415c4d7312996d7382c89637eb9ebe3f0bc2b0cfc54de860f
 AUX vdr-1.6.0-use-v4l2.patch 7994 RMD160 a83561181024f202d6be2f42b5f1a6027d262107 SHA1 437bc0b62b2f78743411a41b9db8020b2bbf3632 SHA256 c4f5ec527c1ac8fa82a2a780251e040471a7056f1a784d817a9e8fc56280a852
 AUX vdr-1.6.0_p2_fontconfig_fontsort.patch 566 RMD160 e792452e8deb477a407dc4e4927a2593c5fa4c64 SHA1 4be3450b824a6c0f71101259a21d9a70b666f18b SHA256 fdf75ca1f2f041eacb19974b27dfb21eece202ddde0a54a5041a85d1fa3a3f47
+AUX vdr-1.6.0_p2_gcc-4.7.patch 603 RMD160 0e3db1dc0e33ff61881f408e181f323a2a07c8a1 SHA1 edaf21baa6a93eaa2c79c4d16f3781b99b269736 SHA256 d7fe0d360d96dcd2636cfc7e6a3d1aff9e97522ace1f068e2b75685284ed111c
 AUX vdr-1.6.0_p2_linguas-v2.diff 621 RMD160 db58bf5872201788aa333fde868888b8b4f266b0 SHA1 c85229190cf01314610c52b681cfcada5f8a4512 SHA256 d6ab8d64ed1f10930b538b3cb0e56548f57f13f04f18512fb5b0e447158b17e5
-AUX vdr-1.6.0_p2_linguas.diff 937 RMD160 068cd9a250b4bf77a82c9e822b0b02faa50d30c7 SHA1 daf25960001d0887097f0d41688b2ff0ecab70c6 SHA256 d07252828f226bd8e63c7958629c4fe69102c32ffd884461dd803625b936a4fe
 AUX vdr-dvb-api-5-is-fine.diff 392 RMD160 599009b4adedd9ef010b899b96744b29fa407ed7 SHA1 cf99f962034a5f7e5ba1cf06557e01e7d56bd281 SHA256 ba126c8233bae50f514aa713072027968d9e115e0d154e2e1d31fe1b8cbbb403
 DIST VDR-Extensions-Patch-72.tar.bz2 445171 RMD160 7a7e3b37810878138af50b6debf6bb14ad746327 SHA1 32075286c7d53060183a931f5ac52fbdb5cdff36 SHA256 defad883a4f42ebc257c14e1a71ec559db2d4d1d2d37eeee04abca542efbcf8d
 DIST vdr-1.6.0-1.diff 6750 RMD160 8fcb1557d50b6d70d8791f7a67c96b4c12b1067a SHA1 68a4a9aab1e5179b5d9725481e09bc1213d1aff2 SHA256 82fc1f30f8b13568478e51c57d117d8c1c8c644aee9416a3c80f76b6a5b209eb
 DIST vdr-1.6.0-2.diff 17906 RMD160 256e6e0544f7a50eac07f91fd7c0664853e4396c SHA1 63f3b25d337b7bdd6eaf5257df78a3042d09d936 SHA256 54e74a40864666c5f92933beaa3935e260de4fd356bb64604af7ce5fd8c7a0ef
 DIST vdr-1.6.0.tar.bz2 593172 RMD160 b190901fcaa5507be37547dfd5cba10887316b09 SHA1 203a03ce4a39e8c70e0a64d7d94b7f5f17f03e7d SHA256 9993a6c20b35f19d46f63c13f2f5fc71036d27ee09bcf9c7e57474ba3b2cb8e6
-EBUILD vdr-1.6.0_p2-r10.ebuild 11866 RMD160 2f52f63ffdea20cf53e733010feab6e8c8247e39 SHA1 fe0dc0c67d27638b98deebb8447fac7030eb3819 SHA256 dbf68ef97f9711b16d70997fe37c6c998a8e6c7391007012ef87b9f6c1e53f9f
+EBUILD vdr-1.6.0_p2-r10.ebuild 11919 RMD160 4f08bdb0394cdea5f83b0178607f27dbfda2dfec SHA1 65bf10321d7c104a0ed28dcff91dad88bfbec37b SHA256 0c094dcbcdaed61be250a1f07e2b81fd2cba9147d1d1f44462176d6629dc35bf
 EBUILD vdr-1.6.0_p2-r7.ebuild 11487 RMD160 c59fd46d2510d1892b68230c03cf24a24586fd7f SHA1 89e467abbce351f642475a234b223e0eb80a883f SHA256 32a60a57b47d1b1c7a545d4c793182edc0ab9a0e3ed6bc2dcacd279da8b30d22
-EBUILD vdr-1.6.0_p2-r9.ebuild 11818 RMD160 75711624243dc57cb34b2ce363ccd4fd467f1f46 SHA1 4c95b2f1a3587b302c7485ce638a730680d03829 SHA256 1f1757ba0ff36511c684f0248c071c99f6314aa10f8bf3ee21bacf4402e4a340
-MISC ChangeLog 29309 RMD160 38ce78fbd6a0bad56ea6be99eadec4e60e83b800 SHA1 f23d0a563091c634d43280bd04960524d15b17a1 SHA256 da5277848ba828e800b1cfd2dd7cc7dc925b9abbbf61d588a8a19deebf1dccad
+MISC ChangeLog 29546 RMD160 bceab6f991951093d97cf2f9af1f2cc27b0040ef SHA1 35758087efaba86258c568817fc99fb29bb97166 SHA256 c3902e2f89579fcea87469141939e516a7a6c6a774bad0f0a604abb76447d725
 MISC metadata.xml 4220 RMD160 81bf8cd288b74bbfc0522b754100045980db7095 SHA1 0d73555d38505f5be3d6e0dcfbe7f706483e35d8 SHA256 d04d296b5a155a2d05e1ec5d6681c6d91fcb430f557e9a2416045090a39c8cc1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 Comment: added by hd_brummy@gentoo.org
 
-iD8DBQFPy2yndn07HTTCgIoRAszLAJsFdiw7SuVgWyyPgK3zLVqXJRppgACgk80D
-adCt41JclRu26dZ859VPGlQ=
-=jYcR
+iD8DBQFP1MSpdn07HTTCgIoRAn7lAKCkpJkDLyhel0w9fnZXifjEfnOSZwCfceVb
+8LBqyNbb1gA9jdA4PulncyQ=
+=mW2f
 -----END PGP SIGNATURE-----
diff --git a/media-video/vdr/files/vdr-1.6.0_p2_gcc-4.7.patch b/media-video/vdr/files/vdr-1.6.0_p2_gcc-4.7.patch
new file mode 100644
index 000000000000..bebdbba5b2bd
--- /dev/null
+++ b/media-video/vdr/files/vdr-1.6.0_p2_gcc-4.7.patch
@@ -0,0 +1,17 @@
+Fix building with gcc-4.7
+
+https://bugs.gentoo.org/show_bug.cgi?id=419165
+signed-of-by: Joerg Bornkessel <hd_brummy@gentoo.org> 2012/06/10
+
+diff -Naur vdr-1.6.0.orig/config.h vdr-1.6.0/config.h
+--- vdr-1.6.0.orig/config.h	2012-06-10 17:41:26.000000000 +0200
++++ vdr-1.6.0/config.h	2012-06-10 17:42:19.000000000 +0200
+@@ -182,7 +182,7 @@
+ #ifdef USE_CMDSUBMENU
+                       AddConfig(l);
+ #else
+-                      Add(l);
++                      this->Add(l);
+ #endif /* CMDSUBMENU */
+                    else {
+                       esyslog("ERROR: error in %s, line %d", fileName, line);
diff --git a/media-video/vdr/files/vdr-1.6.0_p2_linguas.diff b/media-video/vdr/files/vdr-1.6.0_p2_linguas.diff
deleted file mode 100644
index 0b9eb5d668d6..000000000000
--- a/media-video/vdr/files/vdr-1.6.0_p2_linguas.diff
+++ /dev/null
@@ -1,24 +0,0 @@
-install only the given value in LINGUAS
-signed-of: Joerg Bornkessel <hd_brummy@gentoo.org> ( 2012/04/15 )
-
-diff -Naur vdr-1.7.27.orig/Makefile vdr-1.7.27/Makefile
---- vdr-1.7.27.orig/Makefile	2012-04-15 15:45:18.000000000 +0200
-+++ vdr-1.7.27/Makefile	2012-04-15 15:46:21.000000000 +0200
-@@ -144,7 +144,7 @@
- 
- PODIR     = po
- LOCALEDIR = locale
--I18Npo    = $(wildcard $(PODIR)/*.po)
-+I18Npo    = $(foreach dir,$(LINGUAS),$(wildcard $(PODIR)/$(dir)*.po))
- I18Nmsgs  = $(addprefix $(LOCALEDIR)/, $(addsuffix /LC_MESSAGES/vdr.mo, $(notdir $(foreach file, $(I18Npo), $(basename $(file))))))
- I18Npot   = $(PODIR)/vdr.pot
- 
-@@ -167,7 +167,7 @@
- 
- install-i18n:
- 	@mkdir -p $(DESTDIR)$(LOCDIR)
--	@(cd $(LOCALEDIR); cp -r --parents * $(DESTDIR)$(LOCDIR))
-+	@(cd $(LOCALEDIR); for linguas in $(LINGUAS); do [ "$$linguas" = "en" ] && continue; cp -r --parents $$linguas* $(DESTDIR)$(LOCDIR); done)
- 
- # The 'include' directory (for plugins):
- 
diff --git a/media-video/vdr/vdr-1.6.0_p2-r10.ebuild b/media-video/vdr/vdr-1.6.0_p2-r10.ebuild
index 76cde4ad5fb0..05c033b12eee 100644
--- a/media-video/vdr/vdr-1.6.0_p2-r10.ebuild
+++ b/media-video/vdr/vdr-1.6.0_p2-r10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 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-r10.ebuild,v 1.2 2012/06/03 13:54:26 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/vdr-1.6.0_p2-r10.ebuild,v 1.3 2012/06/10 16:00:03 hd_brummy Exp $
 
 EAPI="4"
 
@@ -244,7 +244,8 @@ src_prepare() {
 		epatch "${FILESDIR}"/vdr-1.6.0-extensions-72-gcc-4.4.diff
 		epatch "${FILESDIR}"/vdr-1.6.0-shared-tinyxml.diff
 		epatch "${FILESDIR}"/vdr-1.6.0_p2_linguas-v2.diff
-		epatch "${FILESDIR}/vdr-1.6.0_p2_fontconfig_fontsort.patch"
+		epatch "${FILESDIR}"/vdr-1.6.0_p2_fontconfig_fontsort.patch
+		epatch "${FILESDIR}"/vdr-1.6.0_p2_gcc-4.7.patch
 
 		# This allows us to start even if some plugin does not exist
 		# or is not loadable.
@@ -326,7 +327,7 @@ src_prepare() {
 		einfo "\t Language for ${LING1} will installed \n"
 	fi
 
-	strip-linguas ${LING2}
+	strip-linguas ${LING2} en
 }
 
 src_install() {
diff --git a/media-video/vdr/vdr-1.6.0_p2-r9.ebuild b/media-video/vdr/vdr-1.6.0_p2-r9.ebuild
deleted file mode 100644
index 0d334613f2ea..000000000000
--- a/media-video/vdr/vdr-1.6.0_p2-r9.ebuild
+++ /dev/null
@@ -1,448 +0,0 @@
-# Copyright 1999-2012 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-r9.ebuild,v 1.3 2012/05/06 11:07:10 hd_brummy Exp $
-
-EAPI="4"
-
-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.tvdr.de/"
-SRC_URI="ftp://ftp.tvdr.de/vdr/${MY_P}.tar.bz2
-	ftp://ftp.tvdr.de/vdr/Developer/${MY_P}-1.diff
-	ftp://ftp.tvdr.de/vdr/Developer/${MY_P}-2.diff
-	http://www.zulu-entertainment.de/files/patches/${EXT_P}.tar.bz2"
-
-KEYWORDS="~arm ~amd64 ~ppc ~x86"
-SLOT="0"
-LICENSE="GPL-2"
-
-REQUIRED_USE="setup? ( !menuorg )
-			menuorg? ( !setup )"
-
-COMMON_DEPEND="virtual/jpeg
-	sys-libs/libcap
-	>=media-libs/fontconfig-2.4.2
-	>=media-libs/freetype-2
-	sys-devel/gettext
-	dvdarchive? ( dvdchapjump? ( >=media-libs/libdvdread-4.1.3_p1168 ) )"
-
-DEPEND="${COMMON_DEPEND}
-	>=virtual/linuxtv-dvb-headers-5
-	dev-util/unifdef
-	setup? ( >=dev-libs/tinyxml-2.6.1[stl] )"
-
-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-r4 )
-		dxr3? ( >=media-plugins/vdr-dxr3-0.2.13 )"
-
-CONF_DIR=/etc/vdr
-CAP_FILE=${S}/capabilities.sh
-CAPS="# Capabilities of the vdr-executable for use by startscript etc."
-
-pkg_setup() {
-	if [ -n "${VDR_LOCAL_PATCHES_DIR}" ]; then
-		eerror "Using VDR_LOCAL_PATCHES_DIR is deprecated!"
-		eerror "Please move all your patches into"
-		eerror "${EROOT}/etc/portage/patches/${CATEGORY}/${P}"
-		eerror "and remove or unset the VDR_LOCAL_PATCHES_DIR variable."
-		einfo "Note: all patches must have extension .patch"
-		die || "found obselet local patch handling"
-	fi
-
-	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=""
-	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
-}
-
-lang_linguas() {
-	LING1=$( cat /etc/make.conf | grep LINGUAS | sed -e "s:LINGUAS=::" -e "s:\"::g" )
-}
-
-lang_po() {
-	LING2=$( ls ${S}/po | tr \\\012 ' ' | sed -e "s:_::g" -e "s:[A-Z]::g" -e "s:.po::g" )
-}
-
-src_prepare() {
-	#applying maintainace-patches
-	epatch "${DISTDIR}/${MY_P}-1.diff"
-	epatch "${DISTDIR}/${MY_P}-2.diff"
-	epatch "${FILESDIR}"/vdr-dvb-api-5-is-fine.diff
-	epatch "${FILESDIR}"/vdr-1.6.0-ldflags.patch
-	epatch "${FILESDIR}"/vdr-1.6.0-use-v4l2.patch
-
-	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/locale
-
-		DEFINES			+= -DCONFDIR=\"\$(CONFDIR)\"
-		INCLUDES		+= -I\$(DVBDIR)
-
-	EOT
-	eend 0
-
-	epatch "${FILESDIR}"/vdr-1.6.0-makefile-install-header.diff
-
-	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="${EXT_DIR}/${PN}-${EXT_VDR_PV:-${PV}}_extensions.diff"
-
-		epatch "${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
-		epatch "${FILESDIR}"/vdr-1.6.0-shared-tinyxml.diff
-		epatch "${FILESDIR}"/vdr-1.6.0_p2_linguas.diff
-		epatch "${FILESDIR}/vdr-1.6.0_p2_fontconfig_fontsort.patch"
-
-		# 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
-
-	epatch_user
-
-	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}"
-
-	# LINGUAS handling
-	einfo "\n \t VDR supports now the LINGUAS values"
-
-	lang_po
-	lang_linguas
-
-	einfo "\t Please set one of this values in /etc/make.conf"
-	einfo "\t LINGUAS=\"${LING2}\"\n"
-
-	if [[ -z ${LINGUAS} ]]; then
-		eerror "\n \t No values in LINGUAS="
-		eerror "\t you will get only english text on OSD \n"
-	else
-		einfo "\t Language for ${LING1} will installed \n"
-	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}"
-
-	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_6_0=$?
-}
-
-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"
-}