new release 'n cleanup

6 files changed, 13 insertions, 52 deletions

diff --git a/x11-wm/metacity/ChangeLog b/x11-wm/metacity/ChangeLog
index 857b02b23328..e5193f7ef8f8 100644
--- a/x11-wm/metacity/ChangeLog
+++ b/x11-wm/metacity/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-wm/metacity
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/metacity/ChangeLog,v 1.53 2004/02/10 06:22:14 darkspecter Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/metacity/ChangeLog,v 1.54 2004/02/17 16:32:23 foser Exp $
+
+*metacity-2.6.5 (17 Feb 2004)
+
+  17 Feb 2004; foser <foser@gentoo.org> metacity-2.6.5.ebuild :
+  New release
 
   10 Feb 2004; Bartosch Pixa <darkspecter@gentoo.org> metacity-2.6.3.ebuild:
   set ppc in keywords
diff --git a/x11-wm/metacity/files/digest-metacity-2.6.1 b/x11-wm/metacity/files/digest-metacity-2.6.1
deleted file mode 100644
index 0b060d108f27..000000000000
--- a/x11-wm/metacity/files/digest-metacity-2.6.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 0380801dae821ff67b8c8cb3410ecb01 metacity-2.6.1.tar.bz2 1664239
diff --git a/x11-wm/metacity/files/digest-metacity-2.6.2 b/x11-wm/metacity/files/digest-metacity-2.6.2
deleted file mode 100644
index 90edbcf8d2d2..000000000000
--- a/x11-wm/metacity/files/digest-metacity-2.6.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 92f83eebe98a9adc0cdf895627e58a42 metacity-2.6.2.tar.bz2 1720488
diff --git a/x11-wm/metacity/files/digest-metacity-2.6.5 b/x11-wm/metacity/files/digest-metacity-2.6.5
new file mode 100644
index 000000000000..7faa2d4eebc3
--- /dev/null
+++ b/x11-wm/metacity/files/digest-metacity-2.6.5
@@ -0,0 +1 @@
+MD5 2530cca3818a6c25caa2f2aa135cfd62 metacity-2.6.5.tar.bz2 1775893
diff --git a/x11-wm/metacity/metacity-2.6.1.ebuild b/x11-wm/metacity/metacity-2.6.1.ebuild
deleted file mode 100644
index 1e26d9896c14..000000000000
--- a/x11-wm/metacity/metacity-2.6.1.ebuild
+++ /dev/null
@@ -1,43 +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.1.ebuild,v 1.7 2003/11/08 17:08:42 todd Exp $
-
-inherit gnome2
-
-DESCRIPTION="Gnome default windowmanager"
-HOMEPAGE="http://www.gnome.org/"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 ppc ~alpha sparc ~hppa ~amd64"
-
-# not parallel-safe; see bug #14405
-MAKEOPTS="${MAKEOPTS} -j1"
-
-# FIXME : more useflagging possible
-IUSE=""
-
-# sharp gtk dep is for a certain speed patch
-RDEPEND="
-	>=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}
-	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.2.ebuild b/x11-wm/metacity/metacity-2.6.5.ebuild
index 71e94fbdf86d..61808f8bae09 100644
--- a/x11-wm/metacity/metacity-2.6.2.ebuild
+++ b/x11-wm/metacity/metacity-2.6.5.ebuild
@@ -1,22 +1,22 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 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.7 2003/12/13 00:00:39 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/metacity/metacity-2.6.5.ebuild,v 1.1 2004/02/17 16:32:23 foser Exp $
 
 inherit gnome2
 
 DESCRIPTION="Gnome default windowmanager"
 HOMEPAGE="http://www.gnome.org/"
+LICENSE="GPL-2"
 
 SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 ~ppc alpha sparc hppa amd64 ia64"
+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="
+RDEPEND="virtual/x11
 	>=x11-libs/pango-1.2
 	>=x11-libs/gtk+-2.2.0-r1
 	>=gnome-base/gconf-2
@@ -24,7 +24,7 @@ RDEPEND="
 
 DEPEND="${RDEPEND}
 	>=dev-util/pkgconfig-0.12.0
-	>=dev-util/intltool-0.21"
+	>=dev-util/intltool-0.29"
 
 DOCS="AUTHORS COPYING ChangeLog HACKING INSTALL NEWS README"