From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-517929-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
	by finch.gentoo.org (Postfix) with ESMTP id 3ECB2138010
	for <garchives@archives.gentoo.org>; Sat, 27 Oct 2012 21:36:07 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id 41EA321C01D;
	Sat, 27 Oct 2012 21:35:57 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
	by pigeon.gentoo.org (Postfix) with ESMTP id AD04421C01D
	for <gentoo-commits@lists.gentoo.org>; Sat, 27 Oct 2012 21:35:56 +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 99DA733D888
	for <gentoo-commits@lists.gentoo.org>; Sat, 27 Oct 2012 21:35:55 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
	by hornbill.gentoo.org (Postfix) with ESMTP id 3C28EE5436
	for <gentoo-commits@lists.gentoo.org>; Sat, 27 Oct 2012 21:35:54 +0000 (UTC)
From: "Gilles Dartiguelongue" <eva@gentoo.org>
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" <eva@gentoo.org>
Message-ID: <1351373562.20c3a1acac1cdb879d6dd7ab499ec556d1dc289c.eva@gentoo>
Subject: [gentoo-commits] proj/gnome:master commit in: gnome-base/nautilus/
X-VCS-Repository: proj/gnome
X-VCS-Files: gnome-base/nautilus/nautilus-3.6.0.ebuild gnome-base/nautilus/nautilus-3.6.1.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: 20c3a1acac1cdb879d6dd7ab499ec556d1dc289c
X-VCS-Branch: master
Date: Sat, 27 Oct 2012 21:35:54 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: dc7ba6d2-428a-4c1e-adbe-7a69c4e888ed
X-Archives-Hash: f622739b126bf97fbcfd17ea0b0ad5fb

commit:     20c3a1acac1cdb879d6dd7ab499ec556d1dc289c
Author:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 27 21:32:42 2012 +0000
Commit:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Sat Oct 27 21:32:42 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=20c3a1ac

gnome-base/nautilus: 3.6.0 → 3.6.1

---
 ...nautilus-3.6.0.ebuild => nautilus-3.6.1.ebuild} |   22 +++++++++++--------
 gnome-base/nautilus/nautilus-9999.ebuild           |   22 +++++++++++--------
 2 files changed, 26 insertions(+), 18 deletions(-)

diff --git a/gnome-base/nautilus/nautilus-3.6.0.ebuild b/gnome-base/nautilus/nautilus-3.6.1.ebuild
similarity index 92%
rename from gnome-base/nautilus/nautilus-3.6.0.ebuild
rename to gnome-base/nautilus/nautilus-3.6.1.ebuild
index d5f16a4..a099dd9 100644
--- a/gnome-base/nautilus/nautilus-3.6.0.ebuild
+++ b/gnome-base/nautilus/nautilus-3.6.1.ebuild
@@ -16,13 +16,14 @@ 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
-# profiling?
-IUSE="doc exif gnome +introspection packagekit +previewer sendto tracker xmp"
 
 # FIXME: tests fails under Xvfb, but pass when building manually
 # "FAIL: check failed in nautilus-file.c, line 8307"
@@ -50,11 +51,11 @@ COMMON_DEPEND=">=dev-libs/glib-2.33.13:2
 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
-	doc? ( >=dev-util/gtk-doc-1.4 )"
+	x11-proto/xproto"
 RDEPEND="${COMMON_DEPEND}
 	packagekit? ( app-admin/packagekit-base )
 	sendto? ( !<gnome-extra/nautilus-sendto-3.0.1 )"
@@ -70,7 +71,12 @@ PDEPEND="gnome? (
 	>=gnome-base/gvfs-1.14[gtk]"
 # Need gvfs[gtk] for recent:/// support
 
-pkg_setup() {
+if [[ ${PV} = 9999 ]]; then
+	DEPEND="${DEPEND}
+		doc? ( >=dev-util/gtk-doc-1.4 )"
+fi
+
+src_prepare() {
 	G2CONF="${G2CONF}
 		--disable-profiling
 		--disable-update-mimedb
@@ -81,10 +87,6 @@ pkg_setup() {
 		$(use_enable tracker)
 		$(use_enable xmp)"
 	DOCS="AUTHORS ChangeLog* HACKING MAINTAINERS NEWS README THANKS"
-}
-
-src_prepare() {
-	gnome2_src_prepare
 
 	# Restore the nautilus-2.x Delete shortcut (Ctrl+Delete will still work);
 	# bug #393663
@@ -93,6 +95,8 @@ src_prepare() {
 	# Remove crazy CFLAGS
 	sed 's:-DG.*DISABLE_DEPRECATED::g' -i configure.in configure \
 		|| die "sed 1 failed"
+
+	gnome2_src_prepare
 }
 
 src_test() {

diff --git a/gnome-base/nautilus/nautilus-9999.ebuild b/gnome-base/nautilus/nautilus-9999.ebuild
index d5f16a4..a099dd9 100644
--- a/gnome-base/nautilus/nautilus-9999.ebuild
+++ b/gnome-base/nautilus/nautilus-9999.ebuild
@@ -16,13 +16,14 @@ 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
-# profiling?
-IUSE="doc exif gnome +introspection packagekit +previewer sendto tracker xmp"
 
 # FIXME: tests fails under Xvfb, but pass when building manually
 # "FAIL: check failed in nautilus-file.c, line 8307"
@@ -50,11 +51,11 @@ COMMON_DEPEND=">=dev-libs/glib-2.33.13:2
 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
-	doc? ( >=dev-util/gtk-doc-1.4 )"
+	x11-proto/xproto"
 RDEPEND="${COMMON_DEPEND}
 	packagekit? ( app-admin/packagekit-base )
 	sendto? ( !<gnome-extra/nautilus-sendto-3.0.1 )"
@@ -70,7 +71,12 @@ PDEPEND="gnome? (
 	>=gnome-base/gvfs-1.14[gtk]"
 # Need gvfs[gtk] for recent:/// support
 
-pkg_setup() {
+if [[ ${PV} = 9999 ]]; then
+	DEPEND="${DEPEND}
+		doc? ( >=dev-util/gtk-doc-1.4 )"
+fi
+
+src_prepare() {
 	G2CONF="${G2CONF}
 		--disable-profiling
 		--disable-update-mimedb
@@ -81,10 +87,6 @@ pkg_setup() {
 		$(use_enable tracker)
 		$(use_enable xmp)"
 	DOCS="AUTHORS ChangeLog* HACKING MAINTAINERS NEWS README THANKS"
-}
-
-src_prepare() {
-	gnome2_src_prepare
 
 	# Restore the nautilus-2.x Delete shortcut (Ctrl+Delete will still work);
 	# bug #393663
@@ -93,6 +95,8 @@ src_prepare() {
 	# Remove crazy CFLAGS
 	sed 's:-DG.*DISABLE_DEPRECATED::g' -i configure.in configure \
 		|| die "sed 1 failed"
+
+	gnome2_src_prepare
 }
 
 src_test() {