[gentoo-commits] proj/gnome:master commit in: app-text/evince/, app-text/evince/files/

[gentoo-commits] proj/gnome:master commit in: app-text/evince/, app-text/evince/files/

[Remi Cardona]

commit:     f6aa75a8258c9764f902ac9c623fce5ce5fe3fb0
Author:     Rémi Cardona <remi <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 30 16:57:52 2014 +0000
Commit:     Remi Cardona <remi <AT> gentoo <DOT> org>
CommitDate: Sun Nov 30 17:03:21 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=f6aa75a8

app-text/evince: Fix build with non-bash /bin/sh

Patch comes from upstream git, so -9999 doesn't need it.

---
 app-text/evince/evince-3.14.1.ebuild               |  7 +++++-
 .../evince/files/evince-non-bash-support.patch     | 28 ++++++++++++++++++++++
 2 files changed, 34 insertions(+), 1 deletion(-)

diff --git a/app-text/evince/evince-3.14.1.ebuild b/app-text/evince/evince-3.14.1.ebuild
index 01283b1..0ed7b71 100644
--- a/app-text/evince/evince-3.14.1.ebuild
+++ b/app-text/evince/evince-3.14.1.ebuild
@@ -6,7 +6,7 @@ EAPI="5"
 GCONF_DEBUG="yes"
 GNOME2_LA_PUNT="yes"
 
-inherit eutils gnome2
+inherit eutils autotools gnome2
 
 DESCRIPTION="Simple document viewer for GNOME"
 HOMEPAGE="https://wiki.gnome.org/Apps/Evince"
@@ -67,6 +67,11 @@ DEPEND="${COMMON_DEPEND}
 RESTRICT="test"
 
 src_prepare() {
+	# Fix build with non-bash /bin/sh, see bug #526410
+	epatch "${FILESDIR}/${PN}-non-bash-support.patch"
+
+	eautoreconf
+
 	gnome2_src_prepare
 
 	# Do not depend on adwaita-icon-theme, bug #326855, #391859

diff --git a/app-text/evince/files/evince-non-bash-support.patch b/app-text/evince/files/evince-non-bash-support.patch
new file mode 100644
index 0000000..979d186
--- /dev/null
+++ b/app-text/evince/files/evince-non-bash-support.patch
@@ -0,0 +1,28 @@
+From 59daf398bc0f1d7895eee3a776b33a9c9310ad21 Mon Sep 17 00:00:00 2001
+From: Alexander Tsoy <alexander@tsoy.me>
+Date: Sun, 26 Oct 2014 23:54:47 +0300
+Subject: configure.ac: workaround quoting issues
+
+BROWSER_PLUGIN_DIR variable substitution is not portable. In particular
+it does not work in dash. Replace it with conditional.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=739226
+
+diff --git a/configure.ac b/configure.ac
+index 56bf93c..dd4bcab 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -455,7 +455,9 @@ AC_ARG_ENABLE([browser-plugin],
+ if test x$enable_browser_plugin = "xyes" ; then
+   PKG_CHECK_MODULES([BROWSER_PLUGIN],[gtk+-3.0 >= $GTK_REQUIRED gthread-2.0 gio-2.0 >= $GLIB_REQUIRED])
+ 
+-  BROWSER_PLUGIN_DIR="${BROWSER_PLUGIN_DIR:-"\${libdir}/mozilla/plugins"}"
++  if test -z "${BROWSER_PLUGIN_DIR}"; then
++    BROWSER_PLUGIN_DIR="\${libdir}/mozilla/plugins"
++  fi
+   AC_ARG_VAR([BROWSER_PLUGIN_DIR],[Where to install the plugin to])
+ fi
+ 
+-- 
+cgit v0.10.1
+