Update the gnome, gnome-base and gnome-devel meta-packages to 2.10.0.

3 files changed, 86 insertions, 81 deletions

diff --git a/meta-pkgs/gnome-base/Makefile b/meta-pkgs/gnome-base/Makefile
index 94f93b37666..cf2880779b8 100644
--- a/meta-pkgs/gnome-base/Makefile
+++ b/meta-pkgs/gnome-base/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.16 2005/02/26 17:27:44 jmmv Exp $
+# $NetBSD: Makefile,v 1.17 2005/03/22 16:43:56 jmmv Exp $
 
-DISTNAME=	gnome-base-2.8.3
+DISTNAME=	gnome-base-2.10.0
 CATEGORIES=	meta-pkgs x11 gnome
 MASTER_SITES=	# empty
 DISTFILES=	# empty
@@ -22,59 +22,62 @@ COMMENT=	Meta-package for basic components of the GNOME desktop
 #DEPENDS+=	pkgconfig>=0.15.0:../../devel/pkgconfig
 #DEPENDS+=	intltool>=0.33:../../textproc/intltool
 DEPENDS+=	startup-notification>=0.8:../../x11/startup-notification
-DEPENDS+=	glib2>=2.4.8:../../devel/glib2
-DEPENDS+=	atk>=1.8.0:../../devel/atk
-DEPENDS+=	pango>=1.6.0:../../devel/pango
-DEPENDS+=	gtk2+>=2.4.14:../../x11/gtk2
+DEPENDS+=	glib2>=2.6.3:../../devel/glib2
+DEPENDS+=	atk>=1.9.1:../../devel/atk
+DEPENDS+=	pango>=1.8.1:../../devel/pango
+DEPENDS+=	gtk2+>=2.6.4:../../x11/gtk2
 DEPENDS+=	libIDL>=0.8.5:../../net/libIDL
 DEPENDS+=	ORBit2>=2.12.1:../../net/ORBit2
 DEPENDS+=	libxml2>=2.6.17:../../textproc/libxml2
 DEPENDS+=	libxslt>=1.1.12:../../textproc/libxslt
-DEPENDS+=	GConf2>=2.8.1:../../devel/GConf2
-DEPENDS+=	GConf2-ui>=2.8.1:../../devel/GConf2-ui
+DEPENDS+=	GConf2>=2.10.0:../../devel/GConf2
+DEPENDS+=	GConf2-ui>=2.10.0:../../devel/GConf2-ui
 DEPENDS+=	libbonobo>=2.8.1:../../devel/libbonobo
 DEPENDS+=	gnome-mime-data>=2.4.2:../../databases/gnome-mime-data
 DEPENDS+=	libaudiofile>=0.2.6:../../audio/libaudiofile
 DEPENDS+=	esound>=0.2.35:../../audio/esound
-DEPENDS+=	gnome-vfs2>=2.8.4:../../sysutils/gnome-vfs2
-DEPENDS+=	gnome-vfs2-cdda>=2.8.4:../../audio/gnome-vfs2-cdda
-DEPENDS+=	gnome-vfs2-smb>=2.8.4:../../net/gnome-vfs2-smb
-DEPENDS+=	libgnome>=2.8.1:../../devel/libgnome
-DEPENDS+=	libglade2>=2.4.2:../../devel/libglade2
+DEPENDS+=	gnome-vfs2>=2.10.0:../../sysutils/gnome-vfs2
+DEPENDS+=	gnome-vfs2-cdda>=2.10.0:../../audio/gnome-vfs2-cdda
+DEPENDS+=	gnome-vfs2-smb>=2.10.0:../../net/gnome-vfs2-smb
+DEPENDS+=	libgnome>=2.10.0:../../devel/libgnome
+DEPENDS+=	libglade2>=2.5.1:../../devel/libglade2
 DEPENDS+=	libart2>=2.3.17:../../graphics/libart2
-DEPENDS+=	libgnomecanvas>=2.8.0:../../graphics/libgnomecanvas
+DEPENDS+=	libgnomecanvas>=2.10.0:../../graphics/libgnomecanvas
 DEPENDS+=	libbonoboui>=2.8.1:../../devel/libbonoboui
-DEPENDS+=	gnome-keyring>=0.4.1:../../security/gnome-keyring
-DEPENDS+=	libgnomeui>=2.8.1:../../devel/libgnomeui
-DEPENDS+=	gnome-icon-theme>=2.8.0:../../graphics/gnome-icon-theme
-DEPENDS+=	libgnomeprint>=2.8.2:../../print/libgnomeprint
-DEPENDS+=	libgnomeprintui>=2.8.2:../../print/libgnomeprintui
-DEPENDS+=	libgtop2>=2.8.3:../../sysutils/libgtop2
-DEPENDS+=	librsvg2>=2.8.1:../../graphics/librsvg2
-DEPENDS+=	librsvg2-gtk2>=2.8.1:../../graphics/librsvg2-gtk2
-DEPENDS+=	libxklavier>=1.04:../../x11/libxklavier
+DEPENDS+=	gnome-keyring>=0.4.2:../../security/gnome-keyring
+DEPENDS+=	libgnomeui>=2.10.0:../../devel/libgnomeui
+DEPENDS+=	gnome-icon-theme>=2.10.0:../../graphics/gnome-icon-theme
+DEPENDS+=	libgnomeprint>=2.10.0:../../print/libgnomeprint
+DEPENDS+=	libgnomeprintui>=2.10.0:../../print/libgnomeprintui
+DEPENDS+=	libgtop2>=2.10.0:../../sysutils/libgtop2
+DEPENDS+=	librsvg2>=2.9.5:../../graphics/librsvg2
+DEPENDS+=	librsvg2-gtk2>=2.9.5:../../graphics/librsvg2-gtk2
+DEPENDS+=	libxklavier>=2.0:../../x11/libxklavier
 DEPENDS+=	libgtkhtml>=2.6.3:../../www/libgtkhtml
 DEPENDS+=	libsoup-devel>=2.2.2:../../net/libsoup-devel
-DEPENDS+=	libwnck>=2.8.1:../../devel/libwnck
+DEPENDS+=	libwnck>=2.10.0:../../devel/libwnck
 DEPENDS+=	gail>=1.8.2:../../devel/gail
-DEPENDS+=	gtkhtml3>=3.2.5:../../www/gtkhtml3
-DEPENDS+=	gtk2-engines>=2.2.0:../../x11/gtk2-engines
+DEPENDS+=	gtkhtml36>=3.5.3:../../www/gtkhtml36
+DEPENDS+=	gtk2-engines>=2.6.2:../../x11/gtk2-engines
 DEPENDS+=	scrollkeeper>=0.3.14:../../textproc/scrollkeeper
-DEPENDS+=	gnome2-pixmaps>=2.8.1:../../graphics/gnome2-pixmaps
-DEPENDS+=	gnome-desktop>=2.8.1:../../x11/gnome-desktop
-DEPENDS+=	eel2>=2.8.2:../../devel/eel2
-DEPENDS+=	nautilus>=2.8.2:../../sysutils/nautilus
-DEPENDS+=	metacity>=2.8.8:../../wm/metacity
+DEPENDS+=	gnome2-pixmaps>=2.10.0:../../graphics/gnome2-pixmaps
+DEPENDS+=	gnome-desktop>=2.10.0:../../x11/gnome-desktop
+DEPENDS+=	gnome-menus>=2.10.0:../../sysutils/gnome-menus
+DEPENDS+=	eel2>=2.10.0:../../devel/eel2
+DEPENDS+=	nautilus>=2.10.0:../../sysutils/nautilus
+DEPENDS+=	metacity>=2.10.0:../../wm/metacity
 DEPENDS+=	gstreamer>=0.8.9:../../multimedia/gstreamer
-DEPENDS+=	gst-plugins>=0.8.7:../../multimedia/gst-plugins
-DEPENDS+=	gnome2-control-center>=2.8.2:../../x11/gnome2-control-center
-DEPENDS+=	evolution-data-server>=1.0.4:../../mail/evolution-data-server
-DEPENDS+=	gnome-panel>=2.8.3:../../x11/gnome-panel
-DEPENDS+=	gnome-applets>=2.8.2:../../x11/gnome2-applets
-DEPENDS+=	gnome-themes>=2.8.2:../../x11/gnome-themes
-DEPENDS+=	vte>=0.11.11:../../x11/vte
-DEPENDS+=	gnome2-terminal>=2.8.2:../../x11/gnome2-terminal
-DEPENDS+=	gnome-session>=2.8.1:../../x11/gnome-session
+DEPENDS+=	gst-plugins>=0.8.8:../../multimedia/gst-plugins
+DEPENDS+=	gnome2-control-center>=2.10.0:../../x11/gnome2-control-center
+DEPENDS+=	evolution-data-server>=1.2.0:../../mail/evolution-data-server
+DEPENDS+=	gnome-panel>=2.10.0:../../x11/gnome-panel
+DEPENDS+=	gucharmap>=1.4.3:../../fonts/gucharmap
+DEPENDS+=	gnome-applets>=2.10.0:../../x11/gnome2-applets
+DEPENDS+=	gnome-themes>=2.10.0:../../x11/gnome-themes
+DEPENDS+=	gnome-backgrounds>=2.10.0:../../graphics/gnome-backgrounds
+DEPENDS+=	vte>=0.11.12:../../x11/vte
+DEPENDS+=	gnome2-terminal>=2.10.0:../../x11/gnome2-terminal
+DEPENDS+=	gnome-session>=2.10.0:../../x11/gnome-session
 # Not really part of GNOME, but we need it.
 DEPENDS+=	xscreensaver>=4.16:../../x11/xscreensaver
 
diff --git a/meta-pkgs/gnome-devel/Makefile b/meta-pkgs/gnome-devel/Makefile
index cb2f427c377..05da623a2f4 100644
--- a/meta-pkgs/gnome-devel/Makefile
+++ b/meta-pkgs/gnome-devel/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.11 2005/02/26 17:27:44 jmmv Exp $
+# $NetBSD: Makefile,v 1.12 2005/03/22 16:43:56 jmmv Exp $
 
-DISTNAME=	gnome-devel-2.8.3
+DISTNAME=	gnome-devel-2.10.0
 CATEGORIES=	meta-pkgs devel gnome
 MASTER_SITES=	# empty
 DISTFILES=	# empty
@@ -15,7 +15,8 @@ DEPENDS+=	automake>=1.9.5:../../devel/automake
 DEPENDS+=	automake14>=1.4.6:../../devel/automake14
 DEPENDS+=	gettext-m4>=0.11.5:../../devel/gettext-m4
 DEPENDS+=	gnome-common>=2.8.0:../../devel/gnome-common
-DEPENDS+=	gtk-doc>=1.2:../../textproc/gtk-doc
+DEPENDS+=	gnome-doc-utils>=0.1.3:../../textproc/gnome-doc-utils
+DEPENDS+=	gtk-doc>=1.3:../../textproc/gtk-doc
 DEPENDS+=	intltool>=0.33:../../textproc/intltool
 DEPENDS+=	libtool>=1.5.10:../../devel/libtool
 DEPENDS+=	pkgconfig>=0.15:../../devel/pkgconfig
diff --git a/meta-pkgs/gnome/Makefile b/meta-pkgs/gnome/Makefile
index 8723a430ad4..1be186e31eb 100644
--- a/meta-pkgs/gnome/Makefile
+++ b/meta-pkgs/gnome/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.46 2005/02/26 17:27:44 jmmv Exp $
+# $NetBSD: Makefile,v 1.47 2005/03/22 16:43:56 jmmv Exp $
 
-DISTNAME=	gnome-2.8.3
+DISTNAME=	gnome-2.10.0
 CATEGORIES=	meta-pkgs x11 gnome
 MASTER_SITES=	# empty
 DISTFILES=	# empty
@@ -19,46 +19,47 @@ COMMENT=	Meta-package for the GNU Network Object Model Environment
 #
 # Packages commented out are either because they are just build time
 # dependencies or because they are not yet ready to be enabled.
-DEPENDS+=	gnome-base>=2.8.3:../../meta-pkgs/gnome-base
-DEPENDS+=	at-spi>=1.6.2:../../devel/at-spi
+DEPENDS+=	gnome-base>=2.10.0:../../meta-pkgs/gnome-base
+DEPENDS+=	at-spi>=1.6.3:../../devel/at-spi
 DEPENDS+=	libgail-gnome>=1.1.0:../../devel/libgail-gnome
-#DEPENDS+=	gtk-doc>=1.2:../../textproc/gtk-doc
-DEPENDS+=	gtksourceview>=1.1.1:../../x11/gtksourceview
-DEPENDS+=	gdm>=2.6.0.7:../../x11/gdm
-DEPENDS+=	epiphany>=1.4.8:../../www/epiphany
+#DEPENDS+=	gtk-doc>=1.3:../../textproc/gtk-doc
+DEPENDS+=	gtksourceview>=1.2.0:../../x11/gtksourceview
+DEPENDS+=	gdm>=2.6.0.8:../../x11/gdm
+DEPENDS+=	epiphany>=1.6.0:../../www/epiphany
 DEPENDS+=	yelp>=2.6.5:../../misc/yelp
-DEPENDS+=	zenity>=2.8.2:../../x11/zenity
-DEPENDS+=	bug-buddy>=2.8.0:../../net/bug-buddy
+DEPENDS+=	zenity>=2.10.0:../../x11/zenity
+DEPENDS+=	bug-buddy>=2.10.0:../../net/bug-buddy
 DEPENDS+=	gnome-speech>=0.3.6:../../audio/gnome-speech
-DEPENDS+=	dasher>=3.2.13:../../editors/dasher
-DEPENDS+=	eog>=2.8.2:../../graphics/eog2
-DEPENDS+=	file-roller>=2.8.4:../../archivers/file-roller
-DEPENDS+=	gal2>=2.2.5:../../devel/gal2
-DEPENDS+=	gcalctool>=4.4.22:../../math/gcalctool
-DEPENDS+=	gconf-editor>=2.8.2:../../editors/gconf-editor
-DEPENDS+=	gedit>=2.8.3:../../editors/gedit
-DEPENDS+=	ggv>=2.8.3:../../print/ggv2
-DEPENDS+=	gok>=0.11.17:../../misc/gok
-DEPENDS+=	gnome-mag>=0.11.14:../../x11/gnome-mag
-DEPENDS+=	gnopernicus>=0.9.19:../../x11/gnopernicus
-DEPENDS+=	gpdf>=2.8.3:../../print/gpdf
-DEPENDS+=	gucharmap>=1.4.2:../../fonts/gucharmap
-DEPENDS+=	gnome-games>=2.8.3:../../games/gnome2-games
-DEPENDS+=	gnome-media>=2.8.0:../../multimedia/gnome2-media
-DEPENDS+=	gnome-netstatus>=2.8.0:../../net/gnome-netstatus
-DEPENDS+=	gnome2-system-monitor>=2.8.3:../../sysutils/gnome2-system-monitor
-DEPENDS+=	gnome-utils>=2.8.1:../../misc/gnome2-utils
+DEPENDS+=	dasher>=3.2.15:../../editors/dasher
+DEPENDS+=	eog>=2.9.0:../../graphics/eog2
+DEPENDS+=	file-roller>=2.10.0:../../archivers/file-roller
+DEPENDS+=	gal2>=2.4.0:../../devel/gal2
+DEPENDS+=	gcalctool>=5.5.41:../../math/gcalctool
+DEPENDS+=	gconf-editor>=2.10.0:../../editors/gconf-editor
+DEPENDS+=	gedit>=2.10.0:../../editors/gedit
+DEPENDS+=	ggv>=2.8.4:../../print/ggv2
+DEPENDS+=	gok>=1.0.2:../../misc/gok
+DEPENDS+=	gnome-mag>=0.12.0:../../x11/gnome-mag
+DEPENDS+=	gnopernicus>=0.10.4:../../x11/gnopernicus
+DEPENDS+=	gpdf>=2.10.0:../../print/gpdf
+DEPENDS+=	gnome-games>=2.10.0:../../games/gnome2-games
+DEPENDS+=	gnome-media>=2.10.0:../../multimedia/gnome2-media
+DEPENDS+=	gnome-netstatus>=2.10.0:../../net/gnome-netstatus
+DEPENDS+=	gnome2-system-monitor>=2.10.0:../../sysutils/gnome2-system-monitor
+DEPENDS+=	gnome-utils>=2.10.0:../../misc/gnome2-utils
 DEPENDS+=	gnome2-user-docs>=2.8.1:../../misc/gnome2-user-docs
-DEPENDS+=	nautilus-cd-burner>=2.8.7:../../sysutils/nautilus-cd-burner
-DEPENDS+=	nautilus-media>=0.8.1:../../multimedia/nautilus-media
-DEPENDS+=	vino>=2.8.1:../../net/vino
-DEPENDS+=	evolution-webcal>=2.0.1:../../time/evolution-webcal
-DEPENDS+=	evolution>=2.0.3:../../mail/evolution
-#DEPENDS+=	gnome-nettool>=0.99.3:../../net/gnome-nettool
-#DEPENDS+=	gnome-system-tools>=1.0.2:../../sysutils/gnome-system-tools
-#DEPENDS+=	gnome-volume-manager>=1.0.3:../../sysutils/gnome-volume-manager
-#DEPENDS+=	gnomemeeting>=1.0.2:../../net/gnomemeeting
-#DEPENDS+=	ximian-connector>=2.0.4:../../mail/ximian-connector
+DEPENDS+=	nautilus-cd-burner>=2.10.0:../../sysutils/nautilus-cd-burner
+DEPENDS+=	vino>=2.10.0:../../net/vino
+DEPENDS+=	{totem>=1.0,totem-xine>=1.0}:../../multimedia/totem
+DEPENDS+=	evolution-webcal>=2.2.0:../../time/evolution-webcal
+DEPENDS+=	evolution>=2.2.0:../../mail/evolution
+DEPENDS+=	ximian-connector>=2.2.0:../../mail/ximian-connector
+#DEPENDS+=	gnome-nettool>=1.2.0:../../net/gnome-nettool
+#DEPENDS+=	system-tools-backends>=1.2.0:../../sysutils/system-tools-backends
+#DEPENDS+=	gnome-system-tools>=1.2.0:../../sysutils/gnome-system-tools
+#DEPENDS+=	gnome-volume-manager>=1.2.0:../../sysutils/gnome-volume-manager
+#DEPENDS+=	gnomemeeting>=1.2.1:../../net/gnomemeeting
+#DEPENDS+=	sound-juicer>=2.10.0:../../audio/sound-juicer
 
 USE_X11=	yes
 EXTRACT_ONLY=	# empty