8 files changed, 15 insertions, 369 deletions
diff --git a/gnome-base/nautilus/ChangeLog b/gnome-base/nautilus/ChangeLog
index e194e017ea93..a64b53d06986 100644
--- a/gnome-base/nautilus/ChangeLog
+++ b/gnome-base/nautilus/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for gnome-base/nautilus
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/ChangeLog,v 1.321 2009/10/24 16:52:22 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/ChangeLog,v 1.322 2009/10/28 22:06:30 eva Exp $
+
+  28 Oct 2009; Gilles Dartiguelongue <eva@gentoo.org>
+  -nautilus-2.24.2.ebuild, nautilus-2.24.2-r3.ebuild,
+  -nautilus-2.26.2-r1.ebuild, -nautilus-2.26.3.ebuild,
+  -nautilus-2.26.3-r1.ebuild,
+  -files/nautilus-2.26.3-file-management-properties-ui-dup-id.patch,
+  nautilus-2.26.4.ebuild:
+  Add more envvar cleanup to src_test, bug #246136. Clean up revisions.
 
   24 Oct 2009; nixnut <nixnut@gentoo.org> nautilus-2.26.4.ebuild:
   ppc stable #281427
diff --git a/gnome-base/nautilus/files/nautilus-2.26.3-file-management-properties-ui-dup-id.patch b/gnome-base/nautilus/files/nautilus-2.26.3-file-management-properties-ui-dup-id.patch
deleted file mode 100644
index 5ff2d0534fad..000000000000
--- a/gnome-base/nautilus/files/nautilus-2.26.3-file-management-properties-ui-dup-id.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From bf6bfde36bcadf43a39fb095650b7fc78741d62a Mon Sep 17 00:00:00 2001
-From: Matthias Clasen <mclasen@redhat.com>
-Date: Thu, 27 Aug 2009 00:05:28 +0000
-Subject: Fix a duplicate id in a .ui file
-
-This caused nautilus-file-management-properties to crash.
----
-diff --git a/src/nautilus-file-management-properties.ui b/src/nautilus-file-management-properties.ui
-index eae16d1..c4fb6ee 100644
---- a/src/nautilus-file-management-properties.ui
-+++ b/src/nautilus-file-management-properties.ui
-@@ -1128,7 +1128,7 @@
-                               </packing>
-                             </child>
-                             <child>
--                              <object class="GtkLabel" id="label">
-+                              <object class="GtkLabel" id="label99">
-                                 <property name="height_request">6</property>
-                                 <property name="visible">True</property>
-                                 <property name="label" translatable="yes"/>
---
-cgit v0.8.2
diff --git a/gnome-base/nautilus/nautilus-2.24.2-r3.ebuild b/gnome-base/nautilus/nautilus-2.24.2-r3.ebuild
index 396283890715..445bd27cbd3a 100644
--- a/gnome-base/nautilus/nautilus-2.24.2-r3.ebuild
+++ b/gnome-base/nautilus/nautilus-2.24.2-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/nautilus-2.24.2-r3.ebuild,v 1.7 2009/05/21 19:50:58 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/nautilus-2.24.2-r3.ebuild,v 1.8 2009/10/28 22:06:30 eva Exp $
 
 EAPI="2"
 
@@ -70,6 +70,8 @@ src_prepare() {
 src_test() {
 	addwrite "/root/.gnome2_private"
 	unset SESSION_MANAGER
+	unset ORBIT_SOCKETDIR
+	unset DBUS_SESSION_BUS_ADDRESS
 	Xemake check || die "Test phase failed"
 }
 
diff --git a/gnome-base/nautilus/nautilus-2.24.2.ebuild b/gnome-base/nautilus/nautilus-2.24.2.ebuild
deleted file mode 100644
index b46820b2a1d5..000000000000
--- a/gnome-base/nautilus/nautilus-2.24.2.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/nautilus-2.24.2.ebuild,v 1.16 2009/04/28 11:28:25 armin76 Exp $
-
-inherit gnome2 eutils virtualx
-
-DESCRIPTION="A file manager for the GNOME desktop"
-HOMEPAGE="http://www.gnome.org/projects/nautilus/"
-
-LICENSE="GPL-2 LGPL-2 FDL-1.1"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sh sparc x86 ~x86-fbsd"
-IUSE="beagle doc gnome tracker xmp"
-
-RDEPEND=">=gnome-base/libbonobo-2.1
-	>=gnome-base/eel-2.24.0
-	>=dev-libs/glib-2.17.5
-	>=gnome-base/gnome-desktop-2.10
-	>=gnome-base/libgnome-2.14
-	>=gnome-base/libgnomeui-2.6
-	>=gnome-base/orbit-2.4
-	>=x11-libs/pango-1.1.2
-	>=x11-libs/gtk+-2.13.0
-	>=gnome-base/librsvg-2.0.1
-	>=dev-libs/libxml2-2.4.7
-	>=x11-libs/startup-notification-0.8
-	>=media-libs/libexif-0.5.12
-	>=gnome-base/gconf-2.0
-	>=gnome-base/gvfs-0.1.2
-	beagle? ( || (
-		dev-libs/libbeagle
-		=app-misc/beagle-0.2* ) )
-	tracker? ( >=app-misc/tracker-0.6.4 )
-	xmp? ( >=media-libs/exempi-2 )"
-
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	>=dev-util/pkgconfig-0.9
-	>=dev-util/intltool-0.35
-	doc? ( >=dev-util/gtk-doc-1.4 )"
-
-PDEPEND="gnome? ( >=x11-themes/gnome-icon-theme-1.1.91 )"
-
-DOCS="AUTHORS ChangeLog* HACKING MAINTAINERS NEWS README THANKS TODO"
-
-pkg_setup() {
-	G2CONF="${G2CONF}
-		--disable-update-mimedb
-		$(use_enable beagle)
-		$(use_enable tracker)
-		$(use_enable xmp)"
-}
-
-src_test() {
-	addwrite "/root/.gnome2_private"
-	unset SESSION_MANAGER
-	Xemake check || die "Test phase 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"
-}
diff --git a/gnome-base/nautilus/nautilus-2.26.2-r1.ebuild b/gnome-base/nautilus/nautilus-2.26.2-r1.ebuild
deleted file mode 100644
index b7dc3afcb307..000000000000
--- a/gnome-base/nautilus/nautilus-2.26.2-r1.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/nautilus-2.26.2-r1.ebuild,v 1.2 2009/05/14 13:32:24 nirbheek Exp $
-
-EAPI="2"
-
-inherit gnome2 eutils virtualx
-
-DESCRIPTION="A file manager for the GNOME desktop"
-HOMEPAGE="http://www.gnome.org/projects/nautilus/"
-
-LICENSE="GPL-2 LGPL-2 FDL-1.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="beagle doc gnome tracker xmp"
-
-# not adding gnome-base/gail because it is in gtk+
-RDEPEND=">=dev-libs/glib-2.19.0
-	>=gnome-base/gnome-desktop-2.25.5
-	>=x11-libs/pango-1.1.2
-	>=x11-libs/gtk+-2.16.0
-	>=dev-libs/libxml2-2.4.7
-	>=media-libs/libexif-0.5.12
-	>=gnome-base/gconf-2.0
-	>=gnome-base/gvfs-0.1.2
-	dev-libs/libunique
-	dev-libs/dbus-glib
-	x11-libs/libXft
-	x11-libs/libXrender
-	beagle? ( || (
-		dev-libs/libbeagle
-		=app-misc/beagle-0.2* ) )
-	tracker? ( >=app-misc/tracker-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 )
-	gnome-base/gnome-common
-	dev-util/gtk-doc-am"
-
-PDEPEND="gnome? ( >=x11-themes/gnome-icon-theme-1.1.91 )"
-
-DOCS="AUTHORS ChangeLog* HACKING MAINTAINERS NEWS README THANKS TODO"
-
-pkg_setup() {
-	G2CONF="${G2CONF}
-		--disable-update-mimedb
-		--disable-packagekit
-		$(use_enable beagle)
-		$(use_enable tracker)
-		$(use_enable xmp)"
-}
-
-src_prepare() {
-	gnome2_src_prepare
-
-	# FIXME: tarball generated with broken gtk-doc, revisit me.
-	if use doc; then
-		sed "/^TARGET_DIR/i \GTKDOC_REBASE=/usr/bin/gtkdoc-rebase" \
-			-i gtk-doc.make || die "sed 1 failed"
-	else
-		sed "/^TARGET_DIR/i \GTKDOC_REBASE=/bin/true" \
-			-i gtk-doc.make || die "sed 2 failed"
-	fi
-
-	# gtk-doc-am and gnome-common needed for this
-
-	# Fix intltoolize broken file, see upstream #577133
-	sed "s:'\^\$\$lang\$\$':\^\$\$lang\$\$:g" -i po/Makefile.in.in || die "sed failed"
-
-	# Fix nautilus flipping-out with --no-desktop -- bug 266398
-	epatch "${FILESDIR}/${P}-change-reg-desktop-file-with-no-desktop.patch"
-}
-
-src_test() {
-	addwrite "/root/.gnome2_private"
-	unset SESSION_MANAGER
-	Xemake check || die "Test phase 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"
-}
diff --git a/gnome-base/nautilus/nautilus-2.26.3-r1.ebuild b/gnome-base/nautilus/nautilus-2.26.3-r1.ebuild
deleted file mode 100644
index 6cf6a5d4eeed..000000000000
--- a/gnome-base/nautilus/nautilus-2.26.3-r1.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/nautilus-2.26.3-r1.ebuild,v 1.1 2009/09/28 13:09:56 mrpouet Exp $
-
-EAPI="2"
-
-inherit gnome2 eutils virtualx
-
-DESCRIPTION="A file manager for the GNOME desktop"
-HOMEPAGE="http://www.gnome.org/projects/nautilus/"
-
-LICENSE="GPL-2 LGPL-2 FDL-1.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="beagle doc gnome tracker xmp"
-
-# not adding gnome-base/gail because it is in gtk+
-RDEPEND=">=dev-libs/glib-2.19.0
-	>=gnome-base/gnome-desktop-2.25.5
-	>=x11-libs/pango-1.1.2
-	>=x11-libs/gtk+-2.16.0
-	>=dev-libs/libxml2-2.4.7
-	>=media-libs/libexif-0.5.12
-	>=gnome-base/gconf-2.0
-	>=gnome-base/gvfs-0.1.2
-	dev-libs/libunique
-	dev-libs/dbus-glib
-	x11-libs/libXft
-	x11-libs/libXrender
-	beagle? ( || (
-		dev-libs/libbeagle
-		=app-misc/beagle-0.2* ) )
-	tracker? ( >=app-misc/tracker-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 )
-	gnome-base/gnome-common
-	dev-util/gtk-doc-am"
-
-PDEPEND="gnome? ( >=x11-themes/gnome-icon-theme-1.1.91 )"
-
-DOCS="AUTHORS ChangeLog* HACKING MAINTAINERS NEWS README THANKS TODO"
-
-pkg_setup() {
-	G2CONF="${G2CONF}
-		--disable-update-mimedb
-		--disable-packagekit
-		$(use_enable beagle)
-		$(use_enable tracker)
-		$(use_enable xmp)"
-}
-
-src_prepare() {
-	gnome2_src_prepare
-
-	# FIXME: tarball generated with broken gtk-doc, revisit me.
-	if use doc; then
-		sed "/^TARGET_DIR/i \GTKDOC_REBASE=/usr/bin/gtkdoc-rebase" \
-			-i gtk-doc.make || die "sed 1 failed"
-	else
-		sed "/^TARGET_DIR/i \GTKDOC_REBASE=/bin/true" \
-			-i gtk-doc.make || die "sed 2 failed"
-	fi
-
-	# gtk-doc-am and gnome-common needed for this
-
-	# Fix intltoolize broken file, see upstream #577133
-	sed "s:'\^\$\$lang\$\$':\^\$\$lang\$\$:g" -i po/Makefile.in.in || die "sed failed"
-
-	# Fix nautilus flipping-out with --no-desktop -- bug 266398
-	epatch "${FILESDIR}/${PN}-2.26.2-change-reg-desktop-file-with-no-desktop.patch"
-	# Fix crash due to duplicate id in .ui file, bug #286312
-	epatch "${FILESDIR}/${P}-file-management-properties-ui-dup-id.patch"
-	# Fix massive memory consumption by Nautilus for larger zoom levels.
-	# Import from upstream, see distributor mailing lists.
-	epatch "${FILESDIR}/${P}-thumbnail-zoom-level.patch"
-}
-
-src_test() {
-	addwrite "/root/.gnome2_private"
-	unset SESSION_MANAGER
-	Xemake check || die "Test phase 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"
-}
diff --git a/gnome-base/nautilus/nautilus-2.26.3.ebuild b/gnome-base/nautilus/nautilus-2.26.3.ebuild
deleted file mode 100644
index 23e0bdada902..000000000000
--- a/gnome-base/nautilus/nautilus-2.26.3.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/nautilus-2.26.3.ebuild,v 1.2 2009/05/30 23:41:18 ranger Exp $
-
-EAPI="2"
-
-inherit gnome2 eutils virtualx
-
-DESCRIPTION="A file manager for the GNOME desktop"
-HOMEPAGE="http://www.gnome.org/projects/nautilus/"
-
-LICENSE="GPL-2 LGPL-2 FDL-1.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="beagle doc gnome tracker xmp"
-
-# not adding gnome-base/gail because it is in gtk+
-RDEPEND=">=dev-libs/glib-2.19.0
-	>=gnome-base/gnome-desktop-2.25.5
-	>=x11-libs/pango-1.1.2
-	>=x11-libs/gtk+-2.16.0
-	>=dev-libs/libxml2-2.4.7
-	>=media-libs/libexif-0.5.12
-	>=gnome-base/gconf-2.0
-	>=gnome-base/gvfs-0.1.2
-	dev-libs/libunique
-	dev-libs/dbus-glib
-	x11-libs/libXft
-	x11-libs/libXrender
-	beagle? ( || (
-		dev-libs/libbeagle
-		=app-misc/beagle-0.2* ) )
-	tracker? ( >=app-misc/tracker-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 )
-	gnome-base/gnome-common
-	dev-util/gtk-doc-am"
-
-PDEPEND="gnome? ( >=x11-themes/gnome-icon-theme-1.1.91 )"
-
-DOCS="AUTHORS ChangeLog* HACKING MAINTAINERS NEWS README THANKS TODO"
-
-pkg_setup() {
-	G2CONF="${G2CONF}
-		--disable-update-mimedb
-		--disable-packagekit
-		$(use_enable beagle)
-		$(use_enable tracker)
-		$(use_enable xmp)"
-}
-
-src_prepare() {
-	gnome2_src_prepare
-
-	# FIXME: tarball generated with broken gtk-doc, revisit me.
-	if use doc; then
-		sed "/^TARGET_DIR/i \GTKDOC_REBASE=/usr/bin/gtkdoc-rebase" \
-			-i gtk-doc.make || die "sed 1 failed"
-	else
-		sed "/^TARGET_DIR/i \GTKDOC_REBASE=/bin/true" \
-			-i gtk-doc.make || die "sed 2 failed"
-	fi
-
-	# gtk-doc-am and gnome-common needed for this
-
-	# Fix intltoolize broken file, see upstream #577133
-	sed "s:'\^\$\$lang\$\$':\^\$\$lang\$\$:g" -i po/Makefile.in.in || die "sed failed"
-
-	# Fix nautilus flipping-out with --no-desktop -- bug 266398
-	epatch "${FILESDIR}/${PN}-2.26.2-change-reg-desktop-file-with-no-desktop.patch"
-}
-
-src_test() {
-	addwrite "/root/.gnome2_private"
-	unset SESSION_MANAGER
-	Xemake check || die "Test phase 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"
-}
diff --git a/gnome-base/nautilus/nautilus-2.26.4.ebuild b/gnome-base/nautilus/nautilus-2.26.4.ebuild
index f307ae39baae..90f72bab52f6 100644
--- a/gnome-base/nautilus/nautilus-2.26.4.ebuild
+++ b/gnome-base/nautilus/nautilus-2.26.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/nautilus-2.26.4.ebuild,v 1.5 2009/10/24 16:52:22 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/nautilus-2.26.4.ebuild,v 1.6 2009/10/28 22:06:30 eva Exp $
 
 EAPI="2"
 
@@ -82,6 +82,8 @@ src_prepare() {
 src_test() {
 	addwrite "/root/.gnome2_private"
 	unset SESSION_MANAGER
+	unset ORBIT_SOCKETDIR
+	unset DBUS_SESSION_BUS_ADDRESS
 	Xemake check || die "Test phase failed"
 }