Revision bump including multiple fixes: disable automounting while screen is locked, guard against filename being NULL on nautilus_icon_info_lookup, fix crashes and memory leaks, tracker-0.10 compatibility, hide checkbox to remember selection when opening folders, use the local path for the sound preview, allow keyboard navigation with Enter/Space in places sidebar.

Package-Manager: portage-2.1.9.46/cvs/Linux x86_64

3 files changed, 101 insertions, 5 deletions

diff --git a/gnome-base/nautilus/ChangeLog b/gnome-base/nautilus/ChangeLog
index c4c601a5a955..133fbef0fc7a 100644
--- a/gnome-base/nautilus/ChangeLog
+++ b/gnome-base/nautilus/ChangeLog
@@ -1,6 +1,15 @@
 # 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.374 2011/04/09 13:34:32 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/ChangeLog,v 1.375 2011/04/16 11:09:40 pacho Exp $
+
+*nautilus-2.32.2.1-r1 (16 Apr 2011)
+
+  16 Apr 2011; Pacho Ramos <pacho@gentoo.org> +nautilus-2.32.2.1-r1.ebuild:
+  Revision bump including multiple fixes: disable automounting while screen is
+  locked, guard against filename being NULL on nautilus_icon_info_lookup, fix
+  crashes and memory leaks, tracker-0.10 compatibility, hide checkbox to
+  remember selection when opening folders, use the local path for the sound
+  preview, allow keyboard navigation with Enter/Space in places sidebar.
 
   09 Apr 2011; Gilles Dartiguelongue <eva@gentoo.org>
   -files/nautilus-2.27.4-change-reg-desktop-file-with-no-desktop.patch,
diff --git a/gnome-base/nautilus/Manifest b/gnome-base/nautilus/Manifest
index 50566de087e5..e78d494ea822 100644
--- a/gnome-base/nautilus/Manifest
+++ b/gnome-base/nautilus/Manifest
@@ -1,14 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+DIST nautilus-2.32.2.1-patches.tar.bz2 8258 RMD160 24e713856dc2224e2de241b6738d35ca63750fba SHA1 975b8a01458998db45f9e3111020971844fb3bef SHA256 921680d56b1c7e2042956f4f6f10f27ac601d0f351e0fc87fafdbc586cc1b52e
 DIST nautilus-2.32.2.1.tar.bz2 6350203 RMD160 4498fc3c5dd2a4f13935b0366c175ad1b87bac1e SHA1 7b0a89cd965f4ca1531115d353b208bb2ba9db33 SHA256 802dacc98c697afea2e6201dab1c8c800809f235fff39857983efb4340ecc303
+EBUILD nautilus-2.32.2.1-r1.ebuild 2242 RMD160 db5395af6aa518e06ed945705e8a264c135e8704 SHA1 d9dde2cbcfd48f1e0064401a4d13671b6ae216cc SHA256 05a064ee42e2a6dac9cc8466dc8f8953b8526c2b628e58e4239ea5a46f00a6f1
 EBUILD nautilus-2.32.2.1.ebuild 2077 RMD160 649e3c582283c58d51c4be76a9e11920e308d226 SHA1 65b8bb73a3a8103503fb045736eefb39a4b6d748 SHA256 b593e355936851547e90e65c0ed608ab6e1369d4bbd485a82cc6b8c06d45f354
-MISC ChangeLog 55206 RMD160 523681b03ee89f022afe4f90c61c1e23ef0fa570 SHA1 e4aa825f6c67b66c69e2ccd61f2ca9aef83414e2 SHA256 af978e40845206cdae0fc1e14940c17c2522413491420190084462b363d7e99a
+MISC ChangeLog 55701 RMD160 2fa37cc8af4d60afd9bee1423d4eb7a5906612e0 SHA1 68d17964e1e1fab446079e3121802f24171e306d SHA256 2ea48875d03a26018a6c054b99b01a04b548eac2792910cac4dc55a3885c469d
 MISC metadata.xml 274 RMD160 4a3e5603446a099b3e704fccbc8ccbd78a2660a1 SHA1 4215e0c0bb615596928a5a5fd7ec06b588d2b4b3 SHA256 d0e640b1d069f6546748707f63dc6c709546026b09ab863b26c77c041185002e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk2gYG4ACgkQ1fmVwcYIWAayyACg685zp8yrXXdB4lhmRV+1z9Vg
-If0AoLEb3aTXMyyNfFL/YWHIdhDcOj28
-=Bwrv
+iEYEARECAAYFAk2pePoACgkQCaWpQKGI+9SbKQCeOxSvrnWttZX8vUfDbG87U/bW
+79oAn0WZNnk5qx1wsHc5EejFhmNwCByp
+=TrQh
 -----END PGP SIGNATURE-----
diff --git a/gnome-base/nautilus/nautilus-2.32.2.1-r1.ebuild b/gnome-base/nautilus/nautilus-2.32.2.1-r1.ebuild
new file mode 100644
index 000000000000..9752cb9c22d6
--- /dev/null
+++ b/gnome-base/nautilus/nautilus-2.32.2.1-r1.ebuild
@@ -0,0 +1,85 @@
+# 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-2.32.2.1-r1.ebuild,v 1.1 2011/04/16 11:09:40 pacho Exp $
+
+EAPI="3"
+GCONF_DEBUG="no"
+
+inherit eutils gnome2 virtualx
+
+DESCRIPTION="A file manager for the GNOME desktop"
+HOMEPAGE="http://live.gnome.org/Nautilus"
+
+SRC_URI="${SRC_URI} http://dev.gentoo.org/~pacho/gnome/${P}-patches.tar.bz2"
+
+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 gnome +introspection xmp"
+
+RDEPEND=">=dev-libs/glib-2.25.9:2
+	>=gnome-base/gnome-desktop-2.29.91:2
+	>=x11-libs/pango-1.1.2
+	>=x11-libs/gtk+-2.22:2[introspection?]
+	>=dev-libs/libxml2-2.4.7:2
+	>=media-libs/libexif-0.5.12
+	>=gnome-base/gconf-2:2
+	dev-libs/libunique:1
+	x11-libs/libXext
+	x11-libs/libXrender
+	introspection? ( >=dev-libs/gobject-introspection-0.6.4 )
+	xmp? ( media-libs/exempi:2 )"
+
+DEPEND="${RDEPEND}
+	>=dev-lang/perl-5
+	sys-devel/gettext
+	>=dev-util/pkgconfig-0.9
+	>=dev-util/intltool-0.40.1
+	doc? ( >=dev-util/gtk-doc-1.4 )"
+# For eautoreconf
+#	gnome-base/gnome-common
+#	dev-util/gtk-doc-am"
+
+PDEPEND="gnome? ( >=x11-themes/gnome-icon-theme-1.1.91 )
+	>=gnome-base/gvfs-0.1.2"
+
+pkg_setup() {
+	G2CONF="${G2CONF}
+		--disable-update-mimedb
+		--disable-packagekit
+		$(use_enable introspection)
+		$(use_enable xmp)"
+	DOCS="AUTHORS ChangeLog* HACKING MAINTAINERS NEWS README THANKS TODO"
+}
+
+src_prepare() {
+	gnome2_src_prepare
+
+	# Apply multiple upstream fixes
+	epatch "${WORKDIR}/${P}-patches"/*.patch
+
+	# 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"
+}
+
+src_install() {
+	gnome2_src_install
+	find "${ED}" -name "*.la" -delete || die "remove of la files failed"
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+
+	elog "nautilus can use gstreamer to preview audio files. Just make sure"
+	elog "to have the necessary plugins available to play the media type you"
+	elog "want to preview"
+}