Update to 2.1.1.

git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@78 df743ca5-7f9a-e211-a948-0013205c9059

12 files changed, 72 insertions, 452 deletions

diff --git a/x11-fm/nautilus/Makefile b/x11-fm/nautilus/Makefile
index 7f971a6a0..0614f36b0 100644
--- a/x11-fm/nautilus/Makefile
+++ b/x11-fm/nautilus/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	nautilus2
-PORTVERSION=	2.1.0
-PORTREVISION=	1
+PORTVERSION=	2.1.1
 CATEGORIES=	x11-fm gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/2$//}/2.1
diff --git a/x11-fm/nautilus/distinfo b/x11-fm/nautilus/distinfo
index f80acbc43..94db5d3ee 100644
--- a/x11-fm/nautilus/distinfo
+++ b/x11-fm/nautilus/distinfo
@@ -1 +1 @@
-MD5 (gnome2/nautilus-2.1.0.tar.bz2) = 6ebdece6686d14640a5b0212420e5f46
+MD5 (gnome2/nautilus-2.1.1.tar.bz2) = 74c845fe31bc76b8a5dbb44d668ff74a
diff --git a/x11-fm/nautilus/files/patch-Makefile.in b/x11-fm/nautilus/files/patch-Makefile.in
index e09fa7ef2..334665c47 100644
--- a/x11-fm/nautilus/files/patch-Makefile.in
+++ b/x11-fm/nautilus/files/patch-Makefile.in
@@ -1,10 +1,11 @@
---- Makefile.in.orig	Sat Sep 14 16:54:42 2002
-+++ Makefile.in	Sat Sep 14 16:55:17 2002
-@@ -161,7 +161,6 @@
- 	libnautilus-private 	\
- 	libnautilus-adapter	\
- 	src 			\
--	test 			\
- 	components		\
- 	po 			\
- 	data 			\
+--- Makefile.in.orig	Mon Oct 14 22:08:24 2002
++++ Makefile.in	Mon Oct 14 22:08:53 2002
+@@ -145,7 +145,7 @@
+ DESKTOP_IN_FILES = nautilus.desktop.in
+ DESKTOP_FILES = $(DESKTOP_IN_FILES:.desktop.in=.desktop)
+ 
+-SUBDIRS =  	libnautilus 			cut-n-paste-code 		libbackground			libnautilus-private 		libnautilus-adapter		src 				test 				components			po 				data 				icons 				docs				$(NULL)
++SUBDIRS =  	libnautilus 			cut-n-paste-code 		libbackground			libnautilus-private 		libnautilus-adapter		src 								components			po 				data 				icons 				docs				$(NULL)
+ 
+ 
+ EXTRA_DIST =  	COPYING.LIB					COPYING-DOCS					HACKING						MAINTAINERS					nautilus.spec.in				nautilus.desktop				nautilus.desktop.in				gnome-starthere-96.png				gnome-starthere.png				ChangeLog-20000414				ChangeLog-20000625				ChangeLog-20000831				ChangeLog-20001018				intltool-extract.in				intltool-merge.in				intltool-update.in				Makefile.shared					add-include-prefix				$(DESKTOP_IN_FILES)				$(DESKTOP_FILES)				$(NULL)
diff --git a/x11-fm/nautilus/files/patch-aa b/x11-fm/nautilus/files/patch-aa
index e3791b933..194bf8905 100644
--- a/x11-fm/nautilus/files/patch-aa
+++ b/x11-fm/nautilus/files/patch-aa
@@ -1,6 +1,6 @@
---- configure.orig	Tue Jul 23 21:46:17 2002
-+++ configure	Tue Jul 23 21:49:20 2002
-@@ -8311,6 +8311,7 @@
+--- configure.orig	Mon Oct 14 06:41:32 2002
++++ configure	Mon Oct 14 22:12:45 2002
+@@ -7484,6 +7484,7 @@
  
  # This can be used to rebuild libtool when needed
  LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
@@ -8,25 +8,24 @@
  
  # Always use our own libtool.
  LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-@@ -13383,7 +13384,7 @@
+@@ -11841,14 +11842,14 @@
  
  LIBNAUTILUS_LIBS="`$PKG_CONFIG --libs $LIBNAUTILUS_MODULES`"
  
 -LIBNAUTILUS_IDL_INCLUDES="`$PKG_CONFIG --variable=idldir $LIBNAUTILUS_MODULES | $srcdir/add-include-prefix`"
 +LIBNAUTILUS_IDL_INCLUDES="`$PKG_CONFIG --variable=idldir $LIBNAUTILUS_MODULES | xargs -n1 echo -n ' -I '`"
  
- 
  CORE_MODULES="eel-2.0 librsvg-2.0 bonobo-activation-2.0 libbonobo-2.0 libbonoboui-2.0 esound gnome-desktop-2.0 $EXTRA_CORE_MODULES"
-@@ -13391,7 +13392,7 @@
+ CORE_CFLAGS="`$PKG_CONFIG --cflags $CORE_MODULES` $x_cflags"
  
  CORE_LIBS="`$PKG_CONFIG --libs $CORE_MODULES` $CDDA_LIBS $LIBJPEG $x_libs"
  
 -CORE_IDL_INCLUDES="`$PKG_CONFIG --variable=idldir $CORE_MODULES | $srcdir/add-include-prefix`"
 +CORE_IDL_INCLUDES="`$PKG_CONFIG --variable=idldir $CORE_MODULES | xargs -n1 echo -n ' -I '`"
  
- 
  COMPONENT_MODULES="eel-2.0 libbonoboui-2.0 gnome-vfs-module-2.0 gnome-desktop-2.0"
-@@ -14291,9 +14292,9 @@
+ COMPONENT_CFLAGS="`$PKG_CONFIG --cflags $COMPONENT_MODULES`"
+@@ -12579,9 +12580,9 @@
  s,@ORBIT_CONFIG@,$ORBIT_CONFIG,;t t
  s,@ORBIT_IDL@,$ORBIT_IDL,;t t
  s,@ORBIT_CFLAGS@,$ORBIT_CFLAGS,;t t
@@ -38,7 +37,7 @@
  s,@GETTEXT_PACKAGE@,$GETTEXT_PACKAGE,;t t
  s,@ALLOCA@,$ALLOCA,;t t
  s,@USE_NLS@,$USE_NLS,;t t
-@@ -14345,24 +14346,24 @@
+@@ -12633,26 +12634,26 @@
  s,@HAVE_JW_FALSE@,$HAVE_JW_FALSE,;t t
  s,@HAVE_JW@,$HAVE_JW,;t t
  s,@MEDUSA_CFLAGS@,$MEDUSA_CFLAGS,;t t
@@ -60,6 +59,8 @@
  s,@MUSIC_COMPONENT_CFLAGS@,$MUSIC_COMPONENT_CFLAGS,;t t
 -s,@MUSIC_COMPONENT_LIBS@,$MUSIC_COMPONENT_LIBS,;t t
 +s~@MUSIC_COMPONENT_LIBS@~$MUSIC_COMPONENT_LIBS~;t t
+ s,@EMBLEM_COMPONENT_CFLAGS@,$EMBLEM_COMPONENT_CFLAGS,;t t
+ s,@EMBLEM_COMPONENT_LIBS@,$EMBLEM_COMPONENT_LIBS,;t t
  s,@DISABLE_DEPRECATED_CFLAGS@,$DISABLE_DEPRECATED_CFLAGS,;t t
  s,@ENABLE_HARDWARE_VIEW_TRUE@,$ENABLE_HARDWARE_VIEW_TRUE,;t t
  s,@ENABLE_HARDWARE_VIEW_FALSE@,$ENABLE_HARDWARE_VIEW_FALSE,;t t
diff --git a/x11-fm/nautilus/files/patch-libbackground_Makefile.in b/x11-fm/nautilus/files/patch-libbackground_Makefile.in
index 946b61916..eb7927b81 100644
--- a/x11-fm/nautilus/files/patch-libbackground_Makefile.in
+++ b/x11-fm/nautilus/files/patch-libbackground_Makefile.in
@@ -1,11 +1,11 @@
---- libbackground/Makefile.in.orig	Thu Oct 10 12:36:27 2002
-+++ libbackground/Makefile.in	Thu Oct 10 12:37:27 2002
+--- libbackground/Makefile.in.orig	Mon Oct 14 22:13:17 2002
++++ libbackground/Makefile.in	Mon Oct 14 22:14:31 2002
 @@ -141,7 +141,7 @@
  
- INCLUDES = \
-         -DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\" 		\
--	-DGNOME_ICONDIR=\""${prefix}/share/pixmaps"\"			\
-+	-DGNOME_ICONDIR=\""${datadir}/pixmaps"\"			\
- 	-DG_LOG_DOMAIN=\"capplet-common\"				\
- 	-I$(top_srcdir)/						\
- 	@CAPPLET_CFLAGS@
+ EXTRA_DIST = ChangeLog
+ 
+-INCLUDES =          -DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\" 			-DGNOME_ICONDIR=\""${prefix}/share/pixmaps"\"				-DG_LOG_DOMAIN=\"capplet-common\"					-I$(top_srcdir)/							@CAPPLET_CFLAGS@
++INCLUDES =          -DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\" 			-DGNOME_ICONDIR=\""${datadir}/pixmaps"\"				-DG_LOG_DOMAIN=\"capplet-common\"					-I$(top_srcdir)/							@CAPPLET_CFLAGS@
+ 
+ 
+ noinst_LTLIBRARIES = libbackground.la
diff --git a/x11-fm/nautilus/pkg-plist b/x11-fm/nautilus/pkg-plist
index dac5af0af..08ab89976 100644
--- a/x11-fm/nautilus/pkg-plist
+++ b/x11-fm/nautilus/pkg-plist
@@ -31,6 +31,7 @@ include/libnautilus/nautilus-undo.h
 include/libnautilus/nautilus-view-component.h
 include/libnautilus/nautilus-view-standard-main.h
 include/libnautilus/nautilus-view.h
+lib/bonobo/libnautilus-emblem-view.so
 lib/bonobo/libnautilus-history-view.so
 lib/bonobo/libnautilus-notes-view.so
 lib/bonobo/libnautilus-tree-view.so
@@ -46,6 +47,7 @@ lib/libnautilus.so.2
 libdata/bonobo/servers/Nautilus_ComponentAdapterFactory_std.server
 libdata/bonobo/servers/Nautilus_Control_throbber.server
 libdata/bonobo/servers/Nautilus_View_content-loser.server
+libdata/bonobo/servers/Nautilus_View_emblem.server
 libdata/bonobo/servers/Nautilus_View_history.server
 libdata/bonobo/servers/Nautilus_View_music.server
 libdata/bonobo/servers/Nautilus_View_notes.server
@@ -75,29 +77,6 @@ share/gnome/gnome-2.0/ui/nautilus-sidebar-loser-ui.xml
 share/gnome/idl/nautilus-distributed-undo.idl
 share/gnome/idl/nautilus-view-component.idl
 share/gnome/nautilus/browser.xml
-share/gnome/nautilus/emblems/OK.png
-share/gnome/nautilus/emblems/art.png
-share/gnome/nautilus/emblems/camera.png
-share/gnome/nautilus/emblems/certified.png
-share/gnome/nautilus/emblems/cool.png
-share/gnome/nautilus/emblems/danger.png
-share/gnome/nautilus/emblems/distinguished.png
-share/gnome/nautilus/emblems/documents.png
-share/gnome/nautilus/emblems/draft.png
-share/gnome/nautilus/emblems/erase.png
-share/gnome/nautilus/emblems/favorite.png
-share/gnome/nautilus/emblems/important.png
-share/gnome/nautilus/emblems/mail.png
-share/gnome/nautilus/emblems/multimedia.png
-share/gnome/nautilus/emblems/new.png
-share/gnome/nautilus/emblems/ohno.png
-share/gnome/nautilus/emblems/package.png
-share/gnome/nautilus/emblems/personal.png
-share/gnome/nautilus/emblems/pictures.png
-share/gnome/nautilus/emblems/sound.png
-share/gnome/nautilus/emblems/special.png
-share/gnome/nautilus/emblems/urgent.png
-share/gnome/nautilus/emblems/web.png
 share/gnome/nautilus/filesystem-attributes.xml
 share/gnome/nautilus/glade/nautilus-bookmarks-window.glade
 share/gnome/nautilus/nautilus-extras.placeholder
@@ -150,24 +129,9 @@ share/gnome/pixmaps/nautilus/chit_frame.png
 share/gnome/pixmaps/nautilus/colors.png
 share/gnome/pixmaps/nautilus/cpu.png
 share/gnome/pixmaps/nautilus/crux_eggplant/Search.png
-share/gnome/pixmaps/nautilus/crux_eggplant/backgrounds/background_pattern.png
-share/gnome/pixmaps/nautilus/crux_eggplant/backgrounds/window_pattern.png
 share/gnome/pixmaps/nautilus/crux_eggplant/crux_eggplant.xml
 share/gnome/pixmaps/nautilus/crux_eggplant/decrement-i.png
 share/gnome/pixmaps/nautilus/crux_eggplant/decrement.png
-share/gnome/pixmaps/nautilus/crux_eggplant/emblem-nowrite-72.png
-share/gnome/pixmaps/nautilus/crux_eggplant/emblem-nowrite-96.png
-share/gnome/pixmaps/nautilus/crux_eggplant/emblem-nowrite.png
-share/gnome/pixmaps/nautilus/crux_eggplant/i-directory-12.png
-share/gnome/pixmaps/nautilus/crux_eggplant/i-directory-192.png
-share/gnome/pixmaps/nautilus/crux_eggplant/i-directory-20.png
-share/gnome/pixmaps/nautilus/crux_eggplant/i-directory-24.png
-share/gnome/pixmaps/nautilus/crux_eggplant/i-directory-36.png
-share/gnome/pixmaps/nautilus/crux_eggplant/i-directory-72.png
-share/gnome/pixmaps/nautilus/crux_eggplant/i-directory-96.png
-share/gnome/pixmaps/nautilus/crux_eggplant/i-directory.png
-share/gnome/pixmaps/nautilus/crux_eggplant/i-directory.xml
-share/gnome/pixmaps/nautilus/crux_eggplant/i-regular.xml
 share/gnome/pixmaps/nautilus/crux_eggplant/increment-i.png
 share/gnome/pixmaps/nautilus/crux_eggplant/increment.png
 share/gnome/pixmaps/nautilus/crux_eggplant/number_strip.png
@@ -205,32 +169,9 @@ share/gnome/pixmaps/nautilus/crux_eggplant/throbber/030.png
 share/gnome/pixmaps/nautilus/crux_eggplant/throbber/rest.png
 share/gnome/pixmaps/nautilus/crux_eggplant/zoom_body.png
 share/gnome/pixmaps/nautilus/crux_teal/Search.png
-share/gnome/pixmaps/nautilus/crux_teal/backgrounds/background_pattern.png
-share/gnome/pixmaps/nautilus/crux_teal/backgrounds/window_pattern.png
 share/gnome/pixmaps/nautilus/crux_teal/crux_teal.xml
 share/gnome/pixmaps/nautilus/crux_teal/decrement-i.png
 share/gnome/pixmaps/nautilus/crux_teal/decrement.png
-share/gnome/pixmaps/nautilus/crux_teal/emblem-nowrite-72.png
-share/gnome/pixmaps/nautilus/crux_teal/emblem-nowrite-96.png
-share/gnome/pixmaps/nautilus/crux_teal/emblem-nowrite.png
-share/gnome/pixmaps/nautilus/crux_teal/i-directory-12.png
-share/gnome/pixmaps/nautilus/crux_teal/i-directory-192.png
-share/gnome/pixmaps/nautilus/crux_teal/i-directory-20.png
-share/gnome/pixmaps/nautilus/crux_teal/i-directory-24.png
-share/gnome/pixmaps/nautilus/crux_teal/i-directory-36.png
-share/gnome/pixmaps/nautilus/crux_teal/i-directory-72.png
-share/gnome/pixmaps/nautilus/crux_teal/i-directory-96.png
-share/gnome/pixmaps/nautilus/crux_teal/i-directory.png
-share/gnome/pixmaps/nautilus/crux_teal/i-directory.xml
-share/gnome/pixmaps/nautilus/crux_teal/i-regular-12.png
-share/gnome/pixmaps/nautilus/crux_teal/i-regular-192.png
-share/gnome/pixmaps/nautilus/crux_teal/i-regular-20.png
-share/gnome/pixmaps/nautilus/crux_teal/i-regular-24.png
-share/gnome/pixmaps/nautilus/crux_teal/i-regular-36.png
-share/gnome/pixmaps/nautilus/crux_teal/i-regular-72.png
-share/gnome/pixmaps/nautilus/crux_teal/i-regular-96.png
-share/gnome/pixmaps/nautilus/crux_teal/i-regular.png
-share/gnome/pixmaps/nautilus/crux_teal/i-regular.xml
 share/gnome/pixmaps/nautilus/crux_teal/increment-i.png
 share/gnome/pixmaps/nautilus/crux_teal/increment.png
 share/gnome/pixmaps/nautilus/crux_teal/number_strip.png
@@ -271,115 +212,15 @@ share/gnome/pixmaps/nautilus/decrement.png
 share/gnome/pixmaps/nautilus/default/Search.png
 share/gnome/pixmaps/nautilus/default/decrement.png
 share/gnome/pixmaps/nautilus/default/default.xml
-share/gnome/pixmaps/nautilus/default/desktop-home.png
-share/gnome/pixmaps/nautilus/default/emblem-OK.svg
-share/gnome/pixmaps/nautilus/default/emblem-art.png
-share/gnome/pixmaps/nautilus/default/emblem-broken-link.png
-share/gnome/pixmaps/nautilus/default/emblem-camera.png
-share/gnome/pixmaps/nautilus/default/emblem-certified.svg
-share/gnome/pixmaps/nautilus/default/emblem-cool.svg
-share/gnome/pixmaps/nautilus/default/emblem-danger.svg
-share/gnome/pixmaps/nautilus/default/emblem-distinguished.svg
-share/gnome/pixmaps/nautilus/default/emblem-documents.png
-share/gnome/pixmaps/nautilus/default/emblem-draft.svg
-share/gnome/pixmaps/nautilus/default/emblem-favorite.svg
-share/gnome/pixmaps/nautilus/default/emblem-generic.png
-share/gnome/pixmaps/nautilus/default/emblem-important.svg
-share/gnome/pixmaps/nautilus/default/emblem-mail.png
-share/gnome/pixmaps/nautilus/default/emblem-multimedia.png
-share/gnome/pixmaps/nautilus/default/emblem-new.svg
-share/gnome/pixmaps/nautilus/default/emblem-noread.svg
-share/gnome/pixmaps/nautilus/default/emblem-nowrite.svg
-share/gnome/pixmaps/nautilus/default/emblem-ohno.svg
-share/gnome/pixmaps/nautilus/default/emblem-package.png
-share/gnome/pixmaps/nautilus/default/emblem-personal.svg
-share/gnome/pixmaps/nautilus/default/emblem-pictures.png
-share/gnome/pixmaps/nautilus/default/emblem-sound.png
-share/gnome/pixmaps/nautilus/default/emblem-special.svg
-share/gnome/pixmaps/nautilus/default/emblem-symbolic-link-12.png
-share/gnome/pixmaps/nautilus/default/emblem-symbolic-link-24.png
-share/gnome/pixmaps/nautilus/default/emblem-symbolic-link-36.png
-share/gnome/pixmaps/nautilus/default/emblem-symbolic-link.png
-share/gnome/pixmaps/nautilus/default/emblem-trash.png
-share/gnome/pixmaps/nautilus/default/emblem-urgent.svg
-share/gnome/pixmaps/nautilus/default/emblem-web.png
-share/gnome/pixmaps/nautilus/default/i-bookmark-20.png
-share/gnome/pixmaps/nautilus/default/i-bookmark-missing-20.png
-share/gnome/pixmaps/nautilus/default/i-bookmark-missing.png
-share/gnome/pixmaps/nautilus/default/i-bookmark.png
-share/gnome/pixmaps/nautilus/default/i-broken-image.png
-share/gnome/pixmaps/nautilus/default/i-directory-12.png
-share/gnome/pixmaps/nautilus/default/i-directory-24.png
-share/gnome/pixmaps/nautilus/default/i-directory-36.png
-share/gnome/pixmaps/nautilus/default/i-directory-72.png
-share/gnome/pixmaps/nautilus/default/i-directory-96.png
-share/gnome/pixmaps/nautilus/default/i-directory-accept-12.png
-share/gnome/pixmaps/nautilus/default/i-directory-accept-24.png
-share/gnome/pixmaps/nautilus/default/i-directory-accept-36.png
-share/gnome/pixmaps/nautilus/default/i-directory-accept-72.png
-share/gnome/pixmaps/nautilus/default/i-directory-accept-96.png
-share/gnome/pixmaps/nautilus/default/i-directory-accept.png
-share/gnome/pixmaps/nautilus/default/i-directory-accept.xml
-share/gnome/pixmaps/nautilus/default/i-directory.png
-share/gnome/pixmaps/nautilus/default/i-directory.xml
-share/gnome/pixmaps/nautilus/default/i-regular-12.png
-share/gnome/pixmaps/nautilus/default/i-regular-24.png
-share/gnome/pixmaps/nautilus/default/i-regular-36.png
-share/gnome/pixmaps/nautilus/default/i-regular-72.png
-share/gnome/pixmaps/nautilus/default/i-regular-96.png
-share/gnome/pixmaps/nautilus/default/i-regular.png
-share/gnome/pixmaps/nautilus/default/i-regular.xml
-share/gnome/pixmaps/nautilus/default/i-search-72.png
-share/gnome/pixmaps/nautilus/default/i-spreadsheet.png
-share/gnome/pixmaps/nautilus/default/i-stalled.png
-share/gnome/pixmaps/nautilus/default/i-symlink.png
-share/gnome/pixmaps/nautilus/default/i-web-72.png
 share/gnome/pixmaps/nautilus/default/increment.png
-share/gnome/pixmaps/nautilus/default/loading.png
-share/gnome/pixmaps/nautilus/default/manual.png
 share/gnome/pixmaps/nautilus/default/number_strip.png
 share/gnome/pixmaps/nautilus/default/side_bar_image.png
 share/gnome/pixmaps/nautilus/default/theme_preview.png
-share/gnome/pixmaps/nautilus/default/trash-empty.png
-share/gnome/pixmaps/nautilus/default/trash-full.png
-share/gnome/pixmaps/nautilus/default/trash-empty-192.png
-share/gnome/pixmaps/nautilus/default/trash-full-192.png
 share/gnome/pixmaps/nautilus/default/zoom_body.png
 share/gnome/pixmaps/nautilus/emblems.png
+share/gnome/pixmaps/nautilus/erase.png
 share/gnome/pixmaps/nautilus/gnome/Services.png
-share/gnome/pixmaps/nautilus/gnome/application-x-e-cfg.png
-share/gnome/pixmaps/nautilus/gnome/audio-192.png
-share/gnome/pixmaps/nautilus/gnome/emblem-nowrite-72.png
-share/gnome/pixmaps/nautilus/gnome/emblem-nowrite-96.png
-share/gnome/pixmaps/nautilus/gnome/emblem-nowrite.png
 share/gnome/pixmaps/nautilus/gnome/gnome.xml
-share/gnome/pixmaps/nautilus/gnome/i-core.png
-share/gnome/pixmaps/nautilus/gnome/i-dirclosed.png
-share/gnome/pixmaps/nautilus/gnome/i-directory-12.png
-share/gnome/pixmaps/nautilus/gnome/i-directory-192.png
-share/gnome/pixmaps/nautilus/gnome/i-directory-20.png
-share/gnome/pixmaps/nautilus/gnome/i-directory-24.png
-share/gnome/pixmaps/nautilus/gnome/i-directory-36.png
-share/gnome/pixmaps/nautilus/gnome/i-directory-72.png
-share/gnome/pixmaps/nautilus/gnome/i-directory-96.png
-share/gnome/pixmaps/nautilus/gnome/i-directory-accept-12.png
-share/gnome/pixmaps/nautilus/gnome/i-directory-accept-192.png
-share/gnome/pixmaps/nautilus/gnome/i-directory-accept-20.png
-share/gnome/pixmaps/nautilus/gnome/i-directory-accept-24.png
-share/gnome/pixmaps/nautilus/gnome/i-directory-accept-36.png
-share/gnome/pixmaps/nautilus/gnome/i-directory-accept-72.png
-share/gnome/pixmaps/nautilus/gnome/i-directory-accept-96.png
-share/gnome/pixmaps/nautilus/gnome/i-directory-accept.png
-share/gnome/pixmaps/nautilus/gnome/i-directory.png
-share/gnome/pixmaps/nautilus/gnome/i-executable.png
-share/gnome/pixmaps/nautilus/gnome/i-music-192.png
-share/gnome/pixmaps/nautilus/gnome/i-music.png
-share/gnome/pixmaps/nautilus/gnome/i-nfs.png
-share/gnome/pixmaps/nautilus/gnome/i-regular.png
-share/gnome/pixmaps/nautilus/gnome/i-regular.xml
-share/gnome/pixmaps/nautilus/gnome/i-stalled.png
-share/gnome/pixmaps/nautilus/gnome/linux-penguin.png
-share/gnome/pixmaps/nautilus/gnome/rpm-directory.png
 share/gnome/pixmaps/nautilus/gnome/theme_preview.png
 share/gnome/pixmaps/nautilus/gnome/throbber/001.png
 share/gnome/pixmaps/nautilus/gnome/throbber/002.png
@@ -388,12 +229,6 @@ share/gnome/pixmaps/nautilus/gnome/throbber/004.png
 share/gnome/pixmaps/nautilus/gnome/throbber/005.png
 share/gnome/pixmaps/nautilus/gnome/throbber/006.png
 share/gnome/pixmaps/nautilus/gnome/throbber/rest.png
-share/gnome/pixmaps/nautilus/gnome/trash-empty-192.png
-share/gnome/pixmaps/nautilus/gnome/trash-empty-accept-192.png
-share/gnome/pixmaps/nautilus/gnome/trash-empty-accept.png
-share/gnome/pixmaps/nautilus/gnome/trash-empty.png
-share/gnome/pixmaps/nautilus/gnome/trash-full-192.png
-share/gnome/pixmaps/nautilus/gnome/trash-full.png
 share/gnome/pixmaps/nautilus/increment.png
 share/gnome/pixmaps/nautilus/knob.png
 share/gnome/pixmaps/nautilus/memory_chip.gif
@@ -401,38 +236,12 @@ share/gnome/pixmaps/nautilus/nautilus-launch-icon.png
 share/gnome/pixmaps/nautilus/nautilus-mini-logo.png
 share/gnome/pixmaps/nautilus/note-indicator.png
 share/gnome/pixmaps/nautilus/number_strip.png
-share/gnome/pixmaps/nautilus/side_bar_image.png
-share/gnome/pixmaps/nautilus/sierra/Sierra_desktop.png
 share/gnome/pixmaps/nautilus/sierra/green_weave.png
-share/gnome/pixmaps/nautilus/sierra/i-directory-12.png
-share/gnome/pixmaps/nautilus/sierra/i-directory-24.png
-share/gnome/pixmaps/nautilus/sierra/i-directory-36.png
-share/gnome/pixmaps/nautilus/sierra/i-directory-72.png
-share/gnome/pixmaps/nautilus/sierra/i-directory-96.png
-share/gnome/pixmaps/nautilus/sierra/i-directory-accept-12.png
-share/gnome/pixmaps/nautilus/sierra/i-directory-accept-24.png
-share/gnome/pixmaps/nautilus/sierra/i-directory-accept-36.png
-share/gnome/pixmaps/nautilus/sierra/i-directory-accept-72.png
-share/gnome/pixmaps/nautilus/sierra/i-directory-accept-96.png
-share/gnome/pixmaps/nautilus/sierra/i-directory-accept.png
-share/gnome/pixmaps/nautilus/sierra/i-directory.png
 share/gnome/pixmaps/nautilus/sierra/number_strip.png
 share/gnome/pixmaps/nautilus/sierra/sierra.xml
 share/gnome/pixmaps/nautilus/sierra/theme_preview.png
-share/gnome/pixmaps/nautilus/tahoe/blueridge.png
+share/gnome/pixmaps/nautilus/side_bar_image.png
 share/gnome/pixmaps/nautilus/tahoe/bluewall.png
-share/gnome/pixmaps/nautilus/tahoe/i-directory-12.png
-share/gnome/pixmaps/nautilus/tahoe/i-directory-24.png
-share/gnome/pixmaps/nautilus/tahoe/i-directory-36.png
-share/gnome/pixmaps/nautilus/tahoe/i-directory-72.png
-share/gnome/pixmaps/nautilus/tahoe/i-directory-96.png
-share/gnome/pixmaps/nautilus/tahoe/i-directory-accept-12.png
-share/gnome/pixmaps/nautilus/tahoe/i-directory-accept-24.png
-share/gnome/pixmaps/nautilus/tahoe/i-directory-accept-36.png
-share/gnome/pixmaps/nautilus/tahoe/i-directory-accept-72.png
-share/gnome/pixmaps/nautilus/tahoe/i-directory-accept-96.png
-share/gnome/pixmaps/nautilus/tahoe/i-directory-accept.png
-share/gnome/pixmaps/nautilus/tahoe/i-directory.png
 share/gnome/pixmaps/nautilus/tahoe/number_strip.png
 share/gnome/pixmaps/nautilus/tahoe/tahoe.xml
 share/gnome/pixmaps/nautilus/tahoe/theme_preview.png
diff --git a/x11-fm/nautilus2/Makefile b/x11-fm/nautilus2/Makefile
index 7f971a6a0..0614f36b0 100644
--- a/x11-fm/nautilus2/Makefile
+++ b/x11-fm/nautilus2/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	nautilus2
-PORTVERSION=	2.1.0
-PORTREVISION=	1
+PORTVERSION=	2.1.1
 CATEGORIES=	x11-fm gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/2$//}/2.1
diff --git a/x11-fm/nautilus2/distinfo b/x11-fm/nautilus2/distinfo
index f80acbc43..94db5d3ee 100644
--- a/x11-fm/nautilus2/distinfo
+++ b/x11-fm/nautilus2/distinfo
@@ -1 +1 @@
-MD5 (gnome2/nautilus-2.1.0.tar.bz2) = 6ebdece6686d14640a5b0212420e5f46
+MD5 (gnome2/nautilus-2.1.1.tar.bz2) = 74c845fe31bc76b8a5dbb44d668ff74a
diff --git a/x11-fm/nautilus2/files/patch-Makefile.in b/x11-fm/nautilus2/files/patch-Makefile.in
index e09fa7ef2..334665c47 100644
--- a/x11-fm/nautilus2/files/patch-Makefile.in
+++ b/x11-fm/nautilus2/files/patch-Makefile.in
@@ -1,10 +1,11 @@
---- Makefile.in.orig	Sat Sep 14 16:54:42 2002
-+++ Makefile.in	Sat Sep 14 16:55:17 2002
-@@ -161,7 +161,6 @@
- 	libnautilus-private 	\
- 	libnautilus-adapter	\
- 	src 			\
--	test 			\
- 	components		\
- 	po 			\
- 	data 			\
+--- Makefile.in.orig	Mon Oct 14 22:08:24 2002
++++ Makefile.in	Mon Oct 14 22:08:53 2002
+@@ -145,7 +145,7 @@
+ DESKTOP_IN_FILES = nautilus.desktop.in
+ DESKTOP_FILES = $(DESKTOP_IN_FILES:.desktop.in=.desktop)
+ 
+-SUBDIRS =  	libnautilus 			cut-n-paste-code 		libbackground			libnautilus-private 		libnautilus-adapter		src 				test 				components			po 				data 				icons 				docs				$(NULL)
++SUBDIRS =  	libnautilus 			cut-n-paste-code 		libbackground			libnautilus-private 		libnautilus-adapter		src 								components			po 				data 				icons 				docs				$(NULL)
+ 
+ 
+ EXTRA_DIST =  	COPYING.LIB					COPYING-DOCS					HACKING						MAINTAINERS					nautilus.spec.in				nautilus.desktop				nautilus.desktop.in				gnome-starthere-96.png				gnome-starthere.png				ChangeLog-20000414				ChangeLog-20000625				ChangeLog-20000831				ChangeLog-20001018				intltool-extract.in				intltool-merge.in				intltool-update.in				Makefile.shared					add-include-prefix				$(DESKTOP_IN_FILES)				$(DESKTOP_FILES)				$(NULL)
diff --git a/x11-fm/nautilus2/files/patch-aa b/x11-fm/nautilus2/files/patch-aa
index e3791b933..194bf8905 100644
--- a/x11-fm/nautilus2/files/patch-aa
+++ b/x11-fm/nautilus2/files/patch-aa
@@ -1,6 +1,6 @@
---- configure.orig	Tue Jul 23 21:46:17 2002
-+++ configure	Tue Jul 23 21:49:20 2002
-@@ -8311,6 +8311,7 @@
+--- configure.orig	Mon Oct 14 06:41:32 2002
++++ configure	Mon Oct 14 22:12:45 2002
+@@ -7484,6 +7484,7 @@
  
  # This can be used to rebuild libtool when needed
  LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
@@ -8,25 +8,24 @@
  
  # Always use our own libtool.
  LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-@@ -13383,7 +13384,7 @@
+@@ -11841,14 +11842,14 @@
  
  LIBNAUTILUS_LIBS="`$PKG_CONFIG --libs $LIBNAUTILUS_MODULES`"
  
 -LIBNAUTILUS_IDL_INCLUDES="`$PKG_CONFIG --variable=idldir $LIBNAUTILUS_MODULES | $srcdir/add-include-prefix`"
 +LIBNAUTILUS_IDL_INCLUDES="`$PKG_CONFIG --variable=idldir $LIBNAUTILUS_MODULES | xargs -n1 echo -n ' -I '`"
  
- 
  CORE_MODULES="eel-2.0 librsvg-2.0 bonobo-activation-2.0 libbonobo-2.0 libbonoboui-2.0 esound gnome-desktop-2.0 $EXTRA_CORE_MODULES"
-@@ -13391,7 +13392,7 @@
+ CORE_CFLAGS="`$PKG_CONFIG --cflags $CORE_MODULES` $x_cflags"
  
  CORE_LIBS="`$PKG_CONFIG --libs $CORE_MODULES` $CDDA_LIBS $LIBJPEG $x_libs"
  
 -CORE_IDL_INCLUDES="`$PKG_CONFIG --variable=idldir $CORE_MODULES | $srcdir/add-include-prefix`"
 +CORE_IDL_INCLUDES="`$PKG_CONFIG --variable=idldir $CORE_MODULES | xargs -n1 echo -n ' -I '`"
  
- 
  COMPONENT_MODULES="eel-2.0 libbonoboui-2.0 gnome-vfs-module-2.0 gnome-desktop-2.0"
-@@ -14291,9 +14292,9 @@
+ COMPONENT_CFLAGS="`$PKG_CONFIG --cflags $COMPONENT_MODULES`"
+@@ -12579,9 +12580,9 @@
  s,@ORBIT_CONFIG@,$ORBIT_CONFIG,;t t
  s,@ORBIT_IDL@,$ORBIT_IDL,;t t
  s,@ORBIT_CFLAGS@,$ORBIT_CFLAGS,;t t
@@ -38,7 +37,7 @@
  s,@GETTEXT_PACKAGE@,$GETTEXT_PACKAGE,;t t
  s,@ALLOCA@,$ALLOCA,;t t
  s,@USE_NLS@,$USE_NLS,;t t
-@@ -14345,24 +14346,24 @@
+@@ -12633,26 +12634,26 @@
  s,@HAVE_JW_FALSE@,$HAVE_JW_FALSE,;t t
  s,@HAVE_JW@,$HAVE_JW,;t t
  s,@MEDUSA_CFLAGS@,$MEDUSA_CFLAGS,;t t
@@ -60,6 +59,8 @@
  s,@MUSIC_COMPONENT_CFLAGS@,$MUSIC_COMPONENT_CFLAGS,;t t
 -s,@MUSIC_COMPONENT_LIBS@,$MUSIC_COMPONENT_LIBS,;t t
 +s~@MUSIC_COMPONENT_LIBS@~$MUSIC_COMPONENT_LIBS~;t t
+ s,@EMBLEM_COMPONENT_CFLAGS@,$EMBLEM_COMPONENT_CFLAGS,;t t
+ s,@EMBLEM_COMPONENT_LIBS@,$EMBLEM_COMPONENT_LIBS,;t t
  s,@DISABLE_DEPRECATED_CFLAGS@,$DISABLE_DEPRECATED_CFLAGS,;t t
  s,@ENABLE_HARDWARE_VIEW_TRUE@,$ENABLE_HARDWARE_VIEW_TRUE,;t t
  s,@ENABLE_HARDWARE_VIEW_FALSE@,$ENABLE_HARDWARE_VIEW_FALSE,;t t
diff --git a/x11-fm/nautilus2/files/patch-libbackground_Makefile.in b/x11-fm/nautilus2/files/patch-libbackground_Makefile.in
index 946b61916..eb7927b81 100644
--- a/x11-fm/nautilus2/files/patch-libbackground_Makefile.in
+++ b/x11-fm/nautilus2/files/patch-libbackground_Makefile.in
@@ -1,11 +1,11 @@
---- libbackground/Makefile.in.orig	Thu Oct 10 12:36:27 2002
-+++ libbackground/Makefile.in	Thu Oct 10 12:37:27 2002
+--- libbackground/Makefile.in.orig	Mon Oct 14 22:13:17 2002
++++ libbackground/Makefile.in	Mon Oct 14 22:14:31 2002
 @@ -141,7 +141,7 @@
  
- INCLUDES = \
-         -DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\" 		\
--	-DGNOME_ICONDIR=\""${prefix}/share/pixmaps"\"			\
-+	-DGNOME_ICONDIR=\""${datadir}/pixmaps"\"			\
- 	-DG_LOG_DOMAIN=\"capplet-common\"				\
- 	-I$(top_srcdir)/						\
- 	@CAPPLET_CFLAGS@
+ EXTRA_DIST = ChangeLog
+ 
+-INCLUDES =          -DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\" 			-DGNOME_ICONDIR=\""${prefix}/share/pixmaps"\"				-DG_LOG_DOMAIN=\"capplet-common\"					-I$(top_srcdir)/							@CAPPLET_CFLAGS@
++INCLUDES =          -DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\" 			-DGNOME_ICONDIR=\""${datadir}/pixmaps"\"				-DG_LOG_DOMAIN=\"capplet-common\"					-I$(top_srcdir)/							@CAPPLET_CFLAGS@
+ 
+ 
+ noinst_LTLIBRARIES = libbackground.la
diff --git a/x11-fm/nautilus2/pkg-plist b/x11-fm/nautilus2/pkg-plist
index dac5af0af..08ab89976 100644
--- a/x11-fm/nautilus2/pkg-plist
+++ b/x11-fm/nautilus2/pkg-plist
@@ -31,6 +31,7 @@ include/libnautilus/nautilus-undo.h
 include/libnautilus/nautilus-view-component.h
 include/libnautilus/nautilus-view-standard-main.h
 include/libnautilus/nautilus-view.h
+lib/bonobo/libnautilus-emblem-view.so
 lib/bonobo/libnautilus-history-view.so
 lib/bonobo/libnautilus-notes-view.so
 lib/bonobo/libnautilus-tree-view.so
@@ -46,6 +47,7 @@ lib/libnautilus.so.2
 libdata/bonobo/servers/Nautilus_ComponentAdapterFactory_std.server
 libdata/bonobo/servers/Nautilus_Control_throbber.server
 libdata/bonobo/servers/Nautilus_View_content-loser.server
+libdata/bonobo/servers/Nautilus_View_emblem.server
 libdata/bonobo/servers/Nautilus_View_history.server
 libdata/bonobo/servers/Nautilus_View_music.server
 libdata/bonobo/servers/Nautilus_View_notes.server
@@ -75,29 +77,6 @@ share/gnome/gnome-2.0/ui/nautilus-sidebar-loser-ui.xml
 share/gnome/idl/nautilus-distributed-undo.idl
 share/gnome/idl/nautilus-view-component.idl
 share/gnome/nautilus/browser.xml
-share/gnome/nautilus/emblems/OK.png
-share/gnome/nautilus/emblems/art.png
-share/gnome/nautilus/emblems/camera.png
-share/gnome/nautilus/emblems/certified.png
-share/gnome/nautilus/emblems/cool.png
-share/gnome/nautilus/emblems/danger.png
-share/gnome/nautilus/emblems/distinguished.png
-share/gnome/nautilus/emblems/documents.png
-share/gnome/nautilus/emblems/draft.png
-share/gnome/nautilus/emblems/erase.png
-share/gnome/nautilus/emblems/favorite.png
-share/gnome/nautilus/emblems/important.png
-share/gnome/nautilus/emblems/mail.png
-share/gnome/nautilus/emblems/multimedia.png
-share/gnome/nautilus/emblems/new.png
-share/gnome/nautilus/emblems/ohno.png
-share/gnome/nautilus/emblems/package.png
-share/gnome/nautilus/emblems/personal.png
-share/gnome/nautilus/emblems/pictures.png
-share/gnome/nautilus/emblems/sound.png
-share/gnome/nautilus/emblems/special.png
-share/gnome/nautilus/emblems/urgent.png
-share/gnome/nautilus/emblems/web.png
 share/gnome/nautilus/filesystem-attributes.xml
 share/gnome/nautilus/glade/nautilus-bookmarks-window.glade
 share/gnome/nautilus/nautilus-extras.placeholder
@@ -150,24 +129,9 @@ share/gnome/pixmaps/nautilus/chit_frame.png
 share/gnome/pixmaps/nautilus/colors.png
 share/gnome/pixmaps/nautilus/cpu.png
 share/gnome/pixmaps/nautilus/crux_eggplant/Search.png
-share/gnome/pixmaps/nautilus/crux_eggplant/backgrounds/background_pattern.png
-share/gnome/pixmaps/nautilus/crux_eggplant/backgrounds/window_pattern.png
 share/gnome/pixmaps/nautilus/crux_eggplant/crux_eggplant.xml
 share/gnome/pixmaps/nautilus/crux_eggplant/decrement-i.png
 share/gnome/pixmaps/nautilus/crux_eggplant/decrement.png
-share/gnome/pixmaps/nautilus/crux_eggplant/emblem-nowrite-72.png
-share/gnome/pixmaps/nautilus/crux_eggplant/emblem-nowrite-96.png
-share/gnome/pixmaps/nautilus/crux_eggplant/emblem-nowrite.png
-share/gnome/pixmaps/nautilus/crux_eggplant/i-directory-12.png
-share/gnome/pixmaps/nautilus/crux_eggplant/i-directory-192.png
-share/gnome/pixmaps/nautilus/crux_eggplant/i-directory-20.png
-share/gnome/pixmaps/nautilus/crux_eggplant/i-directory-24.png
-share/gnome/pixmaps/nautilus/crux_eggplant/i-directory-36.png
-share/gnome/pixmaps/nautilus/crux_eggplant/i-directory-72.png
-share/gnome/pixmaps/nautilus/crux_eggplant/i-directory-96.png
-share/gnome/pixmaps/nautilus/crux_eggplant/i-directory.png
-share/gnome/pixmaps/nautilus/crux_eggplant/i-directory.xml
-share/gnome/pixmaps/nautilus/crux_eggplant/i-regular.xml
 share/gnome/pixmaps/nautilus/crux_eggplant/increment-i.png
 share/gnome/pixmaps/nautilus/crux_eggplant/increment.png
 share/gnome/pixmaps/nautilus/crux_eggplant/number_strip.png
@@ -205,32 +169,9 @@ share/gnome/pixmaps/nautilus/crux_eggplant/throbber/030.png
 share/gnome/pixmaps/nautilus/crux_eggplant/throbber/rest.png
 share/gnome/pixmaps/nautilus/crux_eggplant/zoom_body.png
 share/gnome/pixmaps/nautilus/crux_teal/Search.png
-share/gnome/pixmaps/nautilus/crux_teal/backgrounds/background_pattern.png
-share/gnome/pixmaps/nautilus/crux_teal/backgrounds/window_pattern.png
 share/gnome/pixmaps/nautilus/crux_teal/crux_teal.xml
 share/gnome/pixmaps/nautilus/crux_teal/decrement-i.png
 share/gnome/pixmaps/nautilus/crux_teal/decrement.png
-share/gnome/pixmaps/nautilus/crux_teal/emblem-nowrite-72.png
-share/gnome/pixmaps/nautilus/crux_teal/emblem-nowrite-96.png
-share/gnome/pixmaps/nautilus/crux_teal/emblem-nowrite.png
-share/gnome/pixmaps/nautilus/crux_teal/i-directory-12.png
-share/gnome/pixmaps/nautilus/crux_teal/i-directory-192.png
-share/gnome/pixmaps/nautilus/crux_teal/i-directory-20.png
-share/gnome/pixmaps/nautilus/crux_teal/i-directory-24.png
-share/gnome/pixmaps/nautilus/crux_teal/i-directory-36.png
-share/gnome/pixmaps/nautilus/crux_teal/i-directory-72.png
-share/gnome/pixmaps/nautilus/crux_teal/i-directory-96.png
-share/gnome/pixmaps/nautilus/crux_teal/i-directory.png
-share/gnome/pixmaps/nautilus/crux_teal/i-directory.xml
-share/gnome/pixmaps/nautilus/crux_teal/i-regular-12.png
-share/gnome/pixmaps/nautilus/crux_teal/i-regular-192.png
-share/gnome/pixmaps/nautilus/crux_teal/i-regular-20.png
-share/gnome/pixmaps/nautilus/crux_teal/i-regular-24.png
-share/gnome/pixmaps/nautilus/crux_teal/i-regular-36.png
-share/gnome/pixmaps/nautilus/crux_teal/i-regular-72.png
-share/gnome/pixmaps/nautilus/crux_teal/i-regular-96.png
-share/gnome/pixmaps/nautilus/crux_teal/i-regular.png
-share/gnome/pixmaps/nautilus/crux_teal/i-regular.xml
 share/gnome/pixmaps/nautilus/crux_teal/increment-i.png
 share/gnome/pixmaps/nautilus/crux_teal/increment.png
 share/gnome/pixmaps/nautilus/crux_teal/number_strip.png
@@ -271,115 +212,15 @@ share/gnome/pixmaps/nautilus/decrement.png
 share/gnome/pixmaps/nautilus/default/Search.png
 share/gnome/pixmaps/nautilus/default/decrement.png
 share/gnome/pixmaps/nautilus/default/default.xml
-share/gnome/pixmaps/nautilus/default/desktop-home.png
-share/gnome/pixmaps/nautilus/default/emblem-OK.svg
-share/gnome/pixmaps/nautilus/default/emblem-art.png
-share/gnome/pixmaps/nautilus/default/emblem-broken-link.png
-share/gnome/pixmaps/nautilus/default/emblem-camera.png
-share/gnome/pixmaps/nautilus/default/emblem-certified.svg
-share/gnome/pixmaps/nautilus/default/emblem-cool.svg
-share/gnome/pixmaps/nautilus/default/emblem-danger.svg
-share/gnome/pixmaps/nautilus/default/emblem-distinguished.svg
-share/gnome/pixmaps/nautilus/default/emblem-documents.png
-share/gnome/pixmaps/nautilus/default/emblem-draft.svg
-share/gnome/pixmaps/nautilus/default/emblem-favorite.svg
-share/gnome/pixmaps/nautilus/default/emblem-generic.png
-share/gnome/pixmaps/nautilus/default/emblem-important.svg
-share/gnome/pixmaps/nautilus/default/emblem-mail.png
-share/gnome/pixmaps/nautilus/default/emblem-multimedia.png
-share/gnome/pixmaps/nautilus/default/emblem-new.svg
-share/gnome/pixmaps/nautilus/default/emblem-noread.svg
-share/gnome/pixmaps/nautilus/default/emblem-nowrite.svg
-share/gnome/pixmaps/nautilus/default/emblem-ohno.svg
-share/gnome/pixmaps/nautilus/default/emblem-package.png
-share/gnome/pixmaps/nautilus/default/emblem-personal.svg
-share/gnome/pixmaps/nautilus/default/emblem-pictures.png
-share/gnome/pixmaps/nautilus/default/emblem-sound.png
-share/gnome/pixmaps/nautilus/default/emblem-special.svg
-share/gnome/pixmaps/nautilus/default/emblem-symbolic-link-12.png
-share/gnome/pixmaps/nautilus/default/emblem-symbolic-link-24.png
-share/gnome/pixmaps/nautilus/default/emblem-symbolic-link-36.png
-share/gnome/pixmaps/nautilus/default/emblem-symbolic-link.png
-share/gnome/pixmaps/nautilus/default/emblem-trash.png
-share/gnome/pixmaps/nautilus/default/emblem-urgent.svg
-share/gnome/pixmaps/nautilus/default/emblem-web.png
-share/gnome/pixmaps/nautilus/default/i-bookmark-20.png
-share/gnome/pixmaps/nautilus/default/i-bookmark-missing-20.png
-share/gnome/pixmaps/nautilus/default/i-bookmark-missing.png
-share/gnome/pixmaps/nautilus/default/i-bookmark.png
-share/gnome/pixmaps/nautilus/default/i-broken-image.png
-share/gnome/pixmaps/nautilus/default/i-directory-12.png
-share/gnome/pixmaps/nautilus/default/i-directory-24.png
-share/gnome/pixmaps/nautilus/default/i-directory-36.png
-share/gnome/pixmaps/nautilus/default/i-directory-72.png
-share/gnome/pixmaps/nautilus/default/i-directory-96.png
-share/gnome/pixmaps/nautilus/default/i-directory-accept-12.png
-share/gnome/pixmaps/nautilus/default/i-directory-accept-24.png
-share/gnome/pixmaps/nautilus/default/i-directory-accept-36.png
-share/gnome/pixmaps/nautilus/default/i-directory-accept-72.png
-share/gnome/pixmaps/nautilus/default/i-directory-accept-96.png
-share/gnome/pixmaps/nautilus/default/i-directory-accept.png
-share/gnome/pixmaps/nautilus/default/i-directory-accept.xml
-share/gnome/pixmaps/nautilus/default/i-directory.png
-share/gnome/pixmaps/nautilus/default/i-directory.xml
-share/gnome/pixmaps/nautilus/default/i-regular-12.png
-share/gnome/pixmaps/nautilus/default/i-regular-24.png
-share/gnome/pixmaps/nautilus/default/i-regular-36.png
-share/gnome/pixmaps/nautilus/default/i-regular-72.png
-share/gnome/pixmaps/nautilus/default/i-regular-96.png
-share/gnome/pixmaps/nautilus/default/i-regular.png
-share/gnome/pixmaps/nautilus/default/i-regular.xml
-share/gnome/pixmaps/nautilus/default/i-search-72.png
-share/gnome/pixmaps/nautilus/default/i-spreadsheet.png
-share/gnome/pixmaps/nautilus/default/i-stalled.png
-share/gnome/pixmaps/nautilus/default/i-symlink.png
-share/gnome/pixmaps/nautilus/default/i-web-72.png
 share/gnome/pixmaps/nautilus/default/increment.png
-share/gnome/pixmaps/nautilus/default/loading.png
-share/gnome/pixmaps/nautilus/default/manual.png
 share/gnome/pixmaps/nautilus/default/number_strip.png
 share/gnome/pixmaps/nautilus/default/side_bar_image.png
 share/gnome/pixmaps/nautilus/default/theme_preview.png
-share/gnome/pixmaps/nautilus/default/trash-empty.png
-share/gnome/pixmaps/nautilus/default/trash-full.png
-share/gnome/pixmaps/nautilus/default/trash-empty-192.png
-share/gnome/pixmaps/nautilus/default/trash-full-192.png
 share/gnome/pixmaps/nautilus/default/zoom_body.png
 share/gnome/pixmaps/nautilus/emblems.png
+share/gnome/pixmaps/nautilus/erase.png
 share/gnome/pixmaps/nautilus/gnome/Services.png
-share/gnome/pixmaps/nautilus/gnome/application-x-e-cfg.png
-share/gnome/pixmaps/nautilus/gnome/audio-192.png
-share/gnome/pixmaps/nautilus/gnome/emblem-nowrite-72.png
-share/gnome/pixmaps/nautilus/gnome/emblem-nowrite-96.png
-share/gnome/pixmaps/nautilus/gnome/emblem-nowrite.png
 share/gnome/pixmaps/nautilus/gnome/gnome.xml
-share/gnome/pixmaps/nautilus/gnome/i-core.png
-share/gnome/pixmaps/nautilus/gnome/i-dirclosed.png
-share/gnome/pixmaps/nautilus/gnome/i-directory-12.png
-share/gnome/pixmaps/nautilus/gnome/i-directory-192.png
-share/gnome/pixmaps/nautilus/gnome/i-directory-20.png
-share/gnome/pixmaps/nautilus/gnome/i-directory-24.png
-share/gnome/pixmaps/nautilus/gnome/i-directory-36.png
-share/gnome/pixmaps/nautilus/gnome/i-directory-72.png
-share/gnome/pixmaps/nautilus/gnome/i-directory-96.png
-share/gnome/pixmaps/nautilus/gnome/i-directory-accept-12.png
-share/gnome/pixmaps/nautilus/gnome/i-directory-accept-192.png
-share/gnome/pixmaps/nautilus/gnome/i-directory-accept-20.png
-share/gnome/pixmaps/nautilus/gnome/i-directory-accept-24.png
-share/gnome/pixmaps/nautilus/gnome/i-directory-accept-36.png
-share/gnome/pixmaps/nautilus/gnome/i-directory-accept-72.png
-share/gnome/pixmaps/nautilus/gnome/i-directory-accept-96.png
-share/gnome/pixmaps/nautilus/gnome/i-directory-accept.png
-share/gnome/pixmaps/nautilus/gnome/i-directory.png
-share/gnome/pixmaps/nautilus/gnome/i-executable.png
-share/gnome/pixmaps/nautilus/gnome/i-music-192.png
-share/gnome/pixmaps/nautilus/gnome/i-music.png
-share/gnome/pixmaps/nautilus/gnome/i-nfs.png
-share/gnome/pixmaps/nautilus/gnome/i-regular.png
-share/gnome/pixmaps/nautilus/gnome/i-regular.xml
-share/gnome/pixmaps/nautilus/gnome/i-stalled.png
-share/gnome/pixmaps/nautilus/gnome/linux-penguin.png
-share/gnome/pixmaps/nautilus/gnome/rpm-directory.png
 share/gnome/pixmaps/nautilus/gnome/theme_preview.png
 share/gnome/pixmaps/nautilus/gnome/throbber/001.png
 share/gnome/pixmaps/nautilus/gnome/throbber/002.png
@@ -388,12 +229,6 @@ share/gnome/pixmaps/nautilus/gnome/throbber/004.png
 share/gnome/pixmaps/nautilus/gnome/throbber/005.png
 share/gnome/pixmaps/nautilus/gnome/throbber/006.png
 share/gnome/pixmaps/nautilus/gnome/throbber/rest.png
-share/gnome/pixmaps/nautilus/gnome/trash-empty-192.png
-share/gnome/pixmaps/nautilus/gnome/trash-empty-accept-192.png
-share/gnome/pixmaps/nautilus/gnome/trash-empty-accept.png
-share/gnome/pixmaps/nautilus/gnome/trash-empty.png
-share/gnome/pixmaps/nautilus/gnome/trash-full-192.png
-share/gnome/pixmaps/nautilus/gnome/trash-full.png
 share/gnome/pixmaps/nautilus/increment.png
 share/gnome/pixmaps/nautilus/knob.png
 share/gnome/pixmaps/nautilus/memory_chip.gif
@@ -401,38 +236,12 @@ share/gnome/pixmaps/nautilus/nautilus-launch-icon.png
 share/gnome/pixmaps/nautilus/nautilus-mini-logo.png
 share/gnome/pixmaps/nautilus/note-indicator.png
 share/gnome/pixmaps/nautilus/number_strip.png
-share/gnome/pixmaps/nautilus/side_bar_image.png
-share/gnome/pixmaps/nautilus/sierra/Sierra_desktop.png
 share/gnome/pixmaps/nautilus/sierra/green_weave.png
-share/gnome/pixmaps/nautilus/sierra/i-directory-12.png
-share/gnome/pixmaps/nautilus/sierra/i-directory-24.png
-share/gnome/pixmaps/nautilus/sierra/i-directory-36.png
-share/gnome/pixmaps/nautilus/sierra/i-directory-72.png
-share/gnome/pixmaps/nautilus/sierra/i-directory-96.png
-share/gnome/pixmaps/nautilus/sierra/i-directory-accept-12.png
-share/gnome/pixmaps/nautilus/sierra/i-directory-accept-24.png
-share/gnome/pixmaps/nautilus/sierra/i-directory-accept-36.png
-share/gnome/pixmaps/nautilus/sierra/i-directory-accept-72.png
-share/gnome/pixmaps/nautilus/sierra/i-directory-accept-96.png
-share/gnome/pixmaps/nautilus/sierra/i-directory-accept.png
-share/gnome/pixmaps/nautilus/sierra/i-directory.png
 share/gnome/pixmaps/nautilus/sierra/number_strip.png
 share/gnome/pixmaps/nautilus/sierra/sierra.xml
 share/gnome/pixmaps/nautilus/sierra/theme_preview.png
-share/gnome/pixmaps/nautilus/tahoe/blueridge.png
+share/gnome/pixmaps/nautilus/side_bar_image.png
 share/gnome/pixmaps/nautilus/tahoe/bluewall.png
-share/gnome/pixmaps/nautilus/tahoe/i-directory-12.png
-share/gnome/pixmaps/nautilus/tahoe/i-directory-24.png
-share/gnome/pixmaps/nautilus/tahoe/i-directory-36.png
-share/gnome/pixmaps/nautilus/tahoe/i-directory-72.png
-share/gnome/pixmaps/nautilus/tahoe/i-directory-96.png
-share/gnome/pixmaps/nautilus/tahoe/i-directory-accept-12.png
-share/gnome/pixmaps/nautilus/tahoe/i-directory-accept-24.png
-share/gnome/pixmaps/nautilus/tahoe/i-directory-accept-36.png
-share/gnome/pixmaps/nautilus/tahoe/i-directory-accept-72.png
-share/gnome/pixmaps/nautilus/tahoe/i-directory-accept-96.png
-share/gnome/pixmaps/nautilus/tahoe/i-directory-accept.png
-share/gnome/pixmaps/nautilus/tahoe/i-directory.png
 share/gnome/pixmaps/nautilus/tahoe/number_strip.png
 share/gnome/pixmaps/nautilus/tahoe/tahoe.xml
 share/gnome/pixmaps/nautilus/tahoe/theme_preview.png