commit: cec18e9228c9eee73dce1c92685dfc6afff4f279
Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Fri May 8 19:15:27 2015 +0000
Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Sat May 9 23:10:27 2015 +0000
URL: https://gitweb.gentoo.org/proj/gnome.git/commit/?id=cec18e92
gnome-extra/gnome-documents: 3.14.2 → 3.16.0
...s-9999.ebuild => gnome-documents-3.16.0.ebuild} | 25 +++++-----------------
.../gnome-documents/gnome-documents-9999.ebuild | 6 +++---
2 files changed, 8 insertions(+), 23 deletions(-)
diff --git a/gnome-extra/gnome-documents/gnome-documents-9999.ebuild
b/gnome-extra/gnome-documents/gnome-documents-3.16.0.ebuild
similarity index 72%
copy from gnome-extra/gnome-documents/gnome-documents-9999.ebuild
copy to gnome-extra/gnome-documents/gnome-documents-3.16.0.ebuild
index 4159ce6..16498f7 100644
--- a/gnome-extra/gnome-documents/gnome-documents-9999.ebuild
+++ b/gnome-extra/gnome-documents/gnome-documents-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,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="
@@ -36,9 +29,9 @@ COMMON_DEPEND="
>=net-libs/gnome-online-accounts-3.2.0
>=net-libs/libsoup-2.41.3:2.4
>=net-libs/libzapojit-0.0.2
- >=net-libs/webkit-gtk-1.10.0:3
+ >=net-libs/webkit-gtk-2.6:4
>=x11-libs/gdk-pixbuf-2.25:2[introspection]
- >=x11-libs/gtk+-3.13.2:3[introspection]
+ >=x11-libs/gtk+-3.15.5:3[introspection]
x11-libs/pango[introspection]
"
RDEPEND="${COMMON_DEPEND}
@@ -53,14 +46,6 @@ DEPEND="${COMMON_DEPEND}
virtual/pkgconfig
"
-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}
+ gnome2_src_configure ITSTOOL="$(type -P true)"
}
diff --git a/gnome-extra/gnome-documents/gnome-documents-9999.ebuild
b/gnome-extra/gnome-documents/gnome-documents-9999.ebuild
index 4159ce6..72b06c9 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-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
@@ -36,9 +36,9 @@ COMMON_DEPEND="
>=net-libs/gnome-online-accounts-3.2.0
>=net-libs/libsoup-2.41.3:2.4
>=net-libs/libzapojit-0.0.2
- >=net-libs/webkit-gtk-1.10.0:3
+ >=net-libs/webkit-gtk-2.6:4
>=x11-libs/gdk-pixbuf-2.25:2[introspection]
- >=x11-libs/gtk+-3.13.2:3[introspection]
+ >=x11-libs/gtk+-3.15.5:3[introspection]
x11-libs/pango[introspection]
"
RDEPEND="${COMMON_DEPEND}
