Add fix for problems with glib-2.32 and gold linker, #414065

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

3 files changed, 51 insertions, 4 deletions

diff --git a/app-text/evince/ChangeLog b/app-text/evince/ChangeLog
index 270bd79c62fa..e986ffcee091 100644
--- a/app-text/evince/ChangeLog
+++ b/app-text/evince/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-text/evince
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/evince/ChangeLog,v 1.241 2012/04/29 15:13:14 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/evince/ChangeLog,v 1.242 2012/04/30 09:48:04 jlec Exp $
+
+  30 Apr 2012; Justin Lecher <jlec@gentoo.org> evince-3.2.1-r1.ebuild,
+  +files/evince-3.2.1-glib-gold.patch:
+  Add fix for problems with glib-2.32 and gold linker, #414065
 
   29 Apr 2012; Markus Meier <maekke@gentoo.org> evince-2.32.0-r4.ebuild:
   x86 stable, bug #410611
diff --git a/app-text/evince/evince-3.2.1-r1.ebuild b/app-text/evince/evince-3.2.1-r1.ebuild
index e489d9025203..897c56c73e32 100644
--- a/app-text/evince/evince-3.2.1-r1.ebuild
+++ b/app-text/evince/evince-3.2.1-r1.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/evince/evince-3.2.1-r1.ebuild,v 1.3 2011/12/04 04:34:41 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/evince/evince-3.2.1-r1.ebuild,v 1.4 2012/04/30 09:48:04 jlec Exp $
 
 EAPI="4"
 GCONF_DEBUG="yes"
 GNOME2_LA_PUNT="yes"
 
-inherit eutils gnome2
+inherit autotools eutils gnome2
 
 DESCRIPTION="Simple document viewer for GNOME"
 HOMEPAGE="http://www.gnome.org/projects/evince/"
@@ -104,8 +104,13 @@ src_prepare() {
 	# Patch from upstream git master branch to fix libgxps-0.2 compatibility
 	epatch "${FILESDIR}/${PN}-3.2.1-libgxps-0.2.patch"
 
+	# glib-2.32 restructured dep libs in pkg-config files, #414065
+	epatch "${FILESDIR}/${P}-glib-gold.patch"
+
 	gnome2_src_prepare
 
+	AT_NOELIBTOOLIZE=yes eautoreconf
+
 	# Do not depend on gnome-icon-theme, bug #326855, #391859
 	sed -e 's/gnome-icon-theme >= $GNOME_ICON_THEME_REQUIRED//g' \
 		-i configure || die "sed failed"
diff --git a/app-text/evince/files/evince-3.2.1-glib-gold.patch b/app-text/evince/files/evince-3.2.1-glib-gold.patch
new file mode 100644
index 000000000000..ab9dd0fd965c
--- /dev/null
+++ b/app-text/evince/files/evince-3.2.1-glib-gold.patch
@@ -0,0 +1,38 @@
+ configure.ac |    8 ++++----
+ 1 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 183b644..c863997 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -160,10 +160,10 @@ fi
+ ZLIB_LIBS=-lz
+ AC_SUBST(ZLIB_LIBS)
+ 
+-PKG_CHECK_MODULES(LIBDOCUMENT, gtk+-3.0 >= $GTK_REQUIRED gio-2.0 >= $GLIB_REQUIRED)
++PKG_CHECK_MODULES(LIBDOCUMENT, gtk+-3.0 >= $GTK_REQUIRED gio-2.0 >= $GLIB_REQUIRED gmodule-no-export-2.0 >= $GLIB_REQUIRED)
+ PKG_CHECK_MODULES(LIBVIEW, gtk+-3.0 >= $GTK_REQUIRED gail-3.0 >= $GTK_REQUIRED gthread-2.0 gio-2.0 >= $GLIB_REQUIRED)
+ PKG_CHECK_MODULES(BACKEND, cairo >= $CAIRO_REQUIRED gtk+-3.0 >= $GTK_REQUIRED)
+-PKG_CHECK_MODULES(FRONTEND_CORE, gtk+-3.0 >= $GTK_REQUIRED gthread-2.0 gio-2.0 >= $GLIB_REQUIRED)
++PKG_CHECK_MODULES(FRONTEND_CORE, gtk+-3.0 >= $GTK_REQUIRED gthread-2.0 gio-2.0 >= $GLIB_REQUIRED gmodule-no-export-2.0 >= $GLIB_REQUIRED)
+ 
+ SHELL_PLATFORM_PKGS=
+ case "$with_platform" in
+@@ -189,7 +189,7 @@ case "$with_platform" in
+         ;;
+ esac
+ 
+-PKG_CHECK_MODULES([SHELL_CORE],[libxml-2.0 >= $LIBXML_REQUIRED gtk+-3.0 >= $GTK_REQUIRED gio-2.0 >= $GLIB_REQUIRED gthread-2.0 $SHELL_PLATFORM_PKGS])
++PKG_CHECK_MODULES([SHELL_CORE],[libxml-2.0 >= $LIBXML_REQUIRED gtk+-3.0 >= $GTK_REQUIRED gio-2.0 >= $GLIB_REQUIRED gmodule-no-export-2.0 >= $GLIB_REQUIRED gthread-2.0 $SHELL_PLATFORM_PKGS])
+ 
+ # *********
+ # SM client
+@@ -407,7 +407,7 @@ AC_ARG_ENABLE([previewer],
+     esac])
+ 
+ if test x$enable_previewer = "xyes" ; then
+-  PKG_CHECK_MODULES([PREVIEWER],[gtk+-3.0 >= $GTK_REQUIRED gthread-2.0 gio-2.0 >= $GLIB_REQUIRED])
++  PKG_CHECK_MODULES([PREVIEWER],[gtk+-3.0 >= $GTK_REQUIRED gthread-2.0 gio-2.0 >= $GLIB_REQUIRED gmodule-no-export-2.0 >= $GLIB_REQUIRED])
+ fi
+ 
+ AM_CONDITIONAL([ENABLE_PREVIEWER],[test "$enable_previewer" = "yes"])