gentoo resync : 21.10.2017

3 files changed, 163 insertions, 9 deletions

diff --git a/media-plugins/vdr-live/Manifest b/media-plugins/vdr-live/Manifest
index e9d17ba9fe06..228e676bdddc 100644
--- a/media-plugins/vdr-live/Manifest
+++ b/media-plugins/vdr-live/Manifest
@@ -4,10 +4,11 @@ AUX confd-0.3 594 SHA256 eb2cf74905b0407d851f05ac79e379ae593291742ec7cf19ba73a86
 AUX rc-addon-0.2.sh 489 SHA256 2cd9df7459aef95a8d1a568eeb63144d9c995ff66108e04664f84467f78af6f6 SHA512 f42c6e6e03ba33e15c02fc3b42faa15b822d78944c4e29432c230fbc75e636cac6ce64efbed0521965a4fc4054a1a9c9ced0e25a5e8b44fd16332dc5c5269ff2 WHIRLPOOL 6dcd840dbf956ec413f1d63d3ff94ff6bfe3eeed26f5213e08845b6f8845737c7b96ecdc7a1e81da4d184b72179363e7cd86b6e637b6ff60c5764b696b49dcdb
 AUX rc-addon-0.3.sh 619 SHA256 b42f9eedb8142a97b1fbd8f92f7f22312ef5e68de75c47a6ae5f58217d0b10e0 SHA512 c07a13a91f6f0d2f5ad990545875adac161a61d944053c19cf43e1252c18e9e98127cafc704d5a729dcbc887576f83ce78413deac8c35fad5962f1e769c36b93 WHIRLPOOL 605706a8647cf4a560a29c261de15c18d6653c7ba87c919d4c1912bfeb23aa6a15d0f21eaeb1a23934841d36b1f377e195e815011f80f9d7fa563eaa357e8e00
 AUX rc-addon.sh 180 SHA256 d9c9eca9f12362c1f8c162a9bb948feebdb8acc87413a611ecf5f52a3092878a SHA512 2bdf0e809148bbeb33ede687d40332b26dfaa2dc8be2e743f7c56cb19f572ff30e88ceac8c80602b8a39e0dc1657cd79f7afa1b8993b37714a400f7b1384f622 WHIRLPOOL 73d8af3cdb68c341473a18b5e5ff7c45f3165259f2716e454e3cc3a28a660ff4d17b2fffea82dee81eed0b49e36072be7a87138c91c19e601d1ca0997124f1d4
+AUX vdr-live-0.3.0_p20130504-c++11.patch 5995 SHA256 c8da1a3a94f08487774157083230d150ba61c49219decb91ab09757e8950169d SHA512 88e66be9541a8c26821187c9732afba70df725b3b6e4ae52c3a343211ff1e3fcc78a577028d62d31f5f96f4ff542ab87ad252c2d794563b62c177c686e5b5adc WHIRLPOOL 8c4df3c2d3439a46ad3ee8672b0b967d4e2e5059384664224fee4e1afed343e2703fac12da0d775e8daa9d780aed6f82630c50e150d3538783eeb1375a6da093
 AUX vdr-live-0.3.0_p20130504_vdr-2.1.2.diff 2722 SHA256 60ac1cbec3863fedf4620a9c30661139a3c5ee62c843fc809c5f3e53e79370eb SHA512 813e17202fb9dd921e38492127ad8518fc4aa2f6240ce9284990bf3e0a40c04b3b56efcaf667ce5f4aedf9b6e76422e2bb73c3218d124f3d8452b3b7979ba0b2 WHIRLPOOL 0571dbd5fc091aa3eead30179d162186b74a5adaa61a930734159111b61bc2316041b2e96484612742b94fbf6186235aae1f1f5249bfa9a8fed55e4fc48648e4
 DIST vdr-live-0.3.0_p20130504.tar.bz2 6348021 SHA256 edd577580b9e99de88bcd3794fcf792bee7df7ccc41bfebaeebef22bac5c78a7 SHA512 7a238a4567f90448b7813366dbdb5112ab98079fd5a2c9d59d09273853fd62ad520ca9ad373704a8888eb7c25119772421fe998d87069647c40d6d2d869e09c1 WHIRLPOOL 7f8d7ff69914d90af41d4c550df6f57a658e8263d320167fed84f4990063a5323c1f5d58d44283682807c673af81c8e32cd44e13a9aa57e849e3640b4ecac936
 EBUILD vdr-live-0.3.0_p20130504-r1.ebuild 2480 SHA256 e27b6f04c6797b1dceeaa9d5d30eb75f5ce243475f9c82e7aca009a1d6c8c786 SHA512 2c2469249f5e2189a3e251c5df75f4dc8cedf9213211957f91deabf48efeb4f7bcb16d2f210a75e02939511b25dd0390f68fd58ede35a46d43b02d253563e8d7 WHIRLPOOL f17316a6b1bee07de25c0bfb162a140d7f1df51239e1493c6254c8a6304069dc23c8ddc41c6e69fe68989513c4f3fa351541e46d2b8843b1a2ee0dea02261745
-EBUILD vdr-live-0.3.0_p20130504-r2.ebuild 2556 SHA256 8effc9f4348d8de51e9de9798f29e2229a3838b4d6d185246006f36a942c1be3 SHA512 38e2f465297deeb9567f10689a97ca7aa724c7b2d3272206e73ddddcce6eb8c19d74ca992f27bd6eecc26e7a04be6efa0632ed420b898a552252449fece2ef36 WHIRLPOOL 3ff712d702e9c3e745f0a75324fef36260c9cdc6dc3545ac5189a75286597f9628bbc85ecfd0b3a81da7627212c7c7470cc89863c3b0893a248576aaec0e6cb5
+EBUILD vdr-live-0.3.0_p20130504-r2.ebuild 2498 SHA256 234a5ae7cb9a09474def47b3ad604361a4ae86ad325f4f1a1a2e36bccae72652 SHA512 13d00b1869d0eb2a73308b68765b5dcc811bc7b4cbe4e1ab10fd17bac04ee4049334bac56574a235ac041ca1c40b64c3ab571fd9627acdc76044c060afe3c902 WHIRLPOOL c058332d8da321513591f7b3d1145f0c29266ad0d977792e66047421cb9216f14dda5750666c3c6dc93bd3a53f79af4b9e33d07fb043e3d811e0f3665ef799ed
 MISC ChangeLog 3251 SHA256 81db81693e6ca3ca1984a92ad885c887a952d7217389e3514ec36869d1b26eda SHA512 b4f89866e35af9ef3ea81be03334a4cad647f56c534ebb2997a2082ddc53f9be95d9666bf99892d333876748bf66c8c8200113c4aa9cf2529ebe1bf629ce34a7 WHIRLPOOL d8540addb7fc70737ed0512211a4cfb80ff64c173c58d4ffce421e850f9653054f571077c819cfe40adda6bb871dc0663450fcfaa4be37129cb29f2559adb1b0
 MISC ChangeLog-2015 9039 SHA256 d28bd49fd9274e838a4069b65d945ffc4ebb0f869967f6c50c05e94d34612ce5 SHA512 2f0bb7bbb8cc95b9ea8fe60dc2ddd8ffe5f1c93ac1cf4c54e821ce7b3e527793fdd600353bd6d161a0050111a245593629dbb828434f3e7f0a63773247fd24b6 WHIRLPOOL e0a7b75bf7dc451f558c39b402f7e849e26462e9ffab31c3501cda7bb6fb81d60d18b7408f3e274d57dd7418feb3e105c3954f16a12f97dd096fdb7a9171891b
 MISC metadata.xml 243 SHA256 161359b6e9eddec137a431eea66785e070bbc25fab3ae1b57f900e411fc37fe7 SHA512 f7d6e467a5a96c0afdd42df3c0f3866240defc5bbea5ccddf4c0b1a3c004225af5d46dab67d45a5ac34535391584f3b3727fe79ef6cef1a11413636bbc35cf06 WHIRLPOOL ebf59815181c251040396bb44206b875f6d996abcff030fdbf8355b47d6ea8c4f2669847ea1af194112de469258d7ca09ed77b682924ca495958a65f957dbf39
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
new file mode 100644
index 000000000000..e2bf96dec4a1
--- /dev/null
+++ b/media-plugins/vdr-live/files/vdr-live-0.3.0_p20130504-c++11.patch
@@ -0,0 +1,153 @@
+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
index 25179ef3d55f..9d7f6bdbaf5d 100644
--- 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
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -28,6 +28,11 @@ 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
@@ -51,12 +56,9 @@ make_live_cert() {
 	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() {
+	default
+
 	# new Makefile handling ToDp
 #	cp "${FILESDIR}/live.mk" "${S}/Makefile"
 
@@ -65,8 +67,6 @@ src_prepare() {
 
 	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