New release: 2.12.2

(Portage version: 2.0.53_rc7)

5 files changed, 34 insertions, 24 deletions

diff --git a/x11-wm/metacity/ChangeLog b/x11-wm/metacity/ChangeLog
index 3bff3dc3372e..1aa257d2c717 100644
--- a/x11-wm/metacity/ChangeLog
+++ b/x11-wm/metacity/ChangeLog
@@ -1,6 +1,12 @@
 # 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.135 2005/10/10 21:07:50 hardave Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/metacity/ChangeLog,v 1.136 2005/11/29 07:23:49 leonardop Exp $
+
+*metacity-2.12.2 (29 Nov 2005)
+
+  29 Nov 2005; Leonardo Boshell <leonardop@gentoo.org>
+  +metacity-2.12.2.ebuild:
+  New version.
 
   10 Oct 2005; Hardave Riar <hardave@gentoo.org> metacity-2.10.3.ebuild:
   Stable on mips.
diff --git a/x11-wm/metacity/Manifest b/x11-wm/metacity/Manifest
index 88b843d3342e..c81752ada95e 100644
--- a/x11-wm/metacity/Manifest
+++ b/x11-wm/metacity/Manifest
@@ -1,9 +1,9 @@
 MD5 d710d9288a48dacafaf2d3dbaa2b13a4 ChangeLog 14627
-MD5 f209f136db09aa39ba91214fd415a697 metacity-2.10.0.ebuild 1210
-MD5 7c3acd3b4aaeab17a989e45166252589 metacity-2.12.1.ebuild 1282
-MD5 32bfb0fc7521103b5b5a4f5c6f32ce3a metacity-2.10.3.ebuild 1257
-MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
-MD5 138ac865c20f1f4f6ff2fde4fa487c00 files/digest-metacity-2.10.0 69
-MD5 16961ede777e7728d18f802db072e251 files/digest-metacity-2.12.1 69
 MD5 8085853ac850bbbd443d6f4c030f39bf files/digest-metacity-2.10.3 69
+MD5 16961ede777e7728d18f802db072e251 files/digest-metacity-2.12.1 69
+MD5 52d6f3845641e5004a00cb8fffc1d8a8 files/digest-metacity-2.12.2 69
 MD5 98f6fd8a6545a37a2ddf9b0e11ce54f7 files/metacity-2-logout.patch 7363
+MD5 32bfb0fc7521103b5b5a4f5c6f32ce3a metacity-2.10.3.ebuild 1257
+MD5 7c3acd3b4aaeab17a989e45166252589 metacity-2.12.1.ebuild 1282
+MD5 a78eef83fb04fffc3be0066a0509e0bc metacity-2.12.2.ebuild 1284
+MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
diff --git a/x11-wm/metacity/files/digest-metacity-2.10.0 b/x11-wm/metacity/files/digest-metacity-2.10.0
deleted file mode 100644
index 2beaa2d303d8..000000000000
--- a/x11-wm/metacity/files/digest-metacity-2.10.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 fed363d8ce6ae33d6dd4850c8e48fbbc metacity-2.10.0.tar.bz2 1581003
diff --git a/x11-wm/metacity/files/digest-metacity-2.12.2 b/x11-wm/metacity/files/digest-metacity-2.12.2
new file mode 100644
index 000000000000..6a85b56a6d3a
--- /dev/null
+++ b/x11-wm/metacity/files/digest-metacity-2.12.2
@@ -0,0 +1 @@
+MD5 4caabbd7a3ae14ec5ccf6ada2d466049 metacity-2.12.2.tar.bz2 1671369
diff --git a/x11-wm/metacity/metacity-2.10.0.ebuild b/x11-wm/metacity/metacity-2.12.2.ebuild
index 3f356f76a69b..1931a688108c 100644
--- a/x11-wm/metacity/metacity-2.10.0.ebuild
+++ b/x11-wm/metacity/metacity-2.12.2.ebuild
@@ -1,51 +1,55 @@
 # 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.0.ebuild,v 1.11 2005/08/24 01:16:53 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/metacity/metacity-2.12.2.ebuild,v 1.1 2005/11/29 07:23:49 leonardop Exp $
 
-inherit gnome2 eutils
+inherit eutils gnome2
 
 DESCRIPTION="Gnome default windowmanager"
 HOMEPAGE="http://www.gnome.org/"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 sparc x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 IUSE="xinerama"
 
 # not parallel-safe; see bug #14405
 MAKEOPTS="${MAKEOPTS} -j1"
 
 RDEPEND="virtual/x11
+	>=x11-libs/gtk+-2.6
 	>=x11-libs/pango-1.2
-	>=x11-libs/gtk+-2.2.0-r1
 	>=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.12.0
-	>=dev-util/intltool-0.29"
+	>=dev-util/pkgconfig-0.9
+	>=dev-util/intltool-0.28"
 
-# Compositor is too unreliable
-G2CONF="${G2CONF} $(use_enable xinerama) --disable-compositor"
+USE_DESTDIR="1"
+DOCS="AUTHORS ChangeLog HACKING NEWS README *.txt doc/*.txt"
 
-DOCS="AUTHORS ChangeLog HACKING NEWS README *txt"
+
+pkg_setup() {
+	# Compositor is too unreliable
+	G2CONF="$(use_enable xinerama) \
+		--disable-compositor"
+}
 
 src_unpack() {
+	unpack "${A}"
+	cd "${S}"
 
-	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
-
+	epatch "${FILESDIR}"/${PN}-2-logout.patch
 }
 
 pkg_postinst() {
-
 	gnome2_pkg_postinst
 
-	einfo "Metacity & Xorg X11 with composite enabled may cause unwanted border effects"
-
+	einfo "Metacity & Xorg X11 with composite enabled may cause unwanted"
+	einfo "border effects"
 }