update 2.6 meta

5 files changed, 164 insertions, 151 deletions

diff --git a/gnome-base/gnome/Manifest b/gnome-base/gnome/Manifest
index f522e24badbb..b5085152d283 100644
--- a/gnome-base/gnome/Manifest
+++ b/gnome-base/gnome/Manifest
@@ -1,28 +1,30 @@
-MD5 337fc2e5f915f05d2ad67752ce56d813 ChangeLog 14999
-MD5 390bbaf2bb2e535cb4c78ec95348d735 gnome-1.4-r3.ebuild 548
+MD5 26204f51cc1488f95d2f5ea999a71e94 gnome-2.6_rc4.ebuild 3762
+MD5 e9adb47e623cdde77e4390d7a61893a2 gnome-2.2.2-r1.ebuild 3468
+MD5 9e9da28aa3f51efe79f130738acf1ef3 gnome-2.4.2_p1.ebuild 3733
 MD5 00dfa4540719c7e8e7e8c3c2a1dbe9f9 gnome-2.4.ebuild 3409
+MD5 b3dad18956125e0352a11a9bb68b9ef2 gnome-2.6_rc1.ebuild 3722
 MD5 807e4bcde5aebe29bd1bc19a5bca54c3 gnome-2.4.1.ebuild 3593
-MD5 e9adb47e623cdde77e4390d7a61893a2 gnome-2.2.2-r1.ebuild 3468
 MD5 48f23a5e8bae53a8c23b8564c76403d5 gnome-2.4.1_p1.ebuild 3753
+MD5 f19a3e876323c73535e34ec641e06026 gnome-2.6_rc3.ebuild 3774
+MD5 390bbaf2bb2e535cb4c78ec95348d735 gnome-1.4-r3.ebuild 548
 MD5 f9d0cd9a8125699273675a88fc58f2f5 gnome-2.0.2-r1.ebuild 2509
-MD5 b42ff519b0b6d8dd1ba5feb8dbb7dfe3 gnome-2.4.2.ebuild 3745
-MD5 12c67a3214c67be89cea2b5c4e93dba9 gnome-2.4.2_p1.ebuild 3736
 MD5 f120c3ed28a75206d785ac8297b751d6 gnome-2.2-r2.ebuild 3251
-MD5 b3dad18956125e0352a11a9bb68b9ef2 gnome-2.6_rc1.ebuild 3722
 MD5 0b3e9ae06d7cbad8d57840a083170ca5 gnome-2.2.1.ebuild 3224
+MD5 337fc2e5f915f05d2ad67752ce56d813 ChangeLog 14999
 MD5 d03bf642297ac5a4375d4b4a4bc013f0 gnome-2.6_rc2.ebuild 3681
-MD5 5fbe8a81e694e82eac277178ae6324c2 gnome-2.6_rc3.ebuild 3777
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gnome-1.4-r3 0
+MD5 b42ff519b0b6d8dd1ba5feb8dbb7dfe3 gnome-2.4.2.ebuild 3745
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gnome-2.2.1 0
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gnome-2.4.1 0
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gnome-2.2-r2 0
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gnome-2.2.2-r1 0
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gnome-2.4.1_p1 0
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gnome-2.0.2-r1 0
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gnome-2.4 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.2.1 0
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gnome-2.6_rc4 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.1_p1 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.4.1_p1 b/gnome-base/gnome/files/digest-gnome-2.6_rc4
index e69de29bb2d1..e69de29bb2d1 100644
--- a/gnome-base/gnome/files/digest-gnome-2.4.1_p1
+++ b/gnome-base/gnome/files/digest-gnome-2.6_rc4
diff --git a/gnome-base/gnome/gnome-2.4.1_p1.ebuild b/gnome-base/gnome/gnome-2.4.1_p1.ebuild
deleted file mode 100644
index 9853c2dda265..000000000000
--- a/gnome-base/gnome/gnome-2.4.1_p1.ebuild
+++ /dev/null
@@ -1,133 +0,0 @@
-# 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.1_p1.ebuild,v 1.18 2004/03/17 22:47:52 leonardop 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 samba"
-
-# when unmasking for an arch
-# double check none of the deps are still masked !
-
-# NOTE TO DEVS : 
-# THIS IS AN UPDATE TRACKING PACK ONLY MEANT FOR GNOME DEVS
-# NO NEED TO ADD ARCH KEYWORDS, THOSE WILL BE ADDED IN REGULAR RELEASES
-KEYWORDS="~x86"
-
-#  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.2.3
-	>=dev-libs/atk-1.4.1
-	>=x11-libs/pango-1.2.5-r1
-	>=x11-libs/gtk+-2.2.4-r1
-
-	>=gnome-base/gconf-2.4.0.1
-
-	>=dev-libs/libIDL-0.8.2
-	>=gnome-base/ORBit2-2.8.3
-
-	>=media-libs/audiofile-0.2.5
-	>=media-sound/esound-0.2.32
-	>=gnome-base/gail-1.4.1
-	>=gnome-base/gnome-mime-data-2.4.1
-	>=gnome-base/gnome-vfs-2.4.2
-	>=media-libs/libart_lgpl-2.3.16
-
-	>=gnome-base/libbonobo-2.4.3
-	>=gnome-base/libbonoboui-2.4.3
-	>=gnome-base/libglade-2.0.1
-	>=gnome-base/libgnome-2.4
-	>=gnome-base/libgnomecanvas-2.4
-	>=gnome-base/libgnomeui-2.4.0.1
-
-	>=dev-libs/libxml2-2.6.4
-	>=dev-libs/libxslt-1.1.2
-
-	>=gnome-extra/acme-2.4.2
-	>=gnome-extra/bug-buddy-2.4.2
-
-	>=gnome-base/control-center-2.4
-
-	>=gnome-base/eel-2.4.2
-	>=gnome-base/nautilus-2.4.2
-	>=gnome-extra/nautilus-media-0.3.3.1
-
-	>=media-gfx/eog-2.4.1
-	>=net-www/epiphany-1.0.7
-	>=app-arch/file-roller-2.4.4
-	>=gnome-extra/gcalctool-4.3.16
-	>=gnome-extra/gconf-editor-2.4
-	>=gnome-base/gdm-2.4.1.7
-	>=app-editors/gedit-2.4.1
-	>=app-text/ggv-2.4.1
-	>=app-text/gpdf-0.112
-	>=gnome-base/gnome-applets-2.4.2
-	>=gnome-base/gnome-desktop-2.4.1.1
-	>=gnome-extra/gnome-games-2.4.2
-
-	>=x11-themes/gtk-engines-2.2
-	>=x11-themes/gnome-icon-theme-1.0.9
-	>=x11-themes/gnome-themes-2.4.1
-
-	>=gnome-extra/gnome-media-2.4.1.1
-	>=gnome-base/gnome-panel-2.4.2
-	>=gnome-base/gnome-session-2.4.2
-	>=gnome-extra/gnome-system-monitor-2.4
-	>=x11-terms/gnome-terminal-2.4.2
-	>=gnome-extra/gnome2-user-docs-2.4.1
-	>=gnome-extra/gnome-utils-2.4.1
-	>=media-libs/gstreamer-0.6.4
-	>=media-libs/gst-plugins-0.6.4
-	>=x11-libs/gtksourceview-0.7-r1
-	>=gnome-extra/gucharmap-1.2
-	>=gnome-base/libgnomeprint-2.4.2
-	>=gnome-base/libgnomeprintui-2.4.2
-	=gnome-extra/libgtkhtml-2.4*
-	>=gnome-base/libgtop-2.0.8
-	>=gnome-base/librsvg-2.4
-	>=x11-libs/libwnck-2.4.0.1-r1
-	>=x11-wm/metacity-2.6.3
-	>=gnome-extra/zenity-1.8
-
-	>=x11-libs/startup-notification-0.5
-
-	>=gnome-extra/yelp-2.4.2
-	>=x11-libs/vte-0.11.10
-
-	>=app-text/scrollkeeper-0.3.12
-	>=dev-util/pkgconfig-0.15
-	>=dev-util/intltool-0.27.2
-
-	cdr? ( >=gnome-extra/nautilus-cd-burner-0.6.1 )
-	dvdr? ( >=gnome-extra/nautilus-cd-burner-0.6.1 )
-	doc? ( >=dev-util/gtk-doc-1.1 )
-
-	accessibility? ( >=gnome-extra/libgail-gnome-1.0.2
-		>=gnome-extra/at-spi-1.3.9
-		>=app-accessibility/gnome-speech-0.2.8
-		>=app-accessibility/gnome-mag-0.10.4
-		>=app-accessibility/gok-0.8.4
-		>=app-accessibility/gnopernicus-0.7.1 )
-
-	samba? ( >=gnome-extra/gnome-vfs-extras-0.99.11 )"
-
-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"
-
-}
diff --git a/gnome-base/gnome/gnome-2.4.2_p1.ebuild b/gnome-base/gnome/gnome-2.4.2_p1.ebuild
index b194e0df9057..fcf67710824b 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.5 2004/03/24 04:53:44 leonardop Exp $
+# $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 $
 
 S=${WORKDIR}
 DESCRIPTION="Meta package for the GNOME desktop."
@@ -38,7 +38,7 @@ RDEPEND="!gnome-base/gnome-core
 	>=gnome-base/ORBit2-2.8.3
 
 	>=media-libs/audiofile-0.2.6
-	>=media-sound/esound-0.2.33
+	>=media-sound/esound-0.2.34
 	>=gnome-base/gail-1.4.1
 	>=gnome-base/gnome-mime-data-2.4.1
 	>=gnome-base/gnome-vfs-2.4.2-r1
@@ -69,7 +69,7 @@ RDEPEND="!gnome-base/gnome-core
 	>=app-arch/file-roller-2.4.4-r2
 	>=gnome-extra/gcalctool-4.3.44
 	>=gnome-extra/gconf-editor-2.4
-	>=gnome-base/gdm-2.4.1.7-r1
+	>=gnome-base/gdm-2.4.4.7
 	>=app-editors/gedit-2.4.1
 	>=app-text/ggv-2.4.1
 	>=app-text/gpdf-0.112.1
diff --git a/gnome-base/gnome/gnome-2.6_rc4.ebuild b/gnome-base/gnome/gnome-2.6_rc4.ebuild
new file mode 100644
index 000000000000..bf4c4f38e5bb
--- /dev/null
+++ b/gnome-base/gnome/gnome-2.6_rc4.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_rc4.ebuild,v 1.1 2004/03/28 23:25:06 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"
+
+#  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.5.4
+	>=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.5.4
+
+	>=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.7
+
+	>=media-gfx/eog-2.6
+	>=net-www/epiphany-1.2.1
+	>=app-arch/file-roller-2.6
+	>=gnome-extra/gcalctool-4.3.2
+	>=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.130
+
+	>=gnome-base/gnome-session-2.6
+	>=gnome-base/gnome-desktop-2.6
+	>=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
+
+	>=x11-libs/gtksourceview-1
+	>=gnome-extra/gucharmap-1.4
+	>=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.5.8
+
+	>=gnome-base/libgtop-2.5.2
+	>=gnome-extra/gnome-system-monitor-2.6
+
+	>=gnome-base/librsvg-2.6.3
+	>=x11-libs/libwnck-2.6
+	>=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.5.91
+	>=net-analyzer/gnome-netstatus-2.6
+
+	cdr? ( >=gnome-extra/nautilus-cd-burner-0.6.7 )
+	dvdr? ( >=gnome-extra/nautilus-cd-burner-0.6.7 )
+
+	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
+
+}
+