get back the FEATURES="test" fix from the 2.20 series

Package-Manager: portage-2.1.4.4

4 files changed, 12 insertions, 74 deletions

diff --git a/gnome-base/nautilus/ChangeLog b/gnome-base/nautilus/ChangeLog
index 093834e28e0f..524fd3d35d7b 100644
--- a/gnome-base/nautilus/ChangeLog
+++ b/gnome-base/nautilus/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for gnome-base/nautilus
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/ChangeLog,v 1.259 2008/04/02 14:25:52 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/ChangeLog,v 1.260 2008/04/04 20:29:48 eva Exp $
+
+  04 Apr 2008; Gilles Dartiguelongue <eva@gentoo.org>
+  -nautilus-2.22.0.ebuild, nautilus-2.22.1.ebuild:
+  get back the FEATURES="test" fix from the 2.20 series
 
   02 Apr 2008; Daniel Gryniewicz <dang@gentoo.org>
   nautilus-2.20.0-r1.ebuild, nautilus-2.22.0.ebuild, nautilus-2.22.1.ebuild:
diff --git a/gnome-base/nautilus/Manifest b/gnome-base/nautilus/Manifest
index d1f55e5600ea..e075e903c1f1 100644
--- a/gnome-base/nautilus/Manifest
+++ b/gnome-base/nautilus/Manifest
@@ -12,19 +12,17 @@ DIST nautilus-2.18.1.tar.bz2 4325821 RMD160 3cdef422befc96bbd921f2f4788d302cf924
 DIST nautilus-2.18.3.tar.bz2 4331118 RMD160 2069e1e9bb00c1ef6d942b114f8acda4776a06b0 SHA1 3f8eb87aa12080b67cb1f472655c10f03b440d4d SHA256 8ecc2b27f9e8e7f12ee2a84ae54d71d60c769e559f9952f8d792447e6f657c16
 DIST nautilus-2.20.0.tar.bz2 4916284 RMD160 9eeb18c886795ebbdd6dfc61ccddaee8eab81808 SHA1 f6a75a854728ef308e2721424a9638d228661b1d SHA256 98f9d9f7bc89db67cbcc4c7d08ec72175b8c9b3eb9489f7869c5cec9f16feb08
 DIST nautilus-2.22.0-gentoo-patchset.tar.bz2 11315 RMD160 f602bd4a469603675e77b96aed4127408063f9a6 SHA1 075b1f9b1216a86c916adc31f6d26705c37661d7 SHA256 25fb0f9112bd73c13f438fd4eed54ed67f9f7513f7433d84399f5c5ced08243c
-DIST nautilus-2.22.0.tar.bz2 5116215 RMD160 7c2a25f4655533f6f62e6f8354fa0283cdc37397 SHA1 e87460b49cc6d533997808887c351fd6f704e2da SHA256 43e2cfb22e97b7a67d9c02248e61f6529b2dafcf5ab29f13fd4d37bf696f50a1
 DIST nautilus-2.22.1.tar.bz2 5139139 RMD160 2781ffc661f3b5ff44f63ade9258496ea791096b SHA1 c740ebba280faf5756b4a08303a8aebf50046638 SHA256 02792c5a9341bfe97859778f653147ef00d8637028e714bb21328a67d8844bab
 EBUILD nautilus-2.18.1-r1.ebuild 2305 RMD160 b5a84e47b839c5a164707cad8edb67ca4f49fe55 SHA1 1be7eaebbd037bbabb01740515705e93e3b48a92 SHA256 7ecb1c790ee242f62bcc8a25e1da7988b5e50fd2af3fffc9a72bbbd059e5e7af
 EBUILD nautilus-2.18.3-r1.ebuild 2374 RMD160 2852b0729446fccb353c3c2113edb741efe9e1f8 SHA1 61e745b88c08cad7def2f1317f32ee86eee5f949 SHA256 45d7a0dea50256f91cc671679aaf3ab273138b620739cd646e0425c0495871af
 EBUILD nautilus-2.20.0-r1.ebuild 2852 RMD160 870a3b07d593409b7b3cb785a64a58bcb012832a SHA1 99b7fc0d3af14e6c5fb3a4b02d2b3e051c264e79 SHA256 9e63abebe3d1cca2ef484610316c3d01d1f9a8a7b8e904f081257178c195a8cc
-EBUILD nautilus-2.22.0.ebuild 1887 RMD160 d07911294146b327635d05abd273998078dbbc02 SHA1 4189abebaa3ab1ad418318a9b71e9b3f923e4a0f SHA256 b38e827d7515b5f9d9cc16e643ab70c1e37900087379ff259ad84da785a39d63
-EBUILD nautilus-2.22.1.ebuild 1909 RMD160 0215e83cd09e749fccea26f37f921f6ff4c74eb2 SHA1 f456aec1e5d0a0367d6822fca162f08ddb51c089 SHA256 ce0737872f8411d3452ba8dd341bda2b176df2e6d68dfbfbb6e725faf0489cd2
-MISC ChangeLog 35477 RMD160 530089c872c056b06f3fe7296a6b7d06deb18387 SHA1 35ac580693d8d53825440c8b75fc8378b50c9e5a SHA256 9508d058b1bd11a7c94280c5e271424eae85bf49d9d96217797552d8e6d00afe
+EBUILD nautilus-2.22.1.ebuild 1931 RMD160 0d82d123e69a48e327faec70fcf82c0183bb0e03 SHA1 5cf69a84962e9c46ca68332db1571b3647ca899c SHA256 daa6ede365e48ee4bec509dd8557ef7a4463569cd1a07cf2af50314faa7743ef
+MISC ChangeLog 35638 RMD160 df0a166faf91ec0f9787a036a723a1455082d74f SHA1 1062f83bffa180cdf387fc6cfba3be8790e3dcec SHA256 ff29a3cb01d79a551f658d4e637edc44c2598c31ef7c399b1ce5bf5bbd2d7dff
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iD8DBQFH85avomPajV0RnrERAjfhAJ9/k0xXgc/zMSmhXKg9H2H8qAVBgACfbb+V
-F4nDjtvumk3a/YI2mR2mInI=
-=3kDB
+iEYEARECAAYFAkf2q+cACgkQ1fmVwcYIWAZ6fwCeLhhwIFWr7AKH8VdlyEPcg9XY
+yBMAn1T5WhdvO+2peyCHQw4LOZlWf1Yd
+=Xrt7
 -----END PGP SIGNATURE-----
diff --git a/gnome-base/nautilus/nautilus-2.22.0.ebuild b/gnome-base/nautilus/nautilus-2.22.0.ebuild
deleted file mode 100644
index 03467d33689d..000000000000
--- a/gnome-base/nautilus/nautilus-2.22.0.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/nautilus-2.22.0.ebuild,v 1.2 2008/04/02 14:25:52 dang Exp $
-
-inherit virtualx eutils gnome2
-
-DESCRIPTION="A file manager for the GNOME desktop"
-HOMEPAGE="http://www.gnome.org/projects/nautilus/"
-SRC_URI="${SRC_URI} http://dev.gentoo.org/~leio/distfiles/${P}-gentoo-patchset.tar.bz2"
-
-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 gnome tracker"
-
-RDEPEND=">=x11-libs/startup-notification-0.8
-		 >=gnome-base/libbonobo-2.1
-		 >=gnome-base/eel-2.21.90
-		 >=dev-libs/glib-2.15.6
-		 >=gnome-base/gnome-desktop-2.10
-		 >=gnome-base/orbit-2.4
-		 >=x11-libs/pango-1.1.2
-		 >=x11-libs/gtk+-2.11.6
-		 >=gnome-base/librsvg-2.0.1
-		 >=dev-libs/libxml2-2.4.7
-		 >=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 )
-		 >=gnome-base/libgnome-2.14
-		 >=gnome-base/libgnomeui-2.6"
-DEPEND="${RDEPEND}
-		  sys-devel/gettext
-		>=dev-util/pkgconfig-0.9
-		>=dev-util/intltool-0.35"
-PDEPEND="gnome? ( >=x11-themes/gnome-icon-theme-1.1.91 )"
-
-DOCS="AUTHORS ChangeLog* HACKING MAINTAINERS NEWS README THANKS TODO"
-
-pkg_setup() {
-	G2CONF="--disable-update-mimedb $(use_enable beagle) $(use_enable tracker)"
-}
-
-src_unpack() {
-	gnome2_src_unpack
-
-	EPATCH_FORCE="yes" EPATCH_SUFFIX="patch" epatch "${WORKDIR}/patches"
-}
-
-src_test() {
-	addwrite "/root/.gnome2_private"
-	Xmake 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.22.1.ebuild b/gnome-base/nautilus/nautilus-2.22.1.ebuild
index 172219b2eb99..45bd94edac9b 100644
--- a/gnome-base/nautilus/nautilus-2.22.1.ebuild
+++ b/gnome-base/nautilus/nautilus-2.22.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/nautilus-2.22.1.ebuild,v 1.2 2008/04/02 14:25:52 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/nautilus-2.22.1.ebuild,v 1.3 2008/04/04 20:29:48 eva Exp $
 
 inherit virtualx eutils gnome2
 
@@ -54,6 +54,7 @@ src_unpack() {
 
 src_test() {
 	addwrite "/root/.gnome2_private"
+	unset SESSION_MANAGER
 	Xemake check || die "Test phase failed"
 }