gentoo resync : 11.05.2021

7 files changed, 2 insertions, 330 deletions

diff --git a/media-plugins/vdr-live/Manifest b/media-plugins/vdr-live/Manifest
index 801da0637acb..cf26ffeb0a9e 100644
--- a/media-plugins/vdr-live/Manifest
+++ b/media-plugins/vdr-live/Manifest
@@ -1,12 +1,5 @@
-AUX confd-0.2 467 BLAKE2B e827ae5ec7cdeb9211574f4402885aa487ba969e6ecf74f4c6e807b1eae78aa85fea236e682a83e9643c2154ed827ace4e9651dfa8332f918ae0f4eacd0d4854 SHA512 bea6f86cb590199def38df9ff4f462c6e0462d0623c5fdb6b416cffb49b9966ccbd7f364a52bfe702e1c638f3a97873e0ac019d246d3c84b88c58060ab004c51
 AUX confd-2.3 594 BLAKE2B e4e342ce5e7379d0a84ce67644a4011c2978140488f9f1a71c135bb769c8547d6362481526d7f51509e00250a10bb9e4d4a03fee64fa97db1819c5b45243a9db SHA512 d2fa96fdbe1a00fa9f1181b36fa43f2fd2f28a1d270671b8f6c422fc8309b625dc64b8425551d9ef9db2b0929d748555bfdca16349126f78f439c4fe366969e0
-AUX rc-addon-0.2.sh 489 BLAKE2B 770e03cb0dd21a66589a1838f19785d22378ea5fa6c9206c6ad0d0ec9a5bb86089d6b157758fa7d3d43532e2ffbe81853bdc62f0ecd51ec68940d1486d7b707b SHA512 f42c6e6e03ba33e15c02fc3b42faa15b822d78944c4e29432c230fbc75e636cac6ce64efbed0521965a4fc4054a1a9c9ced0e25a5e8b44fd16332dc5c5269ff2
 AUX rc-addon-2.3.sh 619 BLAKE2B a6d994ef6476f17ba558a778ce13a4a72d6c513d10cd2ce43dee8a7ea598682bbd83e27759f1e53644b7f4046274559cf5cc9614775c5d1b05934819b6262604 SHA512 c07a13a91f6f0d2f5ad990545875adac161a61d944053c19cf43e1252c18e9e98127cafc704d5a729dcbc887576f83ce78413deac8c35fad5962f1e769c36b93
-AUX vdr-live-0.3.0_p20130504_vdr-2.1.2.diff 2722 BLAKE2B 021d4470ec84e7912b57b79a706c977ddb1b5ce67880dbdcf0b4bbc5cce7ad3646d05e89d2b31791f91a4af137e8a3e5995ff79580a8db7d5347b7c5a69ceaf1 SHA512 813e17202fb9dd921e38492127ad8518fc4aa2f6240ce9284990bf3e0a40c04b3b56efcaf667ce5f4aedf9b6e76422e2bb73c3218d124f3d8452b3b7979ba0b2
-DIST vdr-live-0.3.0_p20130504.tar.bz2 6348021 BLAKE2B 64567a037dd283d005727b993053609e7c46784de67bcbd9afb4f68edd03cec494e6eca6c497ac578928de92c1d21b2519867c014cfd11ace79e957fc5d487d1 SHA512 7a238a4567f90448b7813366dbdb5112ab98079fd5a2c9d59d09273853fd62ad520ca9ad373704a8888eb7c25119772421fe998d87069647c40d6d2d869e09c1
-DIST vdr-live-2.3.1.tar.bz2 703327 BLAKE2B 70724894a4abf2f94d682602d722b3d015cefefa7c9daf2dae35fc84bff1d950539c916d6d97e39565e87e8e7d841277ad14e137238026b25f73b1b288fa18f5 SHA512 f943c2aa477ca943b2015eb0b49a650e5c9e5cc124549b68d36b56a0ae6344a8d32ac3c4f213ab3cb91794ae569d3ed14a84168f45bf395e90536992078bce41
 DIST vdr-live-3.0.6.tar.gz 737583 BLAKE2B e9fd7f95df7c3fcd11e9e63131c948c1d318e2bb0c5cbc2fab950abc2889df8ca8a33b71f5394b3c22c45f81ee1faf1bf71ca889ae64173be8965db6f6fbd8ac SHA512 f60cd14c3a02eeb571ffc181dabd83dd0af0595d378ed34bc9cee1d54b560d74027c758d3b4d69541a71dc6f94b5f64e3972fc51aeb5a9d688be7656636bcf98
-EBUILD vdr-live-0.3.0_p20130504-r1.ebuild 2486 BLAKE2B eaf2d48c9dd475f34862e7094a4e2af307359760d69688a521c7ca0eeddebb3a4aab01dd2a00026af01e20aa1b1d8bc6bd0d34efd667110e3093418dd4a05fcc SHA512 88d5f9146373fca41978bc0c62d92f7837629c4b4f7970c987a4b56b9a9ae9ad7c5bf52ce42fbe9fb94387a0794fd9144dc87e1f5cc9cd663fa2932b74b311e1
-EBUILD vdr-live-2.3.1.ebuild 2352 BLAKE2B 6460630ff44ad6a8116fe26f0248d3092b321c9f5ab1376d230ba6fdd21713d1568844b69b84cbf4fa77cb49159eb9354bc6b9f096c4f5fae00d329dc4d9da88 SHA512 2b36ef5c6aea1c43a9a6cf5a69daac89c39e394b59520f0620268691b186c6c574e84325b2bdd6acc45cc33fa0fccfa11522dec66703072040221feceb8b66a8
-EBUILD vdr-live-3.0.6.ebuild 2128 BLAKE2B f8ee7b7c7cc4eeca76dfcc91e5dbddf25083089fd2e23792204edc3d784720912454bf250d43665745c43bb3fd6137723ef1f319b931f880ae21a9decdc8d8ba SHA512 66afe84bf4b350b456dda35e5101059aba3d14c3210a5ab138731ec7e8372735bbf7cb1cd02a158878f957d41880a515a1a0c2f227b5a24bef26e87256399ce6
+EBUILD vdr-live-3.0.6.ebuild 2127 BLAKE2B 764eeb71dfd4ca21bad3ce08ca24b36e6232eef77d547d655282daf550c2e9e7907673445ef616c1a5f87373e0634b3880cb17572cedbc7c6205fb30f5235d7e SHA512 0595d1c8ffd7ec5ab53495b7b4367f0846e14a0895f329c2214847726721d0153b61ae01729b07a216934ea28c6838a52f23a9a00269dab0488bc732b2f84702
 MISC metadata.xml 243 BLAKE2B 6287033e852823666551691771936aead83e7394d6c41f6f5a43a4c21309300e6fcfd90e8a87a82eb90433f86344426c07f2fb7833e7226d2e3c4df9fda1d2d6 SHA512 f7d6e467a5a96c0afdd42df3c0f3866240defc5bbea5ccddf4c0b1a3c004225af5d46dab67d45a5ac34535391584f3b3727fe79ef6cef1a11413636bbc35cf06
diff --git a/media-plugins/vdr-live/files/confd-0.2 b/media-plugins/vdr-live/files/confd-0.2
deleted file mode 100644
index bbbbcb5e9d42..000000000000
--- a/media-plugins/vdr-live/files/confd-0.2
+++ /dev/null
@@ -1,23 +0,0 @@
-# configuration of media-plugins/vdr-live
-
-# for people who want more secure
-# with ssl access.
-#	on usage, you have to install vdr-live
-#	with USE="ssl"
-#
-#	SSL ADDRESS -->  https://<your-ip>:8443/
-#
-#	allowed values: yes no
-#	default: no
-#LIVE_USE_SSL="yes"
-
-# default given portnumber
-# only changes needed on problems
-#
-#LIVE_PORT="8008"
-#LIVE_SSL_PORT="8443"
-
-# bind to these IP addresses
-# default, your IP will automaticly detected
-#
-LIVE_BIND_IPS="127.0.0.1"
diff --git a/media-plugins/vdr-live/files/rc-addon-0.2.sh b/media-plugins/vdr-live/files/rc-addon-0.2.sh
deleted file mode 100644
index 54d37d795ea2..000000000000
--- a/media-plugins/vdr-live/files/rc-addon-0.2.sh
+++ /dev/null
@@ -1,25 +0,0 @@
-#
-# zzam@g.o
-# hd_brummy@g.o
-
-
-plugin_pre_vdr_start() {
-	if [ "${LIVE_USE_SSL:=no}" = "yes" ]; then
-		if [ -n "${LIVE_SSL_PORT}" ]; then
-			add_plugin_param "-s ${LIVE_SSL_PORT}"
-		fi
-
-		add_plugin_param "--cert=/etc/vdr/plugins/live/live.pem"
-		add_plugin_param "--key=/etc/vdr/plugins/live/live-key.pem"
-
-	else
-		if [ -n "${LIVE_PORT}" ]; then
-			add_plugin_param "-p ${LIVE_PORT}"
-		fi
-	fi
-
-	local ip
-	for ip in ${LIVE_BIND_IPS:=`hostname -i`}; do
-		add_plugin_param "-i ${ip}"
-	done
-}
diff --git a/media-plugins/vdr-live/files/vdr-live-0.3.0_p20130504_vdr-2.1.2.diff b/media-plugins/vdr-live/files/vdr-live-0.3.0_p20130504_vdr-2.1.2.diff
deleted file mode 100644
index 1346c9be611d..000000000000
--- a/media-plugins/vdr-live/files/vdr-live-0.3.0_p20130504_vdr-2.1.2.diff
+++ /dev/null
@@ -1,69 +0,0 @@
-diff -Naur vdr-live-0.3.0_p20130504.orig/pages/recordings.ecpp vdr-live-0.3.0_p20130504/pages/recordings.ecpp
---- vdr-live-0.3.0_p20130504.orig/pages/recordings.ecpp	2013-10-23 03:28:13.746493449 +0200
-+++ vdr-live-0.3.0_p20130504/pages/recordings.ecpp	2013-10-23 03:29:48.779832793 +0200
-@@ -79,7 +79,11 @@
- deletions.clear();
- 
- int FreeMB, UsedMB;
-+#if APIVERSNUM > 20101
-+int Percent = cVideoDirectory::VideoDiskSpace(&FreeMB, &UsedMB);
-+#else
- int Percent = VideoDiskSpace(&FreeMB, &UsedMB);
-+#endif
- int Minutes = int(double(FreeMB) / MB_PER_MINUTE);
- int Hours = Minutes / 60;
- Minutes %= 60;
-diff -Naur vdr-live-0.3.0_p20130504.orig/recman.cpp vdr-live-0.3.0_p20130504/recman.cpp
---- vdr-live-0.3.0_p20130504.orig/recman.cpp	2013-10-23 03:28:13.756493450 +0200
-+++ vdr-live-0.3.0_p20130504/recman.cpp	2013-10-23 03:31:25.813172263 +0200
-@@ -112,7 +112,11 @@
- 		if (found == string::npos)
- 			return false;
- 
-+#if APIVERSNUM > 20101
-+		string newname = string(cVideoDirectory::Name()) + "/" + name + oldname.substr(found);
-+#else
- 		string newname = string(VideoDirectory) + "/" + name + oldname.substr(found);
-+#endif
- 
- 		if (!MoveDirectory(oldname.c_str(), newname.c_str(), copy)) {
- 			esyslog("[LIVE]: renaming failed from '%s' to '%s'", oldname.c_str(), newname.c_str());
-diff -Naur vdr-live-0.3.0_p20130504.orig/tools.cpp vdr-live-0.3.0_p20130504/tools.cpp
---- vdr-live-0.3.0_p20130504.orig/tools.cpp	2013-10-23 03:28:13.799826786 +0200
-+++ vdr-live-0.3.0_p20130504/tools.cpp	2013-10-23 03:34:29.146517191 +0200
-@@ -365,7 +365,11 @@
- 			stat(source.c_str(), &st1);
- 			stat(target.c_str(),&st2);
- 			if (!copy && (st1.st_dev == st2.st_dev)) {
-+#if APIVERSNUM > 20101
-+				if (!cVideoDirectory::RenameVideoFile(source.c_str(), target.c_str())) {
-+#else
- 				if (!RenameVideoFile(source.c_str(), target.c_str())) {
-+#endif
- 					esyslog("[LIVE]: rename failed from %s to %s", source.c_str(), target.c_str());
- 					return false;
- 				}
-@@ -461,7 +465,11 @@
- 						size_t found = source.find_last_of(delim);
- 						if (found != std::string::npos) {
- 							source = source.substr(0, found);
-+#if APIVERSNUM > 20101
-+							while (source != cVideoDirectory::Name()) {
-+#else
- 							while (source != VideoDirectory) {
-+#endif
- 								found = source.find_last_of(delim);
- 								if (found == std::string::npos)
- 									break;
-@@ -478,7 +486,11 @@
- 					size_t found = target.find_last_of(delim);
- 					if (found != std::string::npos) {
- 						target = target.substr(0, found);
-+#if APIVERSNUM > 20101
-+						while (target != cVideoDirectory::Name()) {
-+#else
- 						while (target != VideoDirectory) {
-+#endif
- 							found = target.find_last_of(delim);
- 							if (found == std::string::npos)
- 								break;
diff --git a/media-plugins/vdr-live/vdr-live-0.3.0_p20130504-r1.ebuild b/media-plugins/vdr-live/vdr-live-0.3.0_p20130504-r1.ebuild
deleted file mode 100644
index 3d0c535fa2fd..000000000000
--- a/media-plugins/vdr-live/vdr-live-0.3.0_p20130504-r1.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit flag-o-matic vdr-plugin-2 ssl-cert
-
-DESCRIPTION="VDR Plugin: Web Access To Settings"
-HOMEPAGE="http://live.vdr-developer.org"
-SRC_URI="mirror://gentoo/${P}.tar.bz2
-		https://dev.gentoo.org/~hd_brummy/distfiles/${P}.tar.bz2"
-
-LICENSE="GPL-2 RSA"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="pcre ssl"
-
-DEPEND="media-video/vdr
-	>=dev-libs/tntnet-2.2.1[ssl=]
-	>=dev-libs/cxxtools-2.2.1
-	pcre? ( >=dev-libs/libpcre-8.12[cxx] )"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${P}"
-
-VDR_CONFD_FILE="${FILESDIR}/confd-0.2"
-VDR_RCADDON_FILE="${FILESDIR}/rc-addon-0.2.sh"
-
-KEEP_I18NOBJECT="yes"
-
-make_live_cert() {
-	# TODO: still true?
-	# ssl-cert eclass creates a "invalid" cert, create our own one
-	local base=$(get_base 1)
-	local keydir="/etc/vdr/plugins/live"
-
-	SSL_ORGANIZATION="${SSL_ORGANIZATION:-VDR Plugin Live}"
-	SSL_COMMONNAME="${SSL_COMMONNAME:-`hostname -f`}"
-
-	echo
-	gen_cnf || return 1
-	echo
-	gen_key 1 || return 1
-	gen_csr 1 || return 1
-	gen_crt 1 || return 1
-	echo
-
-	install -d "${ROOT}${keydir}"
-	install -m0400 "${base}.key" "${ROOT}${keydir}/live-key.pem"
-	install -m0444 "${base}.crt" "${ROOT}${keydir}/live.pem"
-	chown vdr:vdr "${ROOT}"/etc/vdr/plugins/live/live{,-key}.pem
-}
-
-src_configure() {
-	# tmp. disabled gcc -std=c++11, due massiv compile errors
-	filter-flags -std=c++11
-}
-
-src_prepare() {
-	# remove untranslated language files
-	rm "${S}"/po/{ca_ES,da_DK,el_GR,et_EE,hr_HR,hu_HU,nl_NL,nn_NO,pt_PT,ro_RO,ru_RU,sl_SI,sv_SE,tr_TR}.po
-
-	vdr-plugin-2_src_prepare
-
-	epatch "${FILESDIR}/${P}_vdr-2.1.2.diff"
-
-	if ! use pcre; then
-		sed -i "s:^HAVE_LIBPCRECPP:#HAVE_LIBPCRECPP:" Makefile || die
-	fi
-}
-
-src_install() {
-	vdr-plugin-2_src_install
-
-	insinto /usr/share/vdr/plugins/live
-	doins -r live/*
-
-	fowners -R vdr:vdr /usr/share/vdr/plugins/live
-}
-
-pkg_postinst() {
-	vdr-plugin-2_pkg_postinst
-
-	elog "To be able to use all functions of vdr-live"
-	elog "you should emerge and enable"
-	elog "media-plugins/vdr-epgsearch to search the EPG,"
-	elog "media-plugins/vdr-streamdev for Live-TV streaming"
-
-	elog "The default username/password is:"
-	elog "\tadmin:live"
-
-	if use ssl ; then
-		if [[ -f ${ROOT}/etc/vdr/plugins/live/live.pem ]]; then
-			einfo "found an existing SSL cert, to create a new SSL cert, run:\n"
-			einfo "emerge --config ${PN}"
-		else
-			einfo "No SSL cert found, creating a default one now"
-			make_live_cert
-		fi
-	fi
-}
-
-pkg_config() {
-	make_live_cert
-}
diff --git a/media-plugins/vdr-live/vdr-live-2.3.1.ebuild b/media-plugins/vdr-live/vdr-live-2.3.1.ebuild
deleted file mode 100644
index 965fe62f8ffa..000000000000
--- a/media-plugins/vdr-live/vdr-live-2.3.1.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit vdr-plugin-2 ssl-cert
-
-MY_P="release_2-3-1"
-
-DESCRIPTION="VDR Plugin: Web Access To Settings"
-HOMEPAGE="http://live.vdr-developer.org"
-SRC_URI="https://projects.vdr-developer.org/git/vdr-plugin-live.git/snapshot/${MY_P}.tar.bz2 -> ${P}.tar.bz2"
-
-LICENSE="GPL-2 RSA"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="pcre ssl"
-
-DEPEND="media-video/vdr
-	>=dev-libs/tntnet-2.2.1[ssl=]
-	>=dev-libs/cxxtools-2.2.1
-	pcre? ( >=dev-libs/libpcre-8.12[cxx] )"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-VDR_CONFD_FILE="${FILESDIR}/confd-2.3"
-VDR_RCADDON_FILE="${FILESDIR}/rc-addon-2.3.sh"
-
-KEEP_I18NOBJECT="yes"
-
-make_live_cert() {
-	# TODO: still true?
-	# ssl-cert eclass creates a "invalid" cert, create our own one
-	local base=$(get_base 1)
-	local keydir="/etc/vdr/plugins/live"
-
-	SSL_ORGANIZATION="${SSL_ORGANIZATION:-VDR Plugin Live}"
-	SSL_COMMONNAME="${SSL_COMMONNAME:-`hostname -f`}"
-
-	echo
-	gen_cnf || return 1
-	echo
-	gen_key 1 || return 1
-	gen_csr 1 || return 1
-	gen_crt 1 || return 1
-	echo
-
-	install -d "${ROOT}${keydir}"
-	install -m0400 "${base}.key" "${ROOT}${keydir}/live-key.pem"
-	install -m0444 "${base}.crt" "${ROOT}${keydir}/live.pem"
-	chown vdr:vdr "${ROOT}"/etc/vdr/plugins/live/live{,-key}.pem
-}
-
-src_prepare() {
-	# remove untranslated language files
-	rm "${S}"/po/{ca_ES,da_DK,el_GR,et_EE,hr_HR,hu_HU,nl_NL,nn_NO,pt_PT,ro_RO,sl_SI,tr_TR}.po
-
-	vdr-plugin-2_src_prepare
-
-	if ! use pcre; then
-		sed -i "s:^HAVE_LIBPCRECPP:#HAVE_LIBPCRECPP:" Makefile || die
-	fi
-}
-
-src_install() {
-	vdr-plugin-2_src_install
-
-	insinto /usr/share/vdr/plugins/live
-	doins -r live/*
-
-	fowners -R vdr:vdr /usr/share/vdr/plugins/live
-}
-
-pkg_postinst() {
-	vdr-plugin-2_pkg_postinst
-
-	elog "To be able to use all functions of vdr-live"
-	elog "you should emerge and enable"
-	elog "media-plugins/vdr-epgsearch to search the EPG,"
-	elog "media-plugins/vdr-streamdev for Live-TV streaming"
-
-	elog "The default username/password is:"
-	elog "\tadmin:live"
-
-	if use ssl ; then
-		if [[ -f ${ROOT}/etc/vdr/plugins/live/live.pem ]]; then
-			einfo "found an existing SSL cert, to create a new SSL cert, run:\n"
-			einfo "emerge --config ${PN}"
-		else
-			einfo "No SSL cert found, creating a default one now"
-			make_live_cert
-		fi
-	fi
-}
-
-pkg_config() {
-	make_live_cert
-}
diff --git a/media-plugins/vdr-live/vdr-live-3.0.6.ebuild b/media-plugins/vdr-live/vdr-live-3.0.6.ebuild
index 969344c6ee70..ba9c107d430f 100644
--- a/media-plugins/vdr-live/vdr-live-3.0.6.ebuild
+++ b/media-plugins/vdr-live/vdr-live-3.0.6.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/MarkusEh/vdr-plugin-live/archive/${MY_P}.tar.gz -> $
 
 LICENSE="Apache-2.0 GPL-2+ RSA"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="pcre ssl"
 
 DEPEND="media-video/vdr