commit: 647cbfc119e8d19624489eb8a20e000d43ae7179
Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Fri May 8 22:19:30 2015 +0000
Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Fri May 8 23:35:43 2015 +0000
URL: https://gitweb.gentoo.org/proj/gnome.git/commit/?id=647cbfc1
app-text/evince: 3.14.2-r1 → 3.16.0
.../{evince-9999.ebuild => evince-3.16.0.ebuild} | 48 +++++++---------------
app-text/evince/evince-9999.ebuild | 18 ++++----
2 files changed, 24 insertions(+), 42 deletions(-)
diff --git a/app-text/evince/evince-9999.ebuild
b/app-text/evince/evince-3.16.0.ebuild
similarity index 69%
copy from app-text/evince/evince-9999.ebuild
copy to app-text/evince/evince-3.16.0.ebuild
index 0f581af..c6e6bf0 100644
--- a/app-text/evince/evince-9999.ebuild
+++ b/app-text/evince/evince-3.16.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
@@ -6,10 +6,7 @@ EAPI="5"
GCONF_DEBUG="yes"
GNOME2_LA_PUNT="yes"
-inherit eutils gnome2
-if [[ ${PV} = 9999 ]]; then
- inherit gnome2-live
-fi
+inherit gnome2
DESCRIPTION="Simple document viewer for GNOME"
HOMEPAGE="https://wiki.gnome.org/Apps/Evince";
@@ -17,13 +14,8 @@ 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"
-if [[ ${PV} = 9999 ]]; then
- IUSE="${IUSE} doc"
- KEYWORDS=""
-else
- KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x64-solaris"
-fi
+IUSE="djvu dvi gnome +introspection libsecret nautilus nsplugin +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
@@ -32,11 +24,11 @@ fi
# libX11 used for totem-screensaver
COMMON_DEPEND="
dev-libs/atk
- >=dev-libs/glib-2.36:2
+ >=dev-libs/glib-2.36:2[dbus]
>=dev-libs/libxml2-2.5:2
sys-libs/zlib:=
x11-libs/gdk-pixbuf:2
- >=x11-libs/gtk+-3.14:3[introspection?]
+ >=x11-libs/gtk+-3.15.3:3[introspection?]
gnome-base/gsettings-desktop-schemas
>=x11-libs/cairo-1.10:=
>=app-text/poppler-0.24:=[cairo]
@@ -54,6 +46,7 @@ COMMON_DEPEND="
xps? ( >=app-text/libgxps-0.2.1:= )
"
RDEPEND="${COMMON_DEPEND}
+ gnome-base/gvfs
gnome-base/librsvg
|| (
>=x11-themes/adwaita-icon-theme-2.17.1
@@ -63,57 +56,44 @@ RDEPEND="${COMMON_DEPEND}
"
DEPEND="${COMMON_DEPEND}
app-text/docbook-xml-dtd:4.3
+ app-text/yelp-tools
dev-util/gdbus-codegen
- sys-devel/gettext
>=dev-util/gtk-doc-am-1.13
>=dev-util/intltool-0.35
+ sys-devel/gettext
virtual/pkgconfig
"
-
-if [[ ${PV} = 9999 ]]; then
- DEPEND="${DEPEND}
- app-text/yelp-tools
- doc? ( >=dev-util/gtk-doc-1.13 )"
-fi
-
-# Needs dogtail and pyspi from http://fedorahosted.org/dogtail/
-# Releases: http://people.redhat.com/zcerza/dogtail/releases/
-RESTRICT="test"
+# eautoreconf needs:
+# app-text/yelp-tools
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
+ # https://bugs.freedesktop.org/show_bug.cgi?id=29942
sed -e 's/adwaita-icon-theme >= $ADWAITA_ICON_THEME_REQUIRED//g' \
-i configure || die "sed failed"
}
src_configure() {
- local myconf=""
- [[ ${PV} != 9999 ]] && myconf="ITSTOOL=$(type -P true)"
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 nsplugin browser-plugin) \
$(use_enable postscript ps) \
$(use_enable t1lib) \
$(use_enable tiff) \
$(use_enable xps) \
BROWSER_PLUGIN_DIR="${EPREFIX}"/usr/$(get_libdir)/nsbrowser/plugins \
- ${myconf}
+ ITSTOOL=$(type -P true)
}
diff --git a/app-text/evince/evince-9999.ebuild
b/app-text/evince/evince-9999.ebuild
index 0f581af..d0e00c2 100644
--- a/app-text/evince/evince-9999.ebuild
+++ b/app-text/evince/evince-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
@@ -17,7 +17,7 @@ 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"
+IUSE="djvu dvi gnome +introspection libsecret nautilus nsplugin +postscript
t1lib tiff xps"
if [[ ${PV} = 9999 ]]; then
IUSE="${IUSE} doc"
KEYWORDS=""
@@ -32,11 +32,11 @@ fi
# libX11 used for totem-screensaver
COMMON_DEPEND="
dev-libs/atk
- >=dev-libs/glib-2.36:2
+ >=dev-libs/glib-2.36:2[dbus]
>=dev-libs/libxml2-2.5:2
sys-libs/zlib:=
x11-libs/gdk-pixbuf:2
- >=x11-libs/gtk+-3.14:3[introspection?]
+ >=x11-libs/gtk+-3.15.3:3[introspection?]
gnome-base/gsettings-desktop-schemas
>=x11-libs/cairo-1.10:=
>=app-text/poppler-0.24:=[cairo]
@@ -54,6 +54,7 @@ COMMON_DEPEND="
xps? ( >=app-text/libgxps-0.2.1:= )
"
RDEPEND="${COMMON_DEPEND}
+ gnome-base/gvfs
gnome-base/librsvg
|| (
>=x11-themes/adwaita-icon-theme-2.17.1
@@ -63,10 +64,11 @@ RDEPEND="${COMMON_DEPEND}
"
DEPEND="${COMMON_DEPEND}
app-text/docbook-xml-dtd:4.3
+ app-text/yelp-tools
dev-util/gdbus-codegen
- sys-devel/gettext
>=dev-util/gtk-doc-am-1.13
>=dev-util/intltool-0.35
+ sys-devel/gettext
virtual/pkgconfig
"
@@ -78,7 +80,7 @@ fi
# Needs dogtail and pyspi from http://fedorahosted.org/dogtail/
# Releases: http://people.redhat.com/zcerza/dogtail/releases/
-RESTRICT="test"
+#RESTRICT="test"
src_prepare() {
# Fix build with non-bash /bin/sh, see bug #526410
@@ -88,6 +90,7 @@ src_prepare() {
gnome2_src_prepare
# Do not depend on adwaita-icon-theme, bug #326855, #391859
+ # https://bugs.freedesktop.org/show_bug.cgi?id=29942
sed -e 's/adwaita-icon-theme >= $ADWAITA_ICON_THEME_REQUIRED//g' \
-i configure || die "sed failed"
}
@@ -97,19 +100,18 @@ src_configure() {
[[ ${PV} != 9999 ]] && myconf="ITSTOOL=$(type -P true)"
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 nsplugin browser-plugin) \
$(use_enable postscript ps) \
$(use_enable t1lib) \
$(use_enable tiff) \
