Rekeyword and drop old

(Portage version: 2.2.8/cvs/Linux x86_64, signed Manifest commit with key A188FBD4)

4 files changed, 9 insertions, 62 deletions

diff --git a/gnome-base/gnome-light/ChangeLog b/gnome-base/gnome-light/ChangeLog
index d9024211a559..ef7be710b1d8 100644
--- a/gnome-base/gnome-light/ChangeLog
+++ b/gnome-base/gnome-light/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for gnome-base/gnome-light
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-light/ChangeLog,v 1.171 2013/12/08 18:31:48 pacho Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-light/ChangeLog,v 1.172 2014/01/19 19:50:59 pacho Exp $
+
+  19 Jan 2014; Pacho Ramos <pacho@gentoo.org> -gnome-light-3.6.2.ebuild,
+  gnome-light-3.8.0.ebuild, metadata.xml:
+  Rekeyword and drop old
 
   08 Dec 2013; Pacho Ramos <pacho@gentoo.org> gnome-light-3.8.0.ebuild:
   x86 stable, bug #478252
diff --git a/gnome-base/gnome-light/gnome-light-3.6.2.ebuild b/gnome-base/gnome-light/gnome-light-3.6.2.ebuild
deleted file mode 100644
index df33c9221c8f..000000000000
--- a/gnome-base/gnome-light/gnome-light-3.6.2.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-light/gnome-light-3.6.2.ebuild,v 1.2 2013/05/17 02:55:23 mattst88 Exp $
-
-EAPI="5"
-
-DESCRIPTION="Meta package for GNOME-Light, merge this package to install"
-HOMEPAGE="http://www.gnome.org/"
-LICENSE="metapackage"
-SLOT="2.0"
-IUSE="cups +fallback +gnome-shell"
-
-# when unmasking for an arch
-# double check none of the deps are still masked !
-KEYWORDS="~alpha ~amd64 ~x86"
-
-# XXX: Note to developers:
-# This is a wrapper for the 'light' GNOME 3 desktop, and should only consist of
-# the bare minimum of libs/apps needed. It is basically gnome-base/gnome without
-# any apps, but shouldn't be used by users unless they know what they are doing.
-RDEPEND="!gnome-base/gnome
-	>=gnome-base/gnome-core-libs-${PV}[cups?]
-
-	>=gnome-base/gnome-session-${PV}
-	>=gnome-base/gnome-menus-3.6.1:3
-	>=gnome-base/gnome-settings-daemon-${PV}[cups?]
-	>=gnome-base/gnome-control-center-${PV}[cups?]
-
-	>=gnome-base/nautilus-${PV}
-
-	gnome-shell? (
-		>=x11-wm/mutter-${PV}
-		>=gnome-base/gnome-shell-${PV} )
-
-	fallback? ( >=gnome-base/gnome-fallback-${PV} )
-
-	>=x11-themes/gnome-icon-theme-3.6.2
-	>=x11-themes/gnome-icon-theme-symbolic-3.6.2
-	>=x11-themes/gnome-themes-standard-${PV}
-
-	>=x11-terms/gnome-terminal-3.6.1
-"
-DEPEND=""
-PDEPEND=">=gnome-base/gvfs-1.14.2"
-S="${WORKDIR}"
-
-pkg_pretend() {
-	if ! use fallback && ! use gnome-shell; then
-		# Users probably want to use e16, sawfish, etc
-		ewarn "You're installing neither GNOME Shell nor GNOME Fallback!"
-		ewarn "You will have to install and manage a window manager by yourself"
-		# https://bugs.gentoo.org/show_bug.cgi?id=303375
-		ewarn "See: <add link to docs about component handling in gnome-session>"
-	fi
-}
diff --git a/gnome-base/gnome-light/gnome-light-3.8.0.ebuild b/gnome-base/gnome-light/gnome-light-3.8.0.ebuild
index 068076b5b367..dcfaf143438f 100644
--- a/gnome-base/gnome-light/gnome-light-3.8.0.ebuild
+++ b/gnome-base/gnome-light/gnome-light-3.8.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-light/gnome-light-3.8.0.ebuild,v 1.3 2013/12/08 18:31:48 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-light/gnome-light-3.8.0.ebuild,v 1.4 2014/01/19 19:50:59 pacho Exp $
 
 EAPI="5"
 
@@ -12,7 +12,7 @@ IUSE="cups +gnome-shell"
 
 # when unmasking for an arch
 # double check none of the deps are still masked !
-KEYWORDS="amd64 x86"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
 
 # XXX: Note to developers:
 # This is a wrapper for the 'light' GNOME 3 desktop, and should only consist of
diff --git a/gnome-base/gnome-light/metadata.xml b/gnome-base/gnome-light/metadata.xml
index 82398e195cea..917c1a91fe39 100644
--- a/gnome-base/gnome-light/metadata.xml
+++ b/gnome-base/gnome-light/metadata.xml
@@ -5,8 +5,6 @@
 <use>
 	<flag name="automount">Use <pkg>gnome-base/gvfs[gdu]</pkg> for automounting
 		of drives in nautilus</flag>
-	<flag name="fallback">Install <pkg>gnome-base/gnome-panel</pkg> and
-		<pkg>x11-wm/metacity</pkg> for the GNOME 3 fallback mode</flag>
 	<flag name="gnome-shell">Install <pkg>gnome-base/gnome-shell</pkg> and
 		<pkg>x11-wm/mutter</pkg> for the standard GNOME 3 desktop mode</flag>
 </use>