mark 2.6 x86, create new ~ and _p meta

7 files changed, 165 insertions, 8 deletions

diff --git a/gnome-base/gnome/ChangeLog b/gnome-base/gnome/ChangeLog
index 52baf917c1be..cd66b1715bac 100644
--- a/gnome-base/gnome/ChangeLog
+++ b/gnome-base/gnome/ChangeLog
@@ -1,6 +1,16 @@
 # 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.105 2004/05/16 00:15:09 geoman Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome/ChangeLog,v 1.106 2004/05/21 00:11:47 foser Exp $
+
+*gnome-2.6.1_p1 (21 May 2004)
+
+  21 May 2004; foser <foser@gentoo.org> gnome-2.6.1_p1.ebuild :
+  New update tracker
+
+*gnome-2.6.1_rc1 (21 May 2004)
+
+  21 May 2004; foser <foser@gentoo.org> gnome-2.6.1_rc1.ebuild :
+  New meta for 2.6.1 release
 
   15 May 2004; Stephen P. Becker <geoman@gentoo.org> gnome-2.4.2.ebuild:
   Stable on mips.
diff --git a/gnome-base/gnome/Manifest b/gnome-base/gnome/Manifest
index 50063f191e24..5cf3c25977b4 100644
--- a/gnome-base/gnome/Manifest
+++ b/gnome-base/gnome/Manifest
@@ -1,10 +1,12 @@
-MD5 d3f7e52f54e6102e83296411c2a16274 gnome-2.6.ebuild 3743
+MD5 43cca9388aef6d0c84f0e7383daf21e4 gnome-2.6.1_rc1.ebuild 3910
+MD5 afc0bc97a07c6c2948eaf810cf335241 gnome-2.6.ebuild 3742
 MD5 d39011c170b8141bdb73770bae406ce0 gnome-1.4-r3.ebuild 548
-MD5 778d02200b5983b71464cd8fd652c48b gnome-2.6_p1.ebuild 3908
-MD5 dbd9f05c5baffc93bed86b1ee7cd66d9 ChangeLog 15740
+MD5 12bef7c68737fb3035116922ad734bcc ChangeLog 15983
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 MD5 3dbf3ba83b3f0cc8aad16519a93e6445 gnome-2.4.2.ebuild 3746
+MD5 6404f35ae933ba201fec793a68ff3642 gnome-2.6.1_p1.ebuild 3909
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gnome-2.4.2 0
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gnome-2.6.1_rc1 0
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gnome-2.6 0
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gnome-1.4-r3 0
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gnome-2.6_p1 0
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gnome-2.6.1_p1 0
diff --git a/gnome-base/gnome/files/digest-gnome-2.6_p1 b/gnome-base/gnome/files/digest-gnome-2.6.1_p1
index e69de29bb2d1..e69de29bb2d1 100644
--- a/gnome-base/gnome/files/digest-gnome-2.6_p1
+++ b/gnome-base/gnome/files/digest-gnome-2.6.1_p1
diff --git a/gnome-base/gnome/files/digest-gnome-2.6.1_rc1 b/gnome-base/gnome/files/digest-gnome-2.6.1_rc1
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/gnome-base/gnome/files/digest-gnome-2.6.1_rc1
diff --git a/gnome-base/gnome/gnome-2.6_p1.ebuild b/gnome-base/gnome/gnome-2.6.1_p1.ebuild
index b1e774b36f00..2eca25cdea71 100644
--- a/gnome-base/gnome/gnome-2.6_p1.ebuild
+++ b/gnome-base/gnome/gnome-2.6.1_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.6_p1.ebuild,v 1.15 2004/05/20 23:53:33 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome/gnome-2.6.1_p1.ebuild,v 1.1 2004/05/21 00:11:47 foser Exp $
 
 # UPDATE TRACKER : GNOME TEAM ONLY
 
diff --git a/gnome-base/gnome/gnome-2.6.1_rc1.ebuild b/gnome-base/gnome/gnome-2.6.1_rc1.ebuild
new file mode 100644
index 000000000000..ea8852f0e1f0
--- /dev/null
+++ b/gnome-base/gnome/gnome-2.6.1_rc1.ebuild
@@ -0,0 +1,145 @@
+# 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.1_rc1.ebuild,v 1.1 2004/05/21 00:11:47 foser Exp $
+
+# UPDATE TRACKER : GNOME TEAM ONLY
+
+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 ~sparc ~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.1
+	>=dev-libs/atk-1.6.1
+	>=x11-libs/gtk+-2.4.1
+	>=x11-libs/pango-1.4
+
+	>=dev-libs/libxml2-2.6.9
+	>=dev-libs/libxslt-1.1.6
+
+	>=x11-libs/libxklavier-1.02
+	>=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.1
+
+	>=gnome-base/gconf-2.6.1
+	>=gnome-base/gnome-keyring-0.2.1
+	>=gnome-base/gnome-vfs-2.6.1.1
+
+	>=gnome-base/libbonobo-2.6
+	>=gnome-base/libbonoboui-2.6
+	>=gnome-base/libgnome-2.6.1.1
+	>=gnome-base/libgnomeui-2.6.1.1
+	>=gnome-base/libgnomecanvas-2.6.1.1
+	>=gnome-base/libglade-2.3.6
+
+	>=gnome-extra/bug-buddy-2.6.1
+	>=gnome-base/control-center-2.6.1
+
+	>=gnome-base/eel-2.6.1
+	>=gnome-base/nautilus-2.6.1
+
+	>=media-libs/gstreamer-0.8.1
+	>=media-libs/gst-plugins-0.8.1
+	>=gnome-extra/gnome-media-2.6.1
+	>=gnome-extra/nautilus-media-0.8
+
+	>=media-gfx/eog-2.6.1
+	>=net-www/epiphany-1.2.5
+	>=app-arch/file-roller-2.6.1
+	>=gnome-extra/gcalctool-4.3.51
+	>=gnome-extra/gconf-editor-2.6.1
+	>=gnome-base/gdm-2.4.4.7-r1
+	>=app-editors/gedit-2.6.1
+
+	>=app-text/ggv-2.6.1
+	>=app-text/gpdf-0.131
+
+	>=gnome-base/gnome-session-2.6.1
+	>=gnome-base/gnome-desktop-2.6.1
+	>=gnome-base/gnome-applets-2.6.0-r1
+	>=gnome-base/gnome-panel-2.6.1
+
+	>=x11-themes/gnome-icon-theme-1.2.1
+	>=x11-themes/gnome-themes-2.6.1
+
+	>=x11-terms/gnome-terminal-2.6.1
+	>=gnome-extra/gnome2-user-docs-2.6.0.1
+
+	>=x11-libs/gtksourceview-1.0.1
+	>=gnome-extra/gucharmap-1.4.1
+	>=gnome-base/libgnomeprint-2.6.1
+	>=gnome-base/libgnomeprintui-2.6.1
+	=gnome-extra/libgtkhtml-2.6*
+
+	>=gnome-extra/gnome-utils-2.6
+	>=gnome-extra/gnome-games-2.6.1
+
+	>=gnome-base/libgtop-2.6
+	>=gnome-extra/gnome-system-monitor-2.6
+
+	>=gnome-base/librsvg-2.6.5
+	>=x11-libs/libwnck-2.6.1
+	>=x11-wm/metacity-2.8.1
+
+	>=x11-libs/startup-notification-0.6
+
+	>=gnome-extra/yelp-2.6.1
+	>=x11-libs/vte-0.11.10-r1
+	>=gnome-extra/zenity-2.6.0
+	>=net-analyzer/gnome-netstatus-2.6.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.4
+		>=gnome-base/gail-1.6.4
+		>=gnome-extra/at-spi-1.4.2
+		>=app-accessibility/dasher-3.2.10
+		>=app-accessibility/gnome-speech-0.3.2-r1
+		>=app-accessibility/gnome-mag-0.10.11
+		>=app-accessibility/gok-0.10.2
+		>=app-accessibility/gnopernicus-0.8.4 )"
+
+# 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
+	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 famd default' will make FAM start on every boot."
+	echo
+
+}
diff --git a/gnome-base/gnome/gnome-2.6.ebuild b/gnome-base/gnome/gnome-2.6.ebuild
index 2c2f398c9991..8b067e7af21e 100644
--- a/gnome-base/gnome/gnome-2.6.ebuild
+++ b/gnome-base/gnome/gnome-2.6.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.6.ebuild,v 1.3 2004/05/20 23:53:33 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome/gnome-2.6.ebuild,v 1.4 2004/05/21 00:11:47 foser Exp $
 
 S=${WORKDIR}
 DESCRIPTION="Meta package for the GNOME desktop."
@@ -11,7 +11,7 @@ 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 ~sparc ~amd64"
+KEYWORDS="x86 ~ppc ~sparc ~amd64"
 
 #  Note to developers:
 #  This is a wrapper for the complete Gnome2 desktop,