fixed gcc-4.7. compile, bug 423059; eapi=4

(Portage version: 2.1.10.11/cvs/Linux i686)

4 files changed, 106 insertions, 6 deletions

diff --git a/media-plugins/vdr-amarok/ChangeLog b/media-plugins/vdr-amarok/ChangeLog
index 10e2b4da54e3..acdf21158a0f 100644
--- a/media-plugins/vdr-amarok/ChangeLog
+++ b/media-plugins/vdr-amarok/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-plugins/vdr-amarok
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-amarok/ChangeLog,v 1.4 2009/07/30 11:11:10 ssuominen Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-amarok/ChangeLog,v 1.5 2012/06/30 16:16:06 hd_brummy Exp $
+
+  30 Jun 2012; Joerg Bornkessel <hd_brummy@gentoo.org> vdr-amarok-0.0.2.ebuild,
+  files/vdr-amarok-0.0.2-gcc4.3.patch, +files/vdr-amarok-0.0.2_gcc-4.7.diff:
+  fixed gcc-4.7. compile, bug 423059; eapi=4
 
   30 Jul 2009; Samuli Suominen <ssuominen@gentoo.org>
   vdr-amarok-0.0.2.ebuild, +files/vdr-amarok-0.0.2-gcc4.4.patch:
diff --git a/media-plugins/vdr-amarok/files/vdr-amarok-0.0.2-gcc4.3.patch b/media-plugins/vdr-amarok/files/vdr-amarok-0.0.2-gcc4.3.patch
index 313453e24b54..5bb08ee60ed9 100644
--- a/media-plugins/vdr-amarok/files/vdr-amarok-0.0.2-gcc4.3.patch
+++ b/media-plugins/vdr-amarok/files/vdr-amarok-0.0.2-gcc4.3.patch
@@ -17,7 +17,7 @@ diff -ru amarok-0.0.2-orig/Sockets.cpp amarok-0.0.2/Sockets.cpp
  #ifndef WIN32
  // this is for Linux
  #include <unistd.h>
-+#include <string.h>
++#include <cstring>
  #include <sys/types.h>
  #include <sys/socket.h>
  #include <netinet/in.h>
diff --git a/media-plugins/vdr-amarok/files/vdr-amarok-0.0.2_gcc-4.7.diff b/media-plugins/vdr-amarok/files/vdr-amarok-0.0.2_gcc-4.7.diff
new file mode 100644
index 000000000000..cd3810ca89eb
--- /dev/null
+++ b/media-plugins/vdr-amarok/files/vdr-amarok-0.0.2_gcc-4.7.diff
@@ -0,0 +1,92 @@
+gcc-4.7 compile fix
+https://bugs.gentoo.org/show_bug.cgi?id=423059
+
+signed-of-by: Joerg Bornkessel <hd_brummy@gentoo.org> (2012/30/06)
+diff -Naur amarok-0.0.2.orig/Sockets.h amarok-0.0.2/Sockets.h
+--- amarok-0.0.2.orig/Sockets.h	2012-06-30 17:40:27.000000000 +0200
++++ amarok-0.0.2/Sockets.h	2012-06-30 17:43:21.000000000 +0200
+@@ -182,8 +182,8 @@
+ 	{
+ 		if (this->gptr() == NULL)
+ 		{
+-			setg(s, s + n, s + n);
+-			setp(s, s + n);
++			this->setg(s, s + n, s + n);
++			this->setp(s, s + n);
+ 			inbuf_ = s;
+ 			outbuf_ = s;
+ 			bufsize_ = n;
+@@ -215,9 +215,9 @@
+ 		{
+ 			_flush();
+ 		}
+-		setp(outbuf_, outbuf_ + bufsize_);
++		this->setp(outbuf_, outbuf_ + bufsize_);
+ 		if (c != traits::eof())
+-			sputc(traits::to_char_type(c));
++			this->sputc(traits::to_char_type(c));
+ 		return 0;
+ 	}
+ 
+@@ -225,7 +225,7 @@
+ 	{
+ 		// just flush the put area
+ 		_flush();
+-		setp(outbuf_, outbuf_ + bufsize_);
++		this->setp(outbuf_, outbuf_ + bufsize_);
+ 		return 0;
+ 	}
+ 
+@@ -256,7 +256,7 @@
+ 			return traits::eof();
+ 
+ 		size_t totalbytes = readn + remained_;
+-		setg(inbuf_, inbuf_,
++		this->setg(inbuf_, inbuf_,
+ 			inbuf_ + totalbytes / sizeof(char_type));
+ 
+ 		remained_ = totalbytes % sizeof(char_type);
+diff -Naur amarok-0.0.2.orig/vdramgw/Sockets.h amarok-0.0.2/vdramgw/Sockets.h
+--- amarok-0.0.2.orig/vdramgw/Sockets.h	2012-06-30 17:40:27.000000000 +0200
++++ amarok-0.0.2/vdramgw/Sockets.h	2012-06-30 17:41:52.000000000 +0200
+@@ -182,8 +182,8 @@
+ 	{
+ 		if (this->gptr() == NULL)
+ 		{
+-			setg(s, s + n, s + n);
+-			setp(s, s + n);
++			this->setg(s, s + n, s + n);
++			this->setp(s, s + n);
+ 			inbuf_ = s;
+ 			outbuf_ = s;
+ 			bufsize_ = n;
+@@ -215,9 +215,9 @@
+ 		{
+ 			_flush();
+ 		}
+-		setp(outbuf_, outbuf_ + bufsize_);
++		this->setp(outbuf_, outbuf_ + bufsize_);
+ 		if (c != traits::eof())
+-			sputc(traits::to_char_type(c));
++			this->sputc(traits::to_char_type(c));
+ 		return 0;
+ 	}
+ 
+@@ -225,7 +225,7 @@
+ 	{
+ 		// just flush the put area
+ 		_flush();
+-		setp(outbuf_, outbuf_ + bufsize_);
++		this->setp(outbuf_, outbuf_ + bufsize_);
+ 		return 0;
+ 	}
+ 
+@@ -256,7 +256,7 @@
+ 			return traits::eof();
+ 
+ 		size_t totalbytes = readn + remained_;
+-		setg(inbuf_, inbuf_,
++		this->setg(inbuf_, inbuf_,
+ 			inbuf_ + totalbytes / sizeof(char_type));
+ 
+ 		remained_ = totalbytes % sizeof(char_type);
diff --git a/media-plugins/vdr-amarok/vdr-amarok-0.0.2.ebuild b/media-plugins/vdr-amarok/vdr-amarok-0.0.2.ebuild
index 19c5d69b9729..8c5a61dd9d51 100644
--- a/media-plugins/vdr-amarok/vdr-amarok-0.0.2.ebuild
+++ b/media-plugins/vdr-amarok/vdr-amarok-0.0.2.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-amarok/vdr-amarok-0.0.2.ebuild,v 1.5 2009/07/30 11:11:10 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-amarok/vdr-amarok-0.0.2.ebuild,v 1.6 2012/06/30 16:16:06 hd_brummy Exp $
+
+EAPI="4"
 
 inherit vdr-plugin
 
@@ -14,9 +16,11 @@ KEYWORDS="~x86 ~amd64"
 IUSE=""
 
 DEPEND=">=media-video/vdr-1.4.0"
+RDEPEND="${DEPEND}"
 
 PATCHES=( "${FILESDIR}/${P}-gcc4.3.patch"
-	"${FILESDIR}/${P}-gcc4.4.patch" )
+	"${FILESDIR}/${P}-gcc4.4.patch"
+	"${FILESDIR}/${P}_gcc-4.7.diff" )
 
 pkg_postinst() {
 	vdr-plugin_pkg_postinst