fix library underlinking issue that caused link breakage with ld.gold

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0x2B6559ED

5 files changed, 58 insertions, 10 deletions

diff --git a/media-gfx/freewrl/ChangeLog b/media-gfx/freewrl/ChangeLog
index 5ba3bf4adcf6..4f7f2db2354c 100644
--- a/media-gfx/freewrl/ChangeLog
+++ b/media-gfx/freewrl/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-gfx/freewrl
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/freewrl/ChangeLog,v 1.58 2014/04/25 20:03:08 axs Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/freewrl/ChangeLog,v 1.59 2014/05/01 14:16:11 axs Exp $
+
+  01 May 2014; Ian Stakenvicius (_AxS_) <axs@gentoo.org>
+  +files/freewrl-2.3.3-ld.gold.patch, freewrl-1.22.13-r3.ebuild,
+  freewrl-2.3.3.ebuild:
+  fix library underlinking issue that caused link breakage with ld.gold
 
   25 Apr 2014; Ian Stakenvicius (_AxS_) <axs@gentoo.org> freewrl-2.3.3.ebuild:
   fixed distfile on new version
diff --git a/media-gfx/freewrl/Manifest b/media-gfx/freewrl/Manifest
index 4d1fe91f958c..88f5c3dcb71b 100644
--- a/media-gfx/freewrl/Manifest
+++ b/media-gfx/freewrl/Manifest
@@ -5,17 +5,18 @@ AUX freewrl-1.22.13-desktop.patch 350 SHA256 09176fe7ef22d8d0a2381bfb70edbacc999
 AUX freewrl-1.22.13-fontconfig-match.patch 666 SHA256 81ad402685aac3746a1d3fefe3ce77e46f0d7521e721d02f6ceb2fa60b9501c5 SHA512 8f92238be4568bea9959ffd9ac81920633340e583d175e6a35add48edbaa41aa937aa9d7494261e2edf83bbdfeadbfe597b5881c3dbf2ef9e9bf2f3ce4a508f5 WHIRLPOOL 991306f3174466a7505a85592db0b6196f0f55fe4d5b0cb70b72b20c101d7f637b4dac34c2fd9c6b5e627c7c88ccdfc8db4a2b91b863271699fd75d130b4c0b0
 AUX freewrl-1.22.13-java-fix.patch 1942 SHA256 04ab169e8ef34594c730cc7449e4a5f9c335e9125dfe8da0bf1edf043e81800b SHA512 e8224e249e28918e04117542c710b093f90e31666312c7b3f62444d68158832893cf81237c8d9c7677ac4e0b571c0a74457721f0778996a975fbdacffdebb82a WHIRLPOOL 78f23c073f94d39a54734b51320549131fbc2285501b36ea745aa2b5cb8991ab89697d72398b77d170ee9caa7ea312ddcdda21a019fb3ac546dbde30ceeef4cb
 AUX freewrl-1.22.13-mozjs187-config.patch 486 SHA256 340a489d70b1e0d450b779f35686f09c1a50ba62cd8de5bb34340dec8c5ad561 SHA512 69985ba98ca8c12e59b6aba2fda004931778f138dfd90a45fd9a65027961401f6a377bfbc55f9fb2614ada5ac291922809dc87ea8ad7bdf93bdc78ddb3c3b298 WHIRLPOOL f54fb2c381f9fcd0c284898d49c9fd10e0210ade9399a47f241c4657d0c0e6f00edcfb1c3624164ad884562a1eea905f4a59b64979d4110ba3404430eef10e67
+AUX freewrl-2.3.3-ld.gold.patch 1120 SHA256 79a67c587817e818a33a945b0c10b93b5d402f62dd3a26410695772e43bf4649 SHA512 010369ab9ec5f03f3055594b88001deb14a58e3d69cd5f8312a7a25d34ec4bef81940d911a7c13aa8872c82fe66c14284d292a33e1629ab9dfe52cd9a4412e3b WHIRLPOOL 2a535f2aa0ec7a21f1b89d6d37812dbd702cb547d385680a0914c1660192f3e3581aded53578e5ddbe5dffde4faf8cb38164c5d382faee2db5a0cde89eff9d09
 DIST freewrl-1.22.13.1.tar.bz2 1830305 SHA256 29069d63604dbbfde0f684f342f34e9d0eb216a026f83317a00fbdd31ece17e8 SHA512 6e751835a256ce08d4099e5301c0702e28e5cae2e77d8a51ab38f6f0c08680f22a9ef25ef9d2bb860680fc8c1fc22cfebf14cfb14b50ee514b5ef76e71ab1192 WHIRLPOOL 58d301f4f3c1d145b041bb626c8af18954d9cd3da88f348d2341928c2ff050b15e077855b1ef5a2fe18b2218b8d2f8a75e229ca5bf5d683c0c98e4ed132f71cd
 DIST freewrl-2.3.3.1.tar.gz 1731651 SHA256 71ed11f5f3b4b6a1d2fc740e8e3ed62a83b484c9695968fac5e30db14dbb6fef SHA512 e205e8d11a3650ddf4f7dd089bdca36fc1879424c88392229ca8c0d532ebc4662f4f2e3bc491a0a1d6300e78c55cebbb57eeef2145a8c96c727c35dfb2a7d00a WHIRLPOOL d61f65b9f0db94f73760d6b1800be5f77f9898e2305ec93cc43aa8a8631e5d002602a1b79bbec91d30a040479ae01530cb470cb411d803ff8f04c3792e35e545
-EBUILD freewrl-1.22.13-r3.ebuild 4577 SHA256 9f7b0f0d673659e15563779c0a55fd4b1bc8f855dae6e246b2448a12688c0d88 SHA512 3cbbd8b6707dee9c36dc2820f6dafc7189350c7d3f773ba696046c50c1b6b7f313b2a56fc01ab5747a41a62e09762515579c974f3d2e8be31ecb1a8be37aaf63 WHIRLPOOL cb35eb1677f46310c125d182b00deb450f9c418919b44d7ea9003ce73d8804a6c00032efb9c569754dda94305daefd9f344eebc02540b4e096e093f069c772e9
-EBUILD freewrl-2.3.3.ebuild 4406 SHA256 9fc781f3e4bc389a90f2281a17f9b50f4dad96cd07727ca551006a5a627b9626 SHA512 d47e6f06e9389be7c7d63ca35128dad52b3b0bfbcbe0998eb872e5453bc42a2a15751f86aa72d5fc3311aabf6d9dbe54284803451bc0664bca7e4b124cccaf5b WHIRLPOOL d32ee92ffe5e624ac9119c6530ea4a0fd43b8e85fdb0eea44c74a843ac3bd218a5fb4db6907da48f9dfad68627ce041cf83d6bb7c72e756333edd304d0a8529c
+EBUILD freewrl-1.22.13-r3.ebuild 4625 SHA256 19983b90df385ff639c9062c89b4e19645228d2d566ceda438e24ba219e43635 SHA512 99f6a3115a786c1b762f6a560f19e58a8d291e0c6f2a53e2473cd53d0f2add78643e6664afb2a7c1af17c4c070d966046ca4fe9d9bfefe550cb023e6c5c3e680 WHIRLPOOL a8b4feb6044d4d8f6a855f40631df1760b4b4b47c0d81ce3c184fac035d048b80fc1a21e610cb3c85c70deb243c10d983b5c9352102dce0d375bd5545fc1c27c
+EBUILD freewrl-2.3.3.ebuild 4502 SHA256 6ed3b610bd3ca2e01d1212eaa204ebc721d4a263b22bf878c12abbf501a2dfe0 SHA512 fa0c237603592a5c205edc442488e301e206d1c1517f61931d99878d8f2b29ff72fb374213afbc340ba8cb419b507ad69581768fc8f9726838f9b3f65c2c6df6 WHIRLPOOL 683bb002a96624e40c5173cfea4833fe4e3fa9555a15aa8894f22cf26afc506c249ec62cd66cc0a3c91cc02528fd27188516a5c1b05b24381eb832e0a36bb61a
 EBUILD freewrl-9999.ebuild 4617 SHA256 36f9781b591de2aadb37aaf59a1329b523239b8f8b4cbdbd1f7ee8a05406418a SHA512 5de352847dcb06011aa9f228c324c381ace1098171965f3965578e92adbabd8e9e206032e3f05e514cd492c8297d4b8fdabc272a21b943517267cfa47acae962 WHIRLPOOL 57eded189a4ccdbf086f5778615f8af181e3f4fa15390298ea6d4e3a7043927d4d2a970410ed1a264a95a855d830c6f9c5a84c108c8cc95958f2ac85081efe76
-MISC ChangeLog 9191 SHA256 37d8fa5802c0af78c6708f45f2db8ca157cab4b3c80cc2db34951d34074424b4 SHA512 1c31d7d4e54cb486fe2a7e0389bfde0187bc2328b574aff3ff0b9f4a9760b1b43c63551c5ca5611af0ef41d4746909337389430a24711e686423ddd2ef1fb5de WHIRLPOOL cbd5871c3e84913665aa37ae5eac1a48cfa2f754ba64010bffa2a24804a3aa99e157251744fd61465ad42c6ec0ee992e792bb2dfeb966f8bf4cd58485ef779de
+MISC ChangeLog 9410 SHA256 6f2861e68e01393a9d5c3f16728e0e4f72c72e5cb0c92b612c83c3bc4a750d11 SHA512 b950a6394a8ed370bbf568c8a412944644a64c30e28d64d07a56431aae73c3d88e24cf1d0394ff8fa953db3aafc21170c32b76d1219a0f8c933065ae9ffa5818 WHIRLPOOL 62dc00e1c91595c572d9ae855f477e12a8a689558c03b070e2424d10cb9999fc7bca94a3e3c3894d77e5c188f87089df65307163197c18be7bfa318b047c83c4
 MISC metadata.xml 1485 SHA256 fee2f1f54dc3a09b796163dd3b4262013f41a2da6b404aafe68df8afec1ec433 SHA512 c34a945da2f40d442cad2ff1b042078c62976e3af2fee12b7b90361b2e345b29d7e37900c1189bd82ac16bae2c67a94f6d4f55273adb2c6c6e64fdc6b71fa7f7 WHIRLPOOL 03cb8ac4d37078531aaa46260192b197d0e09ff24329063b181e645c9465f610fcd7993a654e9bccefaf011510362d7e01b2d62d860e42322957684c9e3e4002
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iF4EAREIAAYFAlNav4kACgkQ2ugaI38ACPCV3QEAnuVxwRlJqKxfVWeG0dQS0nzh
-8TqbwXLrVpBwmcQqRKIA/07oij4rJ6kDws/QbWSag/OSbX5fqE4Uv+GnhCBhCe3P
-=HEaN
+iF4EAREIAAYFAlNiVysACgkQ2ugaI38ACPCy6wD/YsRH0GWxg5D6K42QI4jHW3wp
+cutQUWg99vyKh7cwn2kBAJw9jkW+7U/7vy6RdF2AUdyiGmsUt6uzF8GL71wYZT/Q
+=0FSn
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/freewrl/files/freewrl-2.3.3-ld.gold.patch b/media-gfx/freewrl/files/freewrl-2.3.3-ld.gold.patch
new file mode 100644
index 000000000000..6660f175b502
--- /dev/null
+++ b/media-gfx/freewrl/files/freewrl-2.3.3-ld.gold.patch
@@ -0,0 +1,35 @@
+commit 57d2d3b900c7d57e167fb7c90b36ca8c9c80b8bd
+Author: Ian Stakenvicius <axs@gentoo.org>
+Date:   Mon Apr 28 10:53:57 2014 -0400
+
+    autotools: fixed underlinking issue with libm
+    
+    Signed-off-by: Ian Stakenvicius <axs@gentoo.org>
+
+diff --git a/freex3d/configure.ac b/freex3d/configure.ac
+index 49db07c..48b09c8 100644
+--- a/freex3d/configure.ac
++++ b/freex3d/configure.ac
+@@ -73,6 +73,8 @@ AC_PROG_GCC_TRADITIONAL
+ dnl AC_FUNC_MALLOC
+ AC_CHECK_FUNCS([strchr strrchr strdup strndup strerror getopt getopt_long getopt_long_only malloc calloc realloc usleep gettimeofday])
+ 
++# Check for math
++AC_CHECK_LIBM
+ 
+ # ====================================================
+ # FreeWRL specific configuration: target system
+diff --git a/freex3d/src/lib/Makefile.am b/freex3d/src/lib/Makefile.am
+index ae7fb05..1b1af8a 100644
+--- a/freex3d/src/lib/Makefile.am
++++ b/freex3d/src/lib/Makefile.am
+@@ -40,7 +40,8 @@ EXTERNAL_LIBS = \
+ 				$(PNG_LIBS) \
+ 				$(LIBCURL_LIBS) \
+ 				$(IMLIB2_LIBS) \
+-				$(LIBLO_LIBS)
++				$(LIBLO_LIBS) \
++				$(LIBM)
+ 
+ 
+ # X11 flags specific to x11 target (default on Linux -- optional on Mac)
diff --git a/media-gfx/freewrl/freewrl-1.22.13-r3.ebuild b/media-gfx/freewrl/freewrl-1.22.13-r3.ebuild
index 61688dfe7bcc..cc1052302e70 100644
--- a/media-gfx/freewrl/freewrl-1.22.13-r3.ebuild
+++ b/media-gfx/freewrl/freewrl-1.22.13-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/freewrl/freewrl-1.22.13-r3.ebuild,v 1.3 2014/03/14 13:45:19 axs Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/freewrl/freewrl-1.22.13-r3.ebuild,v 1.4 2014/05/01 14:16:11 axs Exp $
 
 EAPI=5
 
@@ -51,6 +51,7 @@ src_prepare() {
 	fi
 	epatch "${FILESDIR}"/${P}-desktop.patch
 	epatch "${FILESDIR}"/${P}-java-fix.patch
+	epatch "${FILESDIR}"/${PN}-2.3.3-ld.gold.patch
 	eautoreconf
 }
 
diff --git a/media-gfx/freewrl/freewrl-2.3.3.ebuild b/media-gfx/freewrl/freewrl-2.3.3.ebuild
index 90f7b9be5445..f4d6ea7ddccd 100644
--- a/media-gfx/freewrl/freewrl-2.3.3.ebuild
+++ b/media-gfx/freewrl/freewrl-2.3.3.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/freewrl/freewrl-2.3.3.ebuild,v 1.2 2014/04/25 20:03:08 axs Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/freewrl/freewrl-2.3.3.ebuild,v 1.3 2014/05/01 14:16:11 axs Exp $
 
 EAPI=5
 
-inherit nsplugins eutils flag-o-matic java-pkg-opt-2 multilib
+inherit autotools nsplugins eutils flag-o-matic java-pkg-opt-2 multilib
 
 if [[ ${PV} == "9999" ]]; then
 	inherit git-r3
@@ -52,6 +52,12 @@ RDEPEND="${COMMONDEPEND}
 	java? ( >=virtual/jre-1.4 )
 	sox? ( media-sound/sox )"
 
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-ld.gold.patch
+	epatch_user
+	eautoreconf
+}
+
 src_configure() {
 	# list of js libs without .pc support, to disable ./configure auto-checking
 	local spidermonkeys=( mozilla-js xulrunner-js firefox-js firefox2-js seamonkey-js )