commit: 232ded731f6a76f77daf2b0a673eb8156797b34a
Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 7 21:29:18 2014 +0000
Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Sun Apr 20 22:55:08 2014 +0000
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=232ded73
gnome-extra/gnome-documents: 3.10.2 → 3.12.0
---
...s-9999.ebuild => gnome-documents-3.12.0.ebuild} | 21 +++++++++------------
.../gnome-documents/gnome-documents-9999.ebuild | 22 +++++++++++++++++-----
2 files changed, 26 insertions(+), 17 deletions(-)
diff --git a/gnome-extra/gnome-documents/gnome-documents-9999.ebuild
b/gnome-extra/gnome-documents/gnome-documents-3.12.0.ebuild
similarity index 78%
copy from gnome-extra/gnome-documents/gnome-documents-9999.ebuild
copy to gnome-extra/gnome-documents/gnome-documents-3.12.0.ebuild
index 40178d7..0a4f6a4 100644
--- a/gnome-extra/gnome-documents/gnome-documents-9999.ebuild
+++ b/gnome-extra/gnome-documents/gnome-documents-3.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
@@ -6,25 +6,18 @@ 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/Design/Apps/Documents"
+HOMEPAGE="https://wiki.gnome.org/Apps/Documents"
LICENSE="GPL-2+"
SLOT="0"
IUSE=""
-if [[ ${PV} = 9999 ]]; then
- KEYWORDS=""
-else
- KEYWORDS="~amd64"
-fi
+KEYWORDS="~amd64 ~x86"
# Need gdk-pixbuf-2.25 for gdk_pixbuf_get_pixels_with_length
COMMON_DEPEND="
- >=app-misc/tracker-0.16:=
+ >=app-misc/tracker-1:=
>=app-text/evince-3.7.4[introspection]
dev-libs/gjs
>=dev-libs/glib-2.37:2
@@ -38,7 +31,7 @@ COMMON_DEPEND="
>=net-libs/libzapojit-0.0.2
>=net-libs/webkit-gtk-1.10.0:3
>=x11-libs/gdk-pixbuf-2.25:2[introspection]
- >=x11-libs/gtk+-3.9.11:3[introspection]
+ >=x11-libs/gtk+-3.11.5:3[introspection]
x11-libs/pango[introspection]
"
RDEPEND="${COMMON_DEPEND}
@@ -52,3 +45,7 @@ DEPEND="${COMMON_DEPEND}
>=dev-util/intltool-0.50.1
virtual/pkgconfig
"
+
+src_configure() {
+ 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 40178d7..67f8336 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-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
@@ -11,7 +11,7 @@ if [[ ${PV} = 9999 ]]; then
fi
DESCRIPTION="A document manager application for GNOME"
-HOMEPAGE="https://wiki.gnome.org/Design/Apps/Documents"
+HOMEPAGE="https://wiki.gnome.org/Apps/Documents"
LICENSE="GPL-2+"
SLOT="0"
@@ -19,12 +19,12 @@ IUSE=""
if [[ ${PV} = 9999 ]]; then
KEYWORDS=""
else
- KEYWORDS="~amd64"
+ KEYWORDS="~amd64 ~x86"
fi
# Need gdk-pixbuf-2.25 for gdk_pixbuf_get_pixels_with_length
COMMON_DEPEND="
- >=app-misc/tracker-0.16:=
+ >=app-misc/tracker-1:=
>=app-text/evince-3.7.4[introspection]
dev-libs/gjs
>=dev-libs/glib-2.37:2
@@ -38,7 +38,7 @@ COMMON_DEPEND="
>=net-libs/libzapojit-0.0.2
>=net-libs/webkit-gtk-1.10.0:3
>=x11-libs/gdk-pixbuf-2.25:2[introspection]
- >=x11-libs/gtk+-3.9.11:3[introspection]
+ >=x11-libs/gtk+-3.11.5:3[introspection]
x11-libs/pango[introspection]
"
RDEPEND="${COMMON_DEPEND}
@@ -52,3 +52,15 @@ DEPEND="${COMMON_DEPEND}
>=dev-util/intltool-0.50.1
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}
+}