version bump for GNOME 2.20

(Portage version: 2.1.3.11)

4 files changed, 244 insertions, 1 deletions

diff --git a/gnome-base/nautilus/ChangeLog b/gnome-base/nautilus/ChangeLog
index 3de99faca57c..fe9eef224356 100644
--- a/gnome-base/nautilus/ChangeLog
+++ b/gnome-base/nautilus/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for gnome-base/nautilus
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/ChangeLog,v 1.239 2007/09/27 11:52:38 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/ChangeLog,v 1.240 2007/10/03 03:45:41 compnerd Exp $
+
+*nautilus-2.20.0 (03 Oct 2007)
+
+  03 Oct 2007; Saleem Abdulrasool <compnerd@gentoo.org>
+  +files/nautilus-2.19.90-noesd.patch, +nautilus-2.20.0.ebuild:
+  Version bump for GNOME 2.20
 
   27 Sep 2007; Raúl Porcel <armin76@gentoo.org> nautilus-2.18.3.ebuild:
   alpha/ia64 stable wrt #193339
diff --git a/gnome-base/nautilus/files/digest-nautilus-2.20.0 b/gnome-base/nautilus/files/digest-nautilus-2.20.0
new file mode 100644
index 000000000000..3c16cce1c1cb
--- /dev/null
+++ b/gnome-base/nautilus/files/digest-nautilus-2.20.0
@@ -0,0 +1,3 @@
+MD5 3856ec2ffeba786d12f8f6622e398c33 nautilus-2.20.0.tar.bz2 4916284
+RMD160 9eeb18c886795ebbdd6dfc61ccddaee8eab81808 nautilus-2.20.0.tar.bz2 4916284
+SHA256 98f9d9f7bc89db67cbcc4c7d08ec72175b8c9b3eb9489f7869c5cec9f16feb08 nautilus-2.20.0.tar.bz2 4916284
diff --git a/gnome-base/nautilus/files/nautilus-2.19.90-noesd.patch b/gnome-base/nautilus/files/nautilus-2.19.90-noesd.patch
new file mode 100644
index 000000000000..dae6eaf19a41
--- /dev/null
+++ b/gnome-base/nautilus/files/nautilus-2.19.90-noesd.patch
@@ -0,0 +1,155 @@
+diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN nautilus-2.19.90.orig/configure.in nautilus-2.19.90/configure.in
+--- nautilus-2.19.90.orig/configure.in	2007-07-30 21:25:08.000000000 -0400
++++ nautilus-2.19.90/configure.in	2007-08-21 21:23:35.000000000 -0400
+@@ -90,7 +90,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
+@@ -312,6 +311,25 @@ fi
+ 
+ dnl ==========================================================================
+ 
++AM_CONDITIONAL(HAVE_ESOUND, false)
++
++dnl esound checking
++			    			  
++AC_ARG_ENABLE(esound, [  --disable-esound     build without esound support])
++msg_esound=no
++if test "x$enable_esound" != "xno"; then
++	PKG_CHECK_MODULES(ESOUND, esound >= esound_minver, [
++		  	  AM_CONDITIONAL(HAVE_ESOUND, true)
++			  AC_DEFINE(HAVE_ESOUND, 1, [Define to enable esound support])
++			  ]
++                          msg_esound=yes,
++	          	  [AM_CONDITIONAL(HAVE_ESOUND, false)])
++        AC_SUBST(ESOUND_CFLAGS)
++	AC_SUBST(ESOUND_LIBS)
++fi
++
++dnl ==========================================================================
++
+ dnl ****************************
+ dnl *** Check for libselinux ***
+ dnl ****************************
+@@ -404,7 +422,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 gnome-vfs-module-2.0 $EXTRA_CORE_MODULES"
++CORE_MODULES="eel-2.0 librsvg-2.0 bonobo-activation-2.0 libbonobo-2.0 gnome-desktop-2.0 gnome-vfs-module-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"
+diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN nautilus-2.19.90.orig/libnautilus-private/Makefile.am nautilus-2.19.90/libnautilus-private/Makefile.am
+--- nautilus-2.19.90.orig/libnautilus-private/Makefile.am	2007-07-31 22:12:09.000000000 -0400
++++ nautilus-2.19.90/libnautilus-private/Makefile.am	2007-08-21 18:07:29.000000000 -0400
+@@ -10,6 +10,7 @@ INCLUDES = 						\
+ 	$(DISABLE_DEPRECATED_CFLAGS)			\
+ 	$(TRACKER_CFLAGS)				\
+ 	$(BEAGLE_CFLAGS)				\
++	$(ESOUND_CFLAGS)				\
+ 	-DDATADIR=\""$(datadir)"\" 			\
+ 	-DSYSCONFDIR=\""$(sysconfdir)"\" 			\
+ 	-DNAUTILUS_DATADIR=\""$(datadir)/nautilus"\" 	\
+@@ -31,6 +32,7 @@ libnautilus_private_la_LIBADD =		\
+ 	$(SELINUX_LIBS)			\
+ 	$(BEAGLE_LIBS)			\
+ 	$(TRACKER_LIBS)			\
++	$(ESOUND_LIBS)			\
+ 	$(top_builddir)/libnautilus-extension/libnautilus-extension.la \
+ 	$(CORE_LIBS)			\
+ 	$(NULL)
+@@ -49,8 +51,6 @@ marshal_sources = \
+ 
+ libnautilus_private_la_SOURCES = \
+ 	$(nautilus_metafile_server_idl_sources)	\
+-	nautilus-audio-player.c \
+-	nautilus-audio-player.h \
+ 	nautilus-bookmark.c \
+ 	nautilus-bookmark.h \
+ 	nautilus-cell-renderer-pixbuf-emblem.c \
+@@ -228,6 +228,14 @@ if HAVE_TRACKER
+ libnautilus_private_la_SOURCES += $(TRACKER_SOURCES)
+ endif
+ 
++ESOUND_SOURCES = \
++	nautilus-audio-player.c \
++	nautilus-audio-player.h
++
++if HAVE_ESOUND
++libnautilus_private_la_SOURCES += $(ESOUND_SOURCES)
++endif
++
+ $(lib_LTLIBRARIES): $(dependency_static_libs)
+ 
+ $(nautilus_metafile_server_idl_sources): nautilus_metafile_server_idl_stamp
+@@ -264,6 +272,7 @@ EXTRA_DIST = 				\
+ 	nautilus-marshal.list		\
+ 	$(schema_in_files)              \
+ 	$(BEAGLE_SOURCES)		\
++	$(ESOUND_SOURCES)		\
+ 	$(TRACKER_SOURCES)		\
+ 	$(NULL)
+ 
+diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN nautilus-2.19.90.orig/src/file-manager/fm-icon-view.c nautilus-2.19.90/src/file-manager/fm-icon-view.c
+--- nautilus-2.19.90.orig/src/file-manager/fm-icon-view.c	2007-08-13 19:02:33.000000000 -0400
++++ nautilus-2.19.90/src/file-manager/fm-icon-view.c	2007-08-21 21:45:30.000000000 -0400
+@@ -78,7 +78,9 @@
+ #include <sys/types.h>
+ #include <sys/wait.h>
+ #include <unistd.h>
++#ifdef HAVE_ESOUND
+ #include <esd.h>
++#endif
+ 
+ #define USE_OLD_AUDIO_PREVIEW 1
+ #define READ_CHUNK_SIZE 16384
+@@ -1854,7 +1856,7 @@ play_file (gpointer callback_data)
+ 	g_free (mime_type);
+ 
+ 	icon_view->details->audio_preview_timeout = 0;
+-#else
++#elif HAVE_ESOUND
+ 	char *file_path, *file_uri, *mime_type;
+ 	gboolean is_mp3;
+ 	FMIconView *icon_view;
+@@ -1899,7 +1901,7 @@ preview_audio (FMIconView *icon_view, Na
+ 		waitpid (audio_preview_pid, NULL, 0);
+ 		audio_preview_pid = 0;
+ 	}
+-#else
++#elif HAVE_ESOUND
+ 	if (icon_view->details->audio_player_data != NULL) {
+ 		nautilus_audio_player_stop (icon_view->details->audio_player_data);
+ 		g_free (icon_view->details->audio_player_data);
+@@ -1915,7 +1917,7 @@ preview_audio (FMIconView *icon_view, Na
+ 		icon_view->details->audio_preview_file = file;
+ #if USE_OLD_AUDIO_PREVIEW			
+ 		icon_view->details->audio_preview_timeout = g_timeout_add (1000, play_file, icon_view);
+-#else
++#elif HAVE_ESOUND
+ 		/* FIXME: Need to kill the existing timeout if there is one? */
+ 		icon_view->details->audio_preview_timeout = g_timeout_add (1000, play_file, icon_view);
+ #endif
+@@ -1961,7 +1963,7 @@ can_play_sound (void)
+ 	if (audio_preview_pid > 0) {
+ 		return TRUE;
+ 	}
+-#endif
++#elif HAVE_ESOUND
+ 
+ 	/* Now check and see if system has audio out capabilites */
+         open_result = esd_open_sound (NULL);
+@@ -1972,6 +1974,8 @@ can_play_sound (void)
+ 	esd_close (open_result);
+ 
+ 	return TRUE;
++#endif
++	return FALSE;
+ }
+ 
+ static int
diff --git a/gnome-base/nautilus/nautilus-2.20.0.ebuild b/gnome-base/nautilus/nautilus-2.20.0.ebuild
new file mode 100644
index 000000000000..5b7c16eb70a1
--- /dev/null
+++ b/gnome-base/nautilus/nautilus-2.20.0.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/nautilus-2.20.0.ebuild,v 1.1 2007/10/03 03:45:41 compnerd 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 esd gnome tracker"
+# cups flac gstreamer mad ogg vorbis
+
+RDEPEND=">=media-libs/libart_lgpl-2.3.10
+	>=gnome-base/libbonobo-2.1
+	>=gnome-base/eel-2.15.92
+	esd? ( >=media-sound/esound-0.2.27 )
+	>=dev-libs/glib-2.13
+	>=gnome-base/gnome-desktop-2.9.91
+	>=gnome-base/libgnome-2.14.0
+	>=gnome-base/libgnomeui-2.6
+	>=gnome-base/gnome-vfs-2.19.3
+	>=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
+	>=x11-libs/startup-notification-0.8
+	>=media-libs/libexif-0.5.12
+	>=gnome-base/gconf-2
+	media-libs/audiofile
+	beagle? ( >=app-misc/beagle-0.0.12 )
+	x86? ( tracker? ( >=app-misc/tracker-0.0.1 ) )
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-proto/xproto
+	virtual/eject"
+#	!gstreamer? ( vorbis? ( media-sound/vorbis-tools ) )
+#	gstreamer? (
+#		>=media-libs/gstreamer-0.8
+#		>=media-libs/gst-plugins-0.8
+#		>=media-plugins/gst-plugins-gnomevfs-0.8
+#		mad? ( >=media-plugins/gst-plugins-mad-0.8 )
+#		ogg? ( >=media-plugins/gst-plugins-ogg-0.8 )
+#		vorbis? ( >=media-plugins/gst-plugins-vorbis-0.8 )
+#		flac? (	>=media-plugins/gst-plugins-flac-0.8 ) )"
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+	>=dev-util/intltool-0.35
+	>=dev-util/pkgconfig-0.9"
+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) $(use_enable esd esound)"
+}
+
+src_unpack() {
+	gnome2_src_unpack
+	epatch "${FILESDIR}/${PN}-2.19.90-noesd.patch"
+
+	eautoreconf
+}
+
+src_test() {
+	addwrite "/root/.gnome2_private"
+	Xmake check || die "Test phase failed"
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+
+	elog "nautilus can use mpg123 (media-sound/mpg123 or media-sound/mpg321)"
+	elog "to preview mp3 files, and ogg123 (media-sound/vorbis-tools) to"
+	elog "preview ogg files.  If you want such previews, emerge those packages"
+}