Backport upstream commit to make it build with ld.gold

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

3 files changed, 39 insertions, 4 deletions

diff --git a/gnome-extra/sushi/ChangeLog b/gnome-extra/sushi/ChangeLog
index 20ea6393d4cd..17cbe5b531c8 100644
--- a/gnome-extra/sushi/ChangeLog
+++ b/gnome-extra/sushi/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for gnome-extra/sushi
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/sushi/ChangeLog,v 1.4 2012/05/07 08:05:18 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/sushi/ChangeLog,v 1.5 2012/09/09 18:06:51 jlec Exp $
+
+  09 Sep 2012; Justin Lecher <jlec@gentoo.org> +files/sushi-0.4.1-gold.patch,
+  sushi-0.4.1.ebuild:
+  Backport upstream commit to make it build with ld.gold
 
 *sushi-0.4.1 (07 May 2012)
 
@@ -18,4 +22,3 @@
   02 Nov 2011; Alexandre Rostovtsev <tetromino@gentoo.org> +sushi-0.2.1.ebuild,
   +metadata.xml:
   Add new ebuild from the gnome overlay, needed for gnome-3.2.
-
diff --git a/gnome-extra/sushi/files/sushi-0.4.1-gold.patch b/gnome-extra/sushi/files/sushi-0.4.1-gold.patch
new file mode 100644
index 000000000000..bb9edc0f65b6
--- /dev/null
+++ b/gnome-extra/sushi/files/sushi-0.4.1-gold.patch
@@ -0,0 +1,26 @@
+From 44b5746760248105386c7bca8c4edbf812b42548 Mon Sep 17 00:00:00 2001
+Message-Id: <44b5746760248105386c7bca8c4edbf812b42548.1347213825.git.jlec@gentoo.org>
+From: Funda Wang <fwang@mageia.org>
+Date: Sat, 7 Jul 2012 04:37:08 +0200
+Subject: [PATCH] Make it build with as-needed linking
+
+https://bugzilla.gnome.org/show_bug.cgi?id=679495
+---
+ configure.ac | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/configure.ac b/configure.ac
+index 6f0ade6..60f1359 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -58,6 +58,7 @@ GOBJECT_INTROSPECTION_MIN_VERSION=0.9.6
+ GDK_PIXBUF_MIN_VERSION=2.22.1
+ 
+ PKG_CHECK_MODULES(SUSHI,
++                  freetype2
+                   glib-2.0 >= $GLIB_MIN_VERSION
+                   gobject-introspection-1.0 >= $GOBJECT_INTROSPECTION_MIN_VERSION
+                   gjs-1.0 >= $GJS_MIN_VERSION
+-- 
+1.7.12
+
diff --git a/gnome-extra/sushi/sushi-0.4.1.ebuild b/gnome-extra/sushi/sushi-0.4.1.ebuild
index 8cb674f61b89..c8113e533045 100644
--- a/gnome-extra/sushi/sushi-0.4.1.ebuild
+++ b/gnome-extra/sushi/sushi-0.4.1.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/sushi/sushi-0.4.1.ebuild,v 1.1 2012/05/07 08:05:18 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/sushi/sushi-0.4.1.ebuild,v 1.2 2012/09/09 18:06:51 jlec Exp $
 
 EAPI="4"
 GCONF_DEBUG="no"
 GNOME2_LA_PUNT="yes"
 
-inherit gnome2
+inherit autotools eutils gnome2
 
 DESCRIPTION="A quick previewer for Nautilus, the GNOME file manager"
 HOMEPAGE="http://git.gnome.org/browse/sushi"
@@ -53,3 +53,9 @@ pkg_setup() {
 		--disable-static"
 	DOCS="AUTHORS NEWS README TODO"
 }
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-gold.patch
+	eautoreconf
+	gnome2_src_prepare
+}