bump to 2.20.2 and clean up old revisions

(Portage version: 2.1.4_rc14)

10 files changed, 18 insertions, 131 deletions

diff --git a/x11-wm/metacity/ChangeLog b/x11-wm/metacity/ChangeLog
index 2d3c1613b094..9e924b716162 100644
--- a/x11-wm/metacity/ChangeLog
+++ b/x11-wm/metacity/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-wm/metacity
-# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/metacity/ChangeLog,v 1.204 2007/11/29 05:22:56 jer Exp $
+# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/metacity/ChangeLog,v 1.205 2008/01/09 22:48:58 eva Exp $
+
+*metacity-2.20.2 (09 Jan 2008)
+
+  09 Jan 2008; Gilles Dartiguelongue <eva@gentoo.org>
+  -metacity-2.14.5.ebuild, -metacity-2.16.3.ebuild, -metacity-2.16.8.ebuild,
+  -metacity-2.20.0.ebuild, +metacity-2.20.2.ebuild:
+  bump to 2.20.2 and clean up old releases
 
   29 Nov 2007; Jeroen Roovers <jer@gentoo.org> metacity-2.20.1.ebuild:
   Stable for HPPA (bug #199740).
diff --git a/x11-wm/metacity/files/digest-metacity-2.14.5 b/x11-wm/metacity/files/digest-metacity-2.14.5
deleted file mode 100644
index 7ebdec9cfc94..000000000000
--- a/x11-wm/metacity/files/digest-metacity-2.14.5
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 a14c4a07e456a2590452d6c9db2e5153 metacity-2.14.5.tar.bz2 1851552
-RMD160 46fcdde1801b58f092fca64c300f195ec1852125 metacity-2.14.5.tar.bz2 1851552
-SHA256 5b0fb8c9ca34493bb7922e28d81706df8d628b3ea0f83e34c4d1f967409a0ed2 metacity-2.14.5.tar.bz2 1851552
diff --git a/x11-wm/metacity/files/digest-metacity-2.16.3 b/x11-wm/metacity/files/digest-metacity-2.16.3
deleted file mode 100644
index 8d710ac95d06..000000000000
--- a/x11-wm/metacity/files/digest-metacity-2.16.3
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 95bdf58d175284217132a12a353fe7ec metacity-2.16.3.tar.bz2 1833738
-RMD160 e85e10199739e9c39d24a3a61365093bec010757 metacity-2.16.3.tar.bz2 1833738
-SHA256 3405b2d80c43e532dc6303652e1de182ce2b65001a56c61fc837b7cd04522153 metacity-2.16.3.tar.bz2 1833738
diff --git a/x11-wm/metacity/files/digest-metacity-2.16.8 b/x11-wm/metacity/files/digest-metacity-2.16.8
deleted file mode 100644
index b245b186e68e..000000000000
--- a/x11-wm/metacity/files/digest-metacity-2.16.8
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 f2f7dc2bae47c370686730134020cbbb metacity-2.16.8.tar.bz2 1893552
-RMD160 92dc49df53fc04c2898a488c63a36d83607d0014 metacity-2.16.8.tar.bz2 1893552
-SHA256 62e74c9da42a501c6322044945f371b3d08ec81b52b06c05da43a80175d4306e metacity-2.16.8.tar.bz2 1893552
diff --git a/x11-wm/metacity/files/digest-metacity-2.20.0 b/x11-wm/metacity/files/digest-metacity-2.20.0
deleted file mode 100644
index ac554e1e00f3..000000000000
--- a/x11-wm/metacity/files/digest-metacity-2.20.0
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 e9c6317c85db019ac2d832dd9f45f536 metacity-2.20.0.tar.bz2 1882886
-RMD160 1723f6c575cf71a65918e8c2c223d0a31723be9d metacity-2.20.0.tar.bz2 1882886
-SHA256 e07a68c1015b8e77879c5f7ac492b3b622afeaf95eaef06180e8f7387836f08d metacity-2.20.0.tar.bz2 1882886
diff --git a/x11-wm/metacity/files/digest-metacity-2.20.2 b/x11-wm/metacity/files/digest-metacity-2.20.2
new file mode 100644
index 000000000000..2bc15b970fa0
--- /dev/null
+++ b/x11-wm/metacity/files/digest-metacity-2.20.2
@@ -0,0 +1,3 @@
+MD5 3b986030629860674b219fc35c226b1b metacity-2.20.2.tar.bz2 2035610
+RMD160 7b2478c1327a6ba04665bb42997fda79217b1e00 metacity-2.20.2.tar.bz2 2035610
+SHA256 69f292f92895bb4f915a0547e44b7682577f9c168aea3638ccfc4bba8bb6aabe metacity-2.20.2.tar.bz2 2035610
diff --git a/x11-wm/metacity/metacity-2.14.5.ebuild b/x11-wm/metacity/metacity-2.14.5.ebuild
deleted file mode 100644
index 2c50a63af739..000000000000
--- a/x11-wm/metacity/metacity-2.14.5.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/metacity/metacity-2.14.5.ebuild,v 1.13 2007/07/12 03:41:53 mr_bones_ Exp $
-
-inherit eutils gnome2
-
-DESCRIPTION="Gnome default windowmanager"
-HOMEPAGE="http://www.gnome.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sh sparc x86"
-IUSE="xinerama"
-
-# not parallel-safe; see bug #14405
-MAKEOPTS="${MAKEOPTS} -j1"
-
-RDEPEND=">=x11-libs/gtk+-2.6
-	>=x11-libs/pango-1.2
-	>=gnome-base/gconf-2
-	>=dev-libs/glib-2.6
-	>=x11-libs/startup-notification-0.7
-	!x11-misc/expocity"
-
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	>=dev-util/pkgconfig-0.9
-	>=dev-util/intltool-0.28"
-
-DOCS="AUTHORS ChangeLog HACKING NEWS README *.txt doc/*.txt"
-
-pkg_setup() {
-	# Compositor is too unreliable
-	G2CONF="$(use_enable xinerama) --disable-compositor"
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-
-	einfo "Metacity & Xorg X11 with composite enabled may cause unwanted"
-	einfo "border effects"
-}
diff --git a/x11-wm/metacity/metacity-2.16.3.ebuild b/x11-wm/metacity/metacity-2.16.3.ebuild
deleted file mode 100644
index 7c47e05f4f5d..000000000000
--- a/x11-wm/metacity/metacity-2.16.3.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/metacity/metacity-2.16.3.ebuild,v 1.11 2007/01/18 23:51:54 jer Exp $
-
-inherit eutils gnome2
-
-DESCRIPTION="Gnome default windowmanager"
-HOMEPAGE="http://www.gnome.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sh sparc x86 ~x86-fbsd"
-IUSE="xinerama"
-
-# not parallel-safe; see bug #14405
-MAKEOPTS="${MAKEOPTS} -j1"
-
-RDEPEND=">=x11-libs/gtk+-2.10
-	>=x11-libs/pango-1.2
-	>=gnome-base/gconf-2
-	>=dev-libs/glib-2.6
-	>=x11-libs/startup-notification-0.7
-	!x11-misc/expocity"
-
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	>=dev-util/pkgconfig-0.9
-	>=dev-util/intltool-0.35"
-
-DOCS="AUTHORS ChangeLog HACKING NEWS README *.txt doc/*.txt"
-
-pkg_setup() {
-	# Compositor is not deemed stable
-	G2CONF="$(use_enable xinerama) --disable-compositor"
-}
diff --git a/x11-wm/metacity/metacity-2.16.8.ebuild b/x11-wm/metacity/metacity-2.16.8.ebuild
deleted file mode 100644
index c6c28c49b4c3..000000000000
--- a/x11-wm/metacity/metacity-2.16.8.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/metacity/metacity-2.16.8.ebuild,v 1.1 2007/05/21 04:15:21 leio Exp $
-
-inherit eutils gnome2
-
-DESCRIPTION="Gnome default windowmanager"
-HOMEPAGE="http://www.gnome.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="xinerama"
-
-# not parallel-safe; see bug #14405
-MAKEOPTS="${MAKEOPTS} -j1"
-
-RDEPEND=">=x11-libs/gtk+-2.10
-	>=x11-libs/pango-1.2
-	>=gnome-base/gconf-2
-	>=dev-libs/glib-2.6
-	>=x11-libs/startup-notification-0.7
-	!x11-misc/expocity"
-
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	>=dev-util/pkgconfig-0.9
-	>=dev-util/intltool-0.35"
-
-DOCS="AUTHORS ChangeLog HACKING NEWS README *.txt doc/*.txt"
-
-pkg_setup() {
-	# Compositor is not deemed stable
-	G2CONF="$(use_enable xinerama) --disable-compositor"
-}
diff --git a/x11-wm/metacity/metacity-2.20.0.ebuild b/x11-wm/metacity/metacity-2.20.2.ebuild
index f61de424e5c5..a1acbd3a9859 100644
--- a/x11-wm/metacity/metacity-2.20.0.ebuild
+++ b/x11-wm/metacity/metacity-2.20.2.ebuild
@@ -1,15 +1,15 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/metacity/metacity-2.20.0.ebuild,v 1.2 2007/11/20 14:11:56 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/metacity/metacity-2.20.2.ebuild,v 1.1 2008/01/09 22:48:58 eva Exp $
 
-inherit eutils gnome2
+inherit gnome2
 
 DESCRIPTION="Gnome default windowmanager"
 HOMEPAGE="http://www.gnome.org/"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
 IUSE="xinerama"
 # compositor needs libcm as well, not activating it for the time being
 
@@ -31,6 +31,7 @@ DEPEND="${RDEPEND}
 DOCS="AUTHORS ChangeLog HACKING NEWS README *.txt doc/*.txt"
 
 pkg_setup() {
-	G2CONF="$(use_enable xinerama) \
+	G2CONF="${G2CONF}
+		$(use_enable xinerama)
 		--disable-compositor"
 }