From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id DF008138CCE for ; Fri, 8 May 2015 23:36:46 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 05B24E084E; Fri, 8 May 2015 23:36:32 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 6CDAFE084E for ; Fri, 8 May 2015 23:36:26 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 7205C340F3A for ; Fri, 8 May 2015 23:36:20 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 18DF89F2 for ; Fri, 8 May 2015 23:36:17 +0000 (UTC) From: "Gilles Dartiguelongue" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Gilles Dartiguelongue" Message-ID: <1431128144.2f0451ebf1ff0f54ed6fe43b8bf0b23800034422.eva@gentoo> Subject: [gentoo-commits] proj/gnome:pending-eva commit in: gnome-extra/gnome-documents/ X-VCS-Repository: proj/gnome X-VCS-Files: gnome-extra/gnome-documents/gnome-documents-3.16.0.ebuild gnome-extra/gnome-documents/gnome-documents-9999.ebuild X-VCS-Directories: gnome-extra/gnome-documents/ X-VCS-Committer: eva X-VCS-Committer-Name: Gilles Dartiguelongue X-VCS-Revision: 2f0451ebf1ff0f54ed6fe43b8bf0b23800034422 X-VCS-Branch: pending-eva Date: Fri, 8 May 2015 23:36:17 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 93462167-5be1-483c-b463-d30fbd86a22a X-Archives-Hash: 32e27676a7513096cceaf84df8e039c6 commit: 2f0451ebf1ff0f54ed6fe43b8bf0b23800034422 Author: Gilles Dartiguelongue gentoo org> AuthorDate: Fri May 8 19:15:27 2015 +0000 Commit: Gilles Dartiguelongue gentoo org> CommitDate: Fri May 8 23:35:44 2015 +0000 URL: https://gitweb.gentoo.org/proj/gnome.git/commit/?id=2f0451eb 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}