Bump to 2.26.2. Clean up old revisions.

(Portage version: 2.2_rc33/cvs/Linux x86_64)

4 files changed, 93 insertions, 84 deletions

diff --git a/gnome-base/gnome-light/ChangeLog b/gnome-base/gnome-light/ChangeLog
index 7b6d6c8869b2..06029a22a653 100644
--- a/gnome-base/gnome-light/ChangeLog
+++ b/gnome-base/gnome-light/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for gnome-base/gnome-light
-# Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-light/ChangeLog,v 1.99 2009/04/27 14:49:05 jer Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-light/ChangeLog,v 1.100 2009/05/31 18:30:29 eva Exp $
+
+*gnome-light-2.26.2 (31 May 2009)
+
+  31 May 2009; Gilles Dartiguelongue <eva@gentoo.org>
+  -gnome-light-2.22.0.ebuild, gnome-light-2.24.1.ebuild,
+  +gnome-light-2.26.2.ebuild:
+  Bump to 2.26.2. Clean up old revisions.
 
   27 Apr 2009; Jeroen Roovers <jer@gentoo.org> gnome-light-2.24.1:
   Stable for HPPA (bug #260063).
diff --git a/gnome-base/gnome-light/gnome-light-2.22.0.ebuild b/gnome-base/gnome-light/gnome-light-2.22.0.ebuild
deleted file mode 100644
index a5d726102485..000000000000
--- a/gnome-base/gnome-light/gnome-light-2.22.0.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-light/gnome-light-2.22.0.ebuild,v 1.7 2008/12/20 14:02:58 gentoofan23 Exp $
-
-S=${WORKDIR}
-DESCRIPTION="Meta package for the GNOME desktop, merge this package to install"
-HOMEPAGE="http://www.gnome.org/"
-LICENSE="as-is"
-SLOT="2.0"
-IUSE=""
-
-# when unmasking for an arch
-# double check none of the deps are still masked !
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
-
-#  Note to developers:
-#  This is a wrapper for the 'light' Gnome2 desktop,
-#  This should only consist of the bare minimum of libs/apps needed
-#  It is basicly the gnome-base/gnome without all extra apps
-
-#  This is currently in it's test phase, if you feel like some dep
-#  should be added or removed from this pack file a bug to
-#  gnome@gentoo.org on bugs.gentoo.org
-
-#	>=media-gfx/eog-2.20.4
-
-RDEPEND="!gnome-base/gnome
-
-	>=dev-libs/glib-2.16.1
-	>=x11-libs/gtk+-2.12.8
-	>=dev-libs/atk-1.22.0
-	>=x11-libs/pango-1.20.0
-
-	>=gnome-base/orbit-2.14.12
-
-	>=x11-libs/libwnck-2.22.0
-	>=x11-wm/metacity-2.22.0
-
-	>=gnome-base/gnome-vfs-2.22.0
-	>=gnome-base/gconf-2.22.0
-
-	>=gnome-base/gnome-mime-data-2.18.0
-
-	>=gnome-base/libbonobo-2.22.0
-	>=gnome-base/libbonoboui-2.22.0
-	>=gnome-base/libgnome-2.22.0
-	>=gnome-base/libgnomeui-2.22.01
-	>=gnome-base/libgnomecanvas-2.20.1.1
-	>=gnome-base/libglade-2.6.2
-
-	>=gnome-base/gnome-settings-daemon-2.22.0
-	>=gnome-base/gnome-control-center-2.22.0
-
-	>=gnome-base/eel-2.22.0
-	>=gnome-base/gvfs-0.2.0.1
-	>=gnome-base/nautilus-2.22.0
-
-	>=gnome-base/gnome-desktop-2.22.0
-	>=gnome-base/gnome-session-2.22.0
-	>=gnome-base/gnome-panel-2.22.0
-
-	>=x11-themes/gnome-icon-theme-2.22.0
-	>=x11-themes/gnome-themes-2.22.0
-
-	>=x11-terms/gnome-terminal-2.22.0
-
-	>=gnome-base/librsvg-2.22.2
-
-	>=gnome-extra/yelp-2.22.0"
-
-pkg_postinst () {
-
-	elog "Note that to change windowmanager to metacity do: "
-	elog " export WINDOW_MANAGER=\"/usr/bin/metacity\""
-	elog "of course this works for all other window managers as well"
-	elog
-	elog "Use gnome-base/gnome for the full GNOME Desktop"
-	elog "as released by the GNOME team."
-
-}
diff --git a/gnome-base/gnome-light/gnome-light-2.24.1.ebuild b/gnome-base/gnome-light/gnome-light-2.24.1.ebuild
index 6abc91f4c808..26df43748a97 100644
--- a/gnome-base/gnome-light/gnome-light-2.24.1.ebuild
+++ b/gnome-base/gnome-light/gnome-light-2.24.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-light/gnome-light-2.24.1.ebuild,v 1.5 2009/04/27 14:49:05 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-light/gnome-light-2.24.1.ebuild,v 1.6 2009/05/31 18:30:29 eva Exp $
 
 S=${WORKDIR}
 DESCRIPTION="Meta package for the GNOME desktop, merge this package to install"
@@ -11,7 +11,7 @@ IUSE=""
 
 # when unmasking for an arch
 # double check none of the deps are still masked !
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 x86-fbsd"
+KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
 
 #  Note to developers:
 #  This is a wrapper for the 'light' Gnome2 desktop,
diff --git a/gnome-base/gnome-light/gnome-light-2.26.2.ebuild b/gnome-base/gnome-light/gnome-light-2.26.2.ebuild
new file mode 100644
index 000000000000..60d90363e069
--- /dev/null
+++ b/gnome-base/gnome-light/gnome-light-2.26.2.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-light/gnome-light-2.26.2.ebuild,v 1.1 2009/05/31 18:30:29 eva Exp $
+
+S=${WORKDIR}
+DESCRIPTION="Meta package for the GNOME desktop, merge this package to install"
+HOMEPAGE="http://www.gnome.org/"
+LICENSE="as-is"
+SLOT="2.0"
+IUSE=""
+
+# when unmasking for an arch
+# double check none of the deps are still masked !
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~x86 ~x86-fbsd"
+
+#  Note to developers:
+#  This is a wrapper for the 'light' Gnome2 desktop,
+#  This should only consist of the bare minimum of libs/apps needed
+#  It is basicly the gnome-base/gnome without all extra apps
+
+#  This is currently in it's test phase, if you feel like some dep
+#  should be added or removed from this pack file a bug to
+#  gnome@gentoo.org on bugs.gentoo.org
+
+#	>=media-gfx/eog-2.26.2
+
+RDEPEND="!gnome-base/gnome
+
+	>=dev-libs/glib-2.20.2
+	>=x11-libs/gtk+-2.16.1
+	>=dev-libs/atk-1.26.0
+	>=x11-libs/pango-1.24.2
+
+	>=gnome-base/orbit-2.14.16
+
+	>=x11-libs/libwnck-2.26.1
+	>=x11-wm/metacity-2.26.0
+
+	>=gnome-base/gnome-vfs-2.24.1
+	>=gnome-base/gconf-2.26.2
+
+	>=gnome-base/gnome-mime-data-2.18.0
+
+	>=gnome-base/libbonobo-2.24.1
+	>=gnome-base/libbonoboui-2.24.1
+	>=gnome-base/libgnome-2.26.0
+	>=gnome-base/libgnomeui-2.24.1
+	>=gnome-base/libgnomecanvas-2.26.0
+	>=gnome-base/libglade-2.6.4
+
+	>=gnome-base/gnome-settings-daemon-2.26.1
+	>=gnome-base/gnome-control-center-2.26.0
+
+	>=gnome-base/gvfs-1.2.3
+	>=gnome-base/eel-2.24.1
+	>=gnome-base/nautilus-2.26.3
+
+	>=gnome-base/gnome-desktop-2.26.2
+	>=gnome-base/gnome-session-2.26.1
+	>=gnome-base/gnome-panel-2.26.2
+
+	>=x11-themes/gnome-icon-theme-2.26.0
+	>=x11-themes/gnome-themes-2.26.2
+
+	>=x11-terms/gnome-terminal-2.26.2
+
+	>=gnome-base/librsvg-2.26.0
+
+	>=gnome-extra/yelp-2.26.0"
+
+pkg_postinst () {
+# FIXME: Rephrase to teach about using different WMs instead, as metacity is the default anyway
+# FIXME: but first check WINDOW_MANAGER is still honored in 2.24. gnome-session-2.24 might have lost
+# FIXME: support for it, but we don't ship with gnome-session-2.24 yet
+#	elog "Note that to change windowmanager to metacity do: "
+#	elog " export WINDOW_MANAGER=\"/usr/bin/metacity\""
+#	elog "of course this works for all other window managers as well"
+#	elog
+
+	elog "Use gnome-base/gnome for the full GNOME Desktop"
+	elog "as released by the GNOME team."
+}