Version bump for bug fixes, including a fix for KDE applications seeming to demand attention on workspace switches in Gnome environment - bug 172264

(Portage version: 2.1.3_rc4)

6 files changed, 12 insertions, 42 deletions

diff --git a/x11-wm/metacity/ChangeLog b/x11-wm/metacity/ChangeLog
index fdda362ed9ea..3821e6cf43b3 100644
--- a/x11-wm/metacity/ChangeLog
+++ b/x11-wm/metacity/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-wm/metacity
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/metacity/ChangeLog,v 1.187 2007/05/21 04:15:21 leio Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/metacity/ChangeLog,v 1.188 2007/06/19 01:58:34 leio Exp $
+
+*metacity-2.18.5 (19 Jun 2007)
+
+  19 Jun 2007; Mart Raudsepp <leio@gentoo.org> -metacity-2.18.0.ebuild,
+  -metacity-2.18.1.ebuild, +metacity-2.18.5.ebuild:
+  Version bump for bug fixes, including a fix for KDE applications seeming to
+  demand attention on workspace switches in Gnome environment - bug 172264
 
 *metacity-2.16.8 (21 May 2007)
 
diff --git a/x11-wm/metacity/files/digest-metacity-2.18.0 b/x11-wm/metacity/files/digest-metacity-2.18.0
deleted file mode 100644
index bf659bc2bc73..000000000000
--- a/x11-wm/metacity/files/digest-metacity-2.18.0
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 2af31af033618329d093267ac00e49ff metacity-2.18.0.tar.bz2 1945353
-RMD160 803ebccc4efb0acd5b2ffe98ce9d611a2f853a8b metacity-2.18.0.tar.bz2 1945353
-SHA256 f948a81eb79a93da7ffde870f5823c6e9122e286a2b353131afbd27d2cf1b02e metacity-2.18.0.tar.bz2 1945353
diff --git a/x11-wm/metacity/files/digest-metacity-2.18.1 b/x11-wm/metacity/files/digest-metacity-2.18.1
deleted file mode 100644
index 68dbae59e5a2..000000000000
--- a/x11-wm/metacity/files/digest-metacity-2.18.1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 86387e27d33fa3eb8c5617d37d9cd799 metacity-2.18.1.tar.bz2 1963690
-RMD160 31ef6d17f825af3f8360b25d87c5aa8daf65c36b metacity-2.18.1.tar.bz2 1963690
-SHA256 079eee82d3aecf33be2827ea96d8962e1ba21bfe474fbc2aac5c6f716a60e573 metacity-2.18.1.tar.bz2 1963690
diff --git a/x11-wm/metacity/files/digest-metacity-2.18.5 b/x11-wm/metacity/files/digest-metacity-2.18.5
new file mode 100644
index 000000000000..4fff0ca4d96f
--- /dev/null
+++ b/x11-wm/metacity/files/digest-metacity-2.18.5
@@ -0,0 +1,3 @@
+MD5 7928172bf41f6b63976a62554a699674 metacity-2.18.5.tar.bz2 1949393
+RMD160 fe7b06c38124ed5caf9fccb3d416145a6251787d metacity-2.18.5.tar.bz2 1949393
+SHA256 e611746caa24138d96c48d9bd6b71005d3c893433fcaf1890d37aa0e7d13930d metacity-2.18.5.tar.bz2 1949393
diff --git a/x11-wm/metacity/metacity-2.18.1.ebuild b/x11-wm/metacity/metacity-2.18.1.ebuild
deleted file mode 100644
index dcbee9a2ce7b..000000000000
--- a/x11-wm/metacity/metacity-2.18.1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/metacity/metacity-2.18.1.ebuild,v 1.1 2007/04/17 04:02:16 compnerd Exp $
-
-inherit eutils gnome2
-
-DESCRIPTION="Gnome default windowmanager"
-HOMEPAGE="http://www.gnome.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="xinerama"
-
-# not parallel-safe; see bug #14405
-MAKEOPTS="${MAKEOPTS} -j1"
-
-RDEPEND=">=x11-libs/gtk+-2.10
-	>=x11-libs/pango-1.2
-	>=gnome-base/gconf-2
-	>=dev-libs/glib-2.6
-	>=x11-libs/startup-notification-0.7
-	!x11-misc/expocity"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	>=dev-util/pkgconfig-0.9
-	>=dev-util/intltool-0.35"
-
-DOCS="AUTHORS ChangeLog HACKING NEWS README *.txt doc/*.txt"
-
-pkg_setup() {
-	# Compositor is not deemed stable
-	G2CONF="$(use_enable xinerama) --disable-compositor"
-}
diff --git a/x11-wm/metacity/metacity-2.18.0.ebuild b/x11-wm/metacity/metacity-2.18.5.ebuild
index 978f8f963697..273730b0dd43 100644
--- a/x11-wm/metacity/metacity-2.18.0.ebuild
+++ b/x11-wm/metacity/metacity-2.18.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/metacity/metacity-2.18.0.ebuild,v 1.1 2007/03/27 17:04:58 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/metacity/metacity-2.18.5.ebuild,v 1.1 2007/06/19 01:58:34 leio Exp $
 
 inherit eutils gnome2