[gentoo-commits] proj/gnome:master commit in: gnome-extra/gnome-documents/

[Ole Reifschneider]

commit:     d12cdda9870b3954c1aaceae2212ea5ae7e54c95
Author:     Ole Reifschneider <tranquility <AT> gentoo <DOT> org>
AuthorDate: Sat Apr  2 16:34:25 2016 +0000
Commit:     Ole Reifschneider <tranquility <AT> gentoo <DOT> org>
CommitDate: Sat Apr  2 16:34:25 2016 +0000
URL:        https://gitweb.gentoo.org/proj/gnome.git/commit/?id=d12cdda9

gnome-extra/gnome-documents: Bump version to 3.20.0

Package-Manager: portage-2.2.28
Manifest-Sign-Key: 0xE9E568677E8B4D42

 ...s-9999.ebuild => gnome-documents-3.20.0.ebuild} | 33 ++++++++--------------
 .../gnome-documents/gnome-documents-9999.ebuild    | 14 ++++++---
 2 files changed, 21 insertions(+), 26 deletions(-)

diff --git a/gnome-extra/gnome-documents/gnome-documents-9999.ebuild b/gnome-extra/gnome-documents/gnome-documents-3.20.0.ebuild
similarity index 66%
copy from gnome-extra/gnome-documents/gnome-documents-9999.ebuild
copy to gnome-extra/gnome-documents/gnome-documents-3.20.0.ebuild
index 1f82608..bf96672 100644
--- a/gnome-extra/gnome-documents/gnome-documents-9999.ebuild
+++ b/gnome-extra/gnome-documents/gnome-documents-3.20.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -6,9 +6,6 @@ EAPI="5"
 GCONF_DEBUG="no"
 
 inherit gnome2
-if [[ ${PV} = 9999 ]]; then
-	inherit gnome2-live
-fi
 
 DESCRIPTION="A document manager application for GNOME"
 HOMEPAGE="https://wiki.gnome.org/Apps/Documents"
@@ -16,11 +13,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Documents"
 LICENSE="GPL-2+"
 SLOT="0"
 IUSE=""
-if [[ ${PV} = 9999 ]]; then
-	KEYWORDS=""
-else
-	KEYWORDS="~amd64 ~x86"
-fi
+KEYWORDS="~amd64 ~x86"
 
 # Need gdk-pixbuf-2.25 for gdk_pixbuf_get_pixels_with_length
 COMMON_DEPEND="
@@ -28,8 +21,8 @@ COMMON_DEPEND="
 	>=app-text/evince-3.13.3[introspection]
 	dev-libs/gjs
 	>=dev-libs/glib-2.39.3:2
-	>=dev-libs/gobject-introspection-1.31.6
-	>=dev-libs/libgdata-0.13.3:=[gnome,introspection]
+	>=dev-libs/gobject-introspection-1.31.6:=
+	>=dev-libs/libgdata-0.13.3:=[crypt,gnome-online-accounts,introspection]
 	gnome-base/gnome-desktop:3=
 	>=media-libs/clutter-1.10:1.0
 	>=media-libs/clutter-gtk-1.3.2:1.0[introspection]
@@ -38,7 +31,7 @@ COMMON_DEPEND="
 	>=net-libs/libzapojit-0.0.2
 	>=net-libs/webkit-gtk-2.6:4
 	>=x11-libs/gdk-pixbuf-2.25:2[introspection]
-	>=x11-libs/gtk+-3.15.5:3[introspection]
+	>=x11-libs/gtk+-3.19.1:3[introspection]
 	x11-libs/pango[introspection]
 "
 RDEPEND="${COMMON_DEPEND}
@@ -50,17 +43,13 @@ RDEPEND="${COMMON_DEPEND}
 DEPEND="${COMMON_DEPEND}
 	dev-libs/libxslt
 	>=dev-util/intltool-0.50.1
+	dev-util/itstool
 	virtual/pkgconfig
 "
+# eautoreconf requires yelp-tools
 
-if [[ ${PV} = 9999 ]]; then
-	DEPEND="${DEPEND}
-		app-text/yelp-tools
-	"
-fi
-
-src_configure() {
-	local myconf=""
-	[[ ${PV} != 9999 ]] && myconf="ITSTOOL=$(type -P true)"
-	gnome2_src_configure ${myconf}
+src_prepare() {
+	# Prevent sandbox violation, https://bugzilla.gnome.org/show_bug.cgi?id=758097
+	sed -i -e '/-rm -f $(appdir)\/org.gnome.Books.data.gresource/d' data/Makefile.{am,in} || die
+	gnome2_src_prepare
 }

diff --git a/gnome-extra/gnome-documents/gnome-documents-9999.ebuild b/gnome-extra/gnome-documents/gnome-documents-9999.ebuild
index 1f82608..e67d236 100644
--- a/gnome-extra/gnome-documents/gnome-documents-9999.ebuild
+++ b/gnome-extra/gnome-documents/gnome-documents-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -28,8 +28,8 @@ COMMON_DEPEND="
 	>=app-text/evince-3.13.3[introspection]
 	dev-libs/gjs
 	>=dev-libs/glib-2.39.3:2
-	>=dev-libs/gobject-introspection-1.31.6
-	>=dev-libs/libgdata-0.13.3:=[gnome,introspection]
+	>=dev-libs/gobject-introspection-1.31.6:=
+	>=dev-libs/libgdata-0.13.3:=[crypt,gnome-online-accounts,introspection]
 	gnome-base/gnome-desktop:3=
 	>=media-libs/clutter-1.10:1.0
 	>=media-libs/clutter-gtk-1.3.2:1.0[introspection]
@@ -38,7 +38,7 @@ COMMON_DEPEND="
 	>=net-libs/libzapojit-0.0.2
 	>=net-libs/webkit-gtk-2.6:4
 	>=x11-libs/gdk-pixbuf-2.25:2[introspection]
-	>=x11-libs/gtk+-3.15.5:3[introspection]
+	>=x11-libs/gtk+-3.19.1:3[introspection]
 	x11-libs/pango[introspection]
 "
 RDEPEND="${COMMON_DEPEND}
@@ -59,6 +59,12 @@ if [[ ${PV} = 9999 ]]; then
 	"
 fi
 
+src_prepare() {
+	# Prevent sandbox violation, https://bugzilla.gnome.org/show_bug.cgi?id=758097
+	sed -i -e '/-rm -f $(appdir)\/org.gnome.Books.data.gresource/d' data/Makefile.{am,in} || die
+	gnome2_src_prepare
+}
+
 src_configure() {
 	local myconf=""
 	[[ ${PV} != 9999 ]] && myconf="ITSTOOL=$(type -P true)"