bump to 2.22.2. Bug fixing and startup enhancements.

Package-Manager: portage-2.1.5_rc2

4 files changed, 127 insertions, 5 deletions

diff --git a/gnome-base/nautilus/ChangeLog b/gnome-base/nautilus/ChangeLog
index 524fd3d35d7b..032465b93ccb 100644
--- a/gnome-base/nautilus/ChangeLog
+++ b/gnome-base/nautilus/ChangeLog
@@ -1,6 +1,12 @@
 # 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.260 2008/04/04 20:29:48 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/ChangeLog,v 1.261 2008/04/09 23:32:03 eva Exp $
+
+*nautilus-2.22.2 (10 Apr 2008)
+
+  10 Apr 2008; Gilles Dartiguelongue <eva@gentoo.org>
+  +files/nautilus-2.22.2-no-esound.patch, +nautilus-2.22.2.ebuild:
+  bump to 2.22.2. Bug fixing and startup enhancements.
 
   04 Apr 2008; Gilles Dartiguelongue <eva@gentoo.org>
   -nautilus-2.22.0.ebuild, nautilus-2.22.1.ebuild:
diff --git a/gnome-base/nautilus/Manifest b/gnome-base/nautilus/Manifest
index e075e903c1f1..c1d52bdc9cf2 100644
--- a/gnome-base/nautilus/Manifest
+++ b/gnome-base/nautilus/Manifest
@@ -8,21 +8,24 @@ AUX nautilus-2.20.0-small-font-crasher.patch 492 RMD160 0ee8dacd7d83db84864c477b
 AUX nautilus-2.20.0-sound-preview-cleanup.patch 13013 RMD160 19f50049d52145d2f80326d96ededbed9f895671 SHA1 8a6e8e2340c9c5f64a02438ed5025fe3a5c2b164 SHA256 6b0e7f8c5b50b5ef54d6a075c90324be9b18164aa951fca612c58d31c7d63a38
 AUX nautilus-2.20.0-statfs.patch 470 RMD160 860c6179e0b2796b1bb44fb53caf38b243602de7 SHA1 586f1e438c8ffcd176b056992679b5c6e94fd533 SHA256 0d5cb2624ed32a1eb37ae9619604b2935ba56e22453aeabda36df75b79772623
 AUX nautilus-2.20.0-thumbnail-flashing.patch 4787 RMD160 d9cf1ace6cf1f367cfdd66317ee1bbfb96957b76 SHA1 db9503f51aefbe541aeb39541733543dcea551f2 SHA256 bec9d2a07c8b04137b50591b753e4913583dc673c889f44de40ddbadff5ab6ec
+AUX nautilus-2.22.2-no-esound.patch 2035 RMD160 6aa244b5962384a895bcbab386feb5058dc8e0fe SHA1 c134acdbfb566126a1788f1fc3fefdb6505bab1e SHA256 6abc000bf8f9e54b579ece3bf7ce2dbe7b1e4e660c79f0b148106d840e5d76d5
 DIST nautilus-2.18.1.tar.bz2 4325821 RMD160 3cdef422befc96bbd921f2f4788d302cf9249204 SHA1 c1922ebee16a5ecb51f27af24e19142b48120820 SHA256 b42e90788c14a4aecd748963135bf54fef20d7a19a448f7393d446028f73ec3b
 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.1.tar.bz2 5139139 RMD160 2781ffc661f3b5ff44f63ade9258496ea791096b SHA1 c740ebba280faf5756b4a08303a8aebf50046638 SHA256 02792c5a9341bfe97859778f653147ef00d8637028e714bb21328a67d8844bab
+DIST nautilus-2.22.2.tar.bz2 5032921 RMD160 26787ee2e62e49acf5a03d4792e16a00034dd751 SHA1 fe20dfbfbd21e06dcb4fbb471cdb957c2d96f5cf SHA256 0abf783260ce3c60ffe28c14cb932384b2a1f67b92ba1a1d017a1e8880d05433
 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.1.ebuild 1931 RMD160 0d82d123e69a48e327faec70fcf82c0183bb0e03 SHA1 5cf69a84962e9c46ca68332db1571b3647ca899c SHA256 daa6ede365e48ee4bec509dd8557ef7a4463569cd1a07cf2af50314faa7743ef
-MISC ChangeLog 35638 RMD160 df0a166faf91ec0f9787a036a723a1455082d74f SHA1 1062f83bffa180cdf387fc6cfba3be8790e3dcec SHA256 ff29a3cb01d79a551f658d4e637edc44c2598c31ef7c399b1ce5bf5bbd2d7dff
+EBUILD nautilus-2.22.2.ebuild 1854 RMD160 f56cb9680f8333ec53bc56c370aed2186883ddb2 SHA1 d593dcf850d234f841635d7755de3c3a56a6bcf9 SHA256 ea08d68ff6b08736b12431752d8c2858dd22c26138b4601de35e9acae1f7b239
+MISC ChangeLog 35847 RMD160 af8fd11ba48b4c0f832d282037184a3dd40138f5 SHA1 e5b531a646648b13812134e7059f16a753624ab3 SHA256 d452161b0a96e50538077d47f0a945c97aaf997b911d33ed7ca5d8d3d4322274
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkf2q+cACgkQ1fmVwcYIWAZ6fwCeLhhwIFWr7AKH8VdlyEPcg9XY
-yBMAn1T5WhdvO+2peyCHQw4LOZlWf1Yd
-=Xrt7
+iEYEARECAAYFAkf9biMACgkQ1fmVwcYIWAbv6QCgi5OxaLWYL94pnRChOzTWvIcT
+G9sAn1cEWufpKsEgGotjSnD3Oo8/0P/7
+=XADv
 -----END PGP SIGNATURE-----
diff --git a/gnome-base/nautilus/files/nautilus-2.22.2-no-esound.patch b/gnome-base/nautilus/files/nautilus-2.22.2-no-esound.patch
new file mode 100644
index 000000000000..ffd656f3ccbe
--- /dev/null
+++ b/gnome-base/nautilus/files/nautilus-2.22.2-no-esound.patch
@@ -0,0 +1,45 @@
+--- configure.in	2008-01-08 04:29:18.000000000 -0500
++++ configure.in	2008-01-08 12:06:58.000000000 -0500
+@@ -5,7 +5,6 @@ dnl ====================================
+ m4_define(bonobo_activation_minver,    2.1.0)
+ m4_define(bonobo_minver,               2.1.0)
+ m4_define(eel_minver,                  2.21.90)
+-m4_define(esound_minver,               0.2.27)
+ m4_define(glib_minver,                 2.15.6)
+ m4_define(gnome_desktop_minver,        2.9.91)
+ m4_define(gnome_minver,                2.14.0)
+@@ -43,7 +42,6 @@ AC_SUBST([ACLOCAL_AMFLAGS], ["\${ACLOCAL
+ AC_SUBST(BONOBO_ACTIVATION_REQUIRED, [bonobo_activation_minver])
+ AC_SUBST(BONOBO_REQUIRED, [bonobo_minver])
+ AC_SUBST(EEL_REQUIRED, [eel_minver])
+-AC_SUBST(ESOUND_REQUIRED, [esound_minver])
+ AC_SUBST(GLIB_REQUIRED [glib_minver])
+ AC_SUBST(GNOME_DESKTOP_REQUIRED, [gnome_desktop_minver])
+ AC_SUBST(GNOME_REQUIRED, [gnome_minver])
+@@ -87,7 +85,6 @@ fi
+ AC_SUBST(STARTUP_NOTIFICATION_PACKAGE)
+ 
+ PKG_CHECK_MODULES(ALL, [
+-	esound			>= esound_minver
+ 	bonobo-activation-2.0	>= bonobo_activation_minver
+ 	eel-2.0			>= eel_minver
+ 	glib-2.0		>= glib_minver
+@@ -403,7 +403,7 @@ LIBNAUTILUS_EXTENSION_LIBS="`$PKG_CONFIG
+ AC_SUBST(LIBNAUTILUS_EXTENSION_LIBS)
+ 
+ dnl core nautilus (must list bonobo-activation and libbonobo because idldir does not respect "requires")
+-CORE_MODULES="eel-2.0 librsvg-2.0 bonobo-activation-2.0 libbonobo-2.0 esound gnome-desktop-2.0 gio-2.0 gio-unix-2.0 $EXTRA_CORE_MODULES"
++CORE_MODULES="eel-2.0 librsvg-2.0 bonobo-activation-2.0 libbonobo-2.0 gnome-desktop-2.0 gio-2.0 gio-unix-2.0 $EXTRA_CORE_MODULES"
+ CORE_CFLAGS="`$PKG_CONFIG --cflags $CORE_MODULES` $x_cflags $WARNING_CFLAGS"
+ AC_SUBST(CORE_CFLAGS)
+ CORE_LIBS="`$PKG_CONFIG --libs $CORE_MODULES` $x_libs"
+--- src/file-manager/fm-icon-view.c	2007-12-14 05:23:13.000000000 -0500
++++ src/file-manager/fm-icon-view.c	2008-01-08 12:06:32.000000000 -0500
+@@ -68,7 +68,6 @@
+ #include <sys/types.h>
+ #include <sys/wait.h>
+ #include <unistd.h>
+-#include <esd.h>
+ 
+ #include "nautilus-audio-mime-types.h"
+ 
diff --git a/gnome-base/nautilus/nautilus-2.22.2.ebuild b/gnome-base/nautilus/nautilus-2.22.2.ebuild
new file mode 100644
index 000000000000..ef7d1d48cfc7
--- /dev/null
+++ b/gnome-base/nautilus/nautilus-2.22.2.ebuild
@@ -0,0 +1,68 @@
+# 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.2.ebuild,v 1.1 2008/04/09 23:32:03 eva Exp $
+
+inherit virtualx eutils gnome2 autotools
+
+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
+
+	# Disable compilation with esound
+	epatch "${FILESDIR}/${P}-no-esound.patch"
+
+	eautoreconf
+}
+
+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"
+}