Add patch to avoid listing the same function in two versions to (partially) fix build with gold.

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

4 files changed, 38 insertions, 11 deletions

diff --git a/sys-fs/fuse/ChangeLog b/sys-fs/fuse/ChangeLog
index fd62d53afc0a..fb2e84d39281 100644
--- a/sys-fs/fuse/ChangeLog
+++ b/sys-fs/fuse/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-fs/fuse
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/fuse/ChangeLog,v 1.133 2010/10/07 22:11:09 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/fuse/ChangeLog,v 1.134 2010/11/24 01:28:54 flameeyes Exp $
+
+  24 Nov 2010; Diego E. Pettenò <flameeyes@gentoo.org> fuse-2.8.5.ebuild,
+  +files/fuse-2.8.5-double-version.patch:
+  Add patch to avoid listing the same function in two versions to (partially)
+  fix build with gold.
 
 *fuse-2.8.5 (07 Oct 2010)
 
diff --git a/sys-fs/fuse/Manifest b/sys-fs/fuse/Manifest
index ab6fc43ccead..bd249798b345 100644
--- a/sys-fs/fuse/Manifest
+++ b/sys-fs/fuse/Manifest
@@ -1,6 +1,7 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX fuse-2.8.5-double-version.patch 702 RMD160 46d8a4053b1cc844070c9cd9ebe4ab93a9c7d377 SHA1 f1e1ccbd2e1f57d118db30caf4b1c44c6d220606 SHA256 982260fb289842d6c2ff5586f56e2ac4bfd29f78388390467a5aa5f685b2d010
 AUX fuse-fbsd.init 467 RMD160 ac8ce54b189b3433cede1c8360b63d38a4203e67 SHA1 8f0f10dac4653a82677f31a079a3b006cc8e122d SHA256 d896a80d67668246f586c6283f95f624fdbecb306408bec6f2c944601aae7273
 AUX fuse-fix-lazy-binding.patch 398 RMD160 e8663cdbf720378839bf3ac786a49a9927b81afe SHA1 59a923f6263e954a7db488021005448cefcc8f5a SHA256 d9733aaece65a0c864edbfebae205cdec096174165e943a569adb216ec73f9e1
 AUX fuse.init 756 RMD160 0950f906866311b19c0712f88911e83f6481b5f7 SHA1 96551a5d9ebf21560adafeb2b65c339fa8cfe898 SHA256 22a22c914d2a4f0fb5fc8495f4b7efcd1819efde548c9033ca612c181cd29eda
@@ -14,17 +15,13 @@ EBUILD fuse-2.7.3.ebuild 2549 RMD160 3a6d5ce9f85e3f0500af59ca1a45eb6be931f7d7 SH
 EBUILD fuse-2.7.4-r1.ebuild 2583 RMD160 18db382d4ae16d484f5b2bd30c6e20b78ce19c71 SHA1 158cf82d5725bda610bfd214d7151e3894c14a07 SHA256 3188af1abdeeee2f409e3a278de3026b62ab4127ca2eaad90615f992fbaa0c46
 EBUILD fuse-2.7.4.ebuild 2542 RMD160 78c91d789c592c02cb70d50dba9221a3f6f3425a SHA1 3859a22bc1abd487bf3c186e8c25bb3c2ed9e411 SHA256 b43ddadb2de0169e902bc09ebb4fd055106878a1b0241b8bf37350f9b6fcff93
 EBUILD fuse-2.8.1.ebuild 1855 RMD160 fe585970593227afc0f41107574233af366d987b SHA1 6f70551d9330ee35bd430ed8747a79fb72f32719 SHA256 d61c692f1fff180701657458962225be158bc470229f1a1aeb14f288512fc806
-EBUILD fuse-2.8.5.ebuild 1773 RMD160 0c11db141ce34e0a86f3ff791deaf2a44f76e36a SHA1 5973271218682b5d6253e028618627b3020f5bca SHA256 bed77ec4de740d89e04f71faa78215f2d3ca064f8fc2cbeaed1ec915b5b92249
-MISC ChangeLog 18033 RMD160 7f0189b5a93f4a09e92c504805dbc639d298eeea SHA1 6907227d40cbdd54131873d023495b0335f8aeff SHA256 75bfd93618143025d6687c4e0454fd2e29336bdb0c74964d4d6a1a1934fed840
+EBUILD fuse-2.8.5.ebuild 1822 RMD160 375b3317c98e8b01535af1d4da649cf85c8f2fd9 SHA1 b117184dd76f742090cc81434e13a2c440fc0a7b SHA256 9c6ee19bb77a1609b3383b927dff9f8b451e0d73beb29bed659f95217de404b3
+MISC ChangeLog 18252 RMD160 f8d662058c45ba3eb43adbf9859b248a27cf1ae7 SHA1 84f84779a1a1c2a020400a5a2fc6d112b4e344cf SHA256 521ab885e7479f9e6dc5044887d975d08cc3ffcd0d58017d1aedb114ce85f792
 MISC metadata.xml 166 RMD160 c3e22956fa1bdf11cc38cceb1460a5e32de37018 SHA1 a81e3c6c2214866a94b7b8ad96d82f30e952ad01 SHA256 f07e997e7e54cfa7611f01ff3a778174ba1b8f9e856baf7eec48206ed24e0c14
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iQEcBAEBAgAGBQJMrkWGAAoJEEqz6FtPBkyj1Q4IAJpj8Ap1Iwub+Z/2l3ufKSEU
-7ryrRlhkUAXD3DRuhPSF9yrgfTOrGNJUrvB4Zj6GbENJIlPR2miiMQ6EhPoXVGzI
-fvDLCIknmBB9XPiqh3XBoiWiFEvB8W1hWSjzfJCMODQKBjxq1hYGv5CYqPRbz8ln
-v/MD2jZ+GcMucg94gqwYGRr6WF2SN4cWwZcbpjFxpqACKjoSS5eqwZoXoG1RAi9w
-za16bAHE/Qu9m/7oyMXk/m/QGu0mFxp7aybRqzsRGSQQ7oRx4iM6k+FH83i8/To5
-v7FC5EZULN/rahgUhvvvZg/BRYK4WSFemzWS/paURyLq/tsJxoMoBNwvVsTrUEo=
-=4yjg
+iEYEARECAAYFAkzsal0ACgkQAiZjviIA2XjQUQCfY8kBQFe5cHyxZ7aVUXxdUA2I
+lXIAoKc4/qxfCzuXoVAekg14263QGAAq
+=NxS5
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/fuse/files/fuse-2.8.5-double-version.patch b/sys-fs/fuse/files/fuse-2.8.5-double-version.patch
new file mode 100644
index 000000000000..60f5c98f3840
--- /dev/null
+++ b/sys-fs/fuse/files/fuse-2.8.5-double-version.patch
@@ -0,0 +1,23 @@
+commit 824b4ce6acd676e13cfa216dfbb5dbf4380781a0
+Author: Miklos Szeredi <mszeredi@suse.cz>
+Date:   Tue Sep 28 20:04:02 2010 +0200
+
+    Fix ambiguous symbol version for fuse_chan_new
+    
+    fuse_versionscript included fuse_chan_new in both FUSE_2.4 and
+    FUSE_2.6.  Remove the FUSE_2.4, which is invalid.
+    
+    Reported by Raymes Khoury, who discovered this with the gold linker
+
+diff --git a/lib/fuse_versionscript b/lib/fuse_versionscript
+index bd0186d..860c403 100644
+--- a/lib/fuse_versionscript
++++ b/lib/fuse_versionscript
+@@ -27,7 +27,6 @@ FUSE_2.4 {
+ 		fuse_chan_data;
+ 		fuse_chan_destroy;
+ 		fuse_chan_fd;
+-		fuse_chan_new;
+ 		fuse_chan_receive;
+ 		fuse_chan_send;
+ 		fuse_chan_session;
diff --git a/sys-fs/fuse/fuse-2.8.5.ebuild b/sys-fs/fuse/fuse-2.8.5.ebuild
index c06283134f1a..44e96d2c353e 100644
--- a/sys-fs/fuse/fuse-2.8.5.ebuild
+++ b/sys-fs/fuse/fuse-2.8.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/fuse/fuse-2.8.5.ebuild,v 1.1 2010/10/07 22:11:09 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/fuse/fuse-2.8.5.ebuild,v 1.2 2010/11/24 01:28:54 flameeyes Exp $
 
 EAPI=2
 inherit eutils libtool linux-info
@@ -28,6 +28,8 @@ pkg_setup() {
 }
 
 src_prepare() {
+	epatch "${FILESDIR}/${P}-double-version.patch"
+
 	elibtoolize
 }