bugfix release

(Portage version: 2.0.51.19)

4 files changed, 64 insertions, 5 deletions

diff --git a/x11-wm/metacity/ChangeLog b/x11-wm/metacity/ChangeLog
index 23e93e8f14ec..c0d6de771fd8 100644
--- a/x11-wm/metacity/ChangeLog
+++ b/x11-wm/metacity/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-wm/metacity
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/metacity/ChangeLog,v 1.95 2005/04/07 15:33:31 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/metacity/ChangeLog,v 1.96 2005/04/17 14:05:26 joem Exp $
+
+*metacity-2.10.1 (17 Apr 2005)
+
+  17 Apr 2005; Joe McCann <joem@gentoo.org> +metacity-2.10.1.ebuild:
+  bugfix release
 
   07 Apr 2005; Simon Stelling <blubb@gentoo.org> metacity-2.8.8.ebuild:
   stable on amd64
diff --git a/x11-wm/metacity/Manifest b/x11-wm/metacity/Manifest
index a0e504e70412..bb496aed872e 100644
--- a/x11-wm/metacity/Manifest
+++ b/x11-wm/metacity/Manifest
@@ -1,23 +1,25 @@
 MD5 04ee6cdc4d46ce3c9577a8c5f403790b ChangeLog 10496
-MD5 7d7bfa31f14531889706b379240a3527 metacity-2.10.0.ebuild 1217
 MD5 42d56daa4e0616932aa07b12a7d1673e metacity-2.6.3.ebuild 1008
 MD5 844a6198509977d5f2c6252b9099c88a metacity-2.6.5.ebuild 1017
 MD5 3a828afa2895b5be594478a9ce9da60e metacity-2.8.0.ebuild 1111
 MD5 63cdb873748d6521832133355abb80e1 metacity-2.8.1.ebuild 883
-MD5 b6699d5da808f25b302c5910f7e842c7 metacity-2.8.13.ebuild 1216
 MD5 3103ab3487854ef9f9b24fe8038c5d62 metacity-2.8.5.ebuild 997
 MD5 469a0fced4580981a8be78621e6083d6 metacity-2.8.6-r1.ebuild 1192
 MD5 8196ca95c398816e2e155c8fc97113ed metacity-2.8.8.ebuild 1208
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
-MD5 138ac865c20f1f4f6ff2fde4fa487c00 files/digest-metacity-2.10.0 69
+MD5 b6699d5da808f25b302c5910f7e842c7 metacity-2.8.13.ebuild 1216
+MD5 7d7bfa31f14531889706b379240a3527 metacity-2.10.0.ebuild 1217
+MD5 7d7bfa31f14531889706b379240a3527 metacity-2.10.1.ebuild 1217
 MD5 4ab803ac0ffb0f611f083e2df08fc5f1 files/digest-metacity-2.6.3 68
 MD5 401c8abc54cf89761ae05db69a25aa60 files/digest-metacity-2.6.5 68
 MD5 ad3de36c7f3732f72fa88331f5266ba6 files/digest-metacity-2.8.0 68
 MD5 518f2435e25b7cd5e532fe83b3178e4c files/digest-metacity-2.8.1 68
-MD5 fb1356c09b646ce7eeb382dfcb705a2b files/digest-metacity-2.8.13 69
 MD5 6785913225bcd05588b8b2adf011f3c9 files/digest-metacity-2.8.5 68
 MD5 cb56b63e849c924d574bb926f1c139be files/digest-metacity-2.8.6-r1 68
 MD5 88fc04bedaed2a4d475aaf7928ef9cb1 files/digest-metacity-2.8.8 68
 MD5 98f6fd8a6545a37a2ddf9b0e11ce54f7 files/metacity-2-logout.patch 7363
 MD5 888edb091b2a7f1feebf5ad86907048f files/metacity-2.4.3-ppc-gcc3.2.diff 1062
 MD5 2562cf5fc7b8b4158301e47955a98c09 files/metacity-2.8.0-xinerama_config_test.patch 466
+MD5 fb1356c09b646ce7eeb382dfcb705a2b files/digest-metacity-2.8.13 69
+MD5 138ac865c20f1f4f6ff2fde4fa487c00 files/digest-metacity-2.10.0 69
+MD5 ed9dff958297725508b84313a48e803e files/digest-metacity-2.10.1 69
diff --git a/x11-wm/metacity/files/digest-metacity-2.10.1 b/x11-wm/metacity/files/digest-metacity-2.10.1
new file mode 100644
index 000000000000..52973651f7cf
--- /dev/null
+++ b/x11-wm/metacity/files/digest-metacity-2.10.1
@@ -0,0 +1 @@
+MD5 c326eb1aed8742057e9ad94b9ccae877 metacity-2.10.1.tar.bz2 1650633
diff --git a/x11-wm/metacity/metacity-2.10.1.ebuild b/x11-wm/metacity/metacity-2.10.1.ebuild
new file mode 100644
index 000000000000..233167927754
--- /dev/null
+++ b/x11-wm/metacity/metacity-2.10.1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/metacity/metacity-2.10.1.ebuild,v 1.1 2005/04/17 14:05:26 joem Exp $
+
+inherit gnome2 eutils
+
+DESCRIPTION="Gnome default windowmanager"
+HOMEPAGE="http://www.gnome.org/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~alpha ~sparc ~hppa ~amd64 ~ia64 ~mips ~ppc64 ~arm"
+IUSE="xinerama"
+
+# not parallel-safe; see bug #14405
+MAKEOPTS="${MAKEOPTS} -j1"
+
+RDEPEND="virtual/x11
+	>=x11-libs/pango-1.2
+	>=x11-libs/gtk+-2.2.0-r1
+	>=gnome-base/gconf-2
+	>=x11-libs/startup-notification-0.7
+	!x11-misc/expocity"
+
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+	>=dev-util/pkgconfig-0.12.0
+	>=dev-util/intltool-0.29"
+
+# Compositor is too unreliable
+G2CONF="${G2CONF} $(use_enable xinerama) --disable-compositor"
+USE_DESTDIR="1"
+DOCS="AUTHORS ChangeLog HACKING NEWS README *txt"
+
+src_unpack() {
+
+	unpack ${A}
+	cd ${S}
+	# Fix the logout shortcut problems, by moving the keybindings
+	# into here, from control-center, fixes bug #52034
+	epatch ${FILESDIR}/metacity-2-logout.patch
+
+}
+
+pkg_postinst() {
+
+	gnome2_pkg_postinst
+
+	einfo "Metacity & Xorg X11 with composite enabled may cause unwanted border effects"
+
+}