Set minimal versions to exactly what's in upstream 2.16.1, for version parity; remember that deep upgrade will still get you all the 2.16.2 bits that are there. Remove tomboy for now, as we can't stabilize it yet

(Portage version: 2.1.2_rc3)

2 files changed, 48 insertions, 43 deletions

diff --git a/gnome-base/gnome/ChangeLog b/gnome-base/gnome/ChangeLog
index 0a184c88de44..4b588a53eecf 100644
--- a/gnome-base/gnome/ChangeLog
+++ b/gnome-base/gnome/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for gnome-base/gnome
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome/ChangeLog,v 1.249 2006/12/07 12:24:50 remi Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome/ChangeLog,v 1.250 2006/12/10 02:25:40 leio Exp $
+
+  10 Dec 2006; Mart Raudsepp <leio@gentoo.org> gnome-2.16.1.ebuild:
+  Set minimal versions to exactly what's in upstream 2.16.1, for version
+  parity; remember that deep upgrade will still get you all the 2.16.2 bits
+  that are there. Remove tomboy for now, as we can't stabilize it yet
 
 *gnome-2.16.1 (07 Dec 2006)
 
diff --git a/gnome-base/gnome/gnome-2.16.1.ebuild b/gnome-base/gnome/gnome-2.16.1.ebuild
index 5f109cedfb2b..eaa0cd938603 100644
--- a/gnome-base/gnome/gnome-2.16.1.ebuild
+++ b/gnome-base/gnome/gnome-2.16.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome/gnome-2.16.1.ebuild,v 1.1 2006/12/07 12:24:50 remi Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome/gnome-2.16.1.ebuild,v 1.2 2006/12/10 02:25:40 leio Exp $
 
 DESCRIPTION="Meta package for the GNOME desktop"
 HOMEPAGE="http://www.gnome.org/"
@@ -21,76 +21,76 @@ RDEPEND="!gnome-base/gnome-core
 	>=dev-libs/glib-2.12.4
 	>=x11-libs/gtk+-2.10.6
 	>=dev-libs/atk-1.12.3
-	>=x11-libs/pango-1.14.7
+	>=x11-libs/pango-1.14.5
 
 	>=dev-libs/libxml2-2.6.26
 	>=dev-libs/libxslt-1.1.17
 
 	>=media-libs/audiofile-0.2.6-r1
 	>=media-sound/esound-0.2.36
-	>=x11-libs/libxklavier-2.2
+	>=x11-libs/libxklavier-3.0
 	>=media-libs/libart_lgpl-2.3.17
 
 	>=dev-libs/libIDL-0.8.7
 	>=gnome-base/orbit-2.14.2
 
-	>=x11-libs/libwnck-2.16.2
+	>=x11-libs/libwnck-2.16.1
 	>=x11-wm/metacity-2.16.3
 
 	>=gnome-base/gnome-keyring-0.6.0
 	>=gnome-extra/gnome-keyring-manager-2.16.0
 
-	>=gnome-base/gnome-vfs-2.16.3
+	>=gnome-base/gnome-vfs-2.16.1
 
-	>=gnome-base/gnome-mime-data-2.4.3
+	>=gnome-base/gnome-mime-data-2.4.2
 
 	>=gnome-base/gconf-2.14.0
-	>=net-libs/libsoup-2.2.98
+	>=net-libs/libsoup-2.2.96
 
 	>=gnome-base/libbonobo-2.16.0
 	>=gnome-base/libbonoboui-2.16.0
 	>=gnome-base/libgnome-2.16.0
-	>=gnome-base/libgnomeui-2.16.1
+	>=gnome-base/libgnomeui-2.16.0
 	>=gnome-base/libgnomecanvas-2.14.0
 	>=gnome-base/libglade-2.6.0
 
 	>=gnome-extra/bug-buddy-2.16.0
-	>=gnome-base/control-center-2.16.2
+	>=gnome-base/control-center-2.16.1
 
-	>=gnome-base/eel-2.16.3
-	>=gnome-base/nautilus-2.16.3
+	>=gnome-base/eel-2.16.0
+	>=gnome-base/nautilus-2.16.1
 
 	>=media-libs/gstreamer-0.10.8
 	>=media-libs/gst-plugins-base-0.10.7
 	>=media-libs/gst-plugins-good-0.10.3
 	>=gnome-extra/gnome-media-2.16.1
-	>=media-sound/sound-juicer-2.16.0
+	>=media-sound/sound-juicer-2.16.1
 	>=media-video/totem-2.16.2
 
-	>=media-gfx/eog-2.16.2
+	>=media-gfx/eog-2.16.1
 
-	>=www-client/epiphany-2.16.2
-	>=app-arch/file-roller-2.16.2
-	>=gnome-extra/gcalctool-5.8.25
+	>=www-client/epiphany-2.16.1
+	>=app-arch/file-roller-2.16.0
+	>=gnome-extra/gcalctool-5.8.24
 
 	>=gnome-extra/gconf-editor-2.16.0
-	>=gnome-base/gdm-2.16.2
+	>=gnome-base/gdm-2.16.1
 	>=x11-libs/gtksourceview-1.8.1
-	>=app-editors/gedit-2.16.2
+	>=app-editors/gedit-2.16.1
 
-	>=app-text/evince-0.6.1
+	>=app-text/evince-0.6.0
 
-	>=gnome-base/gnome-desktop-2.16.2
+	>=gnome-base/gnome-desktop-2.16.1
 	>=gnome-base/gnome-session-2.16.1
-	>=gnome-base/gnome-applets-2.16.2
-	>=gnome-base/gnome-panel-2.16.2
+	>=gnome-base/gnome-applets-2.16.1
+	>=gnome-base/gnome-panel-2.16.1
 	>=gnome-base/gnome-menus-2.16.1
-	>=x11-themes/gnome-icon-theme-2.16.1
-	>=x11-themes/gnome-themes-2.16.2
-	>=gnome-extra/deskbar-applet-2.16.2
+	>=x11-themes/gnome-icon-theme-2.16.0.1
+	>=x11-themes/gnome-themes-2.16.1
+	>=gnome-extra/deskbar-applet-2.16.0
 
-	>=x11-themes/gtk-engines-2.8.2
-	>=x11-themes/gnome-backgrounds-2.16.2
+	>=x11-themes/gtk-engines-2.8.1
+	>=x11-themes/gnome-backgrounds-2.16.1
 
 	>=x11-libs/vte-0.14.1
 	>=x11-terms/gnome-terminal-2.16.1
@@ -99,9 +99,9 @@ RDEPEND="!gnome-base/gnome-core
 	>=gnome-base/libgnomeprint-2.12.1
 	>=gnome-base/libgnomeprintui-2.12.1
 
-	>=gnome-extra/gnome-utils-2.16.2
+	>=gnome-extra/gnome-utils-2.16.1
 
-	>=gnome-extra/gnome-games-2.16.2
+	>=gnome-extra/gnome-games-2.16.1
 	>=gnome-base/librsvg-2.16.0
 
 	>=gnome-extra/gnome-system-monitor-2.16.1
@@ -111,19 +111,19 @@ RDEPEND="!gnome-base/gnome-core
 
 	>=gnome-extra/gnome2-user-docs-2.16.1
 	>=gnome-extra/yelp-2.16.1
-	>=gnome-extra/zenity-2.16.2
+	>=gnome-extra/zenity-2.16.1
 
 	>=net-analyzer/gnome-netstatus-2.12.0
 	>=net-analyzer/gnome-nettool-2.16.0
 
-	cdr? ( >=gnome-extra/nautilus-cd-burner-2.16.2 )
-	dvdr? ( >=gnome-extra/nautilus-cd-burner-2.16.2 )
+	cdr? ( >=gnome-extra/nautilus-cd-burner-2.16.1 )
+	dvdr? ( >=gnome-extra/nautilus-cd-burner-2.16.1 )
 
 	hal? ( >=gnome-base/gnome-volume-manager-2.15.0 )
 
-	>=gnome-extra/gtkhtml-3.12.2
-	>=mail-client/evolution-2.8.2.1
-	>=gnome-extra/evolution-data-server-1.8.2
+	>=gnome-extra/gtkhtml-3.12.1
+	>=mail-client/evolution-2.8.1
+	>=gnome-extra/evolution-data-server-1.8.1
 	>=gnome-extra/evolution-webcal-2.8.0
 
 	>=net-misc/vino-2.13.5
@@ -135,26 +135,26 @@ RDEPEND="!gnome-base/gnome-core
 	>=app-admin/pessulus-2.16.1
 	ldap? (
 		>=app-admin/sabayon-2.12.4
-		net-im/ekiga
+		>=net-im/ekiga-2.0.3
 		)
 
 	>=gnome-extra/gnome-screensaver-2.16.1
-	>=x11-misc/alacarte-0.10.1
-	>=gnome-extra/gnome-power-manager-2.16.2
-
-	mono? ( >=app-misc/tomboy-0.4.1 )
+	>=x11-misc/alacarte-0.10.0
+	>=gnome-extra/gnome-power-manager-2.16.1
 
 	accessibility? (
 		>=gnome-extra/libgail-gnome-1.1.3
 		>=gnome-base/gail-1.9.3
 		>=gnome-extra/at-spi-1.7.12
-		>=app-accessibility/dasher-4.2.1
+		>=app-accessibility/dasher-4.2.0
 		>=app-accessibility/gnome-mag-0.13.1
-		>=app-accessibility/gnome-speech-0.4.6
+		>=app-accessibility/gnome-speech-0.4.5
 		>=app-accessibility/gok-1.2.0
 		>=app-accessibility/gnopernicus-1.0.4 )
 	cups? ( >=net-print/gnome-cups-manager-0.31-r1 )"
 
+#	mono? ( >=app-misc/tomboy-0.4.1 )
+
 # Development tools
 #   scrollkeeper
 #   pkgconfig