gentoo resync : 15.01.2020

5 files changed, 0 insertions, 324 deletions

diff --git a/media-plugins/vdr-live/Manifest b/media-plugins/vdr-live/Manifest
index 2dff00eb71de..13834b35f9de 100644
--- a/media-plugins/vdr-live/Manifest
+++ b/media-plugins/vdr-live/Manifest
@@ -1,16 +1,12 @@
 AUX confd 125 BLAKE2B 798765df74a0f41989d1d937600239760383470b52a0498c81f583c488de58d27c8ab2e0b1cbb3dfc346b86a4a3efccf9f73c0eb416c23454fa0c7c147758f9f SHA512 c69a6b1a99f86e9271b925439bb08acf7ab65ebc75b354197eb2668996af966d047a99b1c712efac6efbc031fd9b61d2c90f45331aed74a9093f24982c307505
 AUX confd-0.2 467 BLAKE2B e827ae5ec7cdeb9211574f4402885aa487ba969e6ecf74f4c6e807b1eae78aa85fea236e682a83e9643c2154ed827ace4e9651dfa8332f918ae0f4eacd0d4854 SHA512 bea6f86cb590199def38df9ff4f462c6e0462d0623c5fdb6b416cffb49b9966ccbd7f364a52bfe702e1c638f3a97873e0ac019d246d3c84b88c58060ab004c51
-AUX confd-0.3 594 BLAKE2B e4e342ce5e7379d0a84ce67644a4011c2978140488f9f1a71c135bb769c8547d6362481526d7f51509e00250a10bb9e4d4a03fee64fa97db1819c5b45243a9db SHA512 d2fa96fdbe1a00fa9f1181b36fa43f2fd2f28a1d270671b8f6c422fc8309b625dc64b8425551d9ef9db2b0929d748555bfdca16349126f78f439c4fe366969e0
 AUX confd-2.3 594 BLAKE2B e4e342ce5e7379d0a84ce67644a4011c2978140488f9f1a71c135bb769c8547d6362481526d7f51509e00250a10bb9e4d4a03fee64fa97db1819c5b45243a9db SHA512 d2fa96fdbe1a00fa9f1181b36fa43f2fd2f28a1d270671b8f6c422fc8309b625dc64b8425551d9ef9db2b0929d748555bfdca16349126f78f439c4fe366969e0
 AUX rc-addon-0.2.sh 489 BLAKE2B 770e03cb0dd21a66589a1838f19785d22378ea5fa6c9206c6ad0d0ec9a5bb86089d6b157758fa7d3d43532e2ffbe81853bdc62f0ecd51ec68940d1486d7b707b SHA512 f42c6e6e03ba33e15c02fc3b42faa15b822d78944c4e29432c230fbc75e636cac6ce64efbed0521965a4fc4054a1a9c9ced0e25a5e8b44fd16332dc5c5269ff2
-AUX rc-addon-0.3.sh 619 BLAKE2B a6d994ef6476f17ba558a778ce13a4a72d6c513d10cd2ce43dee8a7ea598682bbd83e27759f1e53644b7f4046274559cf5cc9614775c5d1b05934819b6262604 SHA512 c07a13a91f6f0d2f5ad990545875adac161a61d944053c19cf43e1252c18e9e98127cafc704d5a729dcbc887576f83ce78413deac8c35fad5962f1e769c36b93
 AUX rc-addon-2.3.sh 619 BLAKE2B a6d994ef6476f17ba558a778ce13a4a72d6c513d10cd2ce43dee8a7ea598682bbd83e27759f1e53644b7f4046274559cf5cc9614775c5d1b05934819b6262604 SHA512 c07a13a91f6f0d2f5ad990545875adac161a61d944053c19cf43e1252c18e9e98127cafc704d5a729dcbc887576f83ce78413deac8c35fad5962f1e769c36b93
 AUX rc-addon.sh 180 BLAKE2B b8df7fdcd9377997d7ac4906b365de30f6ed7642dd6b48d5e3410f87fcb3cc3121888e61d42fbaed483f38f4d73449b2f4eaecafe9e5f045cb061d2edd76c301 SHA512 2bdf0e809148bbeb33ede687d40332b26dfaa2dc8be2e743f7c56cb19f572ff30e88ceac8c80602b8a39e0dc1657cd79f7afa1b8993b37714a400f7b1384f622
-AUX vdr-live-0.3.0_p20130504-c++11.patch 5995 BLAKE2B 98d91c9d579c5b7e2843bb92bb73ce602af72608182f307d2ff6853ba10405d3410245a856c94b8ee8e4b2bad708e2ff2d184836cc5fafea9b106f88ef3234c1 SHA512 88e66be9541a8c26821187c9732afba70df725b3b6e4ae52c3a343211ff1e3fcc78a577028d62d31f5f96f4ff542ab87ad252c2d794563b62c177c686e5b5adc
 AUX vdr-live-0.3.0_p20130504_vdr-2.1.2.diff 2722 BLAKE2B 021d4470ec84e7912b57b79a706c977ddb1b5ce67880dbdcf0b4bbc5cce7ad3646d05e89d2b31791f91a4af137e8a3e5995ff79580a8db7d5347b7c5a69ceaf1 SHA512 813e17202fb9dd921e38492127ad8518fc4aa2f6240ce9284990bf3e0a40c04b3b56efcaf667ce5f4aedf9b6e76422e2bb73c3218d124f3d8452b3b7979ba0b2
 DIST release_2-3-1.tar.bz2 703327 BLAKE2B 70724894a4abf2f94d682602d722b3d015cefefa7c9daf2dae35fc84bff1d950539c916d6d97e39565e87e8e7d841277ad14e137238026b25f73b1b288fa18f5 SHA512 f943c2aa477ca943b2015eb0b49a650e5c9e5cc124549b68d36b56a0ae6344a8d32ac3c4f213ab3cb91794ae569d3ed14a84168f45bf395e90536992078bce41
 DIST vdr-live-0.3.0_p20130504.tar.bz2 6348021 BLAKE2B 64567a037dd283d005727b993053609e7c46784de67bcbd9afb4f68edd03cec494e6eca6c497ac578928de92c1d21b2519867c014cfd11ace79e957fc5d487d1 SHA512 7a238a4567f90448b7813366dbdb5112ab98079fd5a2c9d59d09273853fd62ad520ca9ad373704a8888eb7c25119772421fe998d87069647c40d6d2d869e09c1
 EBUILD vdr-live-0.3.0_p20130504-r1.ebuild 2472 BLAKE2B 2eb1baaeee70bee4e9eeff77fbfe1e9c72239ba3fe8cee61dfefce5a10947df8cf071b7360b8e12b771f9685b0fb4fb5c7724753793b36a5b096683ff147fd76 SHA512 eb9d16b2b2dbf5d76f289ccc6ee33cfab4c92543bb27771590e84d34a51a38c5887c414811135f8550bc0f18b5343534a7a142d11153318946a0ed3e5777240e
-EBUILD vdr-live-0.3.0_p20130504-r2.ebuild 2490 BLAKE2B a49886074991f1d19576c673616c012f2ecc17e32c54e5677e60777fd819d29eac12d813d12dc82ef631a7080e86831fd59f49210aaa59a192b35a023d2cbc02 SHA512 1f4d096edb81c10d40ef20078698205ff135508dc67c0e69bc09f6e66b2eda90762b49e2dcb7415769e7186484a08326bb61b97de219e543c2a81636ba7a5690
 EBUILD vdr-live-2.3.1.ebuild 2345 BLAKE2B 9adbf74f2696f1952f1d519930d9277ab3e031c87089d75de38834cbebe7fc026011917cc2abe025796e60aa9d0ba13deff5bed4dd2f0603bdd8f681750de15e SHA512 9e41e251e2c43737c9ae74b1018f21db5b3e5bd33823ab4f58a30d6b85df5834e6f76c3609300a5fb0cc699214be4f95f645cf202cab5abfc06d2738f29d0994
 MISC metadata.xml 243 BLAKE2B 6287033e852823666551691771936aead83e7394d6c41f6f5a43a4c21309300e6fcfd90e8a87a82eb90433f86344426c07f2fb7833e7226d2e3c4df9fda1d2d6 SHA512 f7d6e467a5a96c0afdd42df3c0f3866240defc5bbea5ccddf4c0b1a3c004225af5d46dab67d45a5ac34535391584f3b3727fe79ef6cef1a11413636bbc35cf06
diff --git a/media-plugins/vdr-live/files/confd-0.3 b/media-plugins/vdr-live/files/confd-0.3
deleted file mode 100644
index cb1dce04dfb5..000000000000
--- a/media-plugins/vdr-live/files/confd-0.3
+++ /dev/null
@@ -1,29 +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"
-
-# for people who have epgimges
-# default: /var/cache/vdr/epgimges
-#
-# set this to your own path, if needed
-#EPGIMAGES_DIR=" "
diff --git a/media-plugins/vdr-live/files/rc-addon-0.3.sh b/media-plugins/vdr-live/files/rc-addon-0.3.sh
deleted file mode 100644
index 1372e09d56f0..000000000000
--- a/media-plugins/vdr-live/files/rc-addon-0.3.sh
+++ /dev/null
@@ -1,30 +0,0 @@
-#
-# zzam@g.o
-# hd_brummy@g.o
-
-EPGIMAGES_DIR="/var/cache/vdr/epgimages"
-
-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
-
-	if [ -d ${EPGIMAGES_DIR} ]; then
-		add_plugin_param "--epgimages=${EPGIMAGES_DIR}"
-	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-c++11.patch b/media-plugins/vdr-live/files/vdr-live-0.3.0_p20130504-c++11.patch
deleted file mode 100644
index e2bf96dec4a1..000000000000
--- a/media-plugins/vdr-live/files/vdr-live-0.3.0_p20130504-c++11.patch
+++ /dev/null
@@ -1,153 +0,0 @@
-Bug: https://bugs.gentoo.org/599752
-
---- a/recman.cpp
-+++ b/recman.cpp
-@@ -22,10 +22,10 @@
- 	/**
- 	 *  Implementation of class RecordingsManager:
- 	 */
--	weak_ptr< RecordingsManager > RecordingsManager::m_recMan;
--	shared_ptr< RecordingsTree > RecordingsManager::m_recTree;
--	shared_ptr< RecordingsList > RecordingsManager::m_recList;
--	shared_ptr< DirectoryList > RecordingsManager::m_recDirs;
-+	std::tr1::weak_ptr< RecordingsManager > RecordingsManager::m_recMan;
-+	std::tr1::shared_ptr< RecordingsTree > RecordingsManager::m_recTree;
-+	std::tr1::shared_ptr< RecordingsList > RecordingsManager::m_recList;
-+	std::tr1::shared_ptr< DirectoryList > RecordingsManager::m_recDirs;
- 	int RecordingsManager::m_recordingsState = 0;
- 
- 	// The RecordingsManager holds a VDR lock on the
-@@ -53,7 +53,7 @@
- 	{
- 		RecordingsManagerPtr recMan = EnsureValidData();
- 		if (! recMan) {
--			return RecordingsTreePtr(recMan, shared_ptr< RecordingsTree >());
-+			return RecordingsTreePtr(recMan, std::tr1::shared_ptr< RecordingsTree >());
- 		}
- 		return RecordingsTreePtr(recMan, m_recTree);
- 	}
-@@ -62,25 +62,25 @@
- 	{
- 		RecordingsManagerPtr recMan = EnsureValidData();
- 		if (! recMan) {
--			return RecordingsListPtr(recMan, shared_ptr< RecordingsList >());
-+			return RecordingsListPtr(recMan, std::tr1::shared_ptr< RecordingsList >());
- 		}
--		return RecordingsListPtr(recMan, shared_ptr< RecordingsList >(new RecordingsList(m_recList, ascending)));
-+		return RecordingsListPtr(recMan, std::tr1::shared_ptr< RecordingsList >(new RecordingsList(m_recList, ascending)));
- 	}
- 
- 	RecordingsListPtr RecordingsManager::GetRecordingsList(time_t begin, time_t end, bool ascending) const
- 	{
- 		RecordingsManagerPtr recMan = EnsureValidData();
- 		if (! recMan) {
--			return RecordingsListPtr(recMan, shared_ptr< RecordingsList >());
-+			return RecordingsListPtr(recMan, std::tr1::shared_ptr< RecordingsList >());
- 		}
--		return RecordingsListPtr(recMan, shared_ptr< RecordingsList >(new RecordingsList(m_recList, ascending)));
-+		return RecordingsListPtr(recMan, std::tr1::shared_ptr< RecordingsList >(new RecordingsList(m_recList, ascending)));
- 	}
- 
- 	DirectoryListPtr RecordingsManager::GetDirectoryList() const
- 	{
- 		RecordingsManagerPtr recMan = EnsureValidData();
- 		if (!recMan) {
--			return DirectoryListPtr(recMan, shared_ptr< DirectoryList >());
-+			return DirectoryListPtr(recMan, std::tr1::shared_ptr< DirectoryList >());
- 		}
- 		return DirectoryListPtr(recMan, m_recDirs);
- 	}
-@@ -260,21 +264,21 @@
- 				m_recDirs.reset();
- 			}
- 			if (stateChanged || !m_recTree) {
--				m_recTree = shared_ptr< RecordingsTree >(new RecordingsTree(recMan));
-+				m_recTree = std::tr1::shared_ptr< RecordingsTree >(new RecordingsTree(recMan));
- 			}
- 			if (!m_recTree) {
- 				esyslog("[LIVE]: creation of recordings tree failed!");
- 				return RecordingsManagerPtr();
- 			}
- 			if (stateChanged || !m_recList) {
--				m_recList = shared_ptr< RecordingsList >(new RecordingsList(RecordingsTreePtr(recMan, m_recTree)));
-+				m_recList = std::tr1::shared_ptr< RecordingsList >(new RecordingsList(RecordingsTreePtr(recMan, m_recTree)));
- 			}
- 			if (!m_recList) {
- 				esyslog("[LIVE]: creation of recordings list failed!");
- 				return RecordingsManagerPtr();
- 			}
- 			if (stateChanged || !m_recDirs) {
--				m_recDirs = shared_ptr< DirectoryList >(new DirectoryList(recMan));
-+				m_recDirs = std::tr1::shared_ptr< DirectoryList >(new DirectoryList(recMan));
- 			}
- 			if (!m_recDirs) {
- 				esyslog("[LIVE]: creation of directory list failed!");
-@@ -543,13 +547,13 @@
- 	 *  Implementation of class RecordingsTreePtr:
- 	 */
- 	RecordingsTreePtr::RecordingsTreePtr() :
--		shared_ptr<RecordingsTree>(),
-+		std::tr1::shared_ptr<RecordingsTree>(),
- 		m_recManPtr()
- 	{
- 	}
- 
- 	RecordingsTreePtr::RecordingsTreePtr(RecordingsManagerPtr recManPtr, std::tr1::shared_ptr< RecordingsTree > recTree) :
--		shared_ptr<RecordingsTree>(recTree),
-+		std::tr1::shared_ptr<RecordingsTree>(recTree),
- 		m_recManPtr(recManPtr)
- 	{
- 	}
-@@ -587,7 +591,7 @@
- 		}
- 	}
- 
--	RecordingsList::RecordingsList(shared_ptr< RecordingsList > recList, bool ascending) :
-+	RecordingsList::RecordingsList(std::tr1::shared_ptr< RecordingsList > recList, bool ascending) :
- 		m_pRecVec(new RecVecType(recList->size()))
- 	{
- 		if (!m_pRecVec) {
-@@ -601,7 +605,7 @@
- 		}
- 	}
- 
--	RecordingsList::RecordingsList(shared_ptr< RecordingsList > recList, time_t begin, time_t end, bool ascending) :
-+	RecordingsList::RecordingsList(std::tr1::shared_ptr< RecordingsList > recList, time_t begin, time_t end, bool ascending) :
- 		m_pRecVec(new RecVecType())
- 	{
- 		if (end > begin) {
-@@ -643,8 +647,8 @@
- 	/**
- 	 *  Implementation of class RecordingsList:
- 	 */
--	RecordingsListPtr::RecordingsListPtr(RecordingsManagerPtr recManPtr, shared_ptr< RecordingsList > recList) :
--		shared_ptr< RecordingsList >(recList),
-+	RecordingsListPtr::RecordingsListPtr(RecordingsManagerPtr recManPtr, std::tr1::shared_ptr< RecordingsList > recList) :
-+		std::tr1::shared_ptr< RecordingsList >(recList),
- 		m_recManPtr(recManPtr)
- 	{
- 	}
-@@ -712,8 +716,8 @@
- 	/**
- 	 *  Implementation of class DirectoryListPtr:
- 	 */
--	DirectoryListPtr::DirectoryListPtr(RecordingsManagerPtr recManPtr, shared_ptr< DirectoryList > recDirs) :
--		shared_ptr< DirectoryList >(recDirs),
-+	DirectoryListPtr::DirectoryListPtr(RecordingsManagerPtr recManPtr, std::tr1::shared_ptr< DirectoryList > recDirs) :
-+		std::tr1::shared_ptr< DirectoryList >(recDirs),
- 		m_recManPtr(recManPtr)
- 	{
- 	}
---- a/tasks.cpp
-+++ b/tasks.cpp
-@@ -253,8 +253,8 @@
- 		current->Action();
- 		m_taskQueue.pop_front();
- 	}*/
--	for_each( m_taskQueue.begin(), m_taskQueue.end(), bind( &Task::Action, _1 ) );
--	for_each( m_stickyTasks.begin(), m_stickyTasks.end(), bind( &Task::Action, _1 ) );
-+	for_each( m_taskQueue.begin(), m_taskQueue.end(), std::tr1::bind( &Task::Action, _1 ) );
-+	for_each( m_stickyTasks.begin(), m_stickyTasks.end(), std::tr1::bind( &Task::Action, _1 ) );
- 	m_taskQueue.clear();
- 	m_scheduleWait.Broadcast();
- }
diff --git a/media-plugins/vdr-live/vdr-live-0.3.0_p20130504-r2.ebuild b/media-plugins/vdr-live/vdr-live-0.3.0_p20130504-r2.ebuild
deleted file mode 100644
index 9ecf777aa274..000000000000
--- a/media-plugins/vdr-live/vdr-live-0.3.0_p20130504-r2.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit 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"
-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.3"
-VDR_RCADDON_FILE="${FILESDIR}/rc-addon-0.3.sh"
-
-KEEP_I18NOBJECT="yes"
-
-PATCHES=(
-	"${FILESDIR}"/${P}_vdr-2.1.2.diff
-	"${FILESDIR}"/${P}-c++11.patch
-)
-
-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() {
-	default
-
-	# new Makefile handling ToDp
-#	cp "${FILESDIR}/live.mk" "${S}/Makefile"
-
-	# 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
-
-	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
-}