commit: 334f92c3ec768dd985807823f71ab18c2723a152
Author: Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
AuthorDate: Wed May 27 13:24:32 2015 +0000
Commit: Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
CommitDate: Wed May 27 13:24:32 2015 +0000
URL: https://gitweb.gentoo.org/proj/gnome.git/commit/?id=334f92c3
app-text/evince: 3.16.0 → 3.16.1
Clean up patch that was accepted upstream.
Package-Manager: portage-2.2.20
Manifest-Sign-Key: 0x18E5B6F2D8D5EC8D
.../{evince-3.16.0.ebuild => evince-3.16.1.ebuild} | 0
app-text/evince/evince-9999.ebuild | 6 +----
.../files/evince-3.14.0-non-bash-support.patch | 28 ----------------------
3 files changed, 1 insertion(+), 33 deletions(-)
diff --git a/app-text/evince/evince-3.16.0.ebuild
b/app-text/evince/evince-3.16.1.ebuild
similarity index 100%
rename from app-text/evince/evince-3.16.0.ebuild
rename to app-text/evince/evince-3.16.1.ebuild
diff --git a/app-text/evince/evince-9999.ebuild
b/app-text/evince/evince-9999.ebuild
index d0e00c2..57bb06b 100644
--- a/app-text/evince/evince-9999.ebuild
+++ b/app-text/evince/evince-9999.ebuild
@@ -6,7 +6,7 @@ EAPI="5"
GCONF_DEBUG="yes"
GNOME2_LA_PUNT="yes"
-inherit eutils gnome2
+inherit gnome2
if [[ ${PV} = 9999 ]]; then
inherit gnome2-live
fi
@@ -83,10 +83,6 @@ fi
#RESTRICT="test"
src_prepare() {
- # Fix build with non-bash /bin/sh, see bug #526410
- epatch "${FILESDIR}"/${PN}-3.14.0-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-3.14.0-non-bash-support.patch
b/app-text/evince/files/evince-3.14.0-non-bash-support.patch
deleted file mode 100644
index 979d186..0000000
--- a/app-text/evince/files/evince-3.14.0-non-bash-support.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 59daf398bc0f1d7895eee3a776b33a9c9310ad21 Mon Sep 17 00:00:00 2001
-From: Alexander Tsoy <[email protected]>
-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
-
