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 E76DF59CA9 for ; Sun, 27 Mar 2016 21:25:00 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8FB9421C029; Sun, 27 Mar 2016 21:24:58 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 78A2321C029 for ; Sun, 27 Mar 2016 21:24:57 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 43EC13404A5 for ; Sun, 27 Mar 2016 21:24:56 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E512F864 for ; Sun, 27 Mar 2016 21:24:50 +0000 (UTC) From: "Ole Reifschneider" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ole Reifschneider" Message-ID: <1459034942.dbe51cb4311c9ec6c2819369bd130b832dd51c40.tranquility@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.20.0.ebuild media-gfx/eog/eog-9999.ebuild X-VCS-Directories: media-gfx/eog/ X-VCS-Committer: tranquility X-VCS-Committer-Name: Ole Reifschneider X-VCS-Revision: dbe51cb4311c9ec6c2819369bd130b832dd51c40 X-VCS-Branch: master Date: Sun, 27 Mar 2016 21:24:50 +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: 1342bfc5-c290-4d00-b521-a374d8ebb3bd X-Archives-Hash: 560d17fec99d068c3c9bd50bf9c8f0d0 commit: dbe51cb4311c9ec6c2819369bd130b832dd51c40 Author: Ole Reifschneider gentoo org> AuthorDate: Sat Mar 26 23:29:02 2016 +0000 Commit: Ole Reifschneider gentoo org> CommitDate: Sat Mar 26 23:29:02 2016 +0000 URL: https://gitweb.gentoo.org/proj/gnome.git/commit/?id=dbe51cb4 media-gfx/eog: Bump version to 3.20.0 Package-Manager: portage-2.2.28 Manifest-Sign-Key: 0xE9E568677E8B4D42 .../eog/{eog-9999.ebuild => eog-3.20.0.ebuild} | 34 ++++++---------------- media-gfx/eog/eog-9999.ebuild | 11 +++---- 2 files changed, 15 insertions(+), 30 deletions(-) diff --git a/media-gfx/eog/eog-9999.ebuild b/media-gfx/eog/eog-3.20.0.ebuild similarity index 63% copy from media-gfx/eog/eog-9999.ebuild copy to media-gfx/eog/eog-3.20.0.ebuild index 7eb343b..409fa22 100644 --- a/media-gfx/eog/eog-9999.ebuild +++ b/media-gfx/eog/eog-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$ @@ -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="https://wiki.gnome.org/Apps/EyeOfGnome" @@ -17,28 +14,23 @@ HOMEPAGE="https://wiki.gnome.org/Apps/EyeOfGnome" 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 - REQUIRED_USE="exif? ( jpeg )" +KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" + RDEPEND=" - >=dev-libs/glib-2.38:2 + >=dev-libs/glib-2.42.0:2[dbus] >=dev-libs/libpeas-0.7.4:=[gtk] >=gnome-base/gnome-desktop-2.91.2:3= >=gnome-base/gsettings-desktop-schemas-2.91.92 - >=x11-libs/gtk+-3.14:3[introspection,X] + >=x11-libs/gtk+-3.19.3:3[introspection,X] >=x11-misc/shared-mime-info-0.20 - x11-libs/gdk-pixbuf:2[jpeg?,tiff?] + >=x11-libs/gdk-pixbuf-2.30.0:2[jpeg?,tiff?] x11-libs/libX11 exif? ( >=media-libs/libexif-0.6.14 ) - introspection? ( >=dev-libs/gobject-introspection-0.9.3 ) + introspection? ( >=dev-libs/gobject-introspection-0.9.3:= ) jpeg? ( virtual/jpeg:0 ) lcms? ( media-libs/lcms:2 ) svg? ( >=gnome-base/librsvg-2.36.2:2 ) @@ -47,19 +39,12 @@ RDEPEND=" DEPEND="${RDEPEND} >=dev-util/gtk-doc-am-1.16 >=dev-util/intltool-0.50.1 + dev-util/itstool sys-devel/gettext virtual/pkgconfig " -if [[ ${PV} = 9999 ]]; then - DEPEND="${DEPEND} - app-text/yelp-tools - doc? ( >=dev-util/gtk-doc-1.16 )" -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) \ @@ -67,6 +52,5 @@ src_configure() { $(use_with exif libexif) \ $(use_with lcms cms) \ $(use_with xmp) \ - $(use_with svg librsvg) \ - ${myconf} + $(use_with svg librsvg) } diff --git a/media-gfx/eog/eog-9999.ebuild b/media-gfx/eog/eog-9999.ebuild index 7eb343b..1166191 100644 --- a/media-gfx/eog/eog-9999.ebuild +++ b/media-gfx/eog/eog-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$ @@ -27,18 +27,18 @@ fi REQUIRED_USE="exif? ( jpeg )" RDEPEND=" - >=dev-libs/glib-2.38:2 + >=dev-libs/glib-2.42.0:2[dbus] >=dev-libs/libpeas-0.7.4:=[gtk] >=gnome-base/gnome-desktop-2.91.2:3= >=gnome-base/gsettings-desktop-schemas-2.91.92 - >=x11-libs/gtk+-3.14:3[introspection,X] + >=x11-libs/gtk+-3.19.3:3[introspection,X] >=x11-misc/shared-mime-info-0.20 - x11-libs/gdk-pixbuf:2[jpeg?,tiff?] + >=x11-libs/gdk-pixbuf-2.30.0:2[jpeg?,tiff?] x11-libs/libX11 exif? ( >=media-libs/libexif-0.6.14 ) - introspection? ( >=dev-libs/gobject-introspection-0.9.3 ) + introspection? ( >=dev-libs/gobject-introspection-0.9.3:= ) jpeg? ( virtual/jpeg:0 ) lcms? ( media-libs/lcms:2 ) svg? ( >=gnome-base/librsvg-2.36.2:2 ) @@ -47,6 +47,7 @@ RDEPEND=" DEPEND="${RDEPEND} >=dev-util/gtk-doc-am-1.16 >=dev-util/intltool-0.50.1 + dev-util/itstool sys-devel/gettext virtual/pkgconfig "