[gentoo-commits] proj/vdr/devel:master commit in: profiles/default/linux/, media-video/vdr/files/, media-video/vdr/, profiles/

[Jörg Bornkessel]

commit:     982c0dcdc9f821a5638dc51890d273f684cab4a3
Author:     Joerg Bornkessel <hd_brummy <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 11 18:29:41 2020 +0000
Commit:     Jörg Bornkessel <hd_brummy <AT> gentoo <DOT> org>
CommitDate: Sat Jan 11 18:29:41 2020 +0000
URL:        https://gitweb.gentoo.org/proj/vdr/devel.git/commit/?id=982c0dcd

overlay/vdr/devel: remove developer version vdr-2.3.x

removed vdr-2.3.x developer version
removed obsolete package.*mask entrys for this

Signed-off-by: Joerg Bornkessel <hd_brummy <AT> gentoo.org>

 media-video/vdr/Manifest                       |  24 --
 media-video/vdr/files/channel_alternative.conf |  11 -
 media-video/vdr/files/vdr-2.3.1_gentoo.patch   |  70 ------
 media-video/vdr/metadata.xml                   |  23 --
 media-video/vdr/vdr-2.3.1.ebuild               | 313 -------------------------
 profiles/ChangeLog                             | 200 ----------------
 profiles/default/linux/package.use.mask        |   5 -
 profiles/package.mask                          |   4 -
 profiles/package.use.mask                      |   4 -
 9 files changed, 654 deletions(-)

diff --git a/media-video/vdr/Manifest b/media-video/vdr/Manifest
deleted file mode 100644
index 83996fb..0000000
--- a/media-video/vdr/Manifest
+++ /dev/null
@@ -1,24 +0,0 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
-AUX channel_alternative.conf 332 BLAKE2B ec01e5109ecff9c2cf218d89ae9498809f45774a5fd4d5ba103dae957c038d5227e5a300c4ef0db4d418717776ee82e35676dc7e6d0dcdfdaf4195284c803c3e SHA512 738de5d5d99b54a516f41683834509b477590732db4e00b13b2f26e22c7349cb8517965a21251c08d29b0f368b2bb3fa64a1de71da09ffbedc5a401314a0eb5d
-AUX vdr-2.3.1_gentoo.patch 2321 BLAKE2B d0221d2aac3521f81a0c0e4791d3e3347d49aaf06274c6986760678bc7f12887b0fc6e8d140f7800aebf85ed0b2c03459f4f73a724f729bcb3460467c42316db SHA512 2f6e2076779d4ce6cf22f5fb02d26bd991d12917d0769558ace8dbac528785a70bc10e5f2511ef506419e2b595eab30495f06a3ae769a0242a47397815150bf1
-DIST extpng-vdr-2.3.1-gentoo-edition-v3.patch.bz2 26475 BLAKE2B d63dfc3fa1131ca41a039b63d966b6ad6e421a7eceac27d9602e51a8b98c4fca4cfa58b56f1b6d42c4946ed453aeae316e822e85d249e0ebf7c1e65b72ac3281 SHA512 83d4fa26390bfb5af3c409563bcdfa25d5aa181acb6847d95044ed951674c95a803a462dbe290df463084187e6c9f496bc01cf06cd4a108497323be0404fe9e8
-DIST vdr-2.3.1.tar.bz2 891255 BLAKE2B 18ef28f5eb1bf4aef4c5a2b879ca5b624d6908e5a75e5f78e8e867b18684993943aae3de6c7f8e850152044fcf8e37610ea12a204bfee98dddc6e731a3a2fe2a SHA512 525078247da68da8b3530d61c6c48cf4920c39b9603bc8a6d8c51f69d2b507a40951412606e3f85648ac8d64e28f1553c8f2fe8be80325e4ec880b2a4e564248
-EBUILD vdr-2.3.1.ebuild 8411 BLAKE2B 6e3050bb3b97a8d4d9cb2ffb08a6424bee0b614b733662afd547fe21050fe99d4c67479ccdcfd4a24fd7e8f94414ad1f87bd22613fe80bb973a0f74ec3b484e7 SHA512 7525ee11b47fcdad91a650ffadb95ace7ce4e44d57b4e708ec2d52eab6aa2a248e45e91a36fc5673431f8e39dda4ebd4927d705dffd985e20205217975b1db4e
-MISC metadata.xml 1384 BLAKE2B 8d5e7ebd35dc60f71b228bf51015593bf0192a2fcbb6a6c158556bfd389070465d104649fd31f9e8a68a431d062417a41d6e6e36b51126c3b9dbb7f7871c1f5a SHA512 0b935f2df5e887477a40b0b945ddb264ed28715c767fa632d7d5ceea54b7ccd42fa44be73c8b19d7dbbeab73473a192a6fd859bf94da317adf5a4dd264ce6edd
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
-Comment: Signed-off-by: Jörg Bornkessel <hd_brummy@g.o>
-
-iQGTBAEBCAB9FiEEmjwdqGe+yMep/PbRaMUd5tdw5KYFAl31ngVfFIAAAAAALgAo
-aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDlB
-M0MxREE4NjdCRUM4QzdBOUZDRjZEMTY4QzUxREU2RDc3MEU0QTYACgkQaMUd5tdw
-5Kah1ggAgMrQZhyzVf7uM+tm7ySGkMMpwZkuhOW4eT7W5oIJys43zG6E0CryT9iy
-WeH9qAweBW01TrRjNzBa/7AWZm9iJlOQr08FDfF7IF1i8hzom/SyfldoNueQkbod
-SUBW0gqAxeaheTAjGL6GiDUBOLl9B8usEY+Bi/lWq8TbKc6fv3Smf31q6WZ2uHri
-v7hPfZ44MIw0ndvYvu06/IUC2cEB/KLLtzz6Jpdc76IX0EP16Ci4N2A0zikBuW1Q
-FohAn9onCF+Hjva0R4LUU4Aha2N4CFMbN8jx4Bq592vvBWa1NDax5ZpbzFOcXFn+
-i0hjLLFXmHvdiPW5Kqg3llxJ0jAahw==
-=M3FS
------END PGP SIGNATURE-----

diff --git a/media-video/vdr/files/channel_alternative.conf b/media-video/vdr/files/channel_alternative.conf
deleted file mode 100644
index fb9088f..0000000
--- a/media-video/vdr/files/channel_alternative.conf
+++ /dev/null
@@ -1,11 +0,0 @@
-# Alternative channel configuration file
-#
-# Syntax:  original channel id;alternative channel id
-# Example: C-62499-10007-12003;C-0-196-14
-#          this means, if channel C-62499-10007-12003 is
-#          not available for a recording, vdr will try to
-#          use channel C-0-196-14
-#
-# lines beginning with '#' are ignored
-#
-

diff --git a/media-video/vdr/files/vdr-2.3.1_gentoo.patch b/media-video/vdr/files/vdr-2.3.1_gentoo.patch
deleted file mode 100644
index 810bfaa..0000000
--- a/media-video/vdr/files/vdr-2.3.1_gentoo.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-diff -Naur vdr-2.1.7.orig/Makefile vdr-2.1.7/Makefile
---- vdr-2.1.7.orig/Makefile	2015-01-18 12:37:45.506034673 +0100
-+++ vdr-2.1.7/Makefile	2015-01-18 12:38:34.086037162 +0100
-@@ -116,7 +116,7 @@
- VDRVERSION = $(shell sed -ne '/define VDRVERSION/s/^.*"\(.*\)".*$$/\1/p' config.h)
- APIVERSION = $(shell sed -ne '/define APIVERSION/s/^.*"\(.*\)".*$$/\1/p' config.h)
- 
--all: vdr i18n plugins
-+all: vdr i18n
- 
- # Implicit rules:
- 
-@@ -170,7 +170,7 @@
- 
- PODIR     = po
- LOCALEDIR = locale
--I18Npo    = $(wildcard $(PODIR)/*.po)
-+I18Npo    = $(foreach dir,$(LINGUAS),$(wildcard $(PODIR)/$(dir)*.po))
- I18Nmo    = $(addsuffix .mo, $(foreach file, $(I18Npo), $(basename $(file))))
- I18Nmsgs  = $(addprefix $(LOCALEDIR)/, $(addsuffix /LC_MESSAGES/vdr.mo, $(notdir $(foreach file, $(I18Npo), $(basename $(file))))))
- I18Npot   = $(PODIR)/vdr.pot
-@@ -193,7 +193,7 @@
- 
- install-i18n: i18n
- 	@mkdir -p $(DESTDIR)$(LOCDIR)
--	cp -r $(LOCALEDIR)/* $(DESTDIR)$(LOCDIR)
-+	@(cd $(LOCALEDIR); for linguas in $(LINGUAS); do [ "$$linguas" = "en" ] && continue; cp -r --parents $$linguas* $(DESTDIR)$(LOCDIR); done)
- 
- # The 'include' directory (for plugins):
- 
-@@ -255,7 +255,7 @@
- 
- # Install the files (note that 'install-pc' must be first!):
- 
--install: install-pc install-bin install-dirs install-conf install-doc install-plugins install-i18n install-includes
-+install: install-pc install-bin install-dirs install-conf install-doc install-i18n install-includes
- 
- # VDR binary:
- 
-@@ -267,12 +267,13 @@
- 
- install-dirs:
- 	@mkdir -p $(DESTDIR)$(VIDEODIR)
--	@mkdir -p $(DESTDIR)$(CONFDIR)
--	@mkdir -p $(DESTDIR)$(ARGSDIR)
--	@mkdir -p $(DESTDIR)$(CACHEDIR)
-+#	@mkdir -p $(DESTDIR)$(CONFDIR)
-+	@mkdir -p $(DESTDIR)$(ARGSDIR)
-+#	@mkdir -p $(DESTDIR)$(CACHEDIR)
- 	@mkdir -p $(DESTDIR)$(RESDIR)
- 
- install-conf:
-+	@mkdir -p $(DESTDIR)$(CONFDIR)
- 	@cp -pn *.conf $(DESTDIR)$(CONFDIR)
- 
- # Documentation:
-@@ -299,8 +300,11 @@
- # Includes:
- 
- install-includes: include-dir
--	@mkdir -p $(DESTDIR)$(INCDIR)
--	@cp -pLR include/vdr include/libsi $(DESTDIR)$(INCDIR)
-+#	@mkdir -p $(DESTDIR)$(INCDIR)
-+#	@cp -pLR include/vdr include/libsi $(DESTDIR)$(INCDIR)
-+	@mkdir -p $(DESTDIR)$(INCDIR)/vdr $(DESTDIR)$(INCDIR)/vdr/libsi
-+	@cp -pLR include/vdr $(DESTDIR)$(INCDIR)
-+	@cp -pLR include/libsi Make.config $(DESTDIR)$(INCDIR)/vdr
- 
- # pkg-config file:
- 

diff --git a/media-video/vdr/metadata.xml b/media-video/vdr/metadata.xml
deleted file mode 100644
index 5bf13a8..0000000
--- a/media-video/vdr/metadata.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>vdr@g.o</email>
-		<name>Gentoo VDR Project</name>
-	</maintainer>
-	<use>
-		<flag name="alternatechannel">Use alternate channel on record</flag>
-		<flag name="bidi">fribid support, for languages, written from right to left</flag>
-		<flag name="graphtft">support for <pkg>media-plugins/vdr-graphtft</pkg>plugin up from version 0.1.7</flag>
-		<flag name="html">Install HTML documentation</flag>
-		<flag name="kbd">enable keyboard support as remote device</flag>
-		<flag name="mainmenuhooks">Allows to replace main menu entries by some special plugins (like epgsearch, extrecmenu, ...)</flag>
-		<flag name="menuorg">Enables support for the <pkg>media-plugins/vdr-menuorg</pkg></flag>
-		<flag name="menuselection">adds support for menu hotkeys of double digits</flag>
-		<flag name="naludump">Removes NALU fill data from h.264-Streams of TS files</flag>
-		<flag name="permashift_v1">permanent timeshift by recording live TV on RAM, need plugin &gt;=mediaplugins/vdr-permashift-1</flag>
-		<flag name="pinplugin">Support for <pkg>media-plugins/vdr-pin</pkg></flag>
-		<flag name="resumereset">rreset resume of EOF</flag>
-		<flag name="ttxtsubs">support for <pkg>media-plugins/vdr-ttxtsubs</pkg></flag>
-	</use>
-</pkgmetadata>

diff --git a/media-video/vdr/vdr-2.3.1.ebuild b/media-video/vdr/vdr-2.3.1.ebuild
deleted file mode 100644
index 1ed0b91..0000000
--- a/media-video/vdr/vdr-2.3.1.ebuild
+++ /dev/null
@@ -1,313 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils flag-o-matic multilib toolchain-funcs
-
-# Switches supported by extensions-patch
-EXT_PATCH_FLAGS="alternatechannel permashift_v1 pinplugin graphtft naludump mainmenuhooks menuorg menuselection resumereset ttxtsubs"
-
-# 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="bidi no_kbd sdnotify"
-
-IUSE="bidi debug +kbd html systemd 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-v3"
-
-DESCRIPTION="Video Disk Recorder - turns a pc into a powerful set top box for DVB"
-HOMEPAGE="https://www.tvdr.de/"
-SRC_URI="ftp://ftp.tvdr.de/vdr/Developer/${MY_P}.tar.bz2
-	https://dev.gentoo.org/~hd_brummy/distfiles/${EXT_P}.patch.bz2"
-
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
-SLOT="0"
-LICENSE="GPL-2"
-
-COMMON_DEPEND="virtual/jpeg:*
-	sys-libs/libcap
-	>=media-libs/fontconfig-2.4.2
-	>=media-libs/freetype-2"
-
-DEPEND="${COMMON_DEPEND}
-	>=virtual/linuxtv-dvb-headers-5.3
-	sys-devel/gettext"
-
-RDEPEND="${COMMON_DEPEND}
-	dev-lang/perl
-	>=media-tv/gentoo-vdr-scripts-2.7
-	media-fonts/corefonts
-	bidi? ( dev-libs/fribidi )
-	systemd? ( sys-apps/systemd )"
-
-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_configure() {
-	# support languages, written from right to left
-	export "BIDI=$(usex bidi 1 0)"
-	# systemd notification support
-	export "SDNOTIFY=$(usex systemd 1 0)"
-	# with/without keyboard
-	export "USE_KBD=$(usex kbd 1 0)"
-}
-
-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}
-		ARGSDIR			= \$(CONFDIR)/conf.d
-		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
-
-	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
-
-		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"
-
-			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 "${FILESDIR}/${P}_gentoo.patch"
-
-	# fix some makefile issues
-	sed -e "s:ifndef NO_KBD:ifeq (\$(USE_KBD),1):" \
-		-e "s:ifdef BIDI:ifeq (\$(BIDI),1):" \
-		-e "s:ifdef SDNOTIFY:ifeq (\$(SDNOTIFY),1):" \
-		-i "${S}"/Makefile
-
-	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}" install || die "emake install failed"
-
-	keepdir "${PLUGIN_LIBDIR}"
-
-	# config dir for new plugin conf path
-	keepdir "${CONF_DIR}/conf.avail"
-#	keepdir "${ARGSDIR}"
-
-	# backup for plugins they don't be able to create this dir
-	keepdir "${CONF_DIR}"/plugins
-
-	if use html; then
-		dohtml *.html
-	fi
-
-	nonfatal 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
-
-	chown -R vdr:vdr "${D}/${CONF_DIR}"
-}
-
-pkg_postinst() {
-
-	eerror "WARNING:"
-	eerror "========\n"
-
-	eerror "This is a *developer* version. Even though *I* use it in my productive"
-	eerror "environment, I strongly recommend that you only use it under controlled"
-	eerror "conditions and for testing and debugging.\n"
-
-	eerror "*** PLEASE BE VERY CAREFUL WHEN USING THIS DEVELOPER VERSION, ESPECIALLY"
-	eerror "*** IF YOU ENABLE THE NEW SVDRP PEERING! KEEP BACKUPS OF ALL YOUR TIMERS"
-	eerror "*** AND OBSERVE VERY CLOSELY WHETHER EVERYTHING WORKS AS EXPECTED. THIS"
-	eerror "*** VERSION INTRODUCES SOME MAJOR CHANGES IN HANDLING GLOBAL LISTS AND"
-	eerror "*** LOCKING, SO ANYTHING CAN HAPPEN! YOU HAVE BEEN WARNED!\n"
-
-	eerror "The main focus of this developer version is on the new locking mechanism"
-	eerror "for global lists, and the ability to handle remote timers."
-	eerror "Any plugins that access the global lists of timers, channels, schedules"
-	eerror "or recordings, will need to be adjusted (see below for details). Please"
-	eerror "do initial tests with plain vanilla VDR and just the output plugin you"
-	eerror "need.\n"
-
-	elog "It is a good idea to run vdrplugin-rebuild now."
-
-	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 "\thttps://wiki.gentoo.org/wiki/VDR"
-}
-
-# repoman test wrt  bug 585864

diff --git a/profiles/ChangeLog b/profiles/ChangeLog
deleted file mode 100644
index cb42f11..0000000
--- a/profiles/ChangeLog
+++ /dev/null
@@ -1,200 +0,0 @@
-# ChangeLog for <CATEGORY>/<PACKAGE_NAME>
-# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: $
-
-  15 Nov 2015; Joerg Bornkessel <hd_brummy@g.o>
-  default/linux/package.use.mask, package.use.mask:
-  media-plugins/vdr-streamdev-0.6.1_p20151004 use-flag server masked due
-  compile error with vdr-2.3.1
-
-  18 Oct 2015; Joerg Bornkessel <hd_brummy@g.o>
-  +default/linux/package.use.mask, package.use.mask:
-  add default/linux/package.use.mask
-
-  18 Oct 2015; Joerg Bornkessel <hd_brummy@g.o> +package.use.mask:
-  added package.use.mask
-
-  27 Sep 2015; Joerg Bornkessel <hd_brummy@g.o> package.mask:
-  vdr-2.3.1 tmp masked, bcs 99% plugins will fail on compile
-
-  03 May 2015; Joerg Bornkessel <hd_brummy@g.o> package.mask:
-  pmasked oscam-9999 for live time
-
-  23 Feb 2014; Joerg Bornkessel <hd_brummy@g.o> package.mask:
-  media-plugins/vdr-graphtftng masked for testing
-
-  20 Jan 2014; Joerg Bornkessel <hd_brummy@g.o> package.mask:
-  pmasked media-tv/gentoo-vdr-scripts-9999 for live time
-
-  07 Nov 2013; Joerg Bornkessel <hd_brummy@g.o> -use.local.desc:
-  removed empty use.local.desc
-
-  26 Oct 2013; Joerg Bornkessel <hd_brummy@g.o> package.mask:
-  removed pmask vdr-2.1.2-r1
-
-  25 Oct 2013; Joerg Bornkessel <hd_brummy@g.o> package.mask:
-  vdr-2.1.2-r1 masked, broken plugins on api changes
-
-  22 Oct 2013; Joerg Bornkessel <hd_brummy@g.o> package.mask:
-  pmasked vdr-2.1.2, a lot of broken plugins, extpatchng with use-flag
-  combination pinplugin setup
-
-  05 Mar 2013; Joerg Bornkessel <hd_brummy@g.o> package.mask:
-  unmaks >vdr-1.7.36-r1 and depende plugins
-
-  25 Feb 2013; Joerg Bornkessel <hd_brummy@g.o> package.mask:
-  vompserver-0.4.0 depend on >=vdr-1.7.36-r1
-
-  25 Feb 2013; Joerg Bornkessel <hd_brummy@g.o> package.mask:
-  vdr-burn-0.2.2, depend on pmasked >=vdr-1.7.36-r1
-
-  18 Feb 2013; Joerg Bornkessel <hd_brummy@g.o> package.mask:
-  vdr-1.7.38, vdr-permashift-0.5.1, masked for testing
-
-  15 Feb 2013; Joerg Bornkessel <hd_brummy@g.o> package.mask:
-  vdr-1.7.36-r1 for fixed vdr-plugin-2.eclass testing masked
-
-  28 Jan 2013; Joerg Bornkessel <hd_brummy@g.o> package.mask:
-  vdr-rcu-0.0.4, vdr-dvbsddevice-0.0.8 masked on eclass issues
-
-  26 Jan 2013; Joerg Bornkessel <hd_brummy@g.o> package.mask:
-  rm pmask vdr-1.7.35-r1, gentoo-vdr-scripts-2.0.0_rc1
-
-  26 Jan 2013; Joerg Bornkessel <hd_brummy@g.o> package.mask:
-  gentoo-vdr-scripts-2.0.0_rc1 pmasked
-
-  13 Jan 2013; Joerg Bornkessel <hd_brummy@g.o> package.mask:
-  pmask for livetime media-plugins/xbmc-addon-pvr-9999
-
-  06 Jan 2013; Joerg Bornkessel <hd_brummy@g.o> package.mask:
-  pmasked vdr-1.7.35-r1 for USEFHS handling test
-
-  06 Jan 2013; Joerg Bornkessel <hd_brummy@g.o> package.mask:
-  removed pmaks media-video/vdr-1.7.35 and depende plugins
-
-  01 Jan 2013; Joerg Bornkessel <hd_brummy@g.o> package.mask:
-  removed pmask =vdr-1.7.34
-
-  01 Jan 2013; Joerg Bornkessel <hd_brummy@g.o> package.mask:
-  typo
-
-  01 Jan 2013; Joerg Bornkessel <hd_brummy@g.o> package.mask:
-  depend on >=vdr-1.7.35, masked some plugins
-
-  31 Dec 2012; Joerg Bornkessel <hd_brummy@g.o> package.mask:
-  vdr-1.7.34 pmask, need some global testing
-
-  27 Dec 2012; Joerg Bornkessel <hd_brummy@g.o> package.mask:
-  masked =vdr-1.7.34, all plugins broken yet
-
-  16 Dec 2012; Joerg Bornkessel <hd_brummy@g.o> package.mask:
-  removed pmask =media-video/vdr-1.7.33
-
-  15 Dec 2012; Joerg Bornkessel <hd_brummy@g.o> package.mask:
-  pmask =vdr-1.7.33, to many broken plugins
-
-  27 Sep 2012; Joerg Bornkessel <hd_brummy@g.o> package.mask:
-  unmasked tmp masked vdr-sc vdr-dvb(sc,hd)device
-
-  24 Sep 2012; Joerg Bornkessel <hd_brummy@g.o> package.mask:
-  unmask >=vdr-1.7.27 and depende plugins
-
-  23 Sep 2012; Joerg Bornkessel <hd_brummy@g.o> package.mask:
-  tmp masked for testing on transfermode included in vdr-sc
-
-  01 Jul 2012; Joerg Bornkessel <hd_brummy@g.o> package.mask:
-  media-video/vdr-osdpip-0.1.2 pmasked, need vdr-1.7.27
-
-  10 Jun 2012; Joerg Bornkessel <hd_brummy@g.o> package.mask:
-  vdr-skinsoppalusikka-1.7.7 pmask, need >=vdr-1.7.27
-
-  03 Jun 2012; Joerg Bornkessel <hd_brummy@g.o> package.mask:
-  media-video/vdr-1.7.28 masked for i18n issues
-
-  27 Apr 2012; Joerg Bornkessel <hd_brummy@g.o> package.mask:
-  removed pmask vdr-osdteletext-0.9.3; running with vdr-1.7.23 too
-
-  26 Apr 2012; Joerg Bornkessel <hd_brummy@g.o> package.mask:
-  masking vdr-osdteletex-0.9.3; need vdr-1.7.27 (still masked)
-
-  07 Apr 2012; Joerg Bornkessel <hd_brummy@g.o> package.mask:
-  pmasked vdr-femon-1.7.17, need vdr-1.7.27
-
-  07 Apr 2012; Joerg Bornkessel <hd_brummy@g.o> package.mask:
-  pmasked vdr-femon-1.7.17, need vdr-1.7.27
-
-  02 Apr 2012; Christian Ruppert <idl0r@g.o> package.mask:
-  Mask 1.7.27 for now as there a too many plugins broken currently
-
-  12 Mar 2012; Joerg Bornkessel <hd_brummy@g.o> package.mask:
-  masked vdr-femon-1.7.14, need vdr-1.7.26
-
-  12 Mar 2012; Joerg Bornkessel <hd_brummy@g.o> package.mask:
-  masked vdr-noepg-0.0.1, need vdr-1.7.26
-
-  08 Feb 2012; Joerg Bornkessel <hd_brummy@g.o> package.mask:
-  unmask vdr-1.7.22, depend vdr-femon, vdr-ttxtsubs
-
-  30 Dec 2011; Joerg Bornkessel <hd_brummy@g.o> package.mask:
-  pmasked vdr-femon-1.7.11; need vdr-1.7.22
-
-  30 Dec 2011; Joerg Bornkessel <hd_brummy@g.o> package.mask:
-  masked vdr-1.7.22, last checks before go to maintree
-
-  09 Oct 2011; Joerg Bornkessel <hd_brummy@g.o> package.mask:
-  pmasked media-plugins/vdr-ttxtsubs-0.2.4, need >=vdr-1.7.21
-
-  16 Sep 2011; Joerg Bornkessel <hd_brummy@g.o> package.mask:
-  removed pmask >=vdr-17.19 and depended plugins
-
-  09 May 2010; Joerg Bornkessel <hd_brummy@g.o> package.mask:
-  masked media-plugins/vdr-vnsiserver-9999 for livetime
-
-  07 Apr 2010; Joerg Bornkessel <hd_brummy@g.o> ChangeLog:
-  add some debuginfo for eclass changes
-
-  22 Mar 2010; Joerg Bornkessel <hd_brummy@g.o> package.mask:
-  unmask vdr-1.7.13/14 and plugins depended on this version
-
-  21 Mar 2010; Joerg Bornkessel <hd_brummy@g.o> package.mask:
-  vdr-1.7.14 masked, need some addaption in vdrplugin.eclass before
-
-  08 Mar 2010; Joerg Bornkessel <hd_brummy@g.o> package.mask:
-  masked vdr-1.7.13; vdr-txttsubs-0.2.1
-
-  05 Mar 2010; Joerg Bornkessel <hd_brummy@g.o> package.mask:
-  masked some plugins, need vdr-1.7.13
-
-  01 Mar 2010; Joerg Bornkessel <hd_brummy@g.o> package.mask:
-  vdr-sc-9999, masked for live time
-
-  23 Feb 2010; Joerg Bornkessel <hd_brummy@g.o> package.mask:
-  removed all masks for vdr-1.7.12
-
-  23 Feb 2010; Joerg Bornkessel <hd_brummy@g.o> package.mask:
-  reel-*-14440 masked
-
-  23 Feb 2010; Joerg Bornkessel <hd_brummy@g.o> package.mask:
-  =media-plugins/vdr-femon-1.7.6 masked, need vdr-1.7.12
-
-  22 Feb 2010; Joerg Bornkessel <hd_brummy@g.o> package.mask:
-  vdr-1.7.12 masked, need newest vdr-reelbox plugin
-
-  20 Jan 2010; Joerg Bornkessel <hd_brummy@g.o> package.mask:
-  unmask for vdr-1.7.11
-
-  17 Jan 2010; Joerg Bornkessel <hd_brummy@g.o> package.mask:
-  media-plugins/vdr-skinsopplusikka-1.7.0 masked, need >=vdr-1.7.11
-
-  10 May 2009; Joerg Bornkessel <hd_brummy@g.o> package.mask:
-  vdr-1.7.7 unmask, also depended masked plugins
-
-  09 May 2009; Joerg Bornkessel <hd_brummy@g.o> package.mask:
-  media-plugins/vdr-streamdev-0.3.5_pre20090510 masked; need vdr-1.7.5
-
-  07 May 2009; Joerg Bornkessel <hd_brummy@g.o> ChangeLog:
-  vdr-ttxtsub-0.1.0 masked; need >=vdr-1.7.6
-
-  05 May 2009; Joerg Bornkessel <hd_brummy@g.o> package.mask:
-  vdr-1.7.7. masked; need >=linux-headers-2.6.29, bug #266837
-

diff --git a/profiles/default/linux/package.use.mask b/profiles/default/linux/package.use.mask
index 3a7ef9d..4e7b250 100644
--- a/profiles/default/linux/package.use.mask
+++ b/profiles/default/linux/package.use.mask
@@ -18,11 +18,6 @@
 
 #--- END OF EXAMPLES ---
 
-# Joerg Bornkessel <hd_brummy@g.o> (17 Oct 2015)
-# tmp masked duing strong changes in core vdr
-=media-video/vdr-2.3.1 alternatechannel permashift_v1 ttxtsubs
-
-
 # Joerg Bornkessel <hd_brummy@g.o> (15 Nov 2015)
 # fails on compile with >=vdr-2.3.1
 =media-plugins/vdr-streamdev-0.6.1_p20151004 server

diff --git a/profiles/package.mask b/profiles/package.mask
index ec1df05..0de4e3c 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -21,10 +21,6 @@
 ##   End example
 ##
 
-# Joerg Bornkessel <hd_brummy@g.o> ( 27/Sep/2015 )
-# masked bcs. 99% plugins will fail on compile
-=media-video/vdr-2.3.1
-
 # Joerg Bornkessel <hd_brummy@g.o> ( 12/Feb/2015 )
 # masked for removal ~12/mar/2015, dead on upstream since 2009,
 # not supported by extpatchng anymore

diff --git a/profiles/package.use.mask b/profiles/package.use.mask
index f6bbe1b..4e7b250 100644
--- a/profiles/package.use.mask
+++ b/profiles/package.use.mask
@@ -18,10 +18,6 @@
 
 #--- END OF EXAMPLES ---
 
-# Joerg Bornkessel <hd_brummy@g.o> (17 Oct 2015)
-# tmp masked duing strong changes in core vdr
-=media-video/vdr-2.3.1 alternatechannel permashift_v1 ttxtsubs
-
 # Joerg Bornkessel <hd_brummy@g.o> (15 Nov 2015)
 # fails on compile with >=vdr-2.3.1
 =media-plugins/vdr-streamdev-0.6.1_p20151004 server