Version bump for Gnome 3.6. Switch to EAPI=5. USE=debug not managed by eclass due to gnome macro not being used. USE=introspection is now global.

Package-Manager: portage-2.2.0_alpha149/cvs/Linux x86_64
Manifest-Sign-Key: 0xC6085806

4 files changed, 168 insertions, 9 deletions

diff --git a/gnome-base/nautilus/ChangeLog b/gnome-base/nautilus/ChangeLog
index cc252910efba..be18962869de 100644
--- a/gnome-base/nautilus/ChangeLog
+++ b/gnome-base/nautilus/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for gnome-base/nautilus
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/ChangeLog,v 1.400 2012/12/20 16:27:56 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/ChangeLog,v 1.401 2012/12/24 14:30:56 eva Exp $
+
+*nautilus-3.6.3 (24 Dec 2012)
+
+  24 Dec 2012; Gilles Dartiguelongue <eva@gentoo.org>
+  +files/nautilus-3.5.91-delete.patch, +nautilus-3.6.3.ebuild:
+  Version bump for Gnome 3.6. Switch to EAPI=5. USE=debug not managed by eclass
+  due to gnome macro not being used. USE=introspection is now global.
 
   20 Dec 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
   -nautilus-2.32.2.1.ebuild, -nautilus-2.32.2.1-r1.ebuild,
diff --git a/gnome-base/nautilus/Manifest b/gnome-base/nautilus/Manifest
index 5e0dca087da3..0fc993933edb 100644
--- a/gnome-base/nautilus/Manifest
+++ b/gnome-base/nautilus/Manifest
@@ -4,21 +4,20 @@ Hash: SHA256
 AUX nautilus-2.32.2.1-gold-glib2.32.patch 698 SHA256 a9da048e66d4f326fbfa6b916dfb29e88a766b3c00e9da10df78a2e05d3382b1 SHA512 fe39cd441dbb38e13b9a0ee075b7a82b6681e77209d3386ab563adad3ddde9cf2642a98fcfa7584975388eb255578edeb138a56bede35f3c77bb50efd03bf7cb WHIRLPOOL 9ecab7b759cde6ab73b0409814f1570fcb442e893bc2b6d12f5a5241cd33457e28d1ccee05042fd2126c58e4889fa3fd86003d929a19e5194de5a23813995f6a
 AUX nautilus-3.2.1-delete.patch 1869 SHA256 51ebfb58d3b1217796dfa79386bdeade2255f879108963962c63124cbedb4fa0 SHA512 1230abdb73d3334dffffa0861b3bbaefdcf00773e66eb33877607bf38d73c314f56fd8a077d5918e640dff031f8ebc878b8c896535f6d806b44cb488586ee22f WHIRLPOOL 5430db3032027b4fcc8fb2765c935f18a354073e3028985069d0983ef2d011025dd5403edf695bb8c59899d0ee5cb5e46346f667816309dda8eb9d764b23fc7f
 AUX nautilus-3.2.1-key-press-forwarding.patch 1716 SHA256 9222c08189e01a2bfb8a72d2d4c7dfd0d841e4d159f8045e2cf15cf7857aff05 SHA512 9b196e26cdeb704464ef38752140ee1127ac44be8f1503034aafe70e3a854c00a4b48cc3404a71cfc84658e0b82501f47b9cecc4e040d22d90eddf406e040c32 WHIRLPOOL ee0965bf75777aa30cec42d509d2137a3ff230833693e85e4c71e26c4838029ece56801af70330fb1c2f798e9ef915aa3b8d28d73b6a7944822a3eaa8aa6db7b
+AUX nautilus-3.5.91-delete.patch 1893 SHA256 3471db5c9f2caf4ae4877fe1c1e8a53bbf972aaacdf8cfbe091d8debd24f937a SHA512 807fb309cf217225396bfee5e60856245671a75058c95bd96dffe796e4c27c311aac603afba90c7660595611fe227de0951201e92e5e4da905b01c5ea3ca2460 WHIRLPOOL b6b8a1e69c4a4ec9ddfa437f611bea5711a41b8bc37c0f2701cc210063ec7eee93f92ccb9ca0b70ba5f7abc9fe128e44ad34582d077f4ebddce62e0222e9a025
 DIST nautilus-2.32.2.1-patches.tar.bz2 6984 SHA256 0b756ba661d1f9ed0d2e49a469e6f390e941530309e08a7f9e6ac07b566180bb SHA512 9c18c24001cc3cbf91242845f13bbe44160b85286ab82e29083e06905a0d278a5e9e554dc1e09445490fa723677d4beb080f2d23b934386b8de7704f8bb7e417 WHIRLPOOL d875e319a00288aa46d55c7edee5b1c53ff854ab41f73a4135a5f993e83f658da0b190d44d27fc9d4277de783f55e4e3f9ed3fede444b4b06384a8216a1d087b
 DIST nautilus-2.32.2.1.tar.bz2 6350203 SHA256 802dacc98c697afea2e6201dab1c8c800809f235fff39857983efb4340ecc303 SHA512 cb9d65d16c8d771d182bb94d9de59c4054b05603b8ad33beeca26b41c3ca3c84581b596625f6503924c4a26f5ca1218c6d1e81c9d94e6cc637a3e8a941cde9b4 WHIRLPOOL c98d2750f5b32896c67d1fc6060e1c288296a4a86142fa35eb261f8630fdd92ad974cf3bd66d3843f0073c7ec96081afd01063c4c2d10d70059efc58da9a2fa0
 DIST nautilus-3.4.2.tar.xz 4583996 SHA256 752afa41189b0b6c73dc3769cd885e184c29d6d394345ec05cd48b0004e0f452 SHA512 a842488f58ed5c53a24c99b0f632b58fe7b67e58e8f05d4836adc5cbf4a1fe9754e65a3bc779e35a4d6b2efca482358c1fa4f7284b3b6b5e8b31a54466e1e210 WHIRLPOOL 83bf067fb3c64446e549dc402593eed3e89e0b494fa55527ff2cb8c3606520d77567a5a8e131521eab915f9599b455cd1a04aa157b72b14c88cd65380dc884d4
+DIST nautilus-3.6.3.tar.xz 4959376 SHA256 d272027754ce8591959ae854fc6b5f43eee4af31e4eecf06de727acebe0ee46c SHA512 f90ed3253889764dc3799e53555a9d6e84876b5d5ea020ba34b643df460f703acbba85bba0cf468ea7d614ec954b49304e46a27d46459b4aaa7e53ecd9467895 WHIRLPOOL afe1f70635899aaa3e7b8df575cef9f810c84acd1c63c5a1359584274c689872b1fdfc5e31a6964a419ee0e85c2cacce357a2098052db24d46a980363fd7c923
 EBUILD nautilus-2.32.2.1-r2.ebuild 2225 SHA256 0a9fd9c598526e17a80c185b74620db7d3fc7f5a8cee09016df74ba04e490bda SHA512 db21cd14f90f55a633a0cd8538148e12efbf20a5633a61024f521e40d1a1f60b72efe4b6ecfbfb3ae96d4032800be17a5cfab15c2d39b11d76e7d8dc344ad66f WHIRLPOOL baa604a25dccbc7955d692dd126453f589db4499c96dff39a7445970fa8e70e5f814613d33658eb85d4f61bcbe9bcf65f4fc67d82cc04aa1ea40a0dbb0a5acea
 EBUILD nautilus-3.4.2.ebuild 2934 SHA256 d884ed2fa167807b8c729cff464d134e1f75361f1900ee01d0345246ffd41b2c SHA512 a58d858fb0ad2cf968e4f714038cc01e59bb83d8424a9f197b0106f53586560875caab47f18af8d3497cacff5fa6f672247cd2c7a96445269271d5dd639867f6 WHIRLPOOL 8dc3bfd3116ae9054809ef524626b892cfc6019414f0c17a9aa908c87e93322bd1e6079cc3074da7430121a73c978cc49ce4ae304fbac71ea13f3b6de41df5e0
-MISC ChangeLog 60752 SHA256 64af398448a6f95f3b4e5a451f7b197f616bb6073475e67f1d378b25f0726a96 SHA512 b37f92df39be11ca6f784c98ab4ced99bd7381ca9b906029d84cf3db4456973c0b21a1c6f83494b9c92da22ab20e5ca0126f57260e2cb6635ab139e4851a61a8 WHIRLPOOL 912f5670c4cca611e19ff89063bc4d997d44e030fbcd618c3f5ff63c09ca0545c04fd329324eaa0dea8ae725238fa4c9eaee5d1ecc0e03c0ada3a96cfc69d13d
+EBUILD nautilus-3.6.3.ebuild 3102 SHA256 2ca9f875694f9c6200728932f85a7b54e7d0e73c915aac2ba49a068b38330630 SHA512 a62a74825ddd264907a7c6eb4aadcc55b69b87d7eb079d4e7ef3e71506ca2170f7701ae00078dd8fe3443512d6a9333449aea972d080d6b291a4660da9873d66 WHIRLPOOL 19c22b3cddfc095b7b835b240e2263840c0a0f5f5140067e2c942ad2d37e1c7b73aa0c720a36c66bda3ef9fee1d67dac804f9451999e0f49d2d6e5990cf8009e
+MISC ChangeLog 61045 SHA256 a2e08d427a84b9c6cc4b3c8e119677eaa4ca09e52b3c1779c8a651785d218565 SHA512 2a7173ce9801bf787618b3db7c6bf2911c9965b38433163ea393c91f79c02e52472fce33037bc6d9ac9bc3a8ee44a53173433bcfe31983f46567019c463b1a85 WHIRLPOOL 7ef0e3ffa096e884aec35fef2548f1b8edaefe4825c8da6a271d43ea6726be0fb2b009f6ccf8e4cb9b063f5fc690c3aaf0b4870066373f535cbc0296fb3e2a12
 MISC metadata.xml 566 SHA256 c278ed8fe54c80b07d7b2495826346538a7daaeea11dd9bdeff87ec0a30e74a1 SHA512 daefe3974dae1d708f909a2207f2d09128ab045f8aee11c823093da779e3f283c59459a0f4962631b1508dc545b6ab448c1ead519839011ddeb619f4017f802a WHIRLPOOL b662f3823904bc970b1a8bcd4ca863a7726eb89c76ef4c1d6954ba4b720f4d7490b4cfcf1d30b683a8ecf562d74977598db7b976ec4eea943e86aa07c4dde28b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQ0zyNAAoJEJ0WA1zPCt1hz9YH/2I425+vyuctcxpLT5bTzQZP
-fuDB0jakp+bHur3S9yNx3ctXay2QMnXH3rdNFJYm4clxcfpw6fntQHmxRnFZbCMe
-pAGdyHIOVGbCrDxi/ZnxaO9/EOMI8NEk9WykWglgrkswJLhIRbRtTn6bggsQGBQ9
-D4k70Zr9EM5wZPjkWmt9SRYhJXszPd9xrmRN4M0VHWl3xGztyt/hFsiEGZVld2MX
-HDb22CTENd5T+ov7vtlTYDfKY6xbeE2nCGiTfn98dqd1URVMgJpGjSL858rEOYqw
-XStLQW24Fbc3RGTcvxyal+ja72r5atN9XpFAUASnmAxSFQJG9tMyxJ0Al3Ipzyg=
-=CQPj
+iEYEAREIAAYFAlDYZyEACgkQ1fmVwcYIWAYhHgCgtzqBJLfzCbjutsdjLb5f6PRc
+1nYAn3gOyXzFZoWGYdzjInxmfk4O1y1m
+=tINC
 -----END PGP SIGNATURE-----
diff --git a/gnome-base/nautilus/files/nautilus-3.5.91-delete.patch b/gnome-base/nautilus/files/nautilus-3.5.91-delete.patch
new file mode 100644
index 000000000000..072b34ea9131
--- /dev/null
+++ b/gnome-base/nautilus/files/nautilus-3.5.91-delete.patch
@@ -0,0 +1,44 @@
+From 92af7beb790ad9181e5a6a89ac52f177354536f2 Mon Sep 17 00:00:00 2001
+From: Alexandre Rostovtsev <tetromino@gentoo.org>
+Date: Thu, 8 Dec 2011 18:39:28 -0500
+Subject: [PATCH] Delete key should delete files
+
+Make the Delete key delete files like in nautilus-2.x and every other
+file manager on the planet. Note: the nautilus-3 Ctrl+Delete shortcut
+will also continue to work.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=647048
+https://bugs.gentoo.org/show_bug.cgi?id=393663
+---
+ src/nautilus-view.c | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/src/nautilus-view.c b/src/nautilus-view.c
+index f51d916..0a50994 100644
+--- a/src/nautilus-view.c
++++ b/src/nautilus-view.c
+@@ -7237,7 +7237,7 @@ static const GtkActionEntry directory_view_entries[] = {
+   /* tooltip */                  NULL,
+ 				 G_CALLBACK (action_rename_select_all_callback) },
+   /* name, stock id */         { NAUTILUS_ACTION_TRASH, NULL,
+-  /* label, accelerator */       N_("Mo_ve to Trash"), "<control>Delete",
++  /* label, accelerator */       N_("Mo_ve to Trash"), "Delete",
+   /* tooltip */                  N_("Move each selected item to the Trash"),
+ 				 G_CALLBACK (action_trash_callback) },
+   /* name, stock id */         { NAUTILUS_ACTION_DELETE, NULL,
+@@ -9895,8 +9895,12 @@ nautilus_view_class_init (NautilusViewClass *klass)
+ 	binding_set = gtk_binding_set_by_class (klass);
+ 	gtk_binding_entry_add_signal (binding_set, GDK_KEY_Delete, GDK_CONTROL_MASK,
+ 				      "trash", 0);
++	gtk_binding_entry_add_signal (binding_set, GDK_KEY_Delete, 0,
++				      "trash", 0);
+ 	gtk_binding_entry_add_signal (binding_set, GDK_KEY_KP_Delete, GDK_CONTROL_MASK,
+ 				      "trash", 0);
++	gtk_binding_entry_add_signal (binding_set, GDK_KEY_KP_Delete, 0,
++				      "trash", 0);
+ 	gtk_binding_entry_add_signal (binding_set, GDK_KEY_KP_Delete, GDK_SHIFT_MASK,
+ 				      "delete", 0);
+ }
+-- 
+1.7.12
+
diff --git a/gnome-base/nautilus/nautilus-3.6.3.ebuild b/gnome-base/nautilus/nautilus-3.6.3.ebuild
new file mode 100644
index 000000000000..22d092cc46f6
--- /dev/null
+++ b/gnome-base/nautilus/nautilus-3.6.3.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/nautilus-3.6.3.ebuild,v 1.1 2012/12/24 14:30:56 eva Exp $
+
+EAPI="5"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+
+inherit eutils gnome2 virtualx
+
+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="debug exif gnome +introspection packagekit +previewer sendto tracker xmp"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux"
+
+# FIXME: tests fails under Xvfb, but pass when building manually
+# "FAIL: check failed in nautilus-file.c, line 8307"
+RESTRICT="test"
+
+# FIXME: selinux support is automagic
+# 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: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? ( !<gnome-extra/nautilus-sendto-3.0.1 )"
+# For eautoreconf
+#	gnome-base/gnome-common
+#	dev-util/gtk-doc-am"
+PDEPEND="gnome? (
+		>=x11-themes/gnome-icon-theme-1.1.91
+		x11-themes/gnome-icon-theme-symbolic )
+	tracker? ( >=gnome-extra/nautilus-tracker-tags-0.12 )
+	previewer? ( >=gnome-extra/sushi-0.1.9 )
+	sendto? ( >=gnome-extra/nautilus-sendto-3.0.1 )
+	>=gnome-base/gvfs-1.14[gtk]"
+# Need gvfs[gtk] for recent:/// support
+
+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)"
+	gnome2_src_configure
+}
+
+src_test() {
+	gnome2_environment_reset
+	unset DBUS_SESSION_BUS_ADDRESS
+	export GSETTINGS_BACKEND="memory"
+	Xemake check
+	unset GSETTINGS_BACKEND
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+
+	if use previewer; then
+		elog "nautilus uses gnome-extra/sushi to preview media files."
+		elog "To activate the previewer, select a file and press space; to"
+		elog "close the previewer, press space again."
+	else
+		elog "To preview media files, emerge nautilus with USE=previewer"
+	fi
+}