media-plugins/vdr-vompserver: compile fix gcc-6, wrt bug 593854; cleanup old

Package-Manager: portage-2.3.0

6 files changed, 20 insertions, 145 deletions

diff --git a/media-plugins/vdr-vompserver/Manifest b/media-plugins/vdr-vompserver/Manifest
index 4cdbd92fd5d6..980de820f2d4 100644
--- a/media-plugins/vdr-vompserver/Manifest
+++ b/media-plugins/vdr-vompserver/Manifest
@@ -1,3 +1 @@
-DIST vdr-vompserver-0.3.1.tgz 84183 SHA256 bb9838b1139926bc0bd35e87a750a5aaf937015d78b351361c8611a7610488bd SHA512 0e77e4a005c78f9840ab75a81ceb67cd34479b9a726f1195d7147a1cfde58ea25e1dd5e5c6a9bc22ccca1d94f4011d0f9b67b56ee1faab4b7a2f9654d8a04d3b WHIRLPOOL 3570eeb9f550da2bac8862ed11d49acb37e33eaaf1833583677af1dae0fc3a64881470a4f33fccb63b56e9e2c5712e0aa8010f15f4a3c11198cd11092c02698b
-DIST vdr-vompserver-0.4.0.tgz 87166 SHA256 21437dfaa0a5cec57e211ea5819a96d1b2b56a700bd3e76033a1fb1bd8702b06 SHA512 027b3b63fc8fa34da11cc1841602e89fb48a7345717c22cf796cb24134504991b3056354b459358deb983da93fd6a3e74ddd965e894afcd6ba2bf69c37d058fa WHIRLPOOL 780ee9dd51692456d6b5a8d67c4d273baf77a9c549650416dc7307c0a4386fbf83b2e4df00856008b445875cc21ee665fe06349bf2cf691bae2e7ed91cbbbff2
 DIST vdr-vompserver-0.4.1.tgz 87056 SHA256 c5d2ba4d48c230de1223dcee6edff3a8cdc574a47779569136b39f4f810fdbd9 SHA512 79fbc311b48a752206842f21ec8d864df67aa7614f092b4e6a6623d732d4e053c2e35af7981aaed7d392f6510ebaac59f60640acae540e13c4f38cce04ddd1bd WHIRLPOOL 89ff2f8472a3dae695685417e85b6eef07a993c52ce81b4fee3ed4461b6f9394bf3ee04e41d74bfbc65da2ccb2cf8fff7e66010e083fff9320195a098817372f
diff --git a/media-plugins/vdr-vompserver/files/rrprocstart.patch b/media-plugins/vdr-vompserver/files/rrprocstart.patch
deleted file mode 100644
index bccdc9d5700d..000000000000
--- a/media-plugins/vdr-vompserver/files/rrprocstart.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 10-rrprocstart.dpatch by  <marten.richter@freenet.de>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Backport of a bug in rrproc
-
-fix a message overrun when MediaMVP boots
-The topic is documented in http://forum.loggytronic.com/index.php?topic=528.0
-
-@DPATCH@
-diff -u vdr-plugin-vompserver-new/vompclientrrproc.c vdr-plugin-vompserver-0.3.1/vompclientrrproc.c
---- vdr-plugin-vompserver-new/vompclientrrproc.c	2010-07-05 19:20:11.000000000 +0200
-+++ vdr-plugin-vompserver-0.3.1/vompclientrrproc.c	2010-07-05 19:24:05.000000000 +0200
-@@ -87,9 +87,25 @@
- 
-   if (req_queue.size() != 0)
-   {
--    log->log("RRProc", Log::ERR, "threadMethod err 1");     
--    threadUnlock();
--    return;
-+    log->log("RRProc", Log::ERR, "threadMethod startup with already queued packets");     
-+    while (req_queue.size()) 
-+    {
-+      //log->log("RRProc", Log::DEBUG, "thread while");
-+      req = req_queue.front();
-+      req_queue.pop();
-+      
-+      threadUnlock(); // allow recvRequest to be queuing packets while we are working on this one
-+      
-+      if (!processPacket())
-+      {
-+        log->log("RRProc", Log::ERR, "processPacket exited with fail");     
-+        return;
-+      }
-+      
-+      threadLock();
-+    } 
-+    log->log("RRProc", Log::ERR, "threadMethod startup with already queued packets done.");     
-+
-   }
-     
-   while(1)
-
diff --git a/media-plugins/vdr-vompserver/files/vdr-1.7.27.diff b/media-plugins/vdr-vompserver/files/vdr-1.7.27.diff
deleted file mode 100644
index f98b75c124f4..000000000000
--- a/media-plugins/vdr-vompserver/files/vdr-1.7.27.diff
+++ /dev/null
@@ -1,36 +0,0 @@
-diff -Naur vompserver-0.3.1.orig/mvpreceiver.c vompserver-0.3.1/mvpreceiver.c
---- vompserver-0.3.1.orig/mvpreceiver.c	2012-05-01 14:35:39.000000000 +0200
-+++ vompserver-0.3.1/mvpreceiver.c	2012-05-01 14:49:08.000000000 +0200
-@@ -40,7 +40,7 @@
- #elif VDRVERSNUM < 10500
- : cReceiver(channel->Ca(), 0, channel->Vpid(), channel->Apids(), channel->Dpids(), mergeSpidsTpid(channel->Spids(),channel->Tpid()))
- #else
--: cReceiver(channel->GetChannelID(), 0, channel->Vpid(), channel->Apids(), channel->Dpids(), mergeSpidsTpid(channel->Spids(),channel->Tpid()))
-+: cReceiver(channel, 0)
- #endif
- {
-   logger = Log::getInstance();
-diff -Naur vompserver-0.3.1.orig/vompclientrrproc.c vompserver-0.3.1/vompclientrrproc.c
---- vompserver-0.3.1.orig/vompclientrrproc.c	2012-05-01 14:35:39.000000000 +0200
-+++ vompserver-0.3.1/vompclientrrproc.c	2012-05-01 14:46:41.000000000 +0200
-@@ -615,7 +615,7 @@
- 
-   for (cRecording *recording = Recordings.First(); recording; recording = Recordings.Next(recording))
-   {
--    resp->addULONG(recording->start);
-+    resp->addULONG(recording->Start());
-     resp->addString(recording->Name());
-     resp->addString(recording->FileName());
-   }
-@@ -1770,9 +1770,9 @@
-     {
-       for (const cMark *m = Marks.First(); m; m = Marks.Next(m))
-       {
--        log->log("RRProc", Log::DEBUG, "found Mark %i", m->position);
-+        log->log("RRProc", Log::DEBUG, "found Mark %i", m->Position());
- 
--        resp->addULONG(m->position);
-+        resp->addULONG(m->Position());
-       }
-     }
-     else
diff --git a/media-plugins/vdr-vompserver/files/vdr-vompserver-0.4.1_c++11.patch b/media-plugins/vdr-vompserver/files/vdr-vompserver-0.4.1_c++11.patch
new file mode 100644
index 000000000000..7571f9457b7e
--- /dev/null
+++ b/media-plugins/vdr-vompserver/files/vdr-vompserver-0.4.1_c++11.patch
@@ -0,0 +1,15 @@
+compile fix gcc-6
+https://bugs.gentoo.org/show_bug.cgi?id=593854
+Signed-of-by: Joerg Bornkessel <hd_brummy@gentoo.org> (2016/Oct/16)
+diff -Naur vompserver-0.4.1.orig/Makefile vompserver-0.4.1/Makefile
+--- vompserver-0.4.1.orig/Makefile	2016-10-16 23:48:36.100111158 +0200
++++ vompserver-0.4.1/Makefile	2016-10-16 23:49:05.226111158 +0200
+@@ -53,7 +53,7 @@
+ 
+ INCLUDES +=
+ 
+-DEFINES += -DPLUGIN_NAME_I18N='"$(PLUGIN)"'
++DEFINES += -DPLUGIN_NAME_I18N='"$(PLUGIN)"' -D__STL_CONFIG_H
+ 
+ # VOMP-INSERT
+ DEFINES += -DVOMPSERVER
diff --git a/media-plugins/vdr-vompserver/vdr-vompserver-0.3.1-r1.ebuild b/media-plugins/vdr-vompserver/vdr-vompserver-0.3.1-r1.ebuild
deleted file mode 100644
index 8f135d968e50..000000000000
--- a/media-plugins/vdr-vompserver/vdr-vompserver-0.3.1-r1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-
-inherit vdr-plugin-2
-
-DESCRIPTION="VDR Plugin: server part for MediaMVP device"
-HOMEPAGE="http://www.loggytronic.com/vomp.php"
-SRC_URI="http://www.loggytronic.com/dl/${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND=">=media-video/vdr-1.2.6"
-RDEPEND="${DEPEND}"
-
-PATCHES=("${FILESDIR}/rrprocstart.patch")
-
-src_prepare() {
-	vdr-plugin-2_src_prepare
-
-	sed -i "s:vompserver:vomp:" vompserver.c
-	sed -i "s:char b:// char b:" mediafile.c
-
-	if has_version ">=media-video/vdr-1.7.27"; then
-		epatch "${FILESDIR}/vdr-1.7.27.diff"
-	fi
-}
-
-src_install() {
-	vdr-plugin-2_src_install
-
-	dodoc README
-
-	insinto /etc/vdr/plugins/vomp
-	newins vomp.conf.sample vomp.conf
-	newins vomp-00-00-00-00-00-00.conf.sample vomp-00-00-00-00-00-00.conf
-}
-
-pkg_postinst() {
-	vdr-plugin-2_pkg_postinst
-
-	echo
-	elog "Have a look to the VOMP sample files in /etc/vdr/plugins."
-	echo
-	elog "You have to download the dongle file (i.e. firmware) and adapt"
-	elog "the vomp configuration files accordingly."
-	echo
-}
diff --git a/media-plugins/vdr-vompserver/vdr-vompserver-0.4.0.ebuild b/media-plugins/vdr-vompserver/vdr-vompserver-0.4.1-r1.ebuild
index 7de4173faea6..1a0b04eab365 100644
--- a/media-plugins/vdr-vompserver/vdr-vompserver-0.4.0.ebuild
+++ b/media-plugins/vdr-vompserver/vdr-vompserver-0.4.1-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 inherit vdr-plugin-2
 
@@ -12,25 +12,19 @@ SRC_URI="http://www.loggytronic.com/dl/${P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND=">=media-video/vdr-1.7.36-r1"
 RDEPEND="${DEPEND}"
 
-KEEP_I18NOBJECT="yes"
-
-src_prepare() {
-	cp "${FILESDIR}/${VDRPLUGIN}.mk" "${S}/Makefile"
+PATCHES=( "${FILESDIR}/${P}_c++11.patch" )
 
-	vdr-plugin-2_src_prepare
-}
+KEEP_I18NOBJECT="yes"
 
 src_install() {
 	vdr-plugin-2_src_install
 
-	dodoc README
-
 	insinto /etc/vdr/plugins/vompserver
 	newins vomp.conf.sample vomp.conf
 	newins vomp-00-00-00-00-00-00.conf.sample vomp-00-00-00-00-00-00.conf