new 2.6rc meta, minor updates to stable tracker

5 files changed, 169 insertions, 18 deletions

diff --git a/gnome-base/gnome/ChangeLog b/gnome-base/gnome/ChangeLog
index 492781db904a..259b08038129 100644
--- a/gnome-base/gnome/ChangeLog
+++ b/gnome-base/gnome/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for gnome-base/gnome
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome/ChangeLog,v 1.100 2004/03/31 00:46:47 lv Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome/ChangeLog,v 1.101 2004/03/31 23:07:55 foser Exp $
+
+*gnome-2.6_rc5 (01 Apr 2004)
+
+  01 Apr 2004; foser <foser@gentoo.org> gnome-2.5_rc5.ebuild :
+  New rc, this is really gnome 2.6 final
 
 *gnome-2.6_rc4 (30 Mar 2004)
 
diff --git a/gnome-base/gnome/Manifest b/gnome-base/gnome/Manifest
index 907f52a52ba2..ae4aaf9e21a0 100644
--- a/gnome-base/gnome/Manifest
+++ b/gnome-base/gnome/Manifest
@@ -1,28 +1,30 @@
-MD5 b3dc8db191b7ec7066fed8a5f0a57dc2 ChangeLog 15114
+MD5 4d2b4eff4aabd9c2de5c22325623091f gnome-2.6_rc4.ebuild 3762
+MD5 e9adb47e623cdde77e4390d7a61893a2 gnome-2.2.2-r1.ebuild 3468
+MD5 bdcb2ce5e925ccd1d7ea02b56dc1f6b9 gnome-2.4.2_p1.ebuild 3727
+MD5 00dfa4540719c7e8e7e8c3c2a1dbe9f9 gnome-2.4.ebuild 3409
+MD5 b3dad18956125e0352a11a9bb68b9ef2 gnome-2.6_rc1.ebuild 3722
+MD5 807e4bcde5aebe29bd1bc19a5bca54c3 gnome-2.4.1.ebuild 3593
+MD5 5fbe8a81e694e82eac277178ae6324c2 gnome-2.6_rc3.ebuild 3777
 MD5 390bbaf2bb2e535cb4c78ec95348d735 gnome-1.4-r3.ebuild 548
 MD5 f9d0cd9a8125699273675a88fc58f2f5 gnome-2.0.2-r1.ebuild 2509
 MD5 f120c3ed28a75206d785ac8297b751d6 gnome-2.2-r2.ebuild 3251
+MD5 65d048cf7735642b6e14ecaf9a991418 gnome-2.6_rc5.ebuild 3785
 MD5 0b3e9ae06d7cbad8d57840a083170ca5 gnome-2.2.1.ebuild 3224
-MD5 e9adb47e623cdde77e4390d7a61893a2 gnome-2.2.2-r1.ebuild 3468
-MD5 807e4bcde5aebe29bd1bc19a5bca54c3 gnome-2.4.1.ebuild 3593
-MD5 b42ff519b0b6d8dd1ba5feb8dbb7dfe3 gnome-2.4.2.ebuild 3745
-MD5 0968f4464a15183c73d4afc0e8270dde gnome-2.4.2_p1.ebuild 3729
-MD5 00dfa4540719c7e8e7e8c3c2a1dbe9f9 gnome-2.4.ebuild 3409
-MD5 b3dad18956125e0352a11a9bb68b9ef2 gnome-2.6_rc1.ebuild 3722
+MD5 ebbed88b4b4c18cb545f8c7a9b59af4d ChangeLog 15252
 MD5 d03bf642297ac5a4375d4b4a4bc013f0 gnome-2.6_rc2.ebuild 3681
-MD5 5fbe8a81e694e82eac277178ae6324c2 gnome-2.6_rc3.ebuild 3777
-MD5 4d2b4eff4aabd9c2de5c22325623091f gnome-2.6_rc4.ebuild 3762
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gnome-1.4-r3 0
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gnome-2.0.2-r1 0
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gnome-2.2-r2 0
+MD5 b42ff519b0b6d8dd1ba5feb8dbb7dfe3 gnome-2.4.2.ebuild 3745
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gnome-2.2.1 0
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gnome-2.2.2-r1 0
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gnome-2.4 0
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gnome-2.4.1 0
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gnome-2.4.2 0
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gnome-2.4.2_p1 0
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gnome-2.6_rc1 0
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gnome-2.6_rc2 0
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gnome-2.6_rc3 0
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gnome-2.6_rc4 0
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gnome-2.6_rc5 0
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gnome-2.0.2-r1 0
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gnome-2.2.2-r1 0
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gnome-2.4 0
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gnome-1.4-r3 0
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gnome-2.4.2_p1 0
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gnome-2.2-r2 0
diff --git a/gnome-base/gnome/files/digest-gnome-2.6_rc5 b/gnome-base/gnome/files/digest-gnome-2.6_rc5
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/gnome-base/gnome/files/digest-gnome-2.6_rc5
diff --git a/gnome-base/gnome/gnome-2.4.2_p1.ebuild b/gnome-base/gnome/gnome-2.4.2_p1.ebuild
index fcf67710824b..b1fb20860fa7 100644
--- a/gnome-base/gnome/gnome-2.4.2_p1.ebuild
+++ b/gnome-base/gnome/gnome-2.4.2_p1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome/gnome-2.4.2_p1.ebuild,v 1.6 2004/03/28 23:25:06 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome/gnome-2.4.2_p1.ebuild,v 1.7 2004/03/31 23:07:55 foser Exp $
 
 S=${WORKDIR}
 DESCRIPTION="Meta package for the GNOME desktop."
@@ -61,7 +61,7 @@ RDEPEND="!gnome-base/gnome-core
 
 	>=gnome-base/eel-2.4.2
 	>=gnome-base/nautilus-2.4.2
-	>=gnome-extra/nautilus-media-0.3.3.1
+	>=gnome-extra/nautilus-media-0.3.4
 
 	!hppa? ( >=net-www/epiphany-1.0.7 )
 
diff --git a/gnome-base/gnome/gnome-2.6_rc5.ebuild b/gnome-base/gnome/gnome-2.6_rc5.ebuild
new file mode 100644
index 000000000000..db932a129518
--- /dev/null
+++ b/gnome-base/gnome/gnome-2.6_rc5.ebuild
@@ -0,0 +1,144 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome/gnome-2.6_rc5.ebuild,v 1.1 2004/03/31 23:07:55 foser Exp $
+
+S=${WORKDIR}
+DESCRIPTION="Meta package for the GNOME desktop."
+HOMEPAGE="http://www.gnome.org/"
+LICENSE="as-is"
+SLOT="2.0"
+
+IUSE="cdr dvdr doc accessibility"
+# when unmasking for an arch
+# double check none of the deps are still masked !
+KEYWORDS="~x86 ~ppc ~alpha ~sparc ~hppa ~amd64"
+
+#  Note to developers:
+#  This is a wrapper for the complete Gnome2 desktop,
+#  This means all components that a user expects in Gnome2 are present
+#  please do not reduce this list further unless
+#  dependencies pull in what you remove.
+#  With "emerge gnome" a user expects the full "standard" distribution of Gnome and should be provided with that, consider only installing the parts needed for smaller installations.
+
+RDEPEND="!gnome-base/gnome-core
+
+	>=dev-libs/glib-2.4
+	>=dev-libs/atk-1.6
+	>=x11-libs/gtk+-2.4
+	>=x11-libs/pango-1.4
+
+	>=dev-libs/libxml2-2.6.7
+	>=dev-libs/libxslt-1.1.4
+
+	>=x11-libs/libxklavier-1
+	>=media-libs/audiofile-0.2.5
+	>=media-sound/esound-0.2.34
+	>=gnome-base/gnome-mime-data-2.4.0
+	>=media-libs/libart_lgpl-2.3.16
+
+	>=dev-libs/libIDL-0.8.3
+	>=gnome-base/ORBit2-2.10
+
+	>=gnome-base/gconf-2.6
+	>=gnome-base/gnome-keyring-0.2
+	>=gnome-base/gnome-vfs-2.6
+
+	>=gnome-base/libbonobo-2.6
+	>=gnome-base/libbonoboui-2.6
+	>=gnome-base/libgnome-2.6
+	>=gnome-base/libgnomeui-2.6
+	>=gnome-base/libgnomecanvas-2.6
+	>=gnome-base/libglade-2.3.6
+
+	>=gnome-extra/bug-buddy-2.6
+	>=gnome-base/control-center-2.6.0.2
+
+	>=gnome-base/eel-2.6
+	>=gnome-base/nautilus-2.6
+
+	>=media-libs/gstreamer-0.8
+	>=media-libs/gst-plugins-0.8-r1
+	>=gnome-extra/gnome-media-2.6
+	>=gnome-extra/nautilus-media-0.8
+
+	>=media-gfx/eog-2.6
+	>=net-www/epiphany-1.2.2
+	>=app-arch/file-roller-2.6
+	>=gnome-extra/gcalctool-4.3.51
+	>=gnome-extra/gconf-editor-2.6
+	>=gnome-base/gdm-2.4.4.7
+	>=app-editors/gedit-2.6
+
+	>=app-text/ggv-2.6
+	>=app-text/gpdf-0.131
+
+	>=gnome-base/gnome-session-2.6
+	>=gnome-base/gnome-desktop-2.6.0.1
+	>=gnome-base/gnome-applets-2.6
+	>=gnome-base/gnome-panel-2.6
+
+	>=x11-themes/gnome-icon-theme-1.2
+	>=x11-themes/gnome-themes-2.6
+
+	>=x11-terms/gnome-terminal-2.6
+	>=gnome-extra/gnome2-user-docs-2.6.0.1
+
+	>=x11-libs/gtksourceview-1
+	>=gnome-extra/gucharmap-1.4.1
+	>=gnome-base/libgnomeprint-2.6
+	>=gnome-base/libgnomeprintui-2.6
+	=gnome-extra/libgtkhtml-2.6*
+
+	>=gnome-extra/gnome-utils-2.6
+	>=gnome-extra/gnome-games-2.6.0.1
+
+	>=gnome-base/libgtop-2.5.2
+	>=gnome-extra/gnome-system-monitor-2.6
+
+	>=gnome-base/librsvg-2.6.4
+	>=x11-libs/libwnck-2.6.0.1
+	>=x11-wm/metacity-2.8
+
+	>=x11-libs/startup-notification-0.5
+
+	>=gnome-extra/yelp-2.6
+	>=x11-libs/vte-0.11.10
+	>=gnome-extra/zenity-2.6.0
+	>=net-analyzer/gnome-netstatus-2.6.0.1
+
+	cdr? ( >=gnome-extra/nautilus-cd-burner-2.6.0 )
+	dvdr? ( >=gnome-extra/nautilus-cd-burner-2.6.0 )
+
+	accessibility? (
+		>=gnome-extra/libgail-gnome-1.0.3
+		>=gnome-base/gail-1.6.0
+		>=gnome-extra/at-spi-1.4.0
+		>=app-accessibility/gnome-speech-0.3.2-r1
+		>=app-accessibility/gnome-mag-0.10.10
+		>=app-accessibility/gok-0.10.0
+		>=app-accessibility/gnopernicus-0.8.0 )"
+
+# gst stuff
+#	applets
+
+# unrelated
+# scrollkeeper
+# pkgconfig
+# intltool
+# gtk-doc
+
+pkg_postinst () {
+
+	einfo "Note that to change windowmanager to metacity do: "
+	einfo " export WINDOW_MANAGER=\"/usr/bin/metacity\""
+	einfo "of course this works for all other window managers as well"
+	echo
+	echo
+	einfo "To have nautilus and gnome-vfs monitor file changes, you should"
+	einfo "start the FAM daemon. You can do this to by issueing the"
+	einfo "'/etc/init.d/famd start' command."
+	einfo "'rc-update add fam default' will make FAM start on every boot."
+	echo
+
+}
+