dropping tracker from version to stabilize and add a r1 for ~arch purpose.

Package-Manager: portage-2.2_rc3/cvs/Linux 2.6.24-gentoo-r8-mactel x86_64

4 files changed, 80 insertions, 10 deletions

diff --git a/gnome-base/nautilus/ChangeLog b/gnome-base/nautilus/ChangeLog
index df71004da5d6..73c8549f3665 100644
--- a/gnome-base/nautilus/ChangeLog
+++ b/gnome-base/nautilus/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for gnome-base/nautilus
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/ChangeLog,v 1.268 2008/07/23 20:48:59 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/ChangeLog,v 1.269 2008/07/26 22:24:45 eva Exp $
+
+  26 Jul 2008; Gilles Dartiguelongue <eva@gentoo.org> ChangeLog:
+  dropping tracker from version to stabilize and add a r1 for ~arch purpose.
 
 *nautilus-2.22.5.1 (23 Jul 2008)
 
diff --git a/gnome-base/nautilus/Manifest b/gnome-base/nautilus/Manifest
index 5c7ed7f7876e..915935ca3803 100644
--- a/gnome-base/nautilus/Manifest
+++ b/gnome-base/nautilus/Manifest
@@ -24,13 +24,14 @@ EBUILD nautilus-2.22.2.ebuild 1965 RMD160 39e25052fa91a431d3edd7b79ef4138f49885a
 EBUILD nautilus-2.22.3-r1.ebuild 1939 RMD160 e3833bde252bd31c4b29b598fc9891c98795dcff SHA1 6ceb5b7501a7de84bebd018fa4df9f3e5ed307a8 SHA256 8a92e62e6ad19623ecc414d69d2f65828c6d8507debbf8ef7cf051a6fd7423c8
 EBUILD nautilus-2.22.3.ebuild 1724 RMD160 e28716bd40d476e7b9d3d8abf197f9612adba710 SHA1 0e5854c42a72d4cace269516649f5f1c4a2cf0ca SHA256 5e52153501fb8cdf5309d3859cb3847d45d1d4dba78c8b351401b0a6a46272d0
 EBUILD nautilus-2.22.4.ebuild 1892 RMD160 bd8add4f8f18b51edb5ed25a7b9ff570c58494dc SHA1 eb0d5fc16cdfdbfa55fc4f02fff266e03dd2ca93 SHA256 7d7d4aeeb12340f39a8f240729a05da2f89baba6cdc1a74567bd009ed8296cfc
-EBUILD nautilus-2.22.5.1.ebuild 1894 RMD160 016e46d161effaac1a70b2dc9ded39209c6bfaeb SHA1 4a483806e49221ea5e04f3b7eb517647ad481b3f SHA256 b4cfd31b634003d80012e56f5d3ca3c415b743a66e226d5f9f7262e15078e997
-MISC ChangeLog 37215 RMD160 4366cc2de16368fed93fe5e99237fdf8032c82f6 SHA1 91902a81cbeaf371a8c968e1947562b646bcef04 SHA256 3a7f7c2d718dbd8605ec5dd01d7b7911f43f717466dd3a49f06323f6a9aefa4b
+EBUILD nautilus-2.22.5.1-r1.ebuild 1897 RMD160 5b7c56791007abaa84b52c1af44ef0fc94b23447 SHA1 7192c80210b0591fbb4c1f997732c5ca82e94f7d SHA256 c790f2d5be28f03dc03a0615692d79f7189aa6304175a4d064e2c1d1c47e7ddf
+EBUILD nautilus-2.22.5.1.ebuild 1841 RMD160 14f4c171fdc6fdef4c109068ce7007d440a2badf SHA1 b9f33e6bbef2fc7025c6ca49865c7a300b361d99 SHA256 3ccbb6880bd1e0698c0f270d701c85713efbaac6e5d3bc4a79fd40deeda2b7a5
+MISC ChangeLog 37358 RMD160 161d2d2ee3c60b3cec4133f76ab4f6468cb8a5c1 SHA1 b01034b8ae37fa190a7e6a6b9641366de72cf608 SHA256 3f5cb61166f024c817a3c911ff3e86908ec6807c855cada52521f3884884b3f5
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkiHmUkACgkQ1fmVwcYIWAa80gCcCrRRT5DEb6BxG9lWXdK7mox4
-37sAoMqiJafuN1NxoZHBtFRPkoMMy6Rt
-=t+h2
+iEYEARECAAYFAkiLpDoACgkQ1fmVwcYIWAb0LACdEbDkDCSfGKVwo9fPM9oPNVfg
+rlIAnjZ1MJtspyaf6HwHnByEQR+mFE6v
+=QfS8
 -----END PGP SIGNATURE-----
diff --git a/gnome-base/nautilus/nautilus-2.22.5.1-r1.ebuild b/gnome-base/nautilus/nautilus-2.22.5.1-r1.ebuild
new file mode 100644
index 000000000000..2befa4846318
--- /dev/null
+++ b/gnome-base/nautilus/nautilus-2.22.5.1-r1.ebuild
@@ -0,0 +1,67 @@
+# 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.5.1-r1.ebuild,v 1.1 2008/07/26 22:24:45 eva Exp $
+
+inherit virtualx eutils gnome2
+
+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 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
+
+	# bug #229719, #229723
+	epatch "${FILESDIR}/${PN}-2.22.3-open-folder.patch"
+	epatch "${FILESDIR}/${PN}-2.22.3-prevent-recursive-mvcp.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.22.5.1.ebuild b/gnome-base/nautilus/nautilus-2.22.5.1.ebuild
index fc4c751a79a5..e6bb44dafb6d 100644
--- a/gnome-base/nautilus/nautilus-2.22.5.1.ebuild
+++ b/gnome-base/nautilus/nautilus-2.22.5.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.5.1.ebuild,v 1.1 2008/07/23 20:48:59 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/nautilus-2.22.5.1.ebuild,v 1.2 2008/07/26 22:24:45 eva Exp $
 
 inherit virtualx eutils gnome2
 
@@ -10,7 +10,7 @@ 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 gnome tracker"
+IUSE="beagle gnome"
 
 RDEPEND=">=x11-libs/startup-notification-0.8
 		 >=gnome-base/libbonobo-2.1
@@ -29,7 +29,6 @@ RDEPEND=">=x11-libs/startup-notification-0.8
 			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}
@@ -41,7 +40,7 @@ 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)"
+	G2CONF="--disable-update-mimedb $(use_enable beagle) --disable-tracker"
 }
 
 src_unpack() {