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 3649B1381FB for ; Wed, 26 Dec 2012 21:53:20 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 079C7E05AF; Wed, 26 Dec 2012 21:53:07 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 7244FE05AF for ; Wed, 26 Dec 2012 21:53:07 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 610E633D7EE for ; Wed, 26 Dec 2012 21:53:06 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id E7B58E543D for ; Wed, 26 Dec 2012 21:53:04 +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: <1356558718.853dcaaedd012626bce5f6618ab78a9871c03063.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.6.2.ebuild media-gfx/eog/eog-9999.ebuild media-gfx/eog/metadata.xml X-VCS-Directories: media-gfx/eog/ X-VCS-Committer: eva X-VCS-Committer-Name: Gilles Dartiguelongue X-VCS-Revision: 853dcaaedd012626bce5f6618ab78a9871c03063 X-VCS-Branch: master Date: Wed, 26 Dec 2012 21:53:04 +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: 416e20dc-e1f7-4270-8c09-6a917655f9cf X-Archives-Hash: cfc77a9749ede74d47a421608025e263 commit: 853dcaaedd012626bce5f6618ab78a9871c03063 Author: Gilles Dartiguelongue gentoo org> AuthorDate: Wed Dec 26 21:51:58 2012 +0000 Commit: Gilles Dartiguelongue gentoo org> CommitDate: Wed Dec 26 21:51:58 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=853dcaae media-gfx/eog: moved to gx86 * Sync live ebuild with gx86 changes. * USE=introspection is now global. --- media-gfx/eog/eog-3.6.2.ebuild | 71 ---------------------------------------- media-gfx/eog/eog-9999.ebuild | 22 +++++++------ media-gfx/eog/metadata.xml | 4 -- 3 files changed, 12 insertions(+), 85 deletions(-) diff --git a/media-gfx/eog/eog-3.6.2.ebuild b/media-gfx/eog/eog-3.6.2.ebuild deleted file mode 100644 index 2271efe..0000000 --- a/media-gfx/eog/eog-3.6.2.ebuild +++ /dev/null @@ -1,71 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI="4" -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://www.gnome.org/projects/eog/" - -LICENSE="GPL-2+" -SLOT="1" -IUSE="+exif +introspection +jpeg lcms +svg tiff xmp" -if [[ ${PV} = 9999 ]]; then - IUSE="${IUSE} doc" - KEYWORDS="" -else - KEYWORDS="~amd64 ~x86 ~x86-fbsd" -fi - -REQUIRED_USE="exif? ( jpeg )" - -RDEPEND=">=x11-libs/gtk+-3.3.6:3[introspection,X] - >=dev-libs/glib-2.31.0:2 - >=dev-libs/libxml2-2:2 - >=dev-libs/libpeas-0.7.4[gtk] - >=gnome-base/gnome-desktop-2.91.2:3 - >=gnome-base/gsettings-desktop-schemas-2.91.92 - >=x11-themes/gnome-icon-theme-2.19.1 - >=x11-misc/shared-mime-info-0.20 - - x11-libs/gdk-pixbuf:2[jpeg?,tiff?] - x11-libs/libX11 - - exif? ( >=media-libs/libexif-0.6.14 ) - 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 ) - xmp? ( media-libs/exempi:2 )" -DEPEND="${RDEPEND} - dev-util/gtk-doc-am - >=dev-util/intltool-0.40 - 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() { - G2CONF="${G2CONF} - $(use_enable introspection) - $(use_with jpeg libjpeg) - $(use_with exif libexif) - $(use_with lcms cms) - $(use_with xmp) - $(use_with svg librsvg) - --disable-schemas-compile" - [[ ${PV} != 9999 ]] && G2CONF="${G2CONF} ITSTOOL=$(type -P true)" - DOCS="AUTHORS ChangeLog HACKING MAINTAINERS NEWS README THANKS TODO" - gnome2_src_configure -} diff --git a/media-gfx/eog/eog-9999.ebuild b/media-gfx/eog/eog-9999.ebuild index 2271efe..6c79a2d 100644 --- a/media-gfx/eog/eog-9999.ebuild +++ b/media-gfx/eog/eog-9999.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 # $Header: $ -EAPI="4" +EAPI="5" GCONF_DEBUG="yes" GNOME2_LA_PUNT="yes" @@ -26,11 +26,12 @@ fi REQUIRED_USE="exif? ( jpeg )" -RDEPEND=">=x11-libs/gtk+-3.3.6:3[introspection,X] - >=dev-libs/glib-2.31.0:2 +RDEPEND=" + >=x11-libs/gtk+-3.3.6:3[introspection,X] + >=dev-libs/glib-2.31:2 >=dev-libs/libxml2-2:2 - >=dev-libs/libpeas-0.7.4[gtk] - >=gnome-base/gnome-desktop-2.91.2:3 + >=dev-libs/libpeas-0.7.4:=[gtk] + >=gnome-base/gnome-desktop-2.91.2:3= >=gnome-base/gsettings-desktop-schemas-2.91.92 >=x11-themes/gnome-icon-theme-2.19.1 >=x11-misc/shared-mime-info-0.20 @@ -43,12 +44,14 @@ RDEPEND=">=x11-libs/gtk+-3.3.6:3[introspection,X] jpeg? ( virtual/jpeg:0 ) lcms? ( media-libs/lcms:2 ) svg? ( >=gnome-base/librsvg-2.36.2:2 ) - xmp? ( media-libs/exempi:2 )" + xmp? ( media-libs/exempi:2 ) +" DEPEND="${RDEPEND} - dev-util/gtk-doc-am + >=dev-util/gtk-doc-am-1.10 >=dev-util/intltool-0.40 sys-devel/gettext - virtual/pkgconfig" + virtual/pkgconfig +" if [[ ${PV} = 9999 ]]; then DEPEND="${DEPEND} @@ -63,8 +66,7 @@ src_configure() { $(use_with exif libexif) $(use_with lcms cms) $(use_with xmp) - $(use_with svg librsvg) - --disable-schemas-compile" + $(use_with svg librsvg)" [[ ${PV} != 9999 ]] && G2CONF="${G2CONF} ITSTOOL=$(type -P true)" DOCS="AUTHORS ChangeLog HACKING MAINTAINERS NEWS README THANKS TODO" gnome2_src_configure diff --git a/media-gfx/eog/metadata.xml b/media-gfx/eog/metadata.xml index 216da8a..c53de9a 100644 --- a/media-gfx/eog/metadata.xml +++ b/media-gfx/eog/metadata.xml @@ -7,8 +7,4 @@ Desktop environment. With it, you can view single image files, as well as large image collections. - - Use dev-libs/gobject-introspection - for introspection -