gentoo auto-resync : 09:01:2023 - 18:18:58

4 files changed, 35 insertions, 379 deletions

diff --git a/media-video/vdr/Manifest b/media-video/vdr/Manifest
index 2d37b8418753..1aec4f8497c2 100644
--- a/media-video/vdr/Manifest
+++ b/media-video/vdr/Manifest
@@ -10,24 +10,17 @@ AUX vdr-2.4.1_mainmenuhook-1.0.1.patch 4645 BLAKE2B 3b4bc624f33366da133bb471bb5c
 AUX vdr-2.4.6_clang.patch 527 BLAKE2B 6f74ee8a96657df7280ea51b55199768ed3bd968cd377df12674b29616b3a43703e4cc76c4c4fa43412a564bc51bdcb32ec565832177397200f5bd7aef9b05c6 SHA512 5ad498c5784551fdcde9911e2890b236c75e47f20dabe85b561bdb0e8771d7d6ce6ab160fa8831361799ed9d5da0cfa4f3788b509dd0eadf1cdb1eeeb6aad8a7
 AUX vdr-2.4.6_gentoo.patch 2236 BLAKE2B c7372e3bfe04ea14f1bb12459d4385d6001c6acafbf96b4d1d8a69e194e076af656b76bb349ce07a30b131dd9e779d39441a34cc41ff0ae651fd14c8f2791fef SHA512 6ff8d20e4c596e3705ac6814e0ea1562e4b1f2809d585440bd5940b7094127fce21e7f6a738281305d6782c9806336f2d030c864e189d2c85e3b302635f07685
 AUX vdr-2.4.6_makefile-variables.patch 1094 BLAKE2B eabc93d2bb383b1146c15c8b0bdff5979e172a5190a9c755071f1be66a662f89ce6f92c230a0df14ec5ca1958ac53326624e16c54457d83296a0b117047ac22a SHA512 5ee06df94028fc7bbd70fae718aab544f562a1a4d2cf380c282a24db33cdef1bea7224608c01e5ecb4a92cf1a709706342314918f36c0b6f65f5861c872fe499
-AUX vdr-2.4.7_gcc11.patch 1159 BLAKE2B 789345c32b5658d65736552ca25dd98d0f3047284c0b528ce8443fa8a20cfa01d44425c601800833b9f3cba5f798b5393708165618322475e284d32221932c5a SHA512 4a74e7126619678497d952b1adf1d3aa9989207b69cbdbea0dc6c899a3cd90f88f438200b3fc058d6e9f6fc550c59f48cddeedfbe7cd61936b19b619486f944b
 AUX vdr-2.4_remove_plugins.patch 876 BLAKE2B 27f36cd30e11ec85f8c91d0b4da77d2a6a94d23d4801dc8dea70dbd617e12a6e0968ad96624688b7ad1463dcc3676ccbccd85e29c7b556b5e989191fb020df2d SHA512 eb5da3977d5a55dfac8871bf638ad320bf03e84c6c667f098f6f39f71beecd861fd5ae8b898ad835b8441ce8bb9dcb82005ba0b0e1b785ac156e478b222515a9
 AUX vdr-2.6.1-patch-for-permashift.patch 18981 BLAKE2B 01da7d33401a7d73b37f30e5359a4db695345e24a4eda9dda0c5d1c1bb70cf43c2954f136cd96d37d619707f2a74dfb8960b3346d644ab89ac9720b1eb0da4c3 SHA512 71eb63ff475723fb75a7b35fbfff43728baee4d2a665dd6516c2c4be0bedb5b1744d0653c79d679a38b376cb80627aa05605e469bfab0e0b4a65644136425ec7
 AUX vdr-2.6.1_naludump.patch 19594 BLAKE2B 012b92b265c0721ae7baf0f193c9b50fe3bee1e0fd8396e79e05deebef05a34acc5c7eb9ecad225f084449799c8e04a8285b41aa6cac5b24d582e4797dc60888 SHA512 3482d7d921c4b73f12426538cab6d7923d5ca3013efa9d16998bb48bd75557ace04af683401fc93b7c77bf4d619f4ded74f7f4568acdceb0406de0472bef074a
 AUX vdr-2.6.1_pinplugin.patch 19274 BLAKE2B 19cc70e16f956087ace9a52d646c7003abba0be5894b05314e96880114f07584309756a4102bf8569c6612c21037ae1a4ec45fbcc91b6e2df42d89e4febfc0c7 SHA512 d5e875f8f51c4f946b9f305a36d15b760720b0495c6abaf6c2fbab4d200799741088026e9edb83458cc75cabc390a72173f33620010aedc4eaf22ed1a3d57973
 DIST extpng-vdr-2.2.0-gentoo-edition-v1.patch.bz2 34664 BLAKE2B 81b68ebe0ef4588c3676f0b7a2c766d8d4d4f754a987b3be5868f3c6eff9158d4cea8e492ca81df535e637dbdc5baff638d1fafb4163e9d9a2d0125aba17e2e1 SHA512 16d6fbb8201f003dfe653b6a49424b794d7e697e27ad6f2383dbe17b76712ea5a3da88a676900b84d75ff7425bf3eb9084d60a89a4598758f482dc1f013f7b3e
-DIST vdr-2.1.5-naludump-0.1.diff 21548 BLAKE2B f193d982d072bbba2261d7dabd82e27795b2e4d8d18ae4486d8c559e7325b87f5902def7bb313e98585331144af62597f6f025f44ca142187e724516bc32c175 SHA512 d9188d5bfcf0588c22dc526fc1082253a1b505b322ccfbe676b8b2c12d4471af7b605924bcea85e879c9606d5e2cecdf6a6e8819cd9b8d877e5bb9f62b91251f
 DIST vdr-2.2.0.tar.bz2 922708 BLAKE2B 975e07d6d4c5bd13ee92be5d6a1826d6404b0c59e20fa2e30689b185a61e02d54782ad528e6a4f15e0d36806b30bcf48aa336d63adb3604e78056ff318e0fd2c SHA512 183f58133915c6c0fe8ec2b88becbcb2a36418210e6dcf7931053d3771d727c3581593f9eb5c9693abf39e22e728f7b41c42079cd704610c3636ec05134ea93d
-DIST vdr-2.4-patch-for-permashift.diff.bz2 5298 BLAKE2B ebd00ba1c66783f97f5a6cc757cc9be6d937bd460f46b1880eec8b86ead1a5673a25ab64b733b8030e1c9a94123af28a5d6383905da265c67b2a945ba2c06c33 SHA512 3ba1968d2710061627e2a3b320e24ffeb08be6d8a7e71ed0c6732ebe6ed02d25f3a8afff524a6185ad0025d187ed9c7b259a9fb63dcf0c91e3fd2a079b5ef9d3
-DIST vdr-2.4.1_mainmenuhook-1.0.1.patch.bz2 1463 BLAKE2B 2be3597a273a92d02be0d072e3d74b39275cbbe17d22e570f416d42c46b53f43209498e569142a2cc357e5f7176d2454cb2a86d0822b29cca913eab2ae9cc27f SHA512 9d3eb501fa06ff5b03361ef65c8ddeeba5f37493cc0edc2d4f54e200e48e17607957fa95bd1540f028bc9a98ad6f42b4d38cf79e9ce971de36bed30def108759
-DIST vdr-2.4.6_pinplugin.patch.bz2 5176 BLAKE2B 142ad6551b8e37d223acf86f8c2f511cf2cb3664b5ff968bac5e44420c56bf5fdb974360df574141c424cd7a4b1e1489c4a504207420af10f722a77e6d2bad2f SHA512 d5c7263b908302ebf88a5e5ddcb658f56ee92656b40797fd48af1ff9852454adc1d1672cc97411e7744cc31a56f4d0f51df5ece102c21b2aa25d87e3c3c8fe12
-DIST vdr-2.4.6_ttxtsubs_v2.patch.bz2 51971 BLAKE2B e4915314e8f659df1c3e0ff631fd0c3dcec89053ff727fd28400dc6eecc49c1d4743a9bedaf3b11fce03fc6082309d4b4658d00a5b01aa5cbe8686e05412f882 SHA512 14c7b4397ba65e0ff9a5fb0705872f1cb6f1cdd1752b14f83f260540da25b5957632900232f83904c3d4fd6759e537c85bda2cce61455729eab3050a96441548
-DIST vdr-2.4.7.tbz2 919632 BLAKE2B be4e1ec365330855e4b2b26f44b1f35dc323e4783e96ef344a67b3e9fe2c0499760ab0f3d27c5e3bdddf5a65ebb65b0c81a62092301d34370aa19d0dd63bb1ab SHA512 41b8453bc6cdbb0db728b5d7d6624ab3ff9034b58ba443a8196f5fcc9fa78d18698cc91905890244e69d482ffc493374e6da2c97baed95fe742b888bdc63e42b
 DIST vdr-2.6.1.tbz2 937103 BLAKE2B d8bbf8cb74f79c328ba7a367cd120d9472be667def851fbdff2f2fda3addbf33ae1f0ab0f20dc0ea6b3a03667e36164a5acf5a17cff8f7934c15f4e61b3a8db2 SHA512 235ffd1654d8f13ba658533bfa5db9c9669e93106a63a770297997f9b8342807f270f26e7a6f5a3c127cd9f760bb94ae77f884dcad42a500615c28e1cf3fd92f
 DIST vdr-2.6.1_ttxtsubs_v2.patch 40549 BLAKE2B 525c05b72fa957372cc1ef91428428f664f42d92eebc06fd0b179afbe99e4ecc4919c69cef000cc15c8340c9a2506d38cbf755fd6665cde1708ce17d4320a35f SHA512 590c43e63818de8be9637cb3b32bf3399b82a181ca151d67e2341232669619020ab78ba9934da3a9c58cdb3bac56fc2a332a5838a92ee0851e42c3707726eb49
+DIST vdr-2.6.3.tbz2 943867 BLAKE2B 48dd2f19125dc60b68d835d3da457b4e2377b7b8ca31b9e1849b9f5ebe29391ed51c9460ec8efc9bdd349adba6d39a2b17f4a3e8f23bea3964b15bcbd9618ec9 SHA512 d84ca2cd797c80134a28cebc28172f45081d4f9580122f823dde396d106a15fa88d5f040252b8ee7caa7d44fa6f1cfba37a13c6a36ecd3fd2734b0140f7c438c
 DIST vdr-menuorg-2.3.x.diff 8852 BLAKE2B 19b98d51a69f52ecda5500f51ef1741a8397953b20c490055eab0393da5f56ff9598c3e1e8ed8b915f5877e08deeb9ba7a9ef8d9356ad3a1fa12e3778869174a SHA512 7b41c3a529858a4953a57f21619ea01864e140cc1755ee0b03caf1c4de41e80c3f805653502bc8d39d02a4dfcddf720acd4a8c8bd91f4871eef31d86e8e915c0
-EBUILD vdr-2.2.0-r6.ebuild 8172 BLAKE2B e6823542e56a5ae3bd4cb5d61840522b25ba9c0d1cb600b8a035a5e79f19c530e478751634130199aff157a8d32adc9b154b3d67d863eb54bfc0a8a4dcde8ed6 SHA512 f67d2c299f7e45cb398294735bdaf6fe2c23b06900aad8b9520bd7bab426cffff99d5be2861dfd0a9ac85215324c52b8a4130fd2b4ae6597c3d459f2c179fe3f
 EBUILD vdr-2.2.0-r7.ebuild 8240 BLAKE2B 4ce894b7b579a3d2d9e6c0d3f30b8aac6600479152f2d0d7377d7ae829b35d98ecf7b269a1889084d1cd2c09ece2dbf6c372607d944978e37e11dc2717c3efd4 SHA512 7bed97818724be9f25ebafe1e1256ec0b683ad908306eaceea32a47efaea6b1d5ac5ca43163587d0de7158691b63d61fc88a23ca3a79bb53356f6255f35c4f4f
-EBUILD vdr-2.4.7-r1.ebuild 6171 BLAKE2B 92c996b62c17c3496befa2698023749d89d8599ea2e9cc2eeb03f2c989cd531075bb7c89b19dd16ebf4f7f33bf3e9c5914f6cf40bddf6aebf23db8b101e934db SHA512 46e7e9ea9aee587428ee639ddc280f00685375bad4de92368637583ef855566a7215eedc6b8b95ce67bc3543943cbd36699ec2cf6f422b546a40681053f84323
 EBUILD vdr-2.6.1.ebuild 5514 BLAKE2B 7d9006b725d1ebde1aa139cc36adeeba1e4836d602dabe528ba089c3238c22b6acb1b800460ed4055626fa712bb5b66032b318fe066dae32fdd389f7aeb104c6 SHA512 72b36b33c9a6120c9df2fce4c7572ee6ffe58266cfcd77b607449d8655c154c47825915568b744151778dbf8aa3b0f49f05ac8b736b3054c007edd81e91b4df0
+EBUILD vdr-2.6.3.ebuild 5544 BLAKE2B d5b98347b1234db840c677b55d719c55da1c4ad108fc5d3426bfc2d360ffa1d32893d04b156a8446e6447dc57b7666d88dcd751e690bbb98e32eed7b7bd04fc0 SHA512 8a49e6dd7eabeefa50e0b44bf1da562e8d3a557def432acf73cf78cbff0dd6b225a97a476524119405ea284d005fdbebb588a871359276b1a73224d44c097ab9
 MISC metadata.xml 1780 BLAKE2B 179a1948c96a7b237b500a08861799c25ae084d5b9cd6702921acd04cfbf0111bbb11170e4d14bf31ad7355ef0899f285857350131badc411548a3611593ecb6 SHA512 6c8c2073c55f327d4dfe52cb22ae1622d936c43503caf2964594656e1281b07110187c139216a73ed10abd625b43509ecdfe41edb7439950653e038991abfb31
diff --git a/media-video/vdr/files/vdr-2.4.7_gcc11.patch b/media-video/vdr/files/vdr-2.4.7_gcc11.patch
deleted file mode 100644
index 1e37b2f0010c..000000000000
--- a/media-video/vdr/files/vdr-2.4.7_gcc11.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Fix compile with gcc-11, officially from kls
-
-Signed-off-by: Martin Dummer <martin.dummer@gmx.net>
-
---- a/tools.h     2021/01/19 20:38:28     5.3
-+++ b/tools.h     2021/05/05 15:16:45
-@@ -53,17 +53,15 @@
-
- // In case some plugin needs to use the STL and gets an error message regarding one
- // of these functions, you can #define DISABLE_TEMPLATES_COLLIDING_WITH_STL before
--// including tools.h.
--#if !defined(__STL_CONFIG_H) // for old versions of the STL
--#if !defined(DISABLE_TEMPLATES_COLLIDING_WITH_STL) && !defined(_STL_ALGOBASE_H)
-+// including any VDR header files.
-+#if !defined(DISABLE_TEMPLATES_COLLIDING_WITH_STL)
- template<class T> inline T min(T a, T b) { return a <= b ? a : b; }
- template<class T> inline T max(T a, T b) { return a >= b ? a : b; }
- #endif
- template<class T> inline int sgn(T a) { return a < 0 ? -1 : a > 0 ? 1 : 0; }
--#if !defined(DISABLE_TEMPLATES_COLLIDING_WITH_STL) && !defined(_MOVE_H)
-+#if !defined(DISABLE_TEMPLATES_COLLIDING_WITH_STL)
- template<class T> inline void swap(T &a, T &b) { T t = a; a = b; b = t; }
- #endif
--#endif
-
- template<class T> inline T constrain(T v, T l, T h) { return v < l ? l : v > h ? h : v; }
diff --git a/media-video/vdr/vdr-2.2.0-r6.ebuild b/media-video/vdr/vdr-2.2.0-r6.ebuild
deleted file mode 100644
index 372355cbe09d..000000000000
--- a/media-video/vdr/vdr-2.2.0-r6.ebuild
+++ /dev/null
@@ -1,301 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic strip-linguas toolchain-funcs
-
-# Switches supported by extensions-patch
-EXT_PATCH_FLAGS="alternatechannel graphtft naludump permashift pinplugin
-				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"
-
-MY_PV="${PV%_p*}"
-MY_P="${PN}-${MY_PV}"
-S="${WORKDIR}/${MY_P}"
-
-EXT_P="extpng-${P}-gentoo-edition-v1"
-
-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
-	mirror://gentoo/${EXT_P}.patch.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc x86"
-IUSE="bidi debug keyboard html systemd vanilla ${EXT_PATCH_FLAGS} ${EXT_PATCH_FLAGS_RENAMED}"
-
-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"
-RDEPEND="${COMMON_DEPEND}
-	dev-lang/perl
-	>=media-tv/gentoo-vdr-scripts-2.7
-	media-fonts/corefonts
-	bidi? ( dev-libs/fribidi )
-	systemd? ( sys-apps/systemd )"
-BDEPEND="sys-devel/gettext"
-
-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 || die "cannot write to Make.config"
-
-		# codesnippet to bring the extpng defines into the vdr.pc CXXFLAGS CFLAGS
-		echo "-DUSE_${ARG_UPPER}" >> "${T}"/defines.tmp || die "cannot write to defines.tmp"
-		cat "${T}"/defines.tmp | tr \\\012 ' '  > "${T}"/defines.IUSE || die "cannot write to defines.tmp"
-		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 || die "cannot write to 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:]' || die "error in function extensions_all_defines"
-}
-
-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 keyboard 1 0)"
-}
-
-src_prepare() {
-	# apply maintenance-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 || die "cannot write to Make.config"
-		#
-		# 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
-
-	# wrt bug 586070
-	if has_version ">=sys-apps/systemd-230"; then
-		sed -e "s:libsystemd-daemon:libsystemd:g" -i Makefile || die "sed libsystemd failed"
-	fi
-
-	if ! use vanilla; then
-
-		# Now apply extensions patch
-		eapply "${WORKDIR}/${EXT_P}.patch"
-		sed -e 's/PERMASHIFT_V1/PERMASHIFT/g' -i "${S}"/*.[ch] "${S}"/Make.config* || die "sed failed"
-
-		# 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 || die "cannot write to new.IUSE"
-			echo $EXT_PATCH_FLAGS $EXT_PATCH_FLAGS_RENAMED_EXT_NAME \
-					$IGNORE_PATCHES | \
-				tr ' ' '\n' |sort > "${T}"/old.IUSE || die "cannot write to old.IUSE"
-			local DIFFS=$(diff -u "${T}"/old.IUSE "${T}"/new.IUSE|grep '^[+-][^+-]')
-			if [[ -z ${DIFFS} ]]; then
-				einfo "EXT_PATCH_FLAGS are 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 || die "sed fails on Makefile"
-
-		ebegin "Make depend"
-		emake .dependencies >/dev/null
-		eend $? "make depend failed"
-
-		eapply "${FILESDIR}/${P}_gcc7extpng.patch"
-	fi
-
-	eapply "${FILESDIR}/${P}_gentoo.patch"
-	eapply "${FILESDIR}/${P}_unsignedtosigned.patch"
-	eapply "${FILESDIR}/${P}_glibc-2.24.patch"
-	eapply "${FILESDIR}/${P}-jpeg-9c.patch"
-	eapply "${FILESDIR}/${P}_glibc-2.31.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 || die "sed fails on Makefile"
-
-	eapply_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
-	emake install \
-	VIDEODIR="/" \
-	DESTDIR="${ED}" install
-
-	keepdir "${PLUGIN_LIBDIR}"
-
-	# backup for plugins they don't be able to create this dir
-	keepdir "${CONF_DIR}"/plugins
-
-	if use html; then
-		local HTML_DOCS=( *.html )
-	fi
-
-	local DOCS=( MANUAL INSTALL README* HISTORY CONTRIBUTORS )
-
-	einstalldocs
-
-	insinto /usr/share/vdr
-	doins "${CAP_FILE}"
-
-	if use alternatechannel; then
-		insinto /etc/vdr
-		doins "${FILESDIR}"/channel_alternative.conf
-	fi
-
-	chown -R vdr:vdr "${ED}/${CONF_DIR}" || die "chown failed"
-}
-
-pkg_postinst() {
-
-	elog "\n\t---- 15 YEARS ANNIVERSARY EDITON ----\n"
-	elog "\tA lot of thanks to Klaus Schmidinger"
-	elog "\tfor this nice piece of Software...\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"
-}
diff --git a/media-video/vdr/vdr-2.4.7-r1.ebuild b/media-video/vdr/vdr-2.6.3.ebuild
index a7db9e18f489..dc7302616595 100644
--- a/media-video/vdr/vdr-2.4.7-r1.ebuild
+++ b/media-video/vdr/vdr-2.6.3.ebuild
@@ -1,30 +1,28 @@
-# Copyright 2022 Gentoo Authors
+# Copyright 2021-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-inherit flag-o-matic strip-linguas toolchain-funcs
+inherit flag-o-matic strip-linguas toolchain-funcs user-info
 
 DESCRIPTION="Video Disk Recorder - turns a pc into a powerful set top box for DVB"
 HOMEPAGE="http://www.tvdr.de/"
 SRC_URI="http://git.tvdr.de/?p=vdr.git;a=snapshot;h=refs/tags/${PV};sf=tbz2 -> ${P}.tbz2
-	mainmenuhooks? ( http://vdr.websitec.de/download/${PN}/${PN}-2.4.1/${PN}-2.4.1_mainmenuhook-1.0.1.patch.bz2 )
-	menuorg? ( https://projects.vdr-developer.org/projects/plg-menuorg/repository/revisions/master/raw/vdr-patch/vdr-menuorg-2.3.x.diff )
-	naludump? ( https://www.udo-richter.de/vdr/files/vdr-2.1.5-naludump-0.1.diff )
-	pinplugin? ( http://vdr.websitec.de/download/${PN}/vdr-2.4.6/${PN}-2.4.6_pinplugin.patch.bz2 )
-	ttxtsubs? ( http://vdr.websitec.de/download/${PN}/vdr-2.4.6/${PN}-2.4.6_ttxtsubs_v2.patch.bz2 )
-	permashift? ( http://vdr.websitec.de/download/${PN}/vdr-2.4.6/vdr-2.4-patch-for-permashift.diff.bz2 )"
+	menuorg? ( https://github.com/vdr-projects/vdr-plugin-menuorg/raw/master/vdr-patch/vdr-menuorg-2.3.x.diff )
+	ttxtsubs? ( https://md11.it.cx/download/${PN}/${PN}-2.6.1_ttxtsubs_v2.patch )"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
 IUSE="bidi debug demoplugins html keyboard mainmenuhooks menuorg naludump permashift pinplugin systemd ttxtsubs verbose"
 
 COMMON_DEPEND="
-	virtual/jpeg:*
-	sys-libs/libcap
-	>=media-libs/fontconfig-2.4.2
-	>=media-libs/freetype-2"
+	acct-group/vdr
+	acct-user/vdr
+	media-libs/fontconfig
+	media-libs/freetype
+	media-libs/libjpeg-turbo:=
+	sys-libs/libcap"
 DEPEND="${COMMON_DEPEND}
 	>=virtual/linuxtv-dvb-headers-5.3"
 RDEPEND="${COMMON_DEPEND}
@@ -33,10 +31,11 @@ RDEPEND="${COMMON_DEPEND}
 	media-fonts/corefonts
 	bidi? ( dev-libs/fribidi )
 	systemd? ( sys-apps/systemd )"
-BDEPEND="sys-devel/gettext"
+BDEPEND="
+	sys-devel/gettext
+	virtual/pkgconfig"
 
-REQUIRED_USE="pinplugin? ( !mainmenuhooks )
-	permashift? ( !naludump !pinplugin )"
+REQUIRED_USE="permashift? ( !naludump !pinplugin )"
 
 CONF_DIR="/etc/vdr"
 CAP_FILE="${S}/capabilities.sh"
@@ -46,13 +45,7 @@ pkg_setup() {
 	use debug && append-flags -g
 
 	PLUGIN_LIBDIR="/usr/$(get_libdir)/vdr/plugins"
-
-	# use the corrected DIR /var/lib/vdr/* for acct/{user,group) handling
-	if has_version ">=media-tv/gentoo-vdr-scripts-3.0_rc1"; then
-		VIDEO_DIR="/var/lib/vdr/video"
-	else
-		VIDEO_DIR="/var/vdr/video"
-	fi
+	VIDEO_DIR="$(egethome vdr)/video"
 
 	tc-export CC CXX AR
 }
@@ -68,17 +61,6 @@ 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 keyboard 1 0)"
-	# detailed compile output for debug
-	export "VERBOSE=$(usex verbose 1 0)"
-}
-
 src_prepare() {
 	# apply maintenance-patches
 	ebegin "Changing paths for gentoo"
@@ -136,15 +118,12 @@ src_prepare() {
 	# fix clang/LLVM compile
 	eapply "${FILESDIR}/${PN}-2.4.6_clang.patch"
 
-	# fix gcc-11 compile
-	eapply "${FILESDIR}/${P}_gcc11.patch"
-
-	use naludump && eapply "${DISTDIR}/${PN}-2.1.5-naludump-0.1.diff"
-	use permashift && eapply "${WORKDIR}/${PN}-2.4-patch-for-permashift.diff"
-	use pinplugin && eapply "${WORKDIR}/${PN}-2.4.6_pinplugin.patch"
-	use ttxtsubs && eapply "${WORKDIR}/${PN}-2.4.6_ttxtsubs_v2.patch"
+	use naludump && eapply "${FILESDIR}/${PN}-2.6.1_naludump.patch"
+	use permashift && eapply "${FILESDIR}/${PN}-2.6.1-patch-for-permashift.patch"
+	use pinplugin && eapply "${FILESDIR}/${PN}-2.6.1_pinplugin.patch"
+	use ttxtsubs && eapply "${DISTDIR}/vdr-2.6.1_ttxtsubs_v2.patch"
 	use menuorg && eapply "${DISTDIR}/vdr-menuorg-2.3.x.diff"
-	use mainmenuhooks && eapply "${WORKDIR}/${PN}-2.4.1_mainmenuhook-1.0.1.patch"
+	use mainmenuhooks && eapply "${FILESDIR}/${PN}-2.4.1_mainmenuhook-1.0.1.patch"
 
 	add_cap CAP_UTF8 \
 		CAP_IRCTRL_RUNTIME_PARAM \
@@ -172,6 +151,17 @@ src_prepare() {
 	default
 }
 
+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 keyboard 1 0)"
+	# detailed compile output for debug
+	export "VERBOSE=$(usex verbose 1 0)"
+}
+
 src_install() {
 	# trick the makefile to not create a VIDEODIR by supplying it with an
 	# existing directory