stable amd64 x86; cleanup

(Portage version: 2.2.1/cvs/Linux i686, signed Manifest commit with key 34C2808A)

4 files changed, 10 insertions, 742 deletions

diff --git a/media-video/vdr/ChangeLog b/media-video/vdr/ChangeLog
index 034b98150251..4fe32e269cd3 100644
--- a/media-video/vdr/ChangeLog
+++ b/media-video/vdr/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/vdr
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/ChangeLog,v 1.177 2013/10/26 19:35:17 hd_brummy Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/ChangeLog,v 1.178 2014/01/02 17:46:48 hd_brummy Exp $
+
+  02 Jan 2014; Joerg Bornkessel <hd_brummy@gentoo.org> -vdr-2.0.2-r1.ebuild,
+  -vdr-2.0.3.ebuild, vdr-2.0.4.ebuild:
+  stable amd64 x86; cleanup
 
 *vdr-2.0.4 (26 Oct 2013)
 
diff --git a/media-video/vdr/vdr-2.0.2-r1.ebuild b/media-video/vdr/vdr-2.0.2-r1.ebuild
deleted file mode 100644
index 15f35efbc656..000000000000
--- a/media-video/vdr/vdr-2.0.2-r1.ebuild
+++ /dev/null
@@ -1,372 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/vdr-2.0.2-r1.ebuild,v 1.2 2013/07/07 09:52:20 hd_brummy Exp $
-
-EAPI="5"
-
-inherit eutils flag-o-matic multilib toolchain-funcs
-
-# Switches supported by extensions-patch
-EXT_PATCH_FLAGS="alternatechannel ddepgentry dvlvidprefer graphtft
-	jumpplay jumpingseconds mainmenuhooks menuorg naludump permashift
-	pinplugin rotor setup ttxtsubs vasarajanauloja wareagleicon yaepg"
-
-# names of the use-flags
-EXT_PATCH_FLAGS_RENAMED=""
-
-# names ext-patch uses internally, here only used for maintainer checks
-EXT_PATCH_FLAGS_RENAMED_EXT_NAME=""
-
-IUSE="bidi debug dxr3 html vanilla ${EXT_PATCH_FLAGS} ${EXT_PATCH_FLAGS_RENAMED}"
-
-MY_PV="${PV%_p*}"
-MY_P="${PN}-${MY_PV}"
-S="${WORKDIR}/${MY_P}"
-
-EXT_P="extpng-${P}-gentoo-edition-v4"
-
-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
-	http://dev.gentoo.org/~hd_brummy/distfiles/${EXT_P}.patch.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
-	setup? ( >=dev-libs/tinyxml-2.6.1[stl] )"
-
-DEPEND="${COMMON_DEPEND}
-	>=virtual/linuxtv-dvb-headers-5.3
-	sys-devel/gettext"
-
-RDEPEND="${COMMON_DEPEND}
-	dev-lang/perl
-	>=media-tv/gentoo-vdr-scripts-0.2.0
-	media-fonts/corefonts
-	bidi? ( dev-libs/fribidi )"
-
-# pull in vdr-setup to get the xml files, else menu will not work
-PDEPEND="setup? ( >=media-plugins/vdr-setup-0.3.1-r3 )"
-
-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 obsolete!"
-		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."
-		die
-	fi
-
-	use debug && append-flags -g
-
-	PLUGIN_LIBDIR="/usr/$(get_libdir)/vdr/plugins"
-
-	tc-export CC CXX AR
-}
-
-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
-
-		# codesnippet to bring the extpng defines into the vdr.pc CXXFLAGS CFLAGS
-		echo "-DUSE_${ARG_UPPER}" >> "${T}"/defines.tmp
-		cat "${T}"/defines.tmp | tr \\\012 ' '  > "${T}"/defines.IUSE
-		export DEFINES_IUSE=$( cat ${T}/defines.IUSE )
-	done
-}
-
-extensions_add_make_conf()
-{
-	# copy all ifdef for extensions-patch to Make.config
-	sed -e '1,/need to touch the following:/d' \
-		-e '/need to touch the following/,/^$/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:]'
-}
-
-lang_po() {
-	LING_PO=$( ls ${S}/po | sed -e "s:.po::g" | cut -d_ -f1 | tr \\\012 ' ' )
-}
-
-src_prepare() {
-	# apply maintainace-patches
-
-	ebegin "Changing paths for gentoo"
-
-	local DVBDIR=/usr/include
-	local i
-	for i in ${DVB_HEADER_PATH} /usr/include/v4l-dvb-hg /usr/include; do
-		[[ -d ${i} ]] || continue
-		if [[ -f ${i}/linux/dvb/dmx.h ]]; then
-			einfo "Found DVB header files in ${i}"
-			DVBDIR=${i}
-			break
-		fi
-	done
-
-	# checking for s2api headers
-	local api_version
-	api_version=$(awk -F' ' '/define DVB_API_VERSION / {print $3}' "${DVBDIR}"/linux/dvb/version.h)
-	api_version=${api_version}*$(awk -F' ' '/define DVB_API_VERSION_MINOR / {print $3}' "${DVBDIR}"/linux/dvb/version.h)
-
-	if [[ ${api_version:-0} -lt 5*3 ]]; then
-		eerror "DVB header files do not contain s2api support or too old for ${P}"
-		eerror "You cannot compile VDR against old dvb-header"
-		die "DVB headers too old"
-	fi
-
-	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
-		INCDIR			= \$(PREFIX)/include
-
-		DEFINES			+= -DCONFDIR=\"\$(CONFDIR)\"
-		INCLUDES		+= -I\$(DVBDIR)
-
-		# >=vdr-1.7.36-r1; parameter only used for compiletime on vdr
-		# PLUGINLIBDIR (plugin Makefile old) = LIBDIR (plugin Makefile new)
-		LIBDIR			= ${PLUGIN_LIBDIR}
-		PCDIR			= /usr/$(get_libdir)/pkgconfig
-	EOT
-	eend 0
-
-	# support languages, written from right to left
-	BUILD_PARAMS+=" BIDI=$(usex bidi 1 0)"
-
-	epatch "${FILESDIR}/${PN}-2.0.0_gentoo.patch"
-
-	if ! use vanilla; then
-
-		# Now apply extensions patch
-		epatch "${WORKDIR}/${EXT_P}.patch"
-
-		# This allows us to start even if some plugin does not exist
-		# or is not loadable.
-		enable_patch PLUGINMISSING
-		enable_patch CHANNELBIND
-
-		if [[ -n ${VDR_MAINTAINER_MODE} ]]; then
-			einfo "Doing maintainer checks:"
-
-			# we do not support these patches
-			# (or have them already hard enabled)
-			local IGNORE_PATCHES="pluginmissing  channelbind"
-
-			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
-
-		eend 0
-
-		extensions_add_make_conf
-
-		# add defined use-flags compile options to vdr.pc
-		sed -e "s:\$(CDEFINES) \$(CINCLUDES) \$(HDRDIR):\$(CDEFINES) \$(CINCLUDES) \$(HDRDIR) \$(DEFINES_IUSE):" \
-			-i Makefile
-
-		ebegin "Make depend"
-		emake .dependencies >/dev/null
-		eend $? "make depend failed"
-	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 support
-	einfo "\n \t VDR supports the LINGUAS values"
-
-	lang_po
-
-	einfo "\t Please set one of this values in your sytem make.conf"
-	einfo "\t LINGUAS=\"${LING_PO}\"\n"
-
-	if [[ -z ${LINGUAS} ]]; then
-		einfo "\n \t No values in LINGUAS="
-		einfo "\t You will get only english text on OSD \n"
-	fi
-
-	strip-linguas ${LING_PO} en
-}
-
-src_install() {
-	# trick makefile not to create a videodir by supplying it with an existing
-	# directory
-	einstall \
-	VIDEODIR="/" \
-	DESTDIR="${D}" \
-	|| die "einstall failed"
-
-	keepdir "${PLUGIN_LIBDIR}"
-
-	keepdir "${CONF_DIR}"/plugins
-	keepdir "${CONF_DIR}"/themes
-
-	diropts -m0755 -ovdr -gvdr
-	keepdir /var/cache/vdr
-
-	if use html; then
-		dohtml *.html
-	fi
-
-	dodoc MANUAL INSTALL README* HISTORY CONTRIBUTORS
-
-	insinto /usr/share/vdr
-	doins "${CAP_FILE}"
-
-	if use alternatechannel; then
-		insinto /etc/vdr
-		doins "${FILESDIR}"/channel_alternative.conf
-	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.6.0_p2-r8"
-	previous_less_than_1_6_0_p2_r8=$?
-
-	has_version "<${CATEGORY}/${PN}-1.7.27"
-	previous_less_than_1_7_27=$?
-
-	has_version "<${CATEGORY}/${PN}-1.7.36"
-	previous_less_than_1_7_36=$?
-}
-
-pkg_postinst() {
-
-	# correct wrong permission from earlier install
-	CACHEOWNER="$(stat -c %U /var/cache/vdr)"
-	if [ ! ${CACHEOWNER} == vdr ]; then
-		chown -R vdr:vdr "${ROOT}/var/cache/vdr"
-	fi
-
-	if [[ previous_less_than_1_6_0_p2_r8=$? = 0 ]] ; then
-		elog "  Upgrade Info:"
-
-		elog "  The recording format is now Transport Stream. Existing recordings in PES format"
-		elog "  can still be replayed and edited, but new recordings are done in TS."
-
-		elog "  The support for full featured DVB cards of the TT/FuSi design has been moved"
-		elog "  into the new plugins 'dvbsddevice' 'dvbhddevice'. On systems that use such a card as their"
-		elog "  primary device, one of this plugin now needs to be loaded when running VDR in order"
-		elog "  to view live or recorded video. If the plugin is not loaded, the card will"
-		elog "  be treated like a budget DVB card, and there will be no OSD or viewing"
-		elog "  capability."
-
-		elog "  The index file for TS recordings is now regenerated on-the-fly if a"
-		elog "  recording is replayed that has no index. This can also be used to"
-		elog "  re-create a broken index file by manually deleting the index file and then"
-		elog "  replaying the recording."
-
-		elog "  The files \"commands.conf\" and \"reccmd.conf\" can now contain nested lists of"
-		elog "  commands. See man vdr.5 for information about the new file format."
-
-		elog "  The option \"Setup/DVB/Use Dolby Digital\" now only controls whether Dolby Digital"
-		elog "  tracks appear in the 'Audio' menu. Dolby Digital is always recorded"
-
-		elog "  The default SVDRP port is now 6419"
-	fi
-
-	if [[ previous_less_than_1_7_27=$? = 0 ]] ; then
-		elog "  In vdr releases >=vdr-1.7.27 the depricated i18n handling is removed."
-		elog "  This results now in a lot of plugins which do on compile any more."
-		elog "  Please visit for more infos:"
-		elog "  https://bugs.gentoo.org/show_bug.cgi?id=414177"
-		elog "  and depended bugs"
-	fi
-
-	if [[ previous_less_than_1_7_36=$? = 0 ]] ; then
-		elog "  By default VDR is now build according to the FHS."
-		elog "  Gentoo VDR still uses the standard from"
-		elog "  Filesystem Hierarchy Standard"
-		elog "  It is supported since beginning of VDR support"
-		elog "  on Gentoo"
-		elog "  Finally, there are minimal changes for the user."
-	fi
-
-	elog "It is a good idea to run vdrplugin-rebuild now."
-
-	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
-
-	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"
-}
diff --git a/media-video/vdr/vdr-2.0.3.ebuild b/media-video/vdr/vdr-2.0.3.ebuild
deleted file mode 100644
index 0972eca90ca3..000000000000
--- a/media-video/vdr/vdr-2.0.3.ebuild
+++ /dev/null
@@ -1,364 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/vdr-2.0.3.ebuild,v 1.1 2013/09/01 17:38:16 hd_brummy Exp $
-
-EAPI="5"
-
-inherit eutils flag-o-matic multilib toolchain-funcs
-
-# Switches supported by extensions-patch
-EXT_PATCH_FLAGS="alternatechannel ddepgentry dvlvidprefer graphtft
-	jumpplay jumpingseconds mainmenuhooks menuorg naludump permashift
-	pinplugin rotor setup ttxtsubs vasarajanauloja wareagleicon yaepg"
-
-# names of the use-flags
-EXT_PATCH_FLAGS_RENAMED=""
-
-# names ext-patch uses internally, here only used for maintainer checks
-EXT_PATCH_FLAGS_RENAMED_EXT_NAME=""
-
-IUSE="bidi debug dxr3 html vanilla ${EXT_PATCH_FLAGS} ${EXT_PATCH_FLAGS_RENAMED}"
-
-MY_PV="${PV%_p*}"
-MY_P="${PN}-${MY_PV}"
-S="${WORKDIR}/${MY_P}"
-
-EXT_P="extpng-${PN}-2.0.2-gentoo-edition-v4"
-
-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
-	http://dev.gentoo.org/~hd_brummy/distfiles/${EXT_P}.patch.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
-	setup? ( >=dev-libs/tinyxml-2.6.1[stl] )"
-
-DEPEND="${COMMON_DEPEND}
-	>=virtual/linuxtv-dvb-headers-5.3
-	sys-devel/gettext"
-
-RDEPEND="${COMMON_DEPEND}
-	dev-lang/perl
-	>=media-tv/gentoo-vdr-scripts-0.2.0
-	media-fonts/corefonts
-	bidi? ( dev-libs/fribidi )"
-
-# pull in vdr-setup to get the xml files, else menu will not work
-PDEPEND="setup? ( >=media-plugins/vdr-setup-0.3.1-r3 )"
-
-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"
-
-	tc-export CC CXX AR
-}
-
-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
-
-		# codesnippet to bring the extpng defines into the vdr.pc CXXFLAGS CFLAGS
-		echo "-DUSE_${ARG_UPPER}" >> "${T}"/defines.tmp
-		cat "${T}"/defines.tmp | tr \\\012 ' '  > "${T}"/defines.IUSE
-		export DEFINES_IUSE=$( cat ${T}/defines.IUSE )
-	done
-}
-
-extensions_add_make_conf()
-{
-	# copy all ifdef for extensions-patch to Make.config
-	sed -e '1,/need to touch the following:/d' \
-		-e '/need to touch the following/,/^$/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:]'
-}
-
-lang_po() {
-	LING_PO=$( ls ${S}/po | sed -e "s:.po::g" | cut -d_ -f1 | tr \\\012 ' ' )
-}
-
-src_prepare() {
-	# apply maintainace-patches
-
-	ebegin "Changing paths for gentoo"
-
-	local DVBDIR=/usr/include
-	local i
-	for i in ${DVB_HEADER_PATH} /usr/include/v4l-dvb-hg /usr/include; do
-		[[ -d ${i} ]] || continue
-		if [[ -f ${i}/linux/dvb/dmx.h ]]; then
-			einfo "Found DVB header files in ${i}"
-			DVBDIR=${i}
-			break
-		fi
-	done
-
-	# checking for s2api headers
-	local api_version
-	api_version=$(awk -F' ' '/define DVB_API_VERSION / {print $3}' "${DVBDIR}"/linux/dvb/version.h)
-	api_version=${api_version}*$(awk -F' ' '/define DVB_API_VERSION_MINOR / {print $3}' "${DVBDIR}"/linux/dvb/version.h)
-
-	if [[ ${api_version:-0} -lt 5*3 ]]; then
-		eerror "DVB header files do not contain s2api support or too old for ${P}"
-		eerror "You cannot compile VDR against old dvb-header"
-		die "DVB headers too old"
-	fi
-
-	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
-		INCDIR			= \$(PREFIX)/include
-
-		DEFINES			+= -DCONFDIR=\"\$(CONFDIR)\"
-		INCLUDES		+= -I\$(DVBDIR)
-
-		# >=vdr-1.7.36-r1; parameter only used for compiletime on vdr
-		# PLUGINLIBDIR (plugin Makefile old) = LIBDIR (plugin Makefile new)
-		LIBDIR			= ${PLUGIN_LIBDIR}
-		PCDIR			= /usr/$(get_libdir)/pkgconfig
-	EOT
-	eend 0
-
-	# support languages, written from right to left
-	BUILD_PARAMS+=" BIDI=$(usex bidi 1 0)"
-
-	epatch "${FILESDIR}/${PN}-2.0.0_gentoo.patch"
-
-	if ! use vanilla; then
-
-		# Now apply extensions patch
-		epatch "${WORKDIR}/${EXT_P}.patch"
-
-		# This allows us to start even if some plugin does not exist
-		# or is not loadable.
-		enable_patch PLUGINMISSING
-		enable_patch CHANNELBIND
-
-		if [[ -n ${VDR_MAINTAINER_MODE} ]]; then
-			einfo "Doing maintainer checks:"
-
-			# we do not support these patches
-			# (or have them already hard enabled)
-			local IGNORE_PATCHES="pluginmissing  channelbind"
-
-			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
-
-		eend 0
-
-		extensions_add_make_conf
-
-		# add defined use-flags compile options to vdr.pc
-		sed -e "s:\$(CDEFINES) \$(CINCLUDES) \$(HDRDIR):\$(CDEFINES) \$(CINCLUDES) \$(HDRDIR) \$(DEFINES_IUSE):" \
-			-i Makefile
-
-		ebegin "Make depend"
-		emake .dependencies >/dev/null
-		eend $? "make depend failed"
-	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 support
-	einfo "\n \t VDR supports the LINGUAS values"
-
-	lang_po
-
-	einfo "\t Please set one of this values in your sytem make.conf"
-	einfo "\t LINGUAS=\"${LING_PO}\"\n"
-
-	if [[ -z ${LINGUAS} ]]; then
-		einfo "\n \t No values in LINGUAS="
-		einfo "\t You will get only english text on OSD \n"
-	fi
-
-	strip-linguas ${LING_PO} en
-}
-
-src_install() {
-	# trick makefile not to create a videodir by supplying it with an existing
-	# directory
-	einstall \
-	VIDEODIR="/" \
-	DESTDIR="${D}" \
-	|| die "einstall failed"
-
-	keepdir "${PLUGIN_LIBDIR}"
-
-	keepdir "${CONF_DIR}"/plugins
-	keepdir "${CONF_DIR}"/themes
-
-	diropts -m0755 -ovdr -gvdr
-	keepdir /var/cache/vdr
-
-	if use html; then
-		dohtml *.html
-	fi
-
-	dodoc MANUAL INSTALL README* HISTORY CONTRIBUTORS
-
-	insinto /usr/share/vdr
-	doins "${CAP_FILE}"
-
-	if use alternatechannel; then
-		insinto /etc/vdr
-		doins "${FILESDIR}"/channel_alternative.conf
-	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.6.0_p2-r8"
-	previous_less_than_1_6_0_p2_r8=$?
-
-	has_version "<${CATEGORY}/${PN}-1.7.27"
-	previous_less_than_1_7_27=$?
-
-	has_version "<${CATEGORY}/${PN}-1.7.36"
-	previous_less_than_1_7_36=$?
-}
-
-pkg_postinst() {
-
-	# correct wrong permission from earlier install
-	CACHEOWNER="$(stat -c %U /var/cache/vdr)"
-	if [ ! ${CACHEOWNER} == vdr ]; then
-		chown -R vdr:vdr "${ROOT}/var/cache/vdr"
-	fi
-
-	if [[ previous_less_than_1_6_0_p2_r8=$? = 0 ]] ; then
-		elog "  Upgrade Info:"
-
-		elog "  The recording format is now Transport Stream. Existing recordings in PES format"
-		elog "  can still be replayed and edited, but new recordings are done in TS."
-
-		elog "  The support for full featured DVB cards of the TT/FuSi design has been moved"
-		elog "  into the new plugins 'dvbsddevice' 'dvbhddevice'. On systems that use such a card as their"
-		elog "  primary device, one of this plugin now needs to be loaded when running VDR in order"
-		elog "  to view live or recorded video. If the plugin is not loaded, the card will"
-		elog "  be treated like a budget DVB card, and there will be no OSD or viewing"
-		elog "  capability."
-
-		elog "  The index file for TS recordings is now regenerated on-the-fly if a"
-		elog "  recording is replayed that has no index. This can also be used to"
-		elog "  re-create a broken index file by manually deleting the index file and then"
-		elog "  replaying the recording."
-
-		elog "  The files \"commands.conf\" and \"reccmd.conf\" can now contain nested lists of"
-		elog "  commands. See man vdr.5 for information about the new file format."
-
-		elog "  The option \"Setup/DVB/Use Dolby Digital\" now only controls whether Dolby Digital"
-		elog "  tracks appear in the 'Audio' menu. Dolby Digital is always recorded"
-
-		elog "  The default SVDRP port is now 6419"
-	fi
-
-	if [[ previous_less_than_1_7_27=$? = 0 ]] ; then
-		elog "  In vdr releases >=vdr-1.7.27 the depricated i18n handling is removed."
-		elog "  This results now in a lot of plugins which do on compile any more."
-		elog "  Please visit for more infos:"
-		elog "  https://bugs.gentoo.org/show_bug.cgi?id=414177"
-		elog "  and depended bugs"
-	fi
-
-	if [[ previous_less_than_1_7_36=$? = 0 ]] ; then
-		elog "  By default VDR is now build according to the FHS."
-		elog "  Gentoo VDR still uses the standard from"
-		elog "  Filesystem Hierarchy Standard"
-		elog "  It is supported since beginning of VDR support"
-		elog "  on Gentoo"
-		elog "  Finally, there are minimal changes for the user."
-	fi
-
-	elog "It is a good idea to run vdrplugin-rebuild now."
-
-	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
-
-	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"
-}
diff --git a/media-video/vdr/vdr-2.0.4.ebuild b/media-video/vdr/vdr-2.0.4.ebuild
index 91385fb6f3bb..89020a886c53 100644
--- a/media-video/vdr/vdr-2.0.4.ebuild
+++ b/media-video/vdr/vdr-2.0.4.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/vdr-2.0.4.ebuild,v 1.1 2013/10/26 19:35:17 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/vdr-2.0.4.ebuild,v 1.2 2014/01/02 17:46:48 hd_brummy Exp $
 
-EAPI="5"
+EAPI=5
 
 inherit eutils flag-o-matic multilib toolchain-funcs
 
@@ -30,7 +30,7 @@ HOMEPAGE="http://www.tvdr.de/"
 SRC_URI="ftp://ftp.tvdr.de/vdr/${MY_P}.tar.bz2
 	http://dev.gentoo.org/~hd_brummy/distfiles/${EXT_P}.patch.bz2"
 
-KEYWORDS="~arm ~amd64 ~ppc ~x86"
+KEYWORDS="~arm amd64 ~ppc x86"
 SLOT="0"
 LICENSE="GPL-2"