Fix linking with gold.ld

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

4 files changed, 36 insertions, 13 deletions

diff --git a/app-text/evince/ChangeLog b/app-text/evince/ChangeLog
index 9af962e03139..926b5674ab12 100644
--- a/app-text/evince/ChangeLog
+++ b/app-text/evince/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-text/evince
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/evince/ChangeLog,v 1.228 2011/10/05 17:11:36 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/evince/ChangeLog,v 1.229 2011/10/17 18:20:48 jlec Exp $
+
+  17 Oct 2011; Justin Lecher <jlec@gentoo.org> +files/evince-2.32.0-gold.patch,
+  metadata.xml, evince-2.32.0-r3.ebuild:
+  Fix linking with gold.ld
 
   05 Oct 2011; Kacper Kowalik <xarthisius@gentoo.org> evince-2.32.0-r3.ebuild:
   ppc/ppc64 stable wrt #369909
diff --git a/app-text/evince/evince-2.32.0-r3.ebuild b/app-text/evince/evince-2.32.0-r3.ebuild
index 47b1761f72e0..4a0aee84211c 100644
--- a/app-text/evince/evince-2.32.0-r3.ebuild
+++ b/app-text/evince/evince-2.32.0-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/evince/evince-2.32.0-r3.ebuild,v 1.7 2011/10/05 17:11:36 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/evince/evince-2.32.0-r3.ebuild,v 1.8 2011/10/17 18:20:48 jlec Exp $
 
 EAPI="3"
 GCONF_DEBUG="yes"
@@ -125,6 +125,9 @@ src_prepare() {
 		cp "${FILESDIR}/gconf-2.m4" m4/ || die "Copying gconf-2.m4 failed!"
 	fi
 
+	# Fix underlinking with gold
+	epatch "${FILESDIR}"/${P}-gold.patch
+
 	intltoolize --force --copy --automake || die "intltoolize failed"
 	eautoreconf
 }
diff --git a/app-text/evince/files/evince-2.32.0-gold.patch b/app-text/evince/files/evince-2.32.0-gold.patch
new file mode 100644
index 000000000000..dc846dfa3227
--- /dev/null
+++ b/app-text/evince/files/evince-2.32.0-gold.patch
@@ -0,0 +1,16 @@
+ thumbnailer/Makefile.am |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/thumbnailer/Makefile.am b/thumbnailer/Makefile.am
+index 171c00f..b060a97 100644
+--- a/thumbnailer/Makefile.am
++++ b/thumbnailer/Makefile.am
+@@ -26,7 +26,7 @@ endif
+ 
+ evince_thumbnailer_LDADD = \
+ 	$(top_builddir)/libdocument/libevdocument.la	\
+-	$(FRONTEND_LIBS)
++	$(FRONTEND_LIBS) -lm
+ 
+ schema_files = \
+ 	evince-thumbnailer-dvi.schemas.in  \
diff --git a/app-text/evince/metadata.xml b/app-text/evince/metadata.xml
index 624d962f12ef..c47f45d1e418 100644
--- a/app-text/evince/metadata.xml
+++ b/app-text/evince/metadata.xml
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome</herd>
-<maintainer>
-  <email>dang@gentoo.org</email>
-</maintainer>
-<use>
-	<flag name='gnome'>Enable the use of <pkg>gnome-base/gconf</pkg> to honour
+	<herd>gnome</herd>
+	<maintainer>
+		<email>dang@gentoo.org</email>
+	</maintainer>
+	<use>
+		<flag name="gnome">Enable the use of <pkg>gnome-base/gconf</pkg> to honour
 		lockdown settings</flag>
-  <flag name='dvi'>Enable the built-in DVI viewer</flag>
-  <flag name="introspection">Use <pkg>dev-libs/gobject-introspection</pkg>
+		<flag name="dvi">Enable the built-in DVI viewer</flag>
+		<flag name="introspection">Use <pkg>dev-libs/gobject-introspection</pkg>
   	for introspection</flag>
-  <flag name='nautilus'>Enable property page extension in <pkg>gnome-base/nautilus</pkg></flag>
-  <flag name='t1lib'>Enable the Type-1 fonts for the built-in DVI viewer
+		<flag name="nautilus">Enable property page extension in <pkg>gnome-base/nautilus</pkg></flag>
+		<flag name="t1lib">Enable the Type-1 fonts for the built-in DVI viewer
     (<pkg>media-libs/t1lib</pkg>)</flag>
-</use>
+	</use>
 </pkgmetadata>