Update to 0.8.5.

6 files changed, 14 insertions, 64 deletions

diff --git a/audio/rhythmbox-devel/Makefile b/audio/rhythmbox-devel/Makefile
index e5de0f5c8361..90d4d09aaf18 100644
--- a/audio/rhythmbox-devel/Makefile
+++ b/audio/rhythmbox-devel/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	rhythmbox
-PORTVERSION=	0.8.4
-PORTREVISION=	1
+PORTVERSION=	0.8.5
 CATEGORIES=	audio gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/0.8
diff --git a/audio/rhythmbox-devel/distinfo b/audio/rhythmbox-devel/distinfo
index 8bfcc7f5b944..7aa75942399c 100644
--- a/audio/rhythmbox-devel/distinfo
+++ b/audio/rhythmbox-devel/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/rhythmbox-0.8.4.tar.bz2) = 937ce7843edb40e0d43432638da236c5
-SIZE (gnome2/rhythmbox-0.8.4.tar.bz2) = 1778890
+MD5 (gnome2/rhythmbox-0.8.5.tar.bz2) = 50d2ebb835f89e01c6fb0531d65c1341
+SIZE (gnome2/rhythmbox-0.8.5.tar.bz2) = 1787019
diff --git a/audio/rhythmbox-devel/pkg-plist b/audio/rhythmbox-devel/pkg-plist
index f77fdfa52e41..b765f405e4eb 100644
--- a/audio/rhythmbox-devel/pkg-plist
+++ b/audio/rhythmbox-devel/pkg-plist
@@ -1,19 +1,7 @@
 bin/rhythmbox
-etc/gconf/gconf.xml.defaults/apps/rhythmbox/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/rhythmbox/state/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/rhythmbox/state/iradio/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/rhythmbox/state/library/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/rhythmbox/state/load_failure_dialog/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/rhythmbox/ui/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/rhythmbox/ui/library/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/rhythmbox/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/rhythmbox/state/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/rhythmbox/state/iradio/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/rhythmbox/state/library/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/rhythmbox/state/load_failure_dialog/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/rhythmbox/ui/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/rhythmbox/ui/library/%gconf.xml
+@unexec GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/rhythmbox.schemas > /dev/null || /usr/bin/true
 etc/gconf/schemas/rhythmbox.schemas
+@exec GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/rhythmbox.schemas > /dev/null || /usr/bin/true
 lib/bonobo/librb-nautilus-context-menu.so
 libdata/bonobo/servers/GNOME_Rhythmbox.server
 libdata/bonobo/servers/Rhythmbox_Nautilus_Context_Menu.server
@@ -126,6 +114,7 @@ share/locale/ga/LC_MESSAGES/rhythmbox.mo
 share/locale/hr/LC_MESSAGES/rhythmbox.mo
 share/locale/hu/LC_MESSAGES/rhythmbox.mo
 share/locale/id/LC_MESSAGES/rhythmbox.mo
+share/locale/is/LC_MESSAGES/rhythmbox.mo
 share/locale/it/LC_MESSAGES/rhythmbox.mo
 share/locale/ja/LC_MESSAGES/rhythmbox.mo
 share/locale/ko/LC_MESSAGES/rhythmbox.mo
@@ -141,6 +130,7 @@ share/locale/pt/LC_MESSAGES/rhythmbox.mo
 share/locale/pt_BR/LC_MESSAGES/rhythmbox.mo
 share/locale/ro/LC_MESSAGES/rhythmbox.mo
 share/locale/ru/LC_MESSAGES/rhythmbox.mo
+share/locale/sk/LC_MESSAGES/rhythmbox.mo
 share/locale/sr/LC_MESSAGES/rhythmbox.mo
 share/locale/sr@Latn/LC_MESSAGES/rhythmbox.mo
 share/locale/sv/LC_MESSAGES/rhythmbox.mo
@@ -156,18 +146,4 @@ share/locale/zh_TW/LC_MESSAGES/rhythmbox.mo
 @dirrm share/gnome/help/rhythmbox/C/figures
 @dirrm share/gnome/help/rhythmbox/C
 @dirrm share/gnome/help/rhythmbox
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/rhythmbox/ui/library
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/rhythmbox/ui
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/rhythmbox/state/load_failure_dialog
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/rhythmbox/state/library
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/rhythmbox/state/iradio
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/rhythmbox/state
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/rhythmbox
-@dirrm etc/gconf/gconf.xml.defaults/apps/rhythmbox/ui/library
-@dirrm etc/gconf/gconf.xml.defaults/apps/rhythmbox/ui
-@dirrm etc/gconf/gconf.xml.defaults/apps/rhythmbox/state/load_failure_dialog
-@dirrm etc/gconf/gconf.xml.defaults/apps/rhythmbox/state/library
-@dirrm etc/gconf/gconf.xml.defaults/apps/rhythmbox/state/iradio
-@dirrm etc/gconf/gconf.xml.defaults/apps/rhythmbox/state
-@dirrm etc/gconf/gconf.xml.defaults/apps/rhythmbox
 @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/rhythmbox/rhythmbox-C.omf 2>/dev/null || /usr/bin/true
diff --git a/audio/rhythmbox/Makefile b/audio/rhythmbox/Makefile
index e5de0f5c8361..90d4d09aaf18 100644
--- a/audio/rhythmbox/Makefile
+++ b/audio/rhythmbox/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	rhythmbox
-PORTVERSION=	0.8.4
-PORTREVISION=	1
+PORTVERSION=	0.8.5
 CATEGORIES=	audio gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/0.8
diff --git a/audio/rhythmbox/distinfo b/audio/rhythmbox/distinfo
index 8bfcc7f5b944..7aa75942399c 100644
--- a/audio/rhythmbox/distinfo
+++ b/audio/rhythmbox/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/rhythmbox-0.8.4.tar.bz2) = 937ce7843edb40e0d43432638da236c5
-SIZE (gnome2/rhythmbox-0.8.4.tar.bz2) = 1778890
+MD5 (gnome2/rhythmbox-0.8.5.tar.bz2) = 50d2ebb835f89e01c6fb0531d65c1341
+SIZE (gnome2/rhythmbox-0.8.5.tar.bz2) = 1787019
diff --git a/audio/rhythmbox/pkg-plist b/audio/rhythmbox/pkg-plist
index f77fdfa52e41..b765f405e4eb 100644
--- a/audio/rhythmbox/pkg-plist
+++ b/audio/rhythmbox/pkg-plist
@@ -1,19 +1,7 @@
 bin/rhythmbox
-etc/gconf/gconf.xml.defaults/apps/rhythmbox/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/rhythmbox/state/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/rhythmbox/state/iradio/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/rhythmbox/state/library/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/rhythmbox/state/load_failure_dialog/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/rhythmbox/ui/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/rhythmbox/ui/library/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/rhythmbox/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/rhythmbox/state/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/rhythmbox/state/iradio/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/rhythmbox/state/library/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/rhythmbox/state/load_failure_dialog/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/rhythmbox/ui/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/rhythmbox/ui/library/%gconf.xml
+@unexec GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/rhythmbox.schemas > /dev/null || /usr/bin/true
 etc/gconf/schemas/rhythmbox.schemas
+@exec GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/rhythmbox.schemas > /dev/null || /usr/bin/true
 lib/bonobo/librb-nautilus-context-menu.so
 libdata/bonobo/servers/GNOME_Rhythmbox.server
 libdata/bonobo/servers/Rhythmbox_Nautilus_Context_Menu.server
@@ -126,6 +114,7 @@ share/locale/ga/LC_MESSAGES/rhythmbox.mo
 share/locale/hr/LC_MESSAGES/rhythmbox.mo
 share/locale/hu/LC_MESSAGES/rhythmbox.mo
 share/locale/id/LC_MESSAGES/rhythmbox.mo
+share/locale/is/LC_MESSAGES/rhythmbox.mo
 share/locale/it/LC_MESSAGES/rhythmbox.mo
 share/locale/ja/LC_MESSAGES/rhythmbox.mo
 share/locale/ko/LC_MESSAGES/rhythmbox.mo
@@ -141,6 +130,7 @@ share/locale/pt/LC_MESSAGES/rhythmbox.mo
 share/locale/pt_BR/LC_MESSAGES/rhythmbox.mo
 share/locale/ro/LC_MESSAGES/rhythmbox.mo
 share/locale/ru/LC_MESSAGES/rhythmbox.mo
+share/locale/sk/LC_MESSAGES/rhythmbox.mo
 share/locale/sr/LC_MESSAGES/rhythmbox.mo
 share/locale/sr@Latn/LC_MESSAGES/rhythmbox.mo
 share/locale/sv/LC_MESSAGES/rhythmbox.mo
@@ -156,18 +146,4 @@ share/locale/zh_TW/LC_MESSAGES/rhythmbox.mo
 @dirrm share/gnome/help/rhythmbox/C/figures
 @dirrm share/gnome/help/rhythmbox/C
 @dirrm share/gnome/help/rhythmbox
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/rhythmbox/ui/library
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/rhythmbox/ui
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/rhythmbox/state/load_failure_dialog
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/rhythmbox/state/library
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/rhythmbox/state/iradio
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/rhythmbox/state
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/rhythmbox
-@dirrm etc/gconf/gconf.xml.defaults/apps/rhythmbox/ui/library
-@dirrm etc/gconf/gconf.xml.defaults/apps/rhythmbox/ui
-@dirrm etc/gconf/gconf.xml.defaults/apps/rhythmbox/state/load_failure_dialog
-@dirrm etc/gconf/gconf.xml.defaults/apps/rhythmbox/state/library
-@dirrm etc/gconf/gconf.xml.defaults/apps/rhythmbox/state/iradio
-@dirrm etc/gconf/gconf.xml.defaults/apps/rhythmbox/state
-@dirrm etc/gconf/gconf.xml.defaults/apps/rhythmbox
 @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/rhythmbox/rhythmbox-C.omf 2>/dev/null || /usr/bin/true