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 45462138A1F for ; Sat, 12 Apr 2014 15:44:58 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id AFB9BE0B18; Sat, 12 Apr 2014 15:44:52 +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 BE1ABE0B18 for ; Sat, 12 Apr 2014 15:44:51 +0000 (UTC) Received: from spoonbill.gentoo.org (spoonbill.gentoo.org [81.93.255.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C64973401D2 for ; Sat, 12 Apr 2014 15:44:50 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by spoonbill.gentoo.org (Postfix) with ESMTP id 2C3B6188CE for ; Sat, 12 Apr 2014 15:44:48 +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: <1397315670.7a12b4267f782cf9adb94dc4640440080cba1f83.eva@gentoo> Subject: [gentoo-commits] proj/gnome:master commit in: media-gfx/eog/ X-VCS-Repository: proj/gnome X-VCS-Files: media-gfx/eog/eog-3.12.0.ebuild media-gfx/eog/eog-9999.ebuild X-VCS-Directories: media-gfx/eog/ X-VCS-Committer: eva X-VCS-Committer-Name: Gilles Dartiguelongue X-VCS-Revision: 7a12b4267f782cf9adb94dc4640440080cba1f83 X-VCS-Branch: master Date: Sat, 12 Apr 2014 15:44:48 +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: dfd253df-a101-47be-9d59-faf8fbabe1fe X-Archives-Hash: b180f39fb843586c15a8987d9826e987 commit: 7a12b4267f782cf9adb94dc4640440080cba1f83 Author: Gilles Dartiguelongue gentoo org> AuthorDate: Sat Apr 12 15:00:17 2014 +0000 Commit: Gilles Dartiguelongue gentoo org> CommitDate: Sat Apr 12 15:14:30 2014 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=7a12b426 media-gfx/eog: 3.10.2 → 3.12.0 --- .../eog/{eog-9999.ebuild => eog-3.12.0.ebuild} | 30 +++++----------------- media-gfx/eog/eog-9999.ebuild | 10 ++++---- 2 files changed, 12 insertions(+), 28 deletions(-) diff --git a/media-gfx/eog/eog-9999.ebuild b/media-gfx/eog/eog-3.12.0.ebuild similarity index 68% copy from media-gfx/eog/eog-9999.ebuild copy to media-gfx/eog/eog-3.12.0.ebuild index 28ee50c..343951f 100644 --- a/media-gfx/eog/eog-9999.ebuild +++ b/media-gfx/eog/eog-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: $ @@ -7,9 +7,6 @@ GCONF_DEBUG="yes" GNOME2_LA_PUNT="yes" inherit gnome2 -if [[ ${PV} = 9999 ]]; then - inherit gnome2-live -fi DESCRIPTION="The Eye of GNOME image viewer" HOMEPAGE="http://projects.gnome.org/eog/" @@ -17,18 +14,13 @@ HOMEPAGE="http://projects.gnome.org/eog/" LICENSE="GPL-2+" SLOT="1" IUSE="+exif +introspection +jpeg lcms +svg tiff xmp" -if [[ ${PV} = 9999 ]]; then - IUSE="${IUSE} doc" - KEYWORDS="" -else - KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" -fi +KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" REQUIRED_USE="exif? ( jpeg )" RDEPEND=" - >=x11-libs/gtk+-3.7.8:3[introspection,X] - >=dev-libs/glib-2.31:2 + >=x11-libs/gtk+-3.10.6:3[introspection,X] + >=dev-libs/glib-2.38:2 >=dev-libs/libxml2-2:2 >=dev-libs/libpeas-0.7.4:=[gtk] >=gnome-base/gnome-desktop-2.91.2:3= @@ -47,21 +39,13 @@ RDEPEND=" xmp? ( media-libs/exempi:2 ) " DEPEND="${RDEPEND} - >=dev-util/gtk-doc-am-1.10 - >=dev-util/intltool-0.40 + >=dev-util/gtk-doc-am-1.16 + >=dev-util/intltool-0.50.1 sys-devel/gettext virtual/pkgconfig " -if [[ ${PV} = 9999 ]]; then - DEPEND="${DEPEND} - app-text/yelp-tools - doc? ( >=dev-util/gtk-doc-1.10 )" -fi - src_configure() { - local myconf="" - [[ ${PV} != 9999 ]] && myconf="ITSTOOL=$(type -P true)" DOCS="AUTHORS ChangeLog HACKING MAINTAINERS NEWS README THANKS TODO" gnome2_src_configure \ $(use_enable introspection) \ @@ -70,5 +54,5 @@ src_configure() { $(use_with lcms cms) \ $(use_with xmp) \ $(use_with svg librsvg) \ - ${myconf} + ITSTOOL=$(type -P true) } diff --git a/media-gfx/eog/eog-9999.ebuild b/media-gfx/eog/eog-9999.ebuild index 28ee50c..502174a 100644 --- a/media-gfx/eog/eog-9999.ebuild +++ b/media-gfx/eog/eog-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: $ @@ -27,8 +27,8 @@ fi REQUIRED_USE="exif? ( jpeg )" RDEPEND=" - >=x11-libs/gtk+-3.7.8:3[introspection,X] - >=dev-libs/glib-2.31:2 + >=x11-libs/gtk+-3.10.6:3[introspection,X] + >=dev-libs/glib-2.38:2 >=dev-libs/libxml2-2:2 >=dev-libs/libpeas-0.7.4:=[gtk] >=gnome-base/gnome-desktop-2.91.2:3= @@ -47,8 +47,8 @@ RDEPEND=" xmp? ( media-libs/exempi:2 ) " DEPEND="${RDEPEND} - >=dev-util/gtk-doc-am-1.10 - >=dev-util/intltool-0.40 + >=dev-util/gtk-doc-am-1.16 + >=dev-util/intltool-0.50.1 sys-devel/gettext virtual/pkgconfig "