Keyworded x86 and ppc for GNOME 2.8.1

5 files changed, 9 insertions, 48 deletions

diff --git a/x11-wm/metacity/ChangeLog b/x11-wm/metacity/ChangeLog
index e7ff0f4968e4..8785f051ede8 100644
--- a/x11-wm/metacity/ChangeLog
+++ b/x11-wm/metacity/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-wm/metacity
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/metacity/ChangeLog,v 1.81 2004/12/11 08:36:21 obz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/metacity/ChangeLog,v 1.82 2004/12/19 05:58:09 obz Exp $
+
+  19 Dec 2004; Mike Gardiner <obz@gentoo.org> metacity-2.8.6-r1.ebuild,
+  -metacity-2.8.6.ebuild:
+  Keyworded x86 and ppc for GNOME 2.8.1
 
 *metacity-2.8.8 (11 Dec 2004)
 
diff --git a/x11-wm/metacity/Manifest b/x11-wm/metacity/Manifest
index cfb2e6c732cd..d9bd722b6904 100644
--- a/x11-wm/metacity/Manifest
+++ b/x11-wm/metacity/Manifest
@@ -1,11 +1,10 @@
-MD5 1fc4e5d460d600b4bde6fad7f29568e2 metacity-2.8.6.ebuild 1006
 MD5 7bed435e70472dc2849e235c267b051d metacity-2.8.1.ebuild 883
 MD5 6719d8f9c6a69661f4b290609f0e6e85 metacity-2.8.8.ebuild 1215
-MD5 f49f72e16dfa276dfb192be5a83147cf metacity-2.8.6-r1.ebuild 1205
+MD5 47027146eb5ace085059d600e988d604 metacity-2.8.6-r1.ebuild 1203
 MD5 27a6204ed5153da696dccdd0f6256903 metacity-2.8.5.ebuild 997
 MD5 1d0c6152a10ced81079e2122a95cbd8e metacity-2.8.0.ebuild 1108
 MD5 f6b59812d25914a474884f7b791c4c99 metacity-2.6.3.ebuild 1004
-MD5 2f4070235160eddf8be7e2e7a51184b4 ChangeLog 9080
+MD5 3708bf06588ea193ecc7dec64d47c952 ChangeLog 9219
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 MD5 a4d312fa0332ab3ffef05469c44ea555 metacity-2.6.5.ebuild 1013
 MD5 888edb091b2a7f1feebf5ad86907048f files/metacity-2.4.3-ppc-gcc3.2.diff 1062
@@ -16,6 +15,5 @@ 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 cb56b63e849c924d574bb926f1c139be files/digest-metacity-2.8.6 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.8.6 b/x11-wm/metacity/files/digest-metacity-2.8.6
deleted file mode 100644
index 334a96e0c781..000000000000
--- a/x11-wm/metacity/files/digest-metacity-2.8.6
+++ /dev/null
@@ -1 +0,0 @@
-MD5 c49e4b5575503975516159780855e317 metacity-2.8.6.tar.bz2 2174175
diff --git a/x11-wm/metacity/metacity-2.8.6-r1.ebuild b/x11-wm/metacity/metacity-2.8.6-r1.ebuild
index 01e0eb0128df..9401d23fd182 100644
--- a/x11-wm/metacity/metacity-2.8.6-r1.ebuild
+++ b/x11-wm/metacity/metacity-2.8.6-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 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.1 2004/12/08 04:05:30 obz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/metacity/metacity-2.8.6-r1.ebuild,v 1.2 2004/12/19 05:58:09 obz Exp $
 
 inherit gnome2 eutils
 
@@ -9,7 +9,7 @@ HOMEPAGE="http://www.gnome.org/"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~alpha ~sparc ~hppa ~amd64 ~ia64 ~mips ~ppc64 ~arm"
+KEYWORDS="x86 ppc ~alpha ~sparc ~hppa ~amd64 ~ia64 ~mips ~ppc64 ~arm"
 IUSE="xinerama"
 
 # not parallel-safe; see bug #14405
diff --git a/x11-wm/metacity/metacity-2.8.6.ebuild b/x11-wm/metacity/metacity-2.8.6.ebuild
deleted file mode 100644
index d6137da3caa0..000000000000
--- a/x11-wm/metacity/metacity-2.8.6.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2004 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.ebuild,v 1.2 2004/11/08 16:56:16 vapier 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 ~arm"
-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"
-
-}