Fix building with sys-devel/gcc >= 4.7 wrt #421745 by Diego Elio Pettenò and Tristan Heaven

(Portage version: 2.2.0_alpha116/cvs/Linux x86_64)

4 files changed, 42 insertions, 19 deletions

diff --git a/media-libs/libxspf/ChangeLog b/media-libs/libxspf/ChangeLog
index 49f2860ecd64..b0af142618a4 100644
--- a/media-libs/libxspf/ChangeLog
+++ b/media-libs/libxspf/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-libs/libxspf
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libxspf/ChangeLog,v 1.10 2012/07/29 18:40:42 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libxspf/ChangeLog,v 1.11 2012/07/30 10:27:14 ssuominen Exp $
+
+  30 Jul 2012; Samuli Suominen <ssuominen@gentoo.org> libxspf-1.2.0.ebuild,
+  +files/libxspf-1.2.0-gcc47.patch:
+  Fix building with sys-devel/gcc >= 4.7 wrt #421745 by Diego Elio Pettenò and
+  Tristan Heaven
 
   29 Jul 2012; Raúl Porcel <armin76@gentoo.org> libxspf-1.2.0.ebuild:
   Drop sparc keywords
diff --git a/media-libs/libxspf/files/libxspf-1.2.0-gcc44.patch b/media-libs/libxspf/files/libxspf-1.2.0-gcc44.patch
index 85bca1b17b84..5e1aa4e74a18 100644
--- a/media-libs/libxspf/files/libxspf-1.2.0-gcc44.patch
+++ b/media-libs/libxspf/files/libxspf-1.2.0-gcc44.patch
@@ -1,6 +1,5 @@
-diff -ur libxspf-1.2.0.orig/test/OfficialSuite.cpp libxspf-1.2.0/test/OfficialSuite.cpp
---- libxspf-1.2.0.orig/test/OfficialSuite.cpp	2009-02-21 22:13:25.000000000 +0200
-+++ libxspf-1.2.0/test/OfficialSuite.cpp	2009-05-10 22:39:16.000000000 +0300
+--- test/OfficialSuite.cpp
++++ test/OfficialSuite.cpp
 @@ -21,6 +21,7 @@
   * Sebastian Pipping, sping@xiph.org
   */
@@ -9,9 +8,8 @@ diff -ur libxspf-1.2.0.orig/test/OfficialSuite.cpp libxspf-1.2.0/test/OfficialSu
  #include "OfficialSuite.h"
  #include <xspf/XspfReaderCallback.h>
  using namespace Xspf;
-diff -ur libxspf-1.2.0.orig/test/ProjectOpus/ProjectOpusSuite.cpp libxspf-1.2.0/test/ProjectOpus/ProjectOpusSuite.cpp
---- libxspf-1.2.0.orig/test/ProjectOpus/ProjectOpusSuite.cpp	2009-02-21 22:13:25.000000000 +0200
-+++ libxspf-1.2.0/test/ProjectOpus/ProjectOpusSuite.cpp	2009-05-10 22:37:16.000000000 +0300
+--- test/ProjectOpus/ProjectOpusSuite.cpp
++++ test/ProjectOpus/ProjectOpusSuite.cpp
 @@ -21,6 +21,7 @@
   * Sebastian Pipping, sping@xiph.org
   */
diff --git a/media-libs/libxspf/files/libxspf-1.2.0-gcc47.patch b/media-libs/libxspf/files/libxspf-1.2.0-gcc47.patch
new file mode 100644
index 000000000000..bfeb7f2d62a0
--- /dev/null
+++ b/media-libs/libxspf/files/libxspf-1.2.0-gcc47.patch
@@ -0,0 +1,10 @@
+--- examples/read/read.cpp
++++ examples/read/read.cpp
+@@ -43,6 +43,7 @@
+ #include <cstdio>
+ #include <cstdlib> // MAX_PATH
+ #include <climits> // PATH_MAX
++#include <unistd.h> // getcwd
+ 
+ 
+ #if defined(__WIN32__) || defined(WIN32)
diff --git a/media-libs/libxspf/libxspf-1.2.0.ebuild b/media-libs/libxspf/libxspf-1.2.0.ebuild
index ac7e95a80d57..19aa2a9a4a5d 100644
--- a/media-libs/libxspf/libxspf-1.2.0.ebuild
+++ b/media-libs/libxspf/libxspf-1.2.0.ebuild
@@ -1,39 +1,49 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libxspf/libxspf-1.2.0.ebuild,v 1.10 2012/07/29 18:40:42 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libxspf/libxspf-1.2.0.ebuild,v 1.11 2012/07/30 10:27:14 ssuominen Exp $
 
 EAPI=4
-
-inherit eutils qt4-r2
+inherit eutils
 
 DESCRIPTION="Playlist handling library"
-HOMEPAGE="http://libspiff.sourceforge.net"
+HOMEPAGE="http://libspiff.sourceforge.net/"
 SRC_URI="mirror://sourceforge/libspiff/${P}.tar.bz2"
 
 LICENSE="BSD LGPL-2.1"
 SLOT="0"
 KEYWORDS="amd64 ppc x86"
-IUSE="doc test"
+IUSE="doc static-libs test"
 
-RDEPEND=">=dev-libs/uriparser-0.7.5
-	>=dev-libs/expat-2"
+RDEPEND=">=dev-libs/expat-2
+	>=dev-libs/uriparser-0.7.5"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
-	test? ( >=dev-util/cpptest-1.1 )
 	doc? (
 		>=app-doc/doxygen-1.5.8
 		media-gfx/graphviz
 		x11-libs/qt-assistant:4
-	)"
+		)
+	test? ( >=dev-util/cpptest-1.1 )"
 
 DOCS="AUTHORS ChangeLog NEWS README THANKS"
-PATCHES=(
-	"${FILESDIR}/${P}-gcc44.patch"
-)
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${P}-gcc44.patch \
+		"${FILESDIR}"/${P}-gcc47.patch
+}
 
 src_configure() {
+	export XDG_CONFIG_HOME="${T}" #398881#c2
+
 	econf \
 		--docdir=/usr/share/doc/${PF} \
+		$(use_enable static-libs static) \
 		$(use_enable test) \
 		$(use_enable doc)
 }
+
+src_install() {
+	default
+	prune_libtool_files
+}