New version

4 files changed, 51 insertions, 3 deletions

diff --git a/x11-wm/metacity/ChangeLog b/x11-wm/metacity/ChangeLog
index b5aee432068a..25aaaac39775 100644
--- a/x11-wm/metacity/ChangeLog
+++ b/x11-wm/metacity/ChangeLog
@@ -1,6 +1,11 @@
 # 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.34 2003/09/07 22:18:40 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/metacity/ChangeLog,v 1.35 2003/09/10 09:13:08 obz Exp $
+
+*metacity-2.6.0 (10 Sep 2003)
+
+  10 Sep 2003; Mike Gardiner <obz@gentoo.org> metacity-2.6.0.ebuild:
+  New version
 
 *metacity-2.5.5 (07 Sep 2003)
 
diff --git a/x11-wm/metacity/Manifest b/x11-wm/metacity/Manifest
index 0bf6df5f03a0..82779232f339 100644
--- a/x11-wm/metacity/Manifest
+++ b/x11-wm/metacity/Manifest
@@ -2,9 +2,9 @@ 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 9578df1d1a9b8d366d66ebe1dec4fdd1 metacity-2.5.5.ebuild 1070
-MD5 26a94895febc80493ca496995b9cc19a ChangeLog 4225
+MD5 506d6877e4d6b50023d97d586a6fb590 ChangeLog 4338
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
-MD5 dc23ef192961886d409df96965faefe7 metacity-2.6.0.ebuild 987
+MD5 cef4128bbffb47a28f74008418ff9e95 metacity-2.6.0.ebuild 1084
 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
diff --git a/x11-wm/metacity/files/digest-metacity-2.6.0 b/x11-wm/metacity/files/digest-metacity-2.6.0
new file mode 100644
index 000000000000..cec1975b8776
--- /dev/null
+++ b/x11-wm/metacity/files/digest-metacity-2.6.0
@@ -0,0 +1 @@
+MD5 790707fb98d1040952eac20b8cf5f5e2 metacity-2.6.0.tar.bz2 1653476
diff --git a/x11-wm/metacity/metacity-2.6.0.ebuild b/x11-wm/metacity/metacity-2.6.0.ebuild
new file mode 100644
index 000000000000..f3e5acae8437
--- /dev/null
+++ b/x11-wm/metacity/metacity-2.6.0.ebuild
@@ -0,0 +1,42 @@
+# 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
+	)
+}