cleanup, SLOT correction

11 files changed, 17 insertions, 145 deletions

diff --git a/x11-wm/metacity/ChangeLog b/x11-wm/metacity/ChangeLog
index 47e9a0b0be5b..18f6603a665c 100644
--- a/x11-wm/metacity/ChangeLog
+++ b/x11-wm/metacity/ChangeLog
@@ -1,6 +1,9 @@
 # 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.36 2003/09/12 00:31:25 spider Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/metacity/ChangeLog,v 1.37 2003/09/12 14:30:01 foser Exp $
+
+  12 Sep 2003; foser <foser@gentoo.org> metacity-*.ebuild :
+  Corrected all SLOT to be 0
 
 *metacity-2.6.1 (12 Sep 2003)
 
diff --git a/x11-wm/metacity/Manifest b/x11-wm/metacity/Manifest
index 3a82bc37ffae..9ac1409ea39c 100644
--- a/x11-wm/metacity/Manifest
+++ b/x11-wm/metacity/Manifest
@@ -1,17 +1,11 @@
-MD5 5c81809203d4969fd95b37f2f4ed9f9a metacity-2.4.1.ebuild 1073
-MD5 203f98d98e27300cd7b76f6fb9038e56 metacity-2.4.55.ebuild 1064
-MD5 108a5ef6535f214de1f04c76c123f084 metacity-2.4.34.ebuild 1039
-MD5 04e286f86db28071c73b5f1090fcf5de ChangeLog 4445
+MD5 adab8ef287ecc752d99ce5ee5d471cb3 metacity-2.4.55.ebuild 1063
+MD5 55ea5673381591db2108fa9cbfa0229c metacity-2.4.34.ebuild 1038
+MD5 6f1ae9169567742257c4410f73694e52 metacity-2.6.1.ebuild 1101
+MD5 e803a916e00e308b074ba812442173b3 ChangeLog 4534
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
-MD5 9578df1d1a9b8d366d66ebe1dec4fdd1 metacity-2.5.5.ebuild 1070
-MD5 cef4128bbffb47a28f74008418ff9e95 metacity-2.6.0.ebuild 1084
-MD5 1adb023d11fcdedf70a80aa6fcafc959 metacity-2.6.1.ebuild 1085
 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 4b8d31e149958238c018a4464a5f354f files/digest-metacity-2.4.34 69
 MD5 e5a49c7190b101c113e02491301f77fe files/digest-metacity-2.4.55 69
-MD5 532afda9465b65441cfce76596155801 files/digest-metacity-2.4.1 67
-MD5 540b7a077be3d47e9d0521795bb1a5b9 files/digest-metacity-2.5.5 68
-MD5 0800c1477373d846f6980dd22fd1592b files/digest-metacity-2.6.0 68
 MD5 bcb681865ef146908184b8ef4c70b274 files/digest-metacity-2.6.1 68
diff --git a/x11-wm/metacity/files/digest-metacity-2.4.1 b/x11-wm/metacity/files/digest-metacity-2.4.1
deleted file mode 100644
index 68bbb8a106cc..000000000000
--- a/x11-wm/metacity/files/digest-metacity-2.4.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 bbe3fd579deb3e315cbdd6eb81b79d88 metacity-2.4.1.tar.gz 1254691
diff --git a/x11-wm/metacity/files/digest-metacity-2.5.5 b/x11-wm/metacity/files/digest-metacity-2.5.5
deleted file mode 100644
index f49d977190fa..000000000000
--- a/x11-wm/metacity/files/digest-metacity-2.5.5
+++ /dev/null
@@ -1 +0,0 @@
-MD5 af8e466ca305b0c251fc050ec7587094 metacity-2.5.5.tar.bz2 1652851
diff --git a/x11-wm/metacity/files/digest-metacity-2.6.0 b/x11-wm/metacity/files/digest-metacity-2.6.0
deleted file mode 100644
index cec1975b8776..000000000000
--- a/x11-wm/metacity/files/digest-metacity-2.6.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 790707fb98d1040952eac20b8cf5f5e2 metacity-2.6.0.tar.bz2 1653476
diff --git a/x11-wm/metacity/metacity-2.4.1.ebuild b/x11-wm/metacity/metacity-2.4.1.ebuild
deleted file mode 100644
index 3d6d693aa354..000000000000
--- a/x11-wm/metacity/metacity-2.4.1.ebuild
+++ /dev/null
@@ -1,40 +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.1.ebuild,v 1.8 2003/02/13 17:50:32 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.2.1
-	>=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 (still)
-	use ppc && (
-		[ -z "${CC}" ] && CC=gcc
-		if [ "`${CC} -dumpversion | cut -d. -f1,2`" != "2.95" ] ; then
-			patch -p0 < ${FILESDIR}/metacity-2.4.1-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 fc614fb2d5b0..808832108be2 100644
--- a/x11-wm/metacity/metacity-2.4.34.ebuild
+++ b/x11-wm/metacity/metacity-2.4.34.ebuild
@@ -1,13 +1,13 @@
 # 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.12 2003/07/19 23:56:25 tester Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/metacity/metacity-2.4.34.ebuild,v 1.13 2003/09/12 14:30:01 foser Exp $
 
 inherit gnome2
 
 S=${WORKDIR}/${P}
 DESCRIPTION="Small gtk2 WindowManager"
 HOMEPAGE="http://people.redhat.com/~hp/metacity/"
-SLOT="1"
+SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="x86 ppc alpha sparc hppa amd64"
 
diff --git a/x11-wm/metacity/metacity-2.4.55.ebuild b/x11-wm/metacity/metacity-2.4.55.ebuild
index 2eaaec17c85a..9d0dfd76db10 100644
--- a/x11-wm/metacity/metacity-2.4.55.ebuild
+++ b/x11-wm/metacity/metacity-2.4.55.ebuild
@@ -1,13 +1,13 @@
 # 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.4 2003/08/25 23:50:53 tester Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/metacity/metacity-2.4.55.ebuild,v 1.5 2003/09/12 14:30:01 foser Exp $
 
 inherit gnome2
 
 S=${WORKDIR}/${P}
 DESCRIPTION="Small gtk2 WindowManager"
 HOMEPAGE="http://www.gnome.org/softwaremap/projects/metacity/"
-SLOT="1"
+SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="x86 ~ppc ~alpha ~sparc ~hppa ~amd64"
 IUSE=""
diff --git a/x11-wm/metacity/metacity-2.5.5.ebuild b/x11-wm/metacity/metacity-2.5.5.ebuild
deleted file mode 100644
index 3b7a561c2ae2..000000000000
--- a/x11-wm/metacity/metacity-2.5.5.ebuild
+++ /dev/null
@@ -1,41 +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.5.5.ebuild,v 1.1 2003/09/07 22:18:40 foser Exp $
-
-inherit gnome2
-
-DESCRIPTION="Small gtk2 WindowManager"
-HOMEPAGE="http://people.redhat.com/~hp/metacity/"
-SLOT="1"
-LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~alpha ~sparc"
-
-# not parallel-safe; see bug #14405
-MAKEOPTS="${MAKEOPTS} -j1"
-
-# FIXME : more useflagging possible
-
-# 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
-	>=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
-	)
-}
diff --git a/x11-wm/metacity/metacity-2.6.0.ebuild b/x11-wm/metacity/metacity-2.6.0.ebuild
deleted file mode 100644
index f3e5acae8437..000000000000
--- a/x11-wm/metacity/metacity-2.6.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.6.0.ebuild,v 1.1 2003/09/10 09:13:08 obz Exp $
-
-inherit gnome2
-
-DESCRIPTION="Small gtk2 WindowManager"
-HOMEPAGE="http://people.redhat.com/~hp/metacity/"
-SLOT="1"
-LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~alpha ~sparc"
-
-# not parallel-safe; see bug #14405
-MAKEOPTS="${MAKEOPTS} -j1"
-
-# FIXME : more useflagging possible
-IUSE=""
-
-# 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
-	>=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}
-	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
-	)
-}
diff --git a/x11-wm/metacity/metacity-2.6.1.ebuild b/x11-wm/metacity/metacity-2.6.1.ebuild
index 0ea2c17b2839..57ea51e6bf87 100644
--- a/x11-wm/metacity/metacity-2.6.1.ebuild
+++ b/x11-wm/metacity/metacity-2.6.1.ebuild
@@ -1,14 +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.6.1.ebuild,v 1.1 2003/09/12 00:31:25 spider Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/metacity/metacity-2.6.1.ebuild,v 1.2 2003/09/12 14:30:01 foser Exp $
 
 inherit gnome2
 
-DESCRIPTION="Small gtk2 WindowManager"
+DESCRIPTION="Gnome default windowmanager"
 HOMEPAGE="http://people.redhat.com/~hp/metacity/"
-SLOT="1"
+
+SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~alpha ~sparc"
+KEYWORDS="~x86 ~ppc ~alpha ~sparc ~hppa ~amd64"
 
 # not parallel-safe; see bug #14405
 MAKEOPTS="${MAKEOPTS} -j1"