new version

10 files changed, 20 insertions, 98 deletions

diff --git a/x11-wm/metacity/ChangeLog b/x11-wm/metacity/ChangeLog
index 31e1e78466d5..76f53813ce4f 100644
--- a/x11-wm/metacity/ChangeLog
+++ b/x11-wm/metacity/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-wm/metacity
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/metacity/ChangeLog,v 1.29 2003/04/09 15:38:55 todd Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/metacity/ChangeLog,v 1.30 2003/05/22 17:21:29 foser Exp $
+
+*metacity-2.4.55 (22 May 2003)
+
+  22 May 2003; foser <foser@gentoo.org> metacity-2.4.55.ebuild :
+  New version, removed libglade dep, added IUSE 
+  changed HOMEPAGE into something less incorrect
 
   07 Feb 2003; Aron Griffis <agriffis@gentoo.org> metacity-2.4.34.ebuild :
   Add ~alpha to KEYWORDS
diff --git a/x11-wm/metacity/Manifest b/x11-wm/metacity/Manifest
index 0bee95a4091c..b05dd20c3ed6 100644
--- a/x11-wm/metacity/Manifest
+++ b/x11-wm/metacity/Manifest
@@ -1,16 +1,10 @@
 MD5 5c81809203d4969fd95b37f2f4ed9f9a metacity-2.4.1.ebuild 1073
-MD5 41ec0363c84c4f571a0a9af9bb4b5a0c metacity-2.4.21.ebuild 978
-MD5 054fa844f30f6e7906c97f71f1af0e6b metacity-2.4.8.ebuild 925
-MD5 e10f53067be46d2818a52124b23fa463 metacity-2.4.55.ebuild 1039
-MD5 dd4602bf3b056f5c867d3889fce2278f metacity-2.4.0.ebuild 1077
-MD5 e10f53067be46d2818a52124b23fa463 metacity-2.4.34.ebuild 1039
-MD5 f5d2cb28bd79c195d6814d7b9ae3b377 ChangeLog 3526
+MD5 2e54c4d733ea01041916bb5f17bb4da8 metacity-2.4.55.ebuild 1051
+MD5 b4aeba470cf3cb8631dddcb539db97b2 metacity-2.4.34.ebuild 1027
+MD5 10de45c411154e95b62d9c7a0f4ec067 ChangeLog 3723
 MD5 888edb091b2a7f1feebf5ad86907048f files/metacity-2.4.3-ppc-gcc3.2.diff 1062
 MD5 be03404ddfeb13e12276ec1037a5ea42 files/metacity-2.4.0-ppc-gcc3.2.diff 1211
 MD5 a72a1bec809aa05fb1b9002b934f7bca files/metacity-2.4.1-ppc-gcc3.2.diff 1211
-MD5 ce1a348b82224b28a6d0550299e16db5 files/digest-metacity-2.4.21 69
 MD5 4b8d31e149958238c018a4464a5f354f files/digest-metacity-2.4.34 69
 MD5 e5a49c7190b101c113e02491301f77fe files/digest-metacity-2.4.55 69
-MD5 7ac184656985fb8fc03f30bc35a641cf files/digest-metacity-2.4.0 67
 MD5 532afda9465b65441cfce76596155801 files/digest-metacity-2.4.1 67
-MD5 15c118d1ecea21cba60d8000c7c3a6cd files/digest-metacity-2.4.8 67
diff --git a/x11-wm/metacity/files/digest-metacity-2.4.0 b/x11-wm/metacity/files/digest-metacity-2.4.0
deleted file mode 100644
index 9dbe9968e84b..000000000000
--- a/x11-wm/metacity/files/digest-metacity-2.4.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 6157cdb8383ec812b8e546ee9699ec1f metacity-2.4.0.tar.gz 1126846
diff --git a/x11-wm/metacity/files/digest-metacity-2.4.21 b/x11-wm/metacity/files/digest-metacity-2.4.21
deleted file mode 100644
index bb743b293a99..000000000000
--- a/x11-wm/metacity/files/digest-metacity-2.4.21
+++ /dev/null
@@ -1 +0,0 @@
-MD5 538f19286a5a0e126b4548ab3b24e126 metacity-2.4.21.tar.bz2 1108537
diff --git a/x11-wm/metacity/files/digest-metacity-2.4.55 b/x11-wm/metacity/files/digest-metacity-2.4.55
new file mode 100644
index 000000000000..0240dc34a295
--- /dev/null
+++ b/x11-wm/metacity/files/digest-metacity-2.4.55
@@ -0,0 +1 @@
+MD5 33c09d4de65b4bd5d991ef7ee9272e34 metacity-2.4.55.tar.bz2 1350118
diff --git a/x11-wm/metacity/files/digest-metacity-2.4.8 b/x11-wm/metacity/files/digest-metacity-2.4.8
deleted file mode 100644
index ec439f145d25..000000000000
--- a/x11-wm/metacity/files/digest-metacity-2.4.8
+++ /dev/null
@@ -1 +0,0 @@
-MD5 9821eb7bd8a868281d7aefa8abfc3fc0 metacity-2.4.8.tar.bz2 991253
diff --git a/x11-wm/metacity/metacity-2.4.0.ebuild b/x11-wm/metacity/metacity-2.4.0.ebuild
deleted file mode 100644
index 69573f9d39c3..000000000000
--- a/x11-wm/metacity/metacity-2.4.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# 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.0.ebuild,v 1.11 2003/02/13 17:50:26 vapier Exp $
-
-inherit gnome2
-
-S=${WORKDIR}/${P}
-DESCRIPTION="Small gtk2 WindowManager"
-SRC_URI="http://people.redhat.com/~hp/metacity/${P}.tar.gz"
-HOMEPAGE="http://people.redhat.com/~hp/metacity/"
-
-SLOT="1"
-LICENSE="GPL-2"
-KEYWORDS="x86 ppc sparc alpha"
-
-RDEPEND=">=dev-libs/glib-2.0.4
-	>=x11-libs/pango-1.0.2
-	>=x11-libs/gtk+-2.0.5
-	>=gnome-base/gconf-1.1.11
-	>=net-libs/linc-0.1.20
-	>=gnome-base/ORBit2-2.4.0
-	>=gnome-base/libglade-2.0.0"
-
-
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.12.0"
-
-G2CONF="${G2CONF} --enable-platform-gnome-2"
-DOCS="AUTHORS COPYING ChangeLog HACKING INSTALL NEWS README"
-
-src_unpack(){
-	unpack ${A}
-	# causes ICE on ppc w/ gcc 3.2_pre
-	use ppc && (
-		[ -z "${CC}" ] && CC=gcc
-		if [ "`${CC} -dumpversion | cut -d. -f1,2`" != "2.95" ] ; then
-			patch -p0 < ${FILESDIR}/metacity-2.4.0-ppc-gcc3.2.diff || die "patch failed"
-		fi
-	)
-}
-
-
diff --git a/x11-wm/metacity/metacity-2.4.34.ebuild b/x11-wm/metacity/metacity-2.4.34.ebuild
index 53886382d2b5..40736ff1e967 100644
--- a/x11-wm/metacity/metacity-2.4.34.ebuild
+++ b/x11-wm/metacity/metacity-2.4.34.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.4.34.ebuild,v 1.8 2003/04/09 15:38:55 todd Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/metacity/metacity-2.4.34.ebuild,v 1.9 2003/05/22 17:21:29 foser Exp $
 
 inherit gnome2
 
@@ -15,8 +15,7 @@ KEYWORDS="x86 ~ppc alpha sparc"
 MAKEOPTS="-j1"
 
 # sharp gtk dep is for a certain speed patch
-RDEPEND="virtual/x11
-	>=x11-libs/gtk+-2.2.0-r1
+RDEPEND=">=x11-libs/gtk+-2.2.0-r1
 	>=gnome-base/gconf-1.2
 	>=gnome-base/libglade-2
 	>=x11-libs/startup-notification-0.4"
diff --git a/x11-wm/metacity/metacity-2.4.21.ebuild b/x11-wm/metacity/metacity-2.4.55.ebuild
index 2035daad8099..e33de84074b3 100644
--- a/x11-wm/metacity/metacity-2.4.21.ebuild
+++ b/x11-wm/metacity/metacity-2.4.55.ebuild
@@ -1,21 +1,24 @@
 # 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.21.ebuild,v 1.3 2003/02/13 17:50:43 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/metacity/metacity-2.4.55.ebuild,v 1.1 2003/05/22 17:21:29 foser Exp $
 
 inherit gnome2
 
 S=${WORKDIR}/${P}
 DESCRIPTION="Small gtk2 WindowManager"
-HOMEPAGE="http://people.redhat.com/~hp/metacity/"
+HOMEPAGE="http://www.gnome.org/softwaremap/projects/metacity/"
 SLOT="1"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="~x86 ~ppc ~alpha ~sparc"
+IUSE=""
+
+# not parallel-safe; see bug #14405
+MAKEOPTS="${MAKEOPTS} -j1"
 
 # sharp gtk dep is for a certain speed patch
 RDEPEND="virtual/x11
 	>=x11-libs/gtk+-2.2.0-r1
 	>=gnome-base/gconf-1.2
-	>=gnome-base/libglade-2
 	>=x11-libs/startup-notification-0.4"
 
 DEPEND="${RDEPEND}
diff --git a/x11-wm/metacity/metacity-2.4.8.ebuild b/x11-wm/metacity/metacity-2.4.8.ebuild
deleted file mode 100644
index 21fc5f627d38..000000000000
--- a/x11-wm/metacity/metacity-2.4.8.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# 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.8.ebuild,v 1.2 2003/02/13 17:51:17 vapier Exp $
-
-inherit gnome2
-
-S=${WORKDIR}/${P}
-DESCRIPTION="Small gtk2 WindowManager"
-HOMEPAGE="http://people.redhat.com/~hp/metacity/"
-SLOT="1"
-LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc"
-
-RDEPEND="virtual/x11
-	>=x11-libs/gtk+-2
-	>=gnome-base/gconf-1.2
-	>=gnome-base/libglade-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"
-
-src_unpack(){
-	unpack ${A}
-	# causes ICE on ppc w/ gcc (still)
-	cd ${S}
-	use ppc && (
-		[ -z "${CC}" ] && CC=gcc
-		if [ "`${CC} -dumpversion | cut -d. -f1,2`" != "2.95" ] ; then
-			patch -p0 < ${FILESDIR}/metacity-2.4.3-ppc-gcc3.2.diff || die "patch failed"
-		fi
-	)
-}