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

Package-Manager: portage-2.2.0_alpha116/cvs/Linux x86_64

5 files changed, 55 insertions, 27 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/Manifest b/media-libs/libxspf/Manifest
index 8436eb580128..1fad69f37107 100644
--- a/media-libs/libxspf/Manifest
+++ b/media-libs/libxspf/Manifest
@@ -1,15 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX libxspf-1.2.0-gcc44.patch 897 SHA256 181cde7e3cfa5870bbe8ec00333821efaad71df56d2c5e2b36eb451fc3c46b34 SHA512 20c5bf47f84c1a7c520c61a13a86145b737b21fb05a21c539a80c98e0ef97d45a089c5f3cc8fd81845ee9ff6c2b6a95de6cce3d627897db5fe3f5faeebfd3b61 WHIRLPOOL e908cebbe0eec1a0cabbeee1a756292f36b43931d6626c648891e3859f6ef0aee64887ee4fee56cadaad175a0cf216bdbcfb87b222650d7659bd6e6e0255345b
-DIST libxspf-1.2.0.tar.bz2 372483 SHA256 ba9e93a0066469b074b4022b480004651ad3aa5b4313187fd407d833f79b43a5
-EBUILD libxspf-1.2.0.ebuild 876 SHA256 fd7cbf49d9984806104497d8f3170ca2fdb8ffe921cb8345d30847dc0dbdf5c2 SHA512 b5e08d49b383742f7a15304e11fcf8648788cff87f39bdd5227c22f644d4cffaca12ebc7ae56c8343322b91d3529837ed3c268e68a82f7c1684ed43d87ec917c WHIRLPOOL 696b0512941c51bb955804f1836a30f0b85c798b3bd2f6e150cc427bbb42fd6a0f1c476397e983652cf35e0204c65c805033b475f4aed212f9f855673fe9fbb6
-MISC ChangeLog 1620 SHA256 2d7f7fc4709104af57ee8dc2662dc21ff3eb047f83d357f964519663b611da01 SHA512 c9b51acab619fef7999389974c41f4bbe42e418a4387803a1dccfbc1dc600b33ef3a42dce710352b2537f44a0704bce9eaea2ece60e45471a0400ed94e1e267e WHIRLPOOL 3694ae5e716b2e35b7346f5b95b916ad011ea79f542725c27d40ddb3470da67279a323f9ff033be7828983cc82d55d7354f350c7e9b970932db0026195b1d7cc
+AUX libxspf-1.2.0-gcc44.patch 481 SHA256 5a6aa9d4e62e3243655dc7f1994d5d4bd26adfd78c014dd0e488cdf3421cb0d7 SHA512 6ae0565d8b01e08532c9d6cd1e0d2fdb2ce6365fcecde4515354016892f84463c5cd3d50be505a1e45b8d3c8933aaced83fce2fd71a80dd525440ff1650e4b20 WHIRLPOOL 3eb29160e3446d724c6dae3d6a0c50adf5a411c1b09b253869c6304abedba3428ab4cf2973282c4f24b81dc93ab8e86c409107d859d7db6916be2b40dff22e97
+AUX libxspf-1.2.0-gcc47.patch 232 SHA256 4adc04a2275f08e4b03396225b295195539c7d9c70fdde9ecc331e0b0fc6b620 SHA512 7f5feea8511ab83a84ca3c6041f1129e131e7e044dcfc2361978d461bf31d0d2dedb90aa5a0875fd21fdd6838f50c39188c71be0f23d038f71512f9534b680a2 WHIRLPOOL 4f5843d5a0d3629d7517bca407066f68be47ef3869552067a15f5e80b4030217e3352f804e235a06963df3f2b287afbfc29551dd2099963e2d6a5597bcf5efe1
+DIST libxspf-1.2.0.tar.bz2 372483 SHA256 ba9e93a0066469b074b4022b480004651ad3aa5b4313187fd407d833f79b43a5 SHA512 56667b6df89e30517e2e388e2e3b1c083b19d98d69b4ee328d2784bba57a8d50c6b6ae1876cf17e6f9eb1ff872680c8f33b84b826d1290b890ac173c76bea491 WHIRLPOOL 4a518c505d2d685989923fa995547152e1d48ea903834a2a8c8fca938a79973850c2c589e9ad47f680f7f257b3d4b2bea12202f334a96fc8c04b68186a235684
+EBUILD libxspf-1.2.0.ebuild 1066 SHA256 d88988818abe80f8f923a756ad0b795a1c9dd997504c96a9f1d986c1e7b8cdf2 SHA512 045d02bf1df208121fa119c4fed84732d523b8805a48317daaf87c6e101f3759e72984e5a9d0e4131d199f5f8f1630c316f16c707d0995012d715f99f9bb407a WHIRLPOOL 43754119592760d4350d29b1a9b69284e91cf33d8bddef5c64d5b90f93753dfbe319c5400e69191a67ff636d2b5634c09bda0f6ffcdca502fbc585b97f9512b6
+MISC ChangeLog 1832 SHA256 84266e2190e421dd477fcd7b3fac115cda806548845e3bacd5052d0b3c1bba1e SHA512 df93af05eb72552587733b883ac1ecfb81bf526f76656223b91a4aba1c1e21f8e5dc65f30c0f04825c46feda0cb2a13b1d4c5482e6a73d15716430b9a05ef45a WHIRLPOOL 4dfb751091b3d987320a58fc5794ac89dd9df7954346ada8c865885bb90bc01aaa3f58726c92f603d127ab6a145af481dd4bc90e6986a872393dfb1a1546a0d9
 MISC metadata.xml 345 SHA256 b86077c87537a4e7931da84764373510cb5c3a605f7a323f89c1e15fa784c2f5 SHA512 17dcea0cf14e3ab5430fec54f20dc0cd4086110b9259e11d8816a09cbd887d0c5e60db1d09629aa203551c509b9fdcc6303f0df6b797cf50861c1574e53bc383 WHIRLPOOL 87d30619e76075b6d8bc206ecc6eb0b9267ba8a015cdfaf41831ec00e040c003fc733b55fffc852ae7c49546f26c5a8d2c68145b9d9b222960b9cd9beab2b2e9
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEARECAAYFAlAVg7AACgkQuQc30/atMkBGVwCfTpOvEngTIhSf3eWuBlPq/pnf
-iZgAoK8cIN5LS64jDvwdUfbT9GeS5n32
-=aj2E
+iQEcBAEBAgAGBQJQFmFeAAoJEEdUh39IaPFNQtUH/jip0TLjQnidrUfQM2MACch5
+03Rl0bPPvTjEsZbx6UpTeftwRz5eARIv9OCG3pGMUtN7/Csw3dQXCb3JtqScBgrX
+Ozq6StLRywXiEEpIgJ68x4hfB7Ycei2aV2gzVCNpDBcd1qHWndd6b1hzFNeIoAA8
+EnBfaJsWWDjqgCG2yuzxEHzUnUGxsffAN1RElJNTqZX8/S349pL4U0qk64TyuuQY
++08Xfy/X8UebAOolWYTnXLyZNC8oNTkk1i2fMuOpQLcUKs/SYpkKAackjRQqQQVg
+ONinNhco8y4lBosky2A4+K/QR+b4I4tdaB0BfIoEa/8GgnOj2W46Hdya3Bz9zKQ=
+=cnQ8
 -----END PGP SIGNATURE-----
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
+}