[gentoo-commits] proj/gnome:master commit in: app-text/evince/files/, app-text/evince/
commit: 334f92c3ec768dd985807823f71ab18c2723a152
Author: Alexandre Rostovtsev tetromino AT gentoo DOT org
AuthorDate: Wed May 27 13:24:32 2015 +
Commit: Alexandre Rostovtsev tetromino AT gentoo DOT org
CommitDate: Wed May 27 13:24:32 2015 +
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-.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-.ebuild
b/app-text/evince/evince-.ebuild
index d0e00c2..57bb06b 100644
--- a/app-text/evince/evince-.ebuild
+++ b/app-text/evince/evince-.ebuild
@@ -6,7 +6,7 @@ EAPI=5
GCONF_DEBUG=yes
GNOME2_LA_PUNT=yes
-inherit eutils gnome2
+inherit gnome2
if [[ ${PV} = ]]; 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..000
--- 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 alexan...@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
-
[gentoo-commits] proj/gnome:master commit in: app-text/evince/files/, app-text/evince/
commit: 3805be6c8911066c6e27dd15eebf73bdec17fb24
Author: Gilles Dartiguelongue eva AT gentoo DOT org
AuthorDate: Sun Dec 21 12:07:39 2014 +
Commit: Gilles Dartiguelongue eva AT gentoo DOT org
CommitDate: Sun Dec 21 12:14:30 2014 +
URL:
http://sources.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=3805be6c
app-text/evince: moved to gentoo-x86, sync live ebuild
---
app-text/evince/evince-3.14.1.ebuild | 103 -
app-text/evince/evince-.ebuild | 9 +-
patch = evince-3.14.0-non-bash-support.patch} | 0
3 files changed, 6 insertions(+), 106 deletions(-)
diff --git a/app-text/evince/evince-3.14.1.ebuild
b/app-text/evince/evince-3.14.1.ebuild
deleted file mode 100644
index 0ed7b71..000
--- a/app-text/evince/evince-3.14.1.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-GCONF_DEBUG=yes
-GNOME2_LA_PUNT=yes
-
-inherit eutils autotools gnome2
-
-DESCRIPTION=Simple document viewer for GNOME
-HOMEPAGE=https://wiki.gnome.org/Apps/Evince;
-
-LICENSE=GPL-2+ CC-BY-SA-3.0
-# subslot = evd3.(suffix of libevdocument3)-evv3.(suffix of libevview3)
-SLOT=0/evd3.4-evv3.3
-IUSE=debug djvu dvi gnome +introspection libsecret nautilus +postscript t1lib
tiff xps
-KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x64-solaris
-
-# Since 2.26.2, can handle poppler without cairo support. Make it optional ?
-# not mature enough
-# atk used in libview
-# gdk-pixbuf used all over the place
-# libX11 used for totem-screensaver
-COMMON_DEPEND=
- dev-libs/atk
- =dev-libs/glib-2.36:2
- =dev-libs/libxml2-2.5:2
- sys-libs/zlib:=
- x11-libs/gdk-pixbuf:2
- =x11-libs/gtk+-3.14:3[introspection?]
- gnome-base/gsettings-desktop-schemas
- =x11-libs/cairo-1.10:=
- =app-text/poppler-0.24:=[cairo]
- djvu? ( =app-text/djvu-3.5.17:= )
- dvi? (
- virtual/tex-base
- dev-libs/kpathsea:=
- t1lib? ( =media-libs/t1lib-5:= ) )
- gnome? ( gnome-base/gnome-desktop:3 )
- introspection? ( =dev-libs/gobject-introspection-1 )
- libsecret? ( =app-crypt/libsecret-0.5 )
- nautilus? ( =gnome-base/nautilus-2.91.4[introspection?] )
- postscript? ( =app-text/libspectre-0.2:= )
- tiff? ( =media-libs/tiff-3.6:0= )
- xps? ( =app-text/libgxps-0.2.1:= )
-
-RDEPEND=${COMMON_DEPEND}
- gnome-base/librsvg
- || (
- =x11-themes/adwaita-icon-theme-2.17.1
- =x11-themes/gnome-icon-theme-2.17.1
- =x11-themes/hicolor-icon-theme-0.10 )
- x11-themes/gnome-icon-theme-symbolic
-
-DEPEND=${COMMON_DEPEND}
- app-text/docbook-xml-dtd:4.3
- dev-util/gdbus-codegen
- sys-devel/gettext
- =dev-util/gtk-doc-am-1.13
- =dev-util/intltool-0.35
- virtual/pkgconfig
-
-
-# Needs dogtail and pyspi from http://fedorahosted.org/dogtail/
-# Releases: http://people.redhat.com/zcerza/dogtail/releases/
-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
- sed -e 's/adwaita-icon-theme = $ADWAITA_ICON_THEME_REQUIRED//g' \
- -i configure || die sed failed
-}
-
-src_configure() {
- gnome2_src_configure \
- --disable-static \
- --disable-tests \
- --enable-pdf \
- --enable-comics \
- --enable-thumbnailer \
- --with-platform=gnome \
- --enable-dbus \
- --enable-browser-plugin \
- $(use_enable djvu) \
- $(use_enable dvi) \
- $(use_with libsecret keyring) \
- $(use_enable gnome libgnome-desktop) \
- $(use_enable introspection) \
- $(use_enable nautilus) \
- $(use_enable postscript ps) \
- $(use_enable t1lib) \
- $(use_enable tiff) \
- $(use_enable xps) \
- ITSTOOL=$(type -P true)
-}
diff --git a/app-text/evince/evince-.ebuild
b/app-text/evince/evince-.ebuild
index 49309f4..0f581af 100644
--- a/app-text/evince/evince-.ebuild
+++ b/app-text/evince/evince-.ebuild
@@ -36,7 +36,7 @@ COMMON_DEPEND=
=dev-libs/libxml2-2.5:2
sys-libs/zlib:=
x11-libs/gdk-pixbuf:2
- =x11-libs/gtk+-3.12:3[introspection?]
+ =x11-libs/gtk+-3.14:3[introspection?]
gnome-base/gsettings-desktop-schemas
=x11-libs/cairo-1.10:=
=app-text/poppler-0.24:=[cairo]
@@ -76,13 +76,15 @@ if [[ ${PV} = ]]; then
doc? ( =dev-util/gtk-doc-1.13 )
