New release: 2.10.2. Cleaning old ebuilds/patches

Package-Manager: portage-2.0.51.22-r1

19 files changed, 25 insertions, 344 deletions

diff --git a/x11-wm/metacity/ChangeLog b/x11-wm/metacity/ChangeLog
index ee23f2c8f408..b7fc406ae972 100644
--- a/x11-wm/metacity/ChangeLog
+++ b/x11-wm/metacity/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-wm/metacity
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/metacity/ChangeLog,v 1.108 2005/07/11 23:17:24 geoman Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/metacity/ChangeLog,v 1.109 2005/07/18 10:13:51 leonardop Exp $
+
+*metacity-2.10.2 (18 Jul 2005)
+
+  18 Jul 2005; Leonardo Boshell <leonardop@gentoo.org> metacity-2.10.2.ebuild:
+  New version. Added the 'static' USE flag.
 
   11 Jul 2005; Stephen P. Becker <geoman@gentoo.org> metacity-2.10.0.ebuild:
   stable on mips
diff --git a/x11-wm/metacity/Manifest b/x11-wm/metacity/Manifest
index d9d762230388..7f034978fb8c 100644
--- a/x11-wm/metacity/Manifest
+++ b/x11-wm/metacity/Manifest
@@ -1,25 +1,11 @@
-MD5 79ae7781a15dddb6df322b5165027a21 metacity-2.8.1.ebuild 883
-MD5 c169591b1fb07ae2e9e51878966f006b metacity-2.10.1.ebuild 1234
-MD5 8196ca95c398816e2e155c8fc97113ed metacity-2.8.8.ebuild 1208
-MD5 779da48ad69b11cb99d40916378e9dd9 metacity-2.8.6-r1.ebuild 1192
-MD5 3103ab3487854ef9f9b24fe8038c5d62 metacity-2.8.5.ebuild 997
-MD5 3a828afa2895b5be594478a9ce9da60e metacity-2.8.0.ebuild 1111
-MD5 0be28849d58e73a03d82844c80a6ff51 metacity-2.10.0.ebuild 1211
-MD5 42d56daa4e0616932aa07b12a7d1673e metacity-2.6.3.ebuild 1008
+MD5 c0316f0e2b2a367370bdc0c77681d7fb ChangeLog 11908
+MD5 fe681cc86b80b76c26e3d91805364f39 metacity-2.10.2.ebuild 1262
 MD5 9d2facc742178b6073f32bf6b8a44048 metacity-2.8.13.ebuild 1211
-MD5 a97370d3d0520b1ffc9ee9b46a12c9f4 ChangeLog 11749
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
-MD5 844a6198509977d5f2c6252b9099c88a metacity-2.6.5.ebuild 1017
-MD5 888edb091b2a7f1feebf5ad86907048f files/metacity-2.4.3-ppc-gcc3.2.diff 1062
+MD5 0be28849d58e73a03d82844c80a6ff51 metacity-2.10.0.ebuild 1211
+MD5 c169591b1fb07ae2e9e51878966f006b metacity-2.10.1.ebuild 1234
+MD5 0cee2d586461802eec4ccb94b7498901 files/digest-metacity-2.10.2 69
+MD5 fb1356c09b646ce7eeb382dfcb705a2b files/digest-metacity-2.8.13 69
 MD5 98f6fd8a6545a37a2ddf9b0e11ce54f7 files/metacity-2-logout.patch 7363
 MD5 138ac865c20f1f4f6ff2fde4fa487c00 files/digest-metacity-2.10.0 69
 MD5 ed9dff958297725508b84313a48e803e files/digest-metacity-2.10.1 69
-MD5 fb1356c09b646ce7eeb382dfcb705a2b files/digest-metacity-2.8.13 69
-MD5 cb56b63e849c924d574bb926f1c139be files/digest-metacity-2.8.6-r1 68
-MD5 4ab803ac0ffb0f611f083e2df08fc5f1 files/digest-metacity-2.6.3 68
-MD5 401c8abc54cf89761ae05db69a25aa60 files/digest-metacity-2.6.5 68
-MD5 ad3de36c7f3732f72fa88331f5266ba6 files/digest-metacity-2.8.0 68
-MD5 518f2435e25b7cd5e532fe83b3178e4c files/digest-metacity-2.8.1 68
-MD5 6785913225bcd05588b8b2adf011f3c9 files/digest-metacity-2.8.5 68
-MD5 88fc04bedaed2a4d475aaf7928ef9cb1 files/digest-metacity-2.8.8 68
-MD5 2562cf5fc7b8b4158301e47955a98c09 files/metacity-2.8.0-xinerama_config_test.patch 466
diff --git a/x11-wm/metacity/files/digest-metacity-2.10.2 b/x11-wm/metacity/files/digest-metacity-2.10.2
new file mode 100644
index 000000000000..0d63c89630e1
--- /dev/null
+++ b/x11-wm/metacity/files/digest-metacity-2.10.2
@@ -0,0 +1 @@
+MD5 2e86c0243e840adf0805b9805e4f90c2 metacity-2.10.2.tar.bz2 2373035
diff --git a/x11-wm/metacity/files/digest-metacity-2.6.3 b/x11-wm/metacity/files/digest-metacity-2.6.3
deleted file mode 100644
index 22d3d0d870c7..000000000000
--- a/x11-wm/metacity/files/digest-metacity-2.6.3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 370e54af48136a43dcae3596069af791 metacity-2.6.3.tar.bz2 1749859
diff --git a/x11-wm/metacity/files/digest-metacity-2.6.5 b/x11-wm/metacity/files/digest-metacity-2.6.5
deleted file mode 100644
index 7faa2d4eebc3..000000000000
--- a/x11-wm/metacity/files/digest-metacity-2.6.5
+++ /dev/null
@@ -1 +0,0 @@
-MD5 2530cca3818a6c25caa2f2aa135cfd62 metacity-2.6.5.tar.bz2 1775893
diff --git a/x11-wm/metacity/files/digest-metacity-2.8.0 b/x11-wm/metacity/files/digest-metacity-2.8.0
deleted file mode 100644
index c9b39592b460..000000000000
--- a/x11-wm/metacity/files/digest-metacity-2.8.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 c40109eaaaaf28c70eafce140b61bf13 metacity-2.8.0.tar.bz2 1998468
diff --git a/x11-wm/metacity/files/digest-metacity-2.8.1 b/x11-wm/metacity/files/digest-metacity-2.8.1
deleted file mode 100644
index c0e17b212fad..000000000000
--- a/x11-wm/metacity/files/digest-metacity-2.8.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 b311b41446c559056281f205f16d8aca metacity-2.8.1.tar.bz2 2085521
diff --git a/x11-wm/metacity/files/digest-metacity-2.8.5 b/x11-wm/metacity/files/digest-metacity-2.8.5
deleted file mode 100644
index 13863d42d175..000000000000
--- a/x11-wm/metacity/files/digest-metacity-2.8.5
+++ /dev/null
@@ -1 +0,0 @@
-MD5 c535fe74d001ad701e5b794e9dc14371 metacity-2.8.5.tar.bz2 2169636
diff --git a/x11-wm/metacity/files/digest-metacity-2.8.6-r1 b/x11-wm/metacity/files/digest-metacity-2.8.6-r1
deleted file mode 100644
index 334a96e0c781..000000000000
--- a/x11-wm/metacity/files/digest-metacity-2.8.6-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 c49e4b5575503975516159780855e317 metacity-2.8.6.tar.bz2 2174175
diff --git a/x11-wm/metacity/files/digest-metacity-2.8.8 b/x11-wm/metacity/files/digest-metacity-2.8.8
deleted file mode 100644
index 89e4beca508f..000000000000
--- a/x11-wm/metacity/files/digest-metacity-2.8.8
+++ /dev/null
@@ -1 +0,0 @@
-MD5 36c9ff136cff365dc40365000bfecec0 metacity-2.8.8.tar.bz2 2180355
diff --git a/x11-wm/metacity/files/metacity-2.4.3-ppc-gcc3.2.diff b/x11-wm/metacity/files/metacity-2.4.3-ppc-gcc3.2.diff
deleted file mode 100644
index cbf49e41c364..000000000000
--- a/x11-wm/metacity/files/metacity-2.4.3-ppc-gcc3.2.diff
+++ /dev/null
@@ -1,45 +0,0 @@
---- src/screen.c.orig	2002-11-03 17:35:17.000000000 -0600
-+++ src/screen.c	2002-11-03 17:36:41.000000000 -0600
-@@ -1552,10 +1552,27 @@
-   if (rows <= 0 && cols <= 0)
-     cols = num_workspaces;
- 
--  if (rows <= 0)
--    rows = num_workspaces / cols + ((num_workspaces % cols) > 0 ? 1 : 0);
--  if (cols <= 0)
--    cols = num_workspaces / rows + ((num_workspaces % rows) > 0 ? 1 : 0);
-+  if (rows <= 0) {
-+    /* fix PPC compile issue
-+     * ICE occurs using embedded macro in calculation, split 
-+     * into if statements 
-+     */
-+    if ((num_workspaces % cols) > 0) { 
-+      rows = num_workspaces / cols + 1;
-+    } else {
-+      rows  = num_workspaces / cols;
-+    }
-+  }
-+  if (cols <= 0) {
-+    /* another fix for PPC compile issue */
-+    if ((num_workspaces % rows) > 0) {
-+      cols = num_workspaces / rows + 1;
-+    } else {
-+      cols = num_workspaces / rows;
-+    }
-+  }
-+
-+
- 
-   /* paranoia */
-   if (rows < 1)
-@@ -1563,8 +1580,8 @@
-   if (cols < 1)
-     cols = 1;
- 
--  *r = rows;
--  *c = cols;
-+  r[0] = rows;
-+  c[0] = cols;
- }
- 
- static void
diff --git a/x11-wm/metacity/files/metacity-2.8.0-xinerama_config_test.patch b/x11-wm/metacity/files/metacity-2.8.0-xinerama_config_test.patch
deleted file mode 100644
index cadaf522fc0d..000000000000
--- a/x11-wm/metacity/files/metacity-2.8.0-xinerama_config_test.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- metacity-2.8.0/configure.in	2004-03-21 17:16:12.000000000 +0100
-+++ metacity-2.8.0.patched/configure.in	2004-03-31 00:21:54.438187584 +0200
-@@ -214,7 +214,7 @@
- CPPFLAGS="$CPPFLAGS $X_CFLAGS"
- 
- AC_ARG_ENABLE(xinerama,[  --disable-xinerama          disable metacity's use of the Xinerama extension],
--              try_xinerama=no,try_xinerama=yes)
-+              try_xinerama=$enable_xinerama,try_xinerama=yes)
- 
- use_solaris_xinerama=no
- use_xfree_xinerama=no
diff --git a/x11-wm/metacity/metacity-2.8.8.ebuild b/x11-wm/metacity/metacity-2.10.2.ebuild
index 719d58d7fede..25e1076001e5 100644
--- a/x11-wm/metacity/metacity-2.8.8.ebuild
+++ b/x11-wm/metacity/metacity-2.10.2.ebuild
@@ -1,36 +1,38 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/metacity/metacity-2.8.8.ebuild,v 1.8 2005/04/07 15:33:32 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/metacity/metacity-2.10.2.ebuild,v 1.1 2005/07/18 10:13:51 leonardop Exp $
 
-inherit gnome2 eutils
+inherit eutils gnome2
 
 DESCRIPTION="Gnome default windowmanager"
 HOMEPAGE="http://www.gnome.org/"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ~ppc64 sparc x86"
-IUSE="xinerama"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="static xinerama"
 
 # not parallel-safe; see bug #14405
 MAKEOPTS="${MAKEOPTS} -j1"
 
 RDEPEND="virtual/x11
 	>=x11-libs/pango-1.2
-	>=x11-libs/gtk+-2.2.0-r1
+	>=x11-libs/gtk+-2.2
 	>=gnome-base/gconf-2
 	>=x11-libs/startup-notification-0.7
 	!x11-misc/expocity"
 
 DEPEND="${RDEPEND}
 	sys-devel/gettext
-	>=dev-util/pkgconfig-0.12.0
-	>=dev-util/intltool-0.29"
+	dev-util/pkgconfig
+	>=dev-util/intltool-0.21"
 
 # Compositor is too unreliable
-G2CONF="${G2CONF} $(use_enable xinerama) --disable-compositor"
+G2CONF="${G2CONF} $(use_enable xinerama) $(use_enable static) \
+--disable-compositor"
 
-DOCS="AUTHORS ChangeLog HACKING NEWS README *txt"
+USE_DESTDIR="1"
+DOCS="AUTHORS ChangeLog HACKING NEWS README *.txt doc/*.txt"
 
 src_unpack() {
 
@@ -38,7 +40,7 @@ src_unpack() {
 	cd ${S}
 	# Fix the logout shortcut problems, by moving the keybindings
 	# into here, from control-center, fixes bug #52034
-	epatch ${FILESDIR}/metacity-2-logout.patch
+	epatch ${FILESDIR}/${PN}-2-logout.patch
 
 }
 
diff --git a/x11-wm/metacity/metacity-2.6.3.ebuild b/x11-wm/metacity/metacity-2.6.3.ebuild
deleted file mode 100644
index aaad6fafde5d..000000000000
--- a/x11-wm/metacity/metacity-2.6.3.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/metacity/metacity-2.6.3.ebuild,v 1.10 2005/01/08 23:22:55 slarti Exp $
-
-inherit gnome2 toolchain-funcs
-
-DESCRIPTION="Gnome default windowmanager"
-HOMEPAGE="http://www.gnome.org/"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="x86 ppc alpha sparc hppa amd64 ia64"
-IUSE=""
-
-# not parallel-safe; see bug #14405
-MAKEOPTS="${MAKEOPTS} -j1"
-
-# sharp gtk dep is for a certain speed patch
-RDEPEND="virtual/x11
-	>=x11-libs/pango-1.2
-	>=x11-libs/gtk+-2.2.0-r1
-	>=gnome-base/gconf-2
-	>=x11-libs/startup-notification-0.4"
-
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.12.0
-	>=dev-util/intltool-0.21"
-
-DOCS="AUTHORS COPYING ChangeLog HACKING INSTALL NEWS README"
-
-src_unpack(){
-
-	unpack ${A}
-
-	# causes ICE on ppc w/ gcc (still)
-	cd ${S}
-	if use ppc; then
-		if [ gcc-version != "2.95" ] ; then
-			patch -p0 < ${FILESDIR}/metacity-2.4.3-ppc-gcc3.2.diff || die "patch failed"
-		fi
-	fi
-}
diff --git a/x11-wm/metacity/metacity-2.6.5.ebuild b/x11-wm/metacity/metacity-2.6.5.ebuild
deleted file mode 100644
index b02da0681c60..000000000000
--- a/x11-wm/metacity/metacity-2.6.5.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/metacity/metacity-2.6.5.ebuild,v 1.10 2005/01/08 23:22:55 slarti Exp $
-
-inherit gnome2 toolchain-funcs
-
-DESCRIPTION="Gnome default windowmanager"
-HOMEPAGE="http://www.gnome.org/"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="x86 ppc ~alpha sparc ~hppa ~amd64 ~ia64 mips"
-IUSE=""
-
-# not parallel-safe; see bug #14405
-MAKEOPTS="${MAKEOPTS} -j1"
-
-# sharp gtk dep is for a certain speed patch
-RDEPEND="virtual/x11
-	>=x11-libs/pango-1.2
-	>=x11-libs/gtk+-2.2.0-r1
-	>=gnome-base/gconf-2
-	>=x11-libs/startup-notification-0.4"
-
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.12.0
-	>=dev-util/intltool-0.29"
-
-DOCS="AUTHORS COPYING ChangeLog HACKING INSTALL NEWS README"
-
-src_unpack(){
-
-	unpack ${A}
-
-	# causes ICE on ppc w/ gcc (still)
-	cd ${S}
-	if use ppc; then
-		if [ gcc-version != "2.95" ] ; then
-			patch -p0 < ${FILESDIR}/metacity-2.4.3-ppc-gcc3.2.diff || die "patch failed"
-		fi
-	fi
-}
diff --git a/x11-wm/metacity/metacity-2.8.0.ebuild b/x11-wm/metacity/metacity-2.8.0.ebuild
deleted file mode 100644
index f8e140ce6c70..000000000000
--- a/x11-wm/metacity/metacity-2.8.0.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/metacity/metacity-2.8.0.ebuild,v 1.13 2005/01/08 23:22:55 slarti Exp $
-
-inherit gnome2 eutils
-
-DESCRIPTION="Gnome default windowmanager"
-HOMEPAGE="http://www.gnome.org/"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="x86 ppc alpha ~sparc hppa amd64 ~ia64 mips"
-IUSE="xinerama"
-
-# not parallel-safe; see bug #14405
-MAKEOPTS="${MAKEOPTS} -j1"
-
-# sharp gtk dep is for a certain speed patch
-RDEPEND="virtual/x11
-	>=x11-libs/pango-1.2
-	>=x11-libs/gtk+-2.2.0-r1
-	>=gnome-base/gconf-2
-	>=x11-libs/startup-notification-0.4"
-
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	>=dev-util/pkgconfig-0.12.0
-	>=dev-util/intltool-0.29
-	sys-devel/autoconf"
-#autoconf for the config patch only
-
-DOCS="AUTHORS COPYING ChangeLog HACKING INSTALL NEWS README *txt"
-
-G2CONF="${G2CONF} $(use_enable xinerama) --disable-compositor"
-
-src_unpack() {
-
-	unpack ${A}
-	cd ${S}
-
-	# fix the xinerama configure stuff (#46291)
-	epatch ${FILESDIR}/${P}-xinerama_config_test.patch
-	WANT_AUTOCONF=2.5 autoconf || die
-
-}
diff --git a/x11-wm/metacity/metacity-2.8.1.ebuild b/x11-wm/metacity/metacity-2.8.1.ebuild
deleted file mode 100644
index 7caa791c9316..000000000000
--- a/x11-wm/metacity/metacity-2.8.1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/metacity/metacity-2.8.1.ebuild,v 1.13 2005/07/07 03:35:06 vapier Exp $
-
-inherit gnome2
-
-DESCRIPTION="Gnome default windowmanager"
-HOMEPAGE="http://www.gnome.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ~ia64 mips ~ppc ppc64 sparc x86"
-IUSE="xinerama"
-
-# not parallel-safe; see bug #14405
-MAKEOPTS="${MAKEOPTS} -j1"
-
-# sharp gtk dep is for a certain speed patch
-RDEPEND="virtual/x11
-	>=x11-libs/pango-1.2
-	>=x11-libs/gtk+-2.2.0-r1
-	>=gnome-base/gconf-2
-	>=x11-libs/startup-notification-0.4"
-
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	>=dev-util/pkgconfig-0.12.0
-	>=dev-util/intltool-0.29"
-
-G2CONF="${G2CONF} $(use_enable xinerama) --disable-compositor"
-
-DOCS="AUTHORS COPYING ChangeLog HACKING INSTALL NEWS README *txt"
diff --git a/x11-wm/metacity/metacity-2.8.5.ebuild b/x11-wm/metacity/metacity-2.8.5.ebuild
deleted file mode 100644
index 26ec86c32268..000000000000
--- a/x11-wm/metacity/metacity-2.8.5.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/metacity/metacity-2.8.5.ebuild,v 1.6 2005/01/08 23:22:55 slarti Exp $
-
-inherit gnome2
-
-DESCRIPTION="Gnome default windowmanager"
-HOMEPAGE="http://www.gnome.org/"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="x86 ppc alpha sparc ~hppa ~amd64 ~ia64 ~mips ~ppc64"
-IUSE="xinerama"
-
-# not parallel-safe; see bug #14405
-MAKEOPTS="${MAKEOPTS} -j1"
-
-RDEPEND="virtual/x11
-	>=x11-libs/pango-1.2
-	>=x11-libs/gtk+-2.2.0-r1
-	>=gnome-base/gconf-2
-	>=x11-libs/startup-notification-0.7"
-
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	>=dev-util/pkgconfig-0.12.0
-	>=dev-util/intltool-0.29"
-
-# Compositor is too unreliable
-G2CONF="${G2CONF} $(use_enable xinerama) --disable-compositor"
-
-DOCS="AUTHORS COPYING ChangeLog HACKING INSTALL NEWS README *txt"
-
-pkg_postinst() {
-
-	gnome2_pkg_postinst
-
-	einfo "Metacity & Xorg X11 with composite enabled may cause unwanted border effects"
-
-}
diff --git a/x11-wm/metacity/metacity-2.8.6-r1.ebuild b/x11-wm/metacity/metacity-2.8.6-r1.ebuild
deleted file mode 100644
index 07066086024d..000000000000
--- a/x11-wm/metacity/metacity-2.8.6-r1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/metacity/metacity-2.8.6-r1.ebuild,v 1.8 2005/07/07 03:35:06 vapier Exp $
-
-inherit gnome2 eutils
-
-DESCRIPTION="Gnome default windowmanager"
-HOMEPAGE="http://www.gnome.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ~ppc64 sparc x86"
-IUSE="xinerama"
-
-# not parallel-safe; see bug #14405
-MAKEOPTS="${MAKEOPTS} -j1"
-
-RDEPEND="virtual/x11
-	>=x11-libs/pango-1.2
-	>=x11-libs/gtk+-2.2.0-r1
-	>=gnome-base/gconf-2
-	>=x11-libs/startup-notification-0.7"
-
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	>=dev-util/pkgconfig-0.12.0
-	>=dev-util/intltool-0.29"
-
-# Compositor is too unreliable
-G2CONF="${G2CONF} $(use_enable xinerama) --disable-compositor"
-
-DOCS="AUTHORS ChangeLog HACKING INSTALL NEWS README *txt"
-
-src_unpack() {
-
-	unpack ${A}
-	# Fix the logout shortcut problems, by moving the keybindings
-	# into here, from control-center, fixes bug #52034
-	epatch ${FILESDIR}/metacity-2-logout.patch
-
-}
-
-pkg_postinst() {
-
-	gnome2_pkg_postinst
-
-	einfo "Metacity & Xorg X11 with composite enabled may cause unwanted border effects"
-
-}