add 2.6rc1 release, mark 2.6.5 x86 for the good stable folks

5 files changed, 57 insertions, 3 deletions

diff --git a/x11-wm/metacity/ChangeLog b/x11-wm/metacity/ChangeLog
index a7dc032de2e2..a4d451442813 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.55 2004/03/17 00:23:16 geoman Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/metacity/ChangeLog,v 1.56 2004/03/18 23:04:55 foser Exp $
+
+*metacity-2.7.1 (19 Mar 2004)
+
+  19 Mar 2004; foser <foser@gentoo.org> metacity-2.7.1.ebuild :
+  Gnome 2.6 RC1 commit, added xinerama USE
 
   16 Mar 2004; Stephen P. Becker <geoman@gentoo.org> metacity-2.6.5.ebuild:
   Added ~mips keyword.
diff --git a/x11-wm/metacity/Manifest b/x11-wm/metacity/Manifest
index 26be1f3f4f42..0b9a855a2f23 100644
--- a/x11-wm/metacity/Manifest
+++ b/x11-wm/metacity/Manifest
@@ -1,5 +1,6 @@
 MD5 55ea5673381591db2108fa9cbfa0229c metacity-2.4.34.ebuild 1038
 MD5 86dc48c3b19370d59034d51b73f93c89 metacity-2.6.3.ebuild 1055
+MD5 690fa8a50302d509f70070ad9bc42c20 metacity-2.7.1.ebuild 1123
 MD5 8f6cf9219f0f0f5bab16dfd58a00fb25 ChangeLog 6282
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 MD5 257319c7dc468894f56e5b2020ff78d3 metacity-2.6.5.ebuild 1063
@@ -7,3 +8,4 @@ MD5 888edb091b2a7f1feebf5ad86907048f files/metacity-2.4.3-ppc-gcc3.2.diff 1062
 MD5 4b8d31e149958238c018a4464a5f354f files/digest-metacity-2.4.34 69
 MD5 4ab803ac0ffb0f611f083e2df08fc5f1 files/digest-metacity-2.6.3 68
 MD5 401c8abc54cf89761ae05db69a25aa60 files/digest-metacity-2.6.5 68
+MD5 06ae8b178fc661cc29ef54f8e109d7a3 files/digest-metacity-2.7.1 68
diff --git a/x11-wm/metacity/files/digest-metacity-2.7.1 b/x11-wm/metacity/files/digest-metacity-2.7.1
new file mode 100644
index 000000000000..d42186a3a258
--- /dev/null
+++ b/x11-wm/metacity/files/digest-metacity-2.7.1
@@ -0,0 +1 @@
+MD5 058fd6245595a0501c9542b67eb556c8 metacity-2.7.1.tar.bz2 1953406
diff --git a/x11-wm/metacity/metacity-2.6.5.ebuild b/x11-wm/metacity/metacity-2.6.5.ebuild
index b2aceb8adc65..42d3dcae26b2 100644
--- a/x11-wm/metacity/metacity-2.6.5.ebuild
+++ b/x11-wm/metacity/metacity-2.6.5.ebuild
@@ -1,6 +1,6 @@
 # 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.5.ebuild,v 1.2 2004/03/17 00:23:17 geoman Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/metacity/metacity-2.6.5.ebuild,v 1.3 2004/03/18 23:04:55 foser Exp $
 
 inherit gnome2
 
@@ -9,7 +9,7 @@ HOMEPAGE="http://www.gnome.org/"
 LICENSE="GPL-2"
 
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~alpha ~sparc ~hppa ~amd64 ~ia64 ~mips"
+KEYWORDS="x86 ~ppc ~alpha ~sparc ~hppa ~amd64 ~ia64 ~mips"
 IUSE=""
 
 # not parallel-safe; see bug #14405
diff --git a/x11-wm/metacity/metacity-2.7.1.ebuild b/x11-wm/metacity/metacity-2.7.1.ebuild
new file mode 100644
index 000000000000..3d3fbdb855d9
--- /dev/null
+++ b/x11-wm/metacity/metacity-2.7.1.ebuild
@@ -0,0 +1,46 @@
+# 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.7.1.ebuild,v 1.1 2004/03/18 23:04:55 foser Exp $
+
+inherit gnome2
+
+DESCRIPTION="Gnome default windowmanager"
+HOMEPAGE="http://www.gnome.org/"
+LICENSE="GPL-2"
+
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~alpha ~sparc ~hppa ~amd64 ~ia64 ~mips"
+IUSE="xinerama"
+
+# not parallel-safe; see bug #14405
+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-2
+	>=x11-libs/startup-notification-0.4"
+
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+	>=dev-util/pkgconfig-0.12.0
+	>=dev-util/intltool-0.29"
+
+DOCS="AUTHORS COPYING ChangeLog HACKING INSTALL NEWS README"
+
+G2CONF="${G2CONF} $(use_enable xinerama)"
+
+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.3-ppc-gcc3.2.diff || die "patch failed"
+		fi
+	)
+
+}