gentoo resync : 20.03.2021

4 files changed, 3 insertions, 196 deletions

diff --git a/media-plugins/vdr-epgsearch/Manifest b/media-plugins/vdr-epgsearch/Manifest
index 8ac795ccfa8d..e927cf701ad4 100644
--- a/media-plugins/vdr-epgsearch/Manifest
+++ b/media-plugins/vdr-epgsearch/Manifest
@@ -7,8 +7,6 @@ AUX vdr-epgsearch-2.4.0_makefile.patch 1524 BLAKE2B 48ccd25c22e242d9c2f42c40afe6
 AUX vdr-epgsearch-2.4.0_p20200402_clang.patch 1186 BLAKE2B 85dc9f066a907635c6335e671fff1741c0cec1816f7b35ee5103f4d97b021f499ddd3d27a67f3b97783e464bb64b4c54932bfc48309e38d6715207faf5228995 SHA512 fb87ae50b7997fa3e429448f47f15190e11dd6da215b16582b8a8689c1b039295f61998b4d7116b97a1d5090ea2edb36d8ae6eec3e6328fb384feaccf399100c
 DIST vdr-epgsearch-2.2.0.tgz 472502 BLAKE2B f98053d95a6fe56aff48bd3e86ae8a37166b3b8556fe3500c956901cb3f8d19c5792b157606d372392b7387c05a72f4d664881a27bbd5b9484640d8de73b8673 SHA512 c0fef60069addc3cca82535c22b7e1f73f01de7466bc6d0b837ba34df7a7dd0fe2cbf7e9b9bc36a523a75a3db18889a1ff9040fb2647c889ea74666067c3a1e4
 DIST vdr-epgsearch-2.4.0_p20200402.tar.gz 479998 BLAKE2B 04e83bd2361743669baba7b10a27fab91f22115b81fe69e9252cc5ecd94fb0fda55d8b6ce3fcaeb08e779f07d46d26e37026d1732d6b38c03385c659eacd5ab0 SHA512 586b369a25c32bbf2d33e68997e7298ad7fda50ac78da5321c848a74d91753a51e6f47d70ef6893ca980bfa2c9f167defd611464729ca4ebf704247e8e37a065
-EBUILD vdr-epgsearch-2.2.0-r1.ebuild 2405 BLAKE2B cd48805ac512e1e493eebb8743d45af92addf2c58362672b054d5af56518c7fd1b8738c935943aa613e85a78bf19cf7cc4044cbf082e10ba40c0a53e2c3cd17d SHA512 834614271358f7753eaa2b66665e0af0f19c7b33ca52797982c18dc08a2a5268f1c301f29f36d41368855254843d2ee4e063eeee9d0fb13452f434228b27d036
 EBUILD vdr-epgsearch-2.2.0.ebuild 2304 BLAKE2B f5c4f3fbe477295ebb203d7edefcda859af50f76ed7ec7e18e814661e9c8cd037bf961f6f10874d1d59952e2ec34dc5f6cffcdd96c0227adef6c7c643a5a4c75 SHA512 e6ffcc191385616ba709499b80a9c54d9041648c3a2ea02c95cec877f84e0d949c47f5d9aa2d19e8b52a12387edf4b0f38f54ae9f10a6be2b1b2b1b1f14bf7ee
 EBUILD vdr-epgsearch-2.4.0_p20200402-r1.ebuild 2492 BLAKE2B 53afeefc9248ae9318c8fd48d67238d3df33cd938cc0f42dbf9b8477681903eedc043bb53fb079e473ef0f47bcb22825c1434edee2660c458739ee90029c5463 SHA512 3ec9992c40baef8f9a0e20a9591752c65b6f724428cef2d441d966f9dcc8bb4f88eb8f52a2b0c54385e1bb3a38e18f0ccb861e6bb500fd76395b6270b329341c
-EBUILD vdr-epgsearch-2.4.0_p20200402.ebuild 2485 BLAKE2B fd7865a31511456cb24fb5f06b436a2e45669a9589aca5ef2311a4c08842972e7ac37df0ef775aca5dd0d531ad3c9f64294ecbec49bbd85d21d6e9142f57c456 SHA512 08edfb1c53eb798f9e233c615ecf293ad21ea267a2194e691fb5d121099fa3a79eb773439384f8e3ab71c528a8e48c5007133be8e95ee9244ffe74d2bc64f99c
-MISC metadata.xml 816 BLAKE2B 2a7a4b5223b30aaffd7e0300ceba04f69d411e1b4615e0fb8d1ff6afa65850f4558c065a1e3ca6a12c2526d2bf736cbc7b6aba8a9fc66b3dcef09dfa4b7ec3bc SHA512 ea3e5fac06c7e1a53b127d2ce10bbccbf97a80cadcd172100f39512772b0120f59ef9f538b779ebc6a8df6431000f1e4112a18a0300841a8e2c5065f4016b3cd
+MISC metadata.xml 846 BLAKE2B dc6acabb12fac7762e08746152b6c532f58a52f8a991261dd481b93a097218427e10c04a8f37488f796a8af9ca89f6caea45c7b842ea29a33a371ee401324fbc SHA512 ead246cb97042112c9ea8a979384060773f5369c3c78fd083da14271a7531202ba1bf32f3dff656ebb4ac9e06ec692dbf5e6ed0de9320d21458505452fdee375
diff --git a/media-plugins/vdr-epgsearch/metadata.xml b/media-plugins/vdr-epgsearch/metadata.xml
index 44d42030c0ca..b53647e303b1 100644
--- a/media-plugins/vdr-epgsearch/metadata.xml
+++ b/media-plugins/vdr-epgsearch/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
+<maintainer type="person" proxied="yes">
 	<email>martin.dummer@gmx.net</email>
 	<name>Martin Dummer</name>
 </maintainer>
-<maintainer type="project">
+<maintainer type="project" proxied="proxy">
 	<email>proxy-maint@gentoo.org</email>
 	<name>Proxy Maintainers</name>
 </maintainer>
diff --git a/media-plugins/vdr-epgsearch/vdr-epgsearch-2.2.0-r1.ebuild b/media-plugins/vdr-epgsearch/vdr-epgsearch-2.2.0-r1.ebuild
deleted file mode 100644
index 25420e6723ec..000000000000
--- a/media-plugins/vdr-epgsearch/vdr-epgsearch-2.2.0-r1.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit vdr-plugin-2
-
-DESCRIPTION="VDR plugin: create timers from epg content based on saved search expressions"
-HOMEPAGE="http://winni.vdr-developer.org/epgsearch/index_eng.html"
-SRC_URI="https://projects.vdr-developer.org/git/vdr-plugin-${VDRPLUGIN}.git/snapshot/vdr-plugin-${VDRPLUGIN}-${PV}.tar.gz -> ${P}.tgz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="conflictcheckonly epgsearchonly pcre quicksearch tre"
-REQUIRED_USE="?? ( pcre tre )"
-
-DEPEND="
-	=media-video/vdr-2.2*
-	pcre? ( dev-libs/libpcre )
-	tre? ( dev-libs/tre )"
-RDEPEND="${DEPEND}"
-BDEPEND="
-	sys-apps/groff
-	dev-lang/perl"
-
-QA_FLAGS_IGNORED="
-	usr/lib/vdr/plugins/libvdr-.*
-	usr/lib64/vdr/plugins/libvdr-.*
-	usr/bin/createcats"
-S="${WORKDIR}/vdr-plugin-${VDRPLUGIN}-${PV}"
-
-PATCHES=(
-	"${FILESDIR}/${P}_makefile.patch"
-	"${FILESDIR}/${P}_docsrc2man-no-gzip.patch"
-	"${FILESDIR}/${P}_clang.patch"
-)
-
-src_prepare() {
-	# remove untranslated .po files
-	rm "${S}"/po/{ca_ES,da_DK,el_GR,et_EE,hr_HR,hu_HU,nn_NO,pl_PL,pt_PT,ro_RO,ru_RU,sl_SI,sv_SE,tr_TR}.po \
-		|| die "cannot remove untranslated .po files"
-
-	if ! use conflictcheckonly; then
-		sed -e "s:install-\$(PLUGIN3)::" -i Makefile || die "cannot modify Makefile"
-	fi
-
-	if ! use epgsearchonly; then
-		sed -e "s:install-\$(PLUGIN2)::" -i Makefile || die "cannot modify Makefile"
-	fi
-
-	if ! use quicksearch; then
-		sed -e "s:install-\$(PLUGIN4)::" -i Makefile || die "cannot modify Makefile"
-	fi
-
-	vdr-plugin-2_src_prepare
-
-	fix_vdr_libsi_include conflictcheck.c
-
-	# install conf-file disabled
-	sed -e '/^Menu/s:^:#:' -i conf/epgsearchmenu.conf || die "cannot modify epgsearchmenu.conf"
-
-	# Get rid of the broken symlink
-	rm README || die "cannot remove broken symlink"
-}
-
-src_compile() {
-	BUILD_PARAMS="SENDMAIL=/usr/sbin/sendmail AUTOCONFIG=0"
-
-	if use pcre; then
-		BUILD_PARAMS+=" REGEXLIB=pcre"
-		einfo "Using pcre for regexp searches"
-	fi
-
-	if use tre; then
-		BUILD_PARAMS+=" REGEXLIB=tre"
-		einfo "Using tre for unlimited fuzzy searches"
-	fi
-
-	vdr-plugin-2_src_compile
-}
-
-src_install() {
-	local DOCS=( conf/*.templ HISTORY* README.Translators )
-	vdr-plugin-2_src_install
-
-	diropts -m 755 -o vdr -g vdr
-	insopts -m 644 -o vdr -g vdr
-	keepdir /etc/vdr/plugins/epgsearch
-	insinto /etc/vdr/plugins/epgsearch
-	doins conf/*
-
-	doman man/en/*
-	doman -i18n=de man/de/*
-}
diff --git a/media-plugins/vdr-epgsearch/vdr-epgsearch-2.4.0_p20200402.ebuild b/media-plugins/vdr-epgsearch/vdr-epgsearch-2.4.0_p20200402.ebuild
deleted file mode 100644
index d8abad551173..000000000000
--- a/media-plugins/vdr-epgsearch/vdr-epgsearch-2.4.0_p20200402.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit vdr-plugin-2
-
-DESCRIPTION="VDR plugin: create timers from epg content based on saved search expressions"
-HOMEPAGE="http://winni.vdr-developer.org/epgsearch/index_eng.html"
-GIT_COMMIT_ID="d8cff1a251ef2b54f1de3f8e6ea55a838eeb73c3"
-SRC_URI="https://projects.vdr-developer.org/git/vdr-plugin-epgsearch.git/snapshot/vdr-plugin-epgsearch-${GIT_COMMIT_ID}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="conflictcheckonly epgsearchonly pcre quicksearch tre"
-REQUIRED_USE="?? ( pcre tre )"
-
-DEPEND="
-	>=media-video/vdr-2.4
-	pcre? ( dev-libs/libpcre )
-	tre? ( dev-libs/tre )"
-RDEPEND="${DEPEND}"
-BDEPEND="
-	sys-apps/groff
-	dev-lang/perl"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.4.0_makefile.patch"
-	"${FILESDIR}/${PN}-2.4.0_docsrc2man-no-gzip.patch"
-	"${FILESDIR}/${P}_clang.patch"
-)
-
-QA_FLAGS_IGNORED="
-	usr/lib/vdr/plugins/libvdr-.*
-	usr/lib64/vdr/plugins/libvdr-.*
-	usr/bin/createcats"
-S="${WORKDIR}/vdr-plugin-epgsearch-${GIT_COMMIT_ID}"
-
-src_prepare() {
-	# remove untranslated .po files
-	rm "${S}"/po/{ca_ES,da_DK,el_GR,et_EE,hr_HR,hu_HU,nn_NO,pl_PL,pt_PT,ro_RO,ru_RU,sl_SI,sv_SE,tr_TR}.po \
-		|| die "cannot remove untranslated .po files"
-
-	if use conflictcheckonly; then
-		sed -e "s:install-\$(PLUGIN3)::" -i Makefile || die "cannot modify Makefile"
-	fi
-
-	if use epgsearchonly; then
-		sed -e "s:install-\$(PLUGIN2)::" -i Makefile || die "cannot modify Makefile"
-	fi
-
-	if use quicksearch; then
-		sed -e "s:install-\$(PLUGIN4)::" -i Makefile || die "cannot modify Makefile"
-	fi
-
-	vdr-plugin-2_src_prepare
-
-	fix_vdr_libsi_include conflictcheck.c
-
-	# install conf-file disabled
-	sed -e '/^Menu/s:^:#:' -i conf/epgsearchmenu.conf || die "cannot modify epgsearchmenu.conf"
-
-	# Get rid of the broken symlink
-	rm README || die "cannot remove broken symlink"
-}
-
-src_compile() {
-	BUILD_PARAMS="SENDMAIL=/usr/bin/sendmail AUTOCONFIG=0"
-
-	if use pcre; then
-		BUILD_PARAMS+=" REGEXLIB=pcre"
-		einfo "Using pcre for regexp searches"
-	fi
-
-	if use tre; then
-		BUILD_PARAMS+=" REGEXLIB=tre"
-		einfo "Using tre for unlimited fuzzy searches"
-	fi
-
-	vdr-plugin-2_src_compile
-}
-
-src_install() {
-	local DOCS=( conf/*.templ HISTORY* README.Translators )
-	vdr-plugin-2_src_install
-
-	diropts -m 755 -o vdr -g vdr
-	insopts -m 644 -o vdr -g vdr
-	keepdir /etc/vdr/plugins/epgsearch
-	insinto /etc/vdr/plugins/epgsearch
-	doins conf/*
-
-	doman man/en/*
-	doman -i18n=de man/de/*
-}