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

Package-Manager: portage-2.1.10.11/cvs/Linux i686

5 files changed, 121 insertions, 9 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/Manifest b/media-plugins/vdr-amarok/Manifest
index 03c35da4a26d..a19e755431b3 100644
--- a/media-plugins/vdr-amarok/Manifest
+++ b/media-plugins/vdr-amarok/Manifest
@@ -1,6 +1,18 @@
-AUX vdr-amarok-0.0.2-gcc4.3.patch 828 RMD160 4b4ef6f7feee4a32736db264a01126381084df7c SHA1 d26e54098ec664e60f17fc805009bacd82d7e0e9 SHA256 e6346d63914a91cc124e9c5994f040348c4c829bbb1e36b9283e06d777a5a718
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX vdr-amarok-0.0.2-gcc4.3.patch 827 RMD160 ce3e7ba80cc75d5f25d473d7f47b48c91d2eae4e SHA1 c24b056f934869c2a1523ea7a75d9a13144cb7c9 SHA256 fa8ac772c3bd44568a61b5654e9c484aff14ae96ec70275bcebe002a99755f59
 AUX vdr-amarok-0.0.2-gcc4.4.patch 502 RMD160 3aa22a4dde08ff21f85925aefc7bbd3611d32e11 SHA1 055f31b3a807c4bc8e6f20a5cf0f40998dea9b3c SHA256 d5d640a8e84bdad468d77369fb38b56a4e6730847cae3fd84a141d5d05263fd7
+AUX vdr-amarok-0.0.2_gcc-4.7.diff 2297 RMD160 26aaf6367907d365f3842f00cdcfab0deed0b73d SHA1 9eda62bf1e3f1bdf13e97c338eca1ce35dbfedd6 SHA256 2fa53e48cf667687c731dc5b6b92ac9ffcb2a62c47fd4a8a481693c47fc72fc0
 DIST vdr-amarok-0.0.2.tar.bz2 51816 RMD160 393827e9566d26b93da4fc6a5dc4860ab4674d6c SHA1 c5a22ff55bb0366965aa5a360191d1cfdc17fde2 SHA256 b96b6845eba17d500eeccc85f97cc0480e057801657133302ed7271167372a91
-EBUILD vdr-amarok-0.0.2.ebuild 736 RMD160 3226c5040b5ae838c48fea18fa5d7375c3844dbf SHA1 06c11d20c449113f8bfd74b2c84ee997c9c17a7b SHA256 46b13a2369053e1005dbce5aa37ec0d1130403ced9c118ba1c0d3c704a1ee0a9
-MISC ChangeLog 821 RMD160 4922cc3427542bf3dcf91af448d12c206cbc46d2 SHA1 a11c58c900a9e37a7fb16473f189358f1a4cb379 SHA256 4c21ed20fbbc5497120bb732f9e2b370f339ee8719b6cdf7f90f2aa219b69cbf
+EBUILD vdr-amarok-0.0.2.ebuild 799 RMD160 c6e51746878fb7351cff7a2084bfd45eafab5032 SHA1 67da10d680ba7699e6d14cf938a8be4ec846fcf0 SHA256 0c0823db7dc83dd6744922b485115de01dea54e4aa9617b02db6117759e58186
+MISC ChangeLog 1024 RMD160 7a79e262544c99ff0f51e26d3b6a44877b5dcc63 SHA1 c92c01058836079b6d309c042cb6e38d3c1977f2 SHA256 8e216ee453c11d9811c95eae98ed605c7ed60a69d0125431bee68e57f944e787
 MISC metadata.xml 258 RMD160 3978316b72989b0150dd21a2ba1f2449a158ebc9 SHA1 4ed083cc2156c1d9ea22136d69bcdd9da3d758b9 SHA256 1d6292676863287cee09b69ba35f3ea7546ed6718a3fea1d326deae735dadf64
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.5 (GNU/Linux)
+Comment: added by hd_brummy@gentoo.org
+
+iD8DBQFP7yZQdn07HTTCgIoRAsBLAJ97iBSsfAkOSXOy3PlIz9qjUQIg1gCgq0ML
+Lyrmti5yszOROeOg4BiXt4c=
+=H+Fy
+-----END PGP SIGNATURE-----
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