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 E2F361381F3 for ; Mon, 24 Dec 2012 14:33:17 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8F06321C0AF; Mon, 24 Dec 2012 14:33:10 +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 E1E2D21C0AF for ; Mon, 24 Dec 2012 14:33:09 +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 A71EE33D92A for ; Mon, 24 Dec 2012 14:33:08 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 256C9E543C for ; Mon, 24 Dec 2012 14:33:07 +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: <1356359340.190791a17482c33c99ed4d21373557436a754e81.eva@gentoo> Subject: [gentoo-commits] proj/gnome:master commit in: gnome-base/nautilus/ X-VCS-Repository: proj/gnome X-VCS-Files: gnome-base/nautilus/metadata.xml gnome-base/nautilus/nautilus-3.6.3.ebuild gnome-base/nautilus/nautilus-9999.ebuild X-VCS-Directories: gnome-base/nautilus/ X-VCS-Committer: eva X-VCS-Committer-Name: Gilles Dartiguelongue X-VCS-Revision: 190791a17482c33c99ed4d21373557436a754e81 X-VCS-Branch: master Date: Mon, 24 Dec 2012 14:33:07 +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: de7e928c-a60b-4b92-84d7-1908e6523c44 X-Archives-Hash: 3c0200d6c4c7eb91220540fa1b4a720a commit: 190791a17482c33c99ed4d21373557436a754e81 Author: Gilles Dartiguelongue gentoo org> AuthorDate: Mon Dec 24 14:29:00 2012 +0000 Commit: Gilles Dartiguelongue gentoo org> CommitDate: Mon Dec 24 14:29:00 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=190791a1 gnome-base/nautilus: moved to gx86 * Sync live ebuild with gx86 changes. * USE=introspection is now global. --- gnome-base/nautilus/metadata.xml | 2 - gnome-base/nautilus/nautilus-3.6.3.ebuild | 120 ----------------------------- gnome-base/nautilus/nautilus-9999.ebuild | 36 +++++---- 3 files changed, 19 insertions(+), 139 deletions(-) diff --git a/gnome-base/nautilus/metadata.xml b/gnome-base/nautilus/metadata.xml index 68ea7fa..af972bd 100644 --- a/gnome-base/nautilus/metadata.xml +++ b/gnome-base/nautilus/metadata.xml @@ -3,8 +3,6 @@ gnome - Use dev-libs/gobject-introspection for - introspection Use packagekit to search for programs to open unknown file types Use gnome-extra/sushi to preview files diff --git a/gnome-base/nautilus/nautilus-3.6.3.ebuild b/gnome-base/nautilus/nautilus-3.6.3.ebuild deleted file mode 100644 index a099dd9..0000000 --- a/gnome-base/nautilus/nautilus-3.6.3.ebuild +++ /dev/null @@ -1,120 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI="4" -GCONF_DEBUG="no" -GNOME2_LA_PUNT="yes" - -inherit eutils gnome2 virtualx -if [[ ${PV} = 9999 ]]; then - inherit gnome2-live -fi - -DESCRIPTION="A file manager for the GNOME desktop" -HOMEPAGE="http://live.gnome.org/Nautilus" - -LICENSE="GPL-2+ LGPL-2+ FDL-1.1" -SLOT="0" -# profiling? -IUSE="exif gnome +introspection packagekit +previewer sendto tracker xmp" -if [[ ${PV} = 9999 ]]; then - IUSE="${IUSE} doc" - KEYWORDS="" -else - KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux" -fi - -# FIXME: tests fails under Xvfb, but pass when building manually -# "FAIL: check failed in nautilus-file.c, line 8307" -RESTRICT="test" - -# Require {glib,gdbus-codegen}-2.30.0 due to GDBus API changes between 2.29.92 -# and 2.30.0 -COMMON_DEPEND=">=dev-libs/glib-2.33.13:2 - >=x11-libs/pango-1.28.3 - >=x11-libs/gtk+-3.5.12:3[introspection?] - >=dev-libs/libxml2-2.7.8:2 - >=gnome-base/gnome-desktop-3.0.0:3 - - gnome-base/dconf - gnome-base/gsettings-desktop-schemas - >=x11-libs/libnotify-0.7 - x11-libs/libX11 - x11-libs/libXext - x11-libs/libXrender - - exif? ( >=media-libs/libexif-0.6.20 ) - introspection? ( >=dev-libs/gobject-introspection-0.6.4 ) - tracker? ( >=app-misc/tracker-0.14 ) - xmp? ( >=media-libs/exempi-2.1.0 )" -DEPEND="${COMMON_DEPEND} - >=dev-lang/perl-5 - >=dev-util/gdbus-codegen-2.33 - >=dev-util/gtk-doc-am-1.4 - >=dev-util/intltool-0.40.1 - sys-devel/gettext - virtual/pkgconfig - x11-proto/xproto" -RDEPEND="${COMMON_DEPEND} - packagekit? ( app-admin/packagekit-base ) - sendto? ( !=dev-libs/glib-2.33.13:2 >=x11-libs/pango-1.28.3 >=x11-libs/gtk+-3.5.12:3[introspection?] >=dev-libs/libxml2-2.7.8:2 - >=gnome-base/gnome-desktop-3.0.0:3 + >=gnome-base/gnome-desktop-3:3= gnome-base/dconf gnome-base/gsettings-desktop-schemas - >=x11-libs/libnotify-0.7 + >=x11-libs/libnotify-0.7:= x11-libs/libX11 x11-libs/libXext x11-libs/libXrender exif? ( >=media-libs/libexif-0.6.20 ) introspection? ( >=dev-libs/gobject-introspection-0.6.4 ) - tracker? ( >=app-misc/tracker-0.14 ) + tracker? ( >=app-misc/tracker-0.14:= ) xmp? ( >=media-libs/exempi-2.1.0 )" DEPEND="${COMMON_DEPEND} >=dev-lang/perl-5 @@ -77,26 +79,26 @@ if [[ ${PV} = 9999 ]]; then fi src_prepare() { + # Restore the nautilus-2.x Delete shortcut (Ctrl+Delete will still work); + # bug #393663 + epatch "${FILESDIR}/${PN}-3.5.91-delete.patch" + + gnome2_src_prepare +} + +src_configure() { + DOCS="AUTHORS ChangeLog* HACKING MAINTAINERS NEWS README THANKS" G2CONF="${G2CONF} --disable-profiling --disable-update-mimedb + $(use_enable debug) $(use_enable exif libexif) $(use_enable introspection) $(use_enable packagekit) $(use_enable sendto nst-extension) $(use_enable tracker) $(use_enable xmp)" - DOCS="AUTHORS ChangeLog* HACKING MAINTAINERS NEWS README THANKS" - - # Restore the nautilus-2.x Delete shortcut (Ctrl+Delete will still work); - # bug #393663 - epatch "${FILESDIR}/${PN}-3.5.91-delete.patch" - - # Remove crazy CFLAGS - sed 's:-DG.*DISABLE_DEPRECATED::g' -i configure.in configure \ - || die "sed 1 failed" - - gnome2_src_prepare + gnome2_src_configure } src_test() {