commit:     3805be6c8911066c6e27dd15eebf73bdec17fb24
Author:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 21 12:07:39 2014 +0000
Commit:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Sun Dec 21 12:14:30 2014 +0000
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-9999.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..0000000
--- 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-9999.ebuild 
b/app-text/evince/evince-9999.ebuild
index 49309f4..0f581af 100644
--- a/app-text/evince/evince-9999.ebuild
+++ b/app-text/evince/evince-9999.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} = 9999 ]]; then
                doc? ( >=dev-util/gtk-doc-1.13 )"
 fi
 
-ELTCONF="--portage"
-
 # 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}-3.14.0-non-bash-support.patch
+
+       eautoreconf
        gnome2_src_prepare
 
        # Do not depend on adwaita-icon-theme, bug #326855, #391859
@@ -112,5 +114,6 @@ src_configure() {
                $(use_enable t1lib) \
                $(use_enable tiff) \
                $(use_enable xps) \
+               
BROWSER_PLUGIN_DIR="${EPREFIX}"/usr/$(get_libdir)/nsbrowser/plugins \
                ${myconf}
 }

diff --git a/app-text/evince/files/evince-non-bash-support.patch 
b/app-text/evince/files/evince-3.14.0-non-bash-support.patch
similarity index 100%
rename from app-text/evince/files/evince-non-bash-support.patch
rename to app-text/evince/files/evince-3.14.0-non-bash-support.patch

Reply via email to