Add patch to fix build with gcc-4.6 (bug #364781).

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

4 files changed, 31 insertions, 12 deletions

diff --git a/media-libs/rubberband/ChangeLog b/media-libs/rubberband/ChangeLog
index 098ee3cc43e9..79f54f90ed45 100644
--- a/media-libs/rubberband/ChangeLog
+++ b/media-libs/rubberband/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/rubberband
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/rubberband/ChangeLog,v 1.13 2011/04/26 05:34:56 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/rubberband/ChangeLog,v 1.14 2011/04/26 06:52:08 radhermit Exp $
+
+  26 Apr 2011; Tim Harder <radhermit@gentoo.org> rubberband-1.6.0.ebuild,
+  +files/rubberband-1.6.0-gcc-4.6.patch:
+  Add patch to fix build with gcc-4.6 (bug #364781).
 
 *rubberband-1.6.0 (26 Apr 2011)
 
diff --git a/media-libs/rubberband/Manifest b/media-libs/rubberband/Manifest
index 43feab265b41..2914d34d030f 100644
--- a/media-libs/rubberband/Manifest
+++ b/media-libs/rubberband/Manifest
@@ -4,6 +4,7 @@ Hash: SHA1
 AUX rubberband-1.3-gcc44.patch 429 RMD160 605e32c2ae85002b6af8981cca0a053a888867fa SHA1 d5af0d6c9146ed030297fdd0182693994904fc47 SHA256 6c83350e5699d5c0b0de6b079213891a0efcd112c9faf6e25d6f5897056d7478
 AUX rubberband-1.4-gcc44.patch 471 RMD160 4c3af37d1ed8bd967cb6fcb70ad6167908153634 SHA1 ec2736ef76472a19bc08d2d3a78c769dd6c5b643 SHA256 fb79664f6b7213101f59fe8a593e77c48e6d135923fc77911e3933778fbb502b
 AUX rubberband-1.4-install.patch 1080 RMD160 dfbc75c881fda829c89639c152712bb0f93f1b42 SHA1 84567fcd606073ee7d12f9265caebbbabad89448 SHA256 58be5fa591b986ec7d1dac039cb61b49508dbe0fdf3ea632a2bb90cd61388a7f
+AUX rubberband-1.6.0-gcc-4.6.patch 220 RMD160 9f90ec57967e4dd0f183ec7a40c6fa86e5b044af SHA1 c1b005a302507758cc6be83cb87e6a978b46ea3f SHA256 d7945d09bbcf8b463d3f3e057e959650f97baf8207cdd73f56b2cabcb4dfb2b1
 DIST rubberband-1.3.tar.bz2 94302 RMD160 29730bbb7e96440169eae6404873405d3da9fafa SHA1 a1a2fb45959953b0c58e91ca4340b869356ebff3 SHA256 2866afc5868508769ae6f0058506c4cd35634a6a5edefb53afe93ef5258c2b3c
 DIST rubberband-1.4.tar.bz2 101700 RMD160 16b8c4efb9b22d3f7765b87042e92d7b6047e968 SHA1 e0adddf27be321e2fbffbd93f161e583a35a523d SHA256 45d60ef0141ba82ed68484dd9e337462a02f40f493e9d22848c7f149a45fdb26
 DIST rubberband-1.5.0.tar.bz2 106782 RMD160 175ca0b4a0f6fd6e1f857acbe4936126228545d3 SHA1 45c793bc50703d6b6083e75d6116447b8ced991e SHA256 cb9f29220d035f182de154e9a8b67eedac58ab487e983c29d048c93e5f7c1da1
@@ -11,17 +12,17 @@ DIST rubberband-1.6.0.tar.bz2 113512 RMD160 1e87405ee854e0ff6a54074e4c36bb32b632
 EBUILD rubberband-1.3.ebuild 1164 RMD160 bdcd0e77c21f420b1b5a5bf18195f778c95d1fb2 SHA1 9fd30e9296ceb6a595caee595ede98b6ad3de4e3 SHA256 c23ea323214655fda64fe4ae7fa666f968ee026943bdde3a791fc78c540515b9
 EBUILD rubberband-1.4.ebuild 1211 RMD160 c82ba123dbc5e0584076fc86a4b0375841e76403 SHA1 f8538855dfd2cf7cd9ff660d9678ddf128f041d0 SHA256 2850732cc570a002ed904c09f2e4bd45ee6f55191cbfa043569bd59d3b32f03f
 EBUILD rubberband-1.5.0.ebuild 1114 RMD160 9d28fe36998a098f658771c7ae3abcbcbdf71260 SHA1 f158942d5e991d4a82934fd7ad01739fb34c66a1 SHA256 976df3e5eb5d527b06573fb704ae9a4a5231cf106200b77de18b4b9058f8cd18
-EBUILD rubberband-1.6.0.ebuild 1098 RMD160 7754b9fa1ad12bea4c737d3bd68f2e0fe4b0a13d SHA1 eb5e955d250f8eec7de705b0daf3167255db538a SHA256 ef5c53d40195c02e9b6e807b3038fe4a6456eef29bca7dc86857739d1d243bae
-MISC ChangeLog 2042 RMD160 154aa79d2b6e43e83d1616b1356511bd71d1225a SHA1 7ba1f8abe566939ff8815ef0bb2fa7ed9856d2e5 SHA256 6264ace55b770372108ea85a4841acb7aa897a720415d6fda0e5e1ad0a274c0e
+EBUILD rubberband-1.6.0.ebuild 1165 RMD160 1d6045701e4253686c72c04fbc09192512994c2e SHA1 d5e3bc661713d18c781e141d942bb9882a300c6e SHA256 28a7766fcab1c3d9d8f2b5dd89b52cafc3d0fc18a996d3d71db7ad7815f4e207
+MISC ChangeLog 2211 RMD160 3a7e07b9d6911bf8559a26b425efa450b6732685 SHA1 3e2a3913c8f8edac316c43441d27c352f8a09766 SHA256 f7c999a54fa428a74c97acb2d3f306b9137f7918910bdf161265c68ea9d6d089
 MISC metadata.xml 161 RMD160 2738d17827a71b5ccbadae4c4f909d2b57d147b0 SHA1 90201ddb830142147774cc7b7b5178fbd0a9af0c SHA256 0ba191421eefd954d1efe9f6c3384e8c8d7455d35a7e79457272e1c29211b09e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQEcBAEBAgAGBQJNtlmJAAoJEEqz6FtPBkyjl+AIAIDuaoGCpwNYcp2y0S3fz2qf
-w3i7VYr//7m5yIqaaLOiVKa77W+gfJ9V3y5lE4tW8JF/rzURVHxXGIWDg9TOYW/z
-BjRGQdRw/AL+RH0uxiiYR/igfyRj2X070dSnJiF0zuqP3q/rnK8Xv4XDYWpI3yCi
-3Iomip6J5UMnJ7pdxWISKMJ+4cWA3E0/C/yf0xQZ0U+H69SxWlpsrLWFgX9dISgJ
-xG44z0XiSNuy+P7yqcHn/wwvLJJdTDOzB4XpJmQbqNHl31k0J4xkyWCKXkGb1m2J
-ZynGpG2Hrg9f/rTHqnH0946ljlC0CZ+patpB3rq5v7BjM6sq84X8INAJq1r2vXk=
-=yojp
+iQEcBAEBAgAGBQJNtmueAAoJEEqz6FtPBkyjhZ0IAINIHuM15ZJQ2o++uzfCstQC
+yL30rwQ9iRg5CGMoBF52HX9uNsEZk4WigmZkTqPkUYrqjqB8EOhKwjKT4NW9Jd1M
+OJ9bHGg9LMTDWwC0kziKIHtW3QNjDGZ7h5C6AMhnbx0+NUy/odpY5hn31HUhsiPX
+HPAsNsnFvNw0tAglDb2AMtEu1twAra/yYTS1c075ONfFAxXbCCbVAwLwQ6somd6a
+/VvoSJ3mI3Rjd3f/SsMtxnU9rsTPoVDoRqXKiDMG3QuZSjs9472ZlmzByBaYLGwi
+f6H9WaAf8YDJdi34BU/97nC5GPxJe+OtarLIxKMenK47M5LeDtxzO9cGe4BEGoI=
+=fpFe
 -----END PGP SIGNATURE-----
diff --git a/media-libs/rubberband/files/rubberband-1.6.0-gcc-4.6.patch b/media-libs/rubberband/files/rubberband-1.6.0-gcc-4.6.patch
new file mode 100644
index 000000000000..38ac76d42756
--- /dev/null
+++ b/media-libs/rubberband/files/rubberband-1.6.0-gcc-4.6.patch
@@ -0,0 +1,10 @@
+--- rubberband-1.6.0.orig/rubberband/RubberBandStretcher.h
++++ rubberband-1.6.0/rubberband/RubberBandStretcher.h
+@@ -21,6 +21,7 @@
+ 
+ #include <vector>
+ #include <map>
++#include <cstddef>
+ 
+ /**
+  * @mainpage RubberBand
diff --git a/media-libs/rubberband/rubberband-1.6.0.ebuild b/media-libs/rubberband/rubberband-1.6.0.ebuild
index b7ed4df929f1..f78e0503ba09 100644
--- a/media-libs/rubberband/rubberband-1.6.0.ebuild
+++ b/media-libs/rubberband/rubberband-1.6.0.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/rubberband/rubberband-1.6.0.ebuild,v 1.1 2011/04/26 05:34:56 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/rubberband/rubberband-1.6.0.ebuild,v 1.2 2011/04/26 06:52:08 radhermit Exp $
 
 EAPI=4
-inherit multilib
+inherit multilib eutils
 
 DESCRIPTION="An audio time-stretching and pitch-shifting library and utility program"
 HOMEPAGE="http://www.breakfastquay.com/rubberband/"
@@ -22,6 +22,10 @@ RDEPEND="media-libs/vamp-plugin-sdk
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
 
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-gcc-4.6.patch
+}
+
 src_install() {
 	emake INSTALL_BINDIR="${D}/usr/bin" \
 		INSTALL_INCDIR="${D}/usr/include/rubberband" \