Add 2.18.2 and 2.18.3 reflecting package versions as was chosen officially by upstream releng for these versions. Also remove gnome-core blocker for these, as it has been removed from the tree for long enough. 2.18.2 is meant for stabilization this week, 2.18.3 later once some 2.18.3 packages that have had bigger changes have been in the tree long enough

(Portage version: 2.1.3_rc9)

5 files changed, 114 insertions, 28 deletions

diff --git a/gnome-base/gnome-light/ChangeLog b/gnome-base/gnome-light/ChangeLog
index 58261e462def..8f36e94542cf 100644
--- a/gnome-base/gnome-light/ChangeLog
+++ b/gnome-base/gnome-light/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for gnome-base/gnome-light
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-light/ChangeLog,v 1.55 2007/07/10 19:25:15 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-light/ChangeLog,v 1.56 2007/07/27 05:41:57 leio Exp $
+
+*gnome-light-2.18.3 (27 Jul 2007)
+*gnome-light-2.18.2 (27 Jul 2007)
+
+  27 Jul 2007; Mart Raudsepp <leio@gentoo.org> -gnome-light-2.16.2.ebuild,
+  +gnome-light-2.18.2.ebuild, +gnome-light-2.18.3.ebuild:
+  Add 2.18.2 and 2.18.3 reflecting package versions as was chosen officially
+  by upstream releng for these versions. Also remove gnome-core blocker for
+  these, as it has been removed from the tree for long enough.
 
   10 Jul 2007; Raúl Porcel <armin76@gentoo.org> gnome-light-2.16.3.ebuild:
   ia64 stable
diff --git a/gnome-base/gnome-light/files/digest-gnome-light-2.16.2 b/gnome-base/gnome-light/files/digest-gnome-light-2.18.2
index e69de29bb2d1..e69de29bb2d1 100644
--- a/gnome-base/gnome-light/files/digest-gnome-light-2.16.2
+++ b/gnome-base/gnome-light/files/digest-gnome-light-2.18.2
diff --git a/gnome-base/gnome-light/files/digest-gnome-light-2.18.3 b/gnome-base/gnome-light/files/digest-gnome-light-2.18.3
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/gnome-base/gnome-light/files/digest-gnome-light-2.18.3
diff --git a/gnome-base/gnome-light/gnome-light-2.16.2.ebuild b/gnome-base/gnome-light/gnome-light-2.18.2.ebuild
index 37ccf98aef87..c611bc5de0ab 100644
--- a/gnome-base/gnome-light/gnome-light-2.16.2.ebuild
+++ b/gnome-base/gnome-light/gnome-light-2.18.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 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.16.2.ebuild,v 1.12 2007/05/21 10:34:03 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-light/gnome-light-2.18.2.ebuild,v 1.1 2007/07/27 05:41:57 leio 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 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,
@@ -24,48 +24,47 @@ KEYWORDS="alpha amd64 hppa ppc ppc64 sparc x86 ~x86-fbsd"
 
 #	>=media-gfx/eog-2.2.1
 
-RDEPEND="!gnome-base/gnome-core
-	!gnome-base/gnome
+RDEPEND="!gnome-base/gnome
 
-	>=dev-libs/glib-2.12.4
-	>=x11-libs/gtk+-2.10.6
-	>=dev-libs/atk-1.12.3
-	>=x11-libs/pango-1.14.8
+	>=dev-libs/glib-2.12.12
+	>=x11-libs/gtk+-2.10.12
+	>=dev-libs/atk-1.18.0
+	>=x11-libs/pango-1.16.4
 
-	>=gnome-base/orbit-2.14.2
+	>=gnome-base/orbit-2.14.7
 
-	>=x11-libs/libwnck-2.16.2
-	>=x11-wm/metacity-2.16.3
+	>=x11-libs/libwnck-2.18.2
+	>=x11-wm/metacity-2.18.3
 
-	>=gnome-base/gnome-vfs-2.16.3
-	>=gnome-base/gconf-2.14.0
+	>=gnome-base/gnome-vfs-2.18.1
+	>=gnome-base/gconf-2.18.0.1
 
 	>=gnome-base/gnome-mime-data-2.4.3
 
-	>=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/libbonobo-2.18.0
+	>=gnome-base/libbonoboui-2.18.0
+	>=gnome-base/libgnome-2.18.0
+	>=gnome-base/libgnomeui-2.18.1
 	>=gnome-base/libgnomecanvas-2.14.0
 	>=gnome-base/libglade-2.6.0
 
-	>=gnome-base/control-center-2.16.2
+	>=gnome-base/control-center-2.18.1
 
-	>=gnome-base/eel-2.16.3
-	>=gnome-base/nautilus-2.16.3
+	>=gnome-base/eel-2.18.0.1
+	>=gnome-base/nautilus-2.18.1
 
-	>=gnome-base/gnome-desktop-2.16.2
-	>=gnome-base/gnome-session-2.16.2
-	>=gnome-base/gnome-panel-2.16.2
+	>=gnome-base/gnome-desktop-2.18.2
+	>=gnome-base/gnome-session-2.18.2
+	>=gnome-base/gnome-panel-2.18.2
 
-	>=x11-themes/gnome-icon-theme-2.16.1
-	>=x11-themes/gnome-themes-2.16.2
+	>=x11-themes/gnome-icon-theme-2.18.0
+	>=x11-themes/gnome-themes-2.18.1
 
-	>=x11-terms/gnome-terminal-2.16.1
+	>=x11-terms/gnome-terminal-2.18.0
 
 	>=gnome-base/librsvg-2.16.1
 
-	>=gnome-extra/yelp-2.16.2"
+	>=gnome-extra/yelp-2.18.1"
 
 pkg_postinst () {
 
diff --git a/gnome-base/gnome-light/gnome-light-2.18.3.ebuild b/gnome-base/gnome-light/gnome-light-2.18.3.ebuild
new file mode 100644
index 000000000000..6f19493b1a3d
--- /dev/null
+++ b/gnome-base/gnome-light/gnome-light-2.18.3.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2007 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.18.3.ebuild,v 1.1 2007/07/27 05:41:57 leio 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.2.1
+
+RDEPEND="!gnome-base/gnome
+
+	>=dev-libs/glib-2.12.12
+	>=x11-libs/gtk+-2.10.13
+	>=dev-libs/atk-1.18.0
+	>=x11-libs/pango-1.16.4
+
+	>=gnome-base/orbit-2.14.7
+
+	>=x11-libs/libwnck-2.18.3
+	>=x11-wm/metacity-2.18.5
+
+	>=gnome-base/gnome-vfs-2.18.1
+	>=gnome-base/gconf-2.18.0.1
+
+	>=gnome-base/gnome-mime-data-2.4.3
+
+	>=gnome-base/libbonobo-2.18.0
+	>=gnome-base/libbonoboui-2.18.0
+	>=gnome-base/libgnome-2.18.0
+	>=gnome-base/libgnomeui-2.18.1
+	>=gnome-base/libgnomecanvas-2.14.0
+	>=gnome-base/libglade-2.6.1
+
+	>=gnome-base/control-center-2.18.1
+
+	>=gnome-base/eel-2.18.3
+	>=gnome-base/nautilus-2.18.3
+
+	>=gnome-base/gnome-desktop-2.18.3
+	>=gnome-base/gnome-session-2.18.3
+	>=gnome-base/gnome-panel-2.18.3
+
+	>=x11-themes/gnome-icon-theme-2.18.0
+	>=x11-themes/gnome-themes-2.18.1
+
+	>=x11-terms/gnome-terminal-2.18.1
+
+	>=gnome-base/librsvg-2.16.1
+
+	>=gnome-extra/yelp-2.18.1"
+
+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."
+
+}