new version..

6 files changed, 22 insertions, 20 deletions

diff --git a/x11-wm/metacity/Manifest b/x11-wm/metacity/Manifest
index 6f8e30a3778e..360399b90c84 100644
--- a/x11-wm/metacity/Manifest
+++ b/x11-wm/metacity/Manifest
@@ -1,13 +1,11 @@
-MD5 57bf4346fd17d1ccbe22e798209568c6 metacity-2.6.2.ebuild 1052
-MD5 05712ba96a27f59e8775f8f850757fd3 metacity-2.4.55.ebuild 1068
+MD5 fcce76974560707da97a6745fb73741e metacity-2.6.2.ebuild 1036
 MD5 55ea5673381591db2108fa9cbfa0229c metacity-2.4.34.ebuild 1038
-MD5 6804e3a6940196935fc8d703a8924104 metacity-2.6.1.ebuild 1088
-MD5 57bf4346fd17d1ccbe22e798209568c6 metacity-2.6.3.ebuild 1052
-MD5 eafdb96e23786c02b5a5ae295adf712c ChangeLog 5064
+MD5 8a77815c8d3f92d458ad46366f8e724c metacity-2.6.1.ebuild 1071
+MD5 7771578249ec89636da04adbd1724b34 metacity-2.6.3.ebuild 1050
+MD5 8df10274ee568664e2dacd947f70f66c ChangeLog 5168
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 MD5 888edb091b2a7f1feebf5ad86907048f files/metacity-2.4.3-ppc-gcc3.2.diff 1062
 MD5 4b8d31e149958238c018a4464a5f354f files/digest-metacity-2.4.34 69
-MD5 e5a49c7190b101c113e02491301f77fe files/digest-metacity-2.4.55 69
 MD5 bcb681865ef146908184b8ef4c70b274 files/digest-metacity-2.6.1 68
 MD5 658e154d5f9a9c9e67dd1f62ee708fb0 files/digest-metacity-2.6.2 68
 MD5 4ab803ac0ffb0f611f083e2df08fc5f1 files/digest-metacity-2.6.3 68
diff --git a/x11-wm/metacity/files/digest-metacity-2.4.55 b/x11-wm/metacity/files/digest-metacity-2.4.55
deleted file mode 100644
index 0240dc34a295..000000000000
--- a/x11-wm/metacity/files/digest-metacity-2.4.55
+++ /dev/null
@@ -1 +0,0 @@
-MD5 33c09d4de65b4bd5d991ef7ee9272e34 metacity-2.4.55.tar.bz2 1350118
diff --git a/x11-wm/metacity/files/digest-metacity-2.6.3 b/x11-wm/metacity/files/digest-metacity-2.6.3
new file mode 100644
index 000000000000..22d3d0d870c7
--- /dev/null
+++ b/x11-wm/metacity/files/digest-metacity-2.6.3
@@ -0,0 +1 @@
+MD5 370e54af48136a43dcae3596069af791 metacity-2.6.3.tar.bz2 1749859
diff --git a/x11-wm/metacity/metacity-2.6.1.ebuild b/x11-wm/metacity/metacity-2.6.1.ebuild
index 1b1f83cf60e4..fd4c08c9a1ba 100644
--- a/x11-wm/metacity/metacity-2.6.1.ebuild
+++ b/x11-wm/metacity/metacity-2.6.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/metacity/metacity-2.6.1.ebuild,v 1.5 2003/10/22 12:22:24 darkspecter Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/metacity/metacity-2.6.1.ebuild,v 1.6 2003/10/30 13:55:24 foser Exp $
 
 inherit gnome2
 
@@ -18,7 +18,7 @@ MAKEOPTS="${MAKEOPTS} -j1"
 IUSE=""
 
 # sharp gtk dep is for a certain speed patch
-RDEPEND="virtual/x11
+RDEPEND="
 	>=x11-libs/pango-1.2
 	>=x11-libs/gtk+-2.2.0-r1
 	>=gnome-base/gconf-2
diff --git a/x11-wm/metacity/metacity-2.6.2.ebuild b/x11-wm/metacity/metacity-2.6.2.ebuild
index 52ae9fc6069e..7539555e1ad0 100644
--- a/x11-wm/metacity/metacity-2.6.2.ebuild
+++ b/x11-wm/metacity/metacity-2.6.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/metacity/metacity-2.6.2.ebuild,v 1.3 2003/10/18 22:54:00 brad_mssw Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/metacity/metacity-2.6.2.ebuild,v 1.4 2003/10/30 13:55:24 foser Exp $
 
 inherit gnome2
 
@@ -9,14 +9,14 @@ HOMEPAGE="http://www.gnome.org/"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc alpha ~sparc ~hppa amd64"
+KEYWORDS="x86 ~ppc alpha ~sparc ~hppa amd64"
 IUSE=""
 
 # not parallel-safe; see bug #14405
 MAKEOPTS="${MAKEOPTS} -j1"
 
 # sharp gtk dep is for a certain speed patch
-RDEPEND="virtual/x11
+RDEPEND="
 	>=x11-libs/pango-1.2
 	>=x11-libs/gtk+-2.2.0-r1
 	>=gnome-base/gconf-2
diff --git a/x11-wm/metacity/metacity-2.4.55.ebuild b/x11-wm/metacity/metacity-2.6.3.ebuild
index ceecf01f3fad..b9d79b6b93e4 100644
--- a/x11-wm/metacity/metacity-2.4.55.ebuild
+++ b/x11-wm/metacity/metacity-2.6.3.ebuild
@@ -1,15 +1,15 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/metacity/metacity-2.4.55.ebuild,v 1.6 2003/09/23 16:16:10 darkspecter Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/metacity/metacity-2.6.3.ebuild,v 1.1 2003/10/30 13:55:24 foser Exp $
 
 inherit gnome2
 
-S=${WORKDIR}/${P}
-DESCRIPTION="Small gtk2 WindowManager"
-HOMEPAGE="http://www.gnome.org/softwaremap/projects/metacity/"
-SLOT="0"
+DESCRIPTION="Gnome default windowmanager"
+HOMEPAGE="http://www.gnome.org/"
 LICENSE="GPL-2"
-KEYWORDS="x86 ppc ~alpha ~sparc ~hppa ~amd64"
+
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~alpha ~sparc ~hppa ~amd64"
 IUSE=""
 
 # not parallel-safe; see bug #14405
@@ -17,18 +17,21 @@ 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-1.2
+	>=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 ChangeLog HACKING INSTALL NEWS README"
+DOCS="AUTHORS COPYING ChangeLog HACKING INSTALL NEWS README"
 
 src_unpack(){
+
 	unpack ${A}
+
 	# causes ICE on ppc w/ gcc (still)
 	cd ${S}
 	use ppc && (
@@ -37,4 +40,5 @@ src_unpack(){
 			patch -p0 < ${FILESDIR}/metacity-2.4.3-ppc-gcc3.2.diff || die "patch failed"
 		fi
 	)
+
 }