Add 3.2.1 from the gnome overlay. The internal media previewer is gone, gnome-extra/sushi is used for previewing instead. Has more-or-less working app-misc/tracker support.

Package-Manager: portage-2.2.0_alpha72/cvs/Linux x86_64

4 files changed, 121 insertions, 9 deletions

diff --git a/gnome-base/nautilus/ChangeLog b/gnome-base/nautilus/ChangeLog
index e4c3517fd243..6dd79ebb362d 100644
--- a/gnome-base/nautilus/ChangeLog
+++ b/gnome-base/nautilus/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for gnome-base/nautilus
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/ChangeLog,v 1.384 2011/10/05 17:33:36 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/ChangeLog,v 1.385 2011/11/02 16:51:46 tetromino Exp $
+
+*nautilus-3.2.1 (02 Nov 2011)
+
+  02 Nov 2011; Alexandre Rostovtsev <tetromino@gentoo.org>
+  +nautilus-3.2.1.ebuild, metadata.xml:
+  Add 3.2.1 from the gnome overlay. The internal media previewer is gone,
+  gnome-extra/sushi is used for previewing instead. Has more-or-less working
+  app-misc/tracker support.
 
   05 Oct 2011; Kacper Kowalik <xarthisius@gentoo.org>
   nautilus-2.32.2.1-r1.ebuild:
diff --git a/gnome-base/nautilus/Manifest b/gnome-base/nautilus/Manifest
index 61c5bbf439f5..346419692b1b 100644
--- a/gnome-base/nautilus/Manifest
+++ b/gnome-base/nautilus/Manifest
@@ -1,21 +1,21 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 AUX nautilus-3.0.2-segfault-in-gtk_icon_info_load_symbolic.patch 3222 RMD160 34dc109adfebd83c7e47a41690c804fbf1944396 SHA1 11b096e78f594005058b0f59a27d7692349d098b SHA256 d053fb1094995c26c0fa6ac0c368ad14154984db3c73e5ce72607202ff4bb0a8
 DIST nautilus-2.32.2.1-patches.tar.bz2 6984 RMD160 44f6fd3f76dd96f265a9e47220930bf65055c4b6 SHA1 2d839f3f358828d9779a20f4792193b53c369c88 SHA256 0b756ba661d1f9ed0d2e49a469e6f390e941530309e08a7f9e6ac07b566180bb
 DIST nautilus-2.32.2.1.tar.bz2 6350203 RMD160 4498fc3c5dd2a4f13935b0366c175ad1b87bac1e SHA1 7b0a89cd965f4ca1531115d353b208bb2ba9db33 SHA256 802dacc98c697afea2e6201dab1c8c800809f235fff39857983efb4340ecc303
 DIST nautilus-3.0.2.tar.bz2 5636620 RMD160 f133abc4934e6fec0e2a2688ba5a212e923279a6 SHA1 f2a926132a8f6c21be1a0c931588b7fb526ea04a SHA256 6a4c6b75593f0e815763d0040878cd908da72318f18b05f33d24040e0d602b22
+DIST nautilus-3.2.1.tar.xz 4703588 RMD160 d3f2db2747cc69a06494a4d50f6ee67b8dedbff7 SHA1 246c6ae0539dc111d755727ad4cb12d8df7bd322 SHA256 c482d6e7babcc238304cf55586cdf7e2b2806025214a143ed355f0d89b33b154
 EBUILD nautilus-2.32.2.1-r1.ebuild 2262 RMD160 b6e47de5db54d0d6f8a5c5ff5199b5ab0ce1221b SHA1 8e46537dd0e7582ed95c6149f6f71c0f893bf38a SHA256 2f5877b556945f51b4bfc025d099b17a4cd5b8c4e747b99d54751ed445705c84
 EBUILD nautilus-2.32.2.1.ebuild 2077 RMD160 649e3c582283c58d51c4be76a9e11920e308d226 SHA1 65b8bb73a3a8103503fb045736eefb39a4b6d748 SHA256 b593e355936851547e90e65c0ed608ab6e1369d4bbd485a82cc6b8c06d45f354
 EBUILD nautilus-3.0.2.ebuild 2464 RMD160 51291b11286faf352a3a667801e5670deb94ca55 SHA1 c1381b03bda3a372e677c77d472ab574bf7413bd SHA256 26d328dfa3af2d57d5b89e3878309bb8c9281579bcb8767c96a38a1fe0e5628f
-MISC ChangeLog 57130 RMD160 9e2a0bd9070080f984b67bf7d0d5c853576f3d35 SHA1 7f244e68187dcee41e5a98631d5b882e303ce285 SHA256 33ce7468afd785cc5425f6d8a0838915e229719e9292634dd14a513d14b71f7c
-MISC metadata.xml 382 RMD160 1ebea648fbaed962049cb7f95f8c12dc530afc31 SHA1 f651d184f369b1aface2ab9a7d2ba13869ae0453 SHA256 c7243f8999b72a07e46dedc00e9e2568b30ab261971b9eb78a85595f4e2b07a5
+EBUILD nautilus-3.2.1.ebuild 2836 RMD160 fe5a3f572d4e28ce3587d2072e759e37d16d1bec SHA1 134ec9d9a58539f767891bb4a8352248ef9e5062 SHA256 8cfb351e57ad832238970150e6f42e9989095a43006b4533e3db07884f231e80
+MISC ChangeLog 57439 RMD160 cc709d3146b501076131f2f44f652688861b1a83 SHA1 046323219472ec2a7c3df8c969a4e67d795b43b5 SHA256 f034d1f245add06a41d338324390e64b275fe52c87555ff5f40057e4c58d4cba
+MISC metadata.xml 667 RMD160 4905458681c088bef4b030ee1a963a71b9cb53bd SHA1 fa3a39a43c3e54058f3996d30fa93cd8d03897aa SHA256 b2769f7911c156b0692b95f3511adb651cee0486c6d8eb37b7d0a95786aad4c5
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iJwEAQECAAYFAk6MlPYACgkQIiMqcbOVdxSSPAP7Bw4IGm+KtrAXsuMpdFhZGUzo
-TXq0rDMHtsbkTdKyr/V7P19X1Wx4DQswhvxuYb4w+pC04o/f+oa0NzbAh4VCT01T
-5nD+c2kp+zlbil1OpsNp0pw4W3OEeztVQwJ+/I3lHJiRyYvmdfGzxpgjv48h3HbQ
-Wq2SHiFafJOQ5VIF5ts=
-=qOn+
+iF4EAREIAAYFAk6xdScACgkQdjK8w9WeBnDJ9AD9EynCMG6Jrwl/D1KZdBJl3Q0r
+0bID0PvEpTK3XwWksLEA/18Iy2xrxOgl03UbJGSmajk2laY2jiVqVyNNnYsTn4hS
+=R/fK
 -----END PGP SIGNATURE-----
diff --git a/gnome-base/nautilus/metadata.xml b/gnome-base/nautilus/metadata.xml
index e13a63fed6b0..26994994a0f5 100644
--- a/gnome-base/nautilus/metadata.xml
+++ b/gnome-base/nautilus/metadata.xml
@@ -5,7 +5,12 @@
 <use>
 	<flag name="introspection">Use <pkg>dev-libs/gobject-introspection</pkg> for
 		introspection</flag>
+	<flag name="packagekit">Use packagekit to search for programs to open
+		unknown file types</flag>
+	<flag name="previewer">Use <pkg>gnome-extra/sushi</pkg> to preview files
+		from the file mananger</flag>
 	<flag name="sendto">Enable the nautilus-sendto extension to send files to
 		various locations/devices</flag>
+	<flag name="tracker">Add support for <pkg>app-misc/tracker</pkg> search</flag>
 </use>
 </pkgmetadata>
diff --git a/gnome-base/nautilus/nautilus-3.2.1.ebuild b/gnome-base/nautilus/nautilus-3.2.1.ebuild
new file mode 100644
index 000000000000..bbb37d28fa01
--- /dev/null
+++ b/gnome-base/nautilus/nautilus-3.2.1.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/nautilus-3.2.1.ebuild,v 1.1 2011/11/02 16:51:46 tetromino Exp $
+
+EAPI="4"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+
+inherit 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"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux"
+IUSE="doc exif gnome +introspection packagekit +previewer sendto tracker xmp"
+
+# 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.30.0:2
+	>=x11-libs/pango-1.28.3
+	>=x11-libs/gtk+-3.1.6: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.12 )
+	xmp? ( >=media-libs/exempi-2.1.0 )"
+DEPEND="${COMMON_DEPEND}
+	>=dev-lang/perl-5
+	>=dev-util/gdbus-codegen-2.30.0
+	>=dev-util/pkgconfig-0.9
+	>=dev-util/intltool-0.40.1
+	sys-devel/gettext
+	x11-proto/xproto
+	doc? ( >=dev-util/gtk-doc-1.4 )"
+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-0.1.2"
+
+pkg_setup() {
+	G2CONF="${G2CONF}
+		--disable-maintainer-mode
+		--disable-update-mimedb
+		$(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 TODO"
+}
+
+src_prepare() {
+	gnome2_src_prepare
+
+	# Remove crazy CFLAGS
+	sed 's:-DG.*DISABLE_DEPRECATED::g' -i configure.in configure \
+		|| die "sed 1 failed"
+}
+
+src_test() {
+	addpredict "/root/.gnome2_private"
+	unset SESSION_MANAGER
+	unset ORBIT_SOCKETDIR
+	unset DBUS_SESSION_BUS_ADDRESS
+	Xemake check || die "Test phase failed"
+}
+
+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
+}