Version bump. Replace GDK usage by cairo. Fix crashers and memory leaks. Translation updates.

Package-Manager: portage-2.2_rc78/cvs/Linux x86_64

3 files changed, 104 insertions, 5 deletions

diff --git a/x11-wm/metacity/ChangeLog b/x11-wm/metacity/ChangeLog
index 011b6d6c0741..489960cdf442 100644
--- a/x11-wm/metacity/ChangeLog
+++ b/x11-wm/metacity/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-wm/metacity
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/metacity/ChangeLog,v 1.257 2010/09/11 18:41:57 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/metacity/ChangeLog,v 1.258 2010/09/16 21:00:39 eva Exp $
+
+*metacity-2.30.2 (16 Sep 2010)
+
+  16 Sep 2010; Gilles Dartiguelongue <eva@gentoo.org>
+  +metacity-2.30.2.ebuild:
+  Version bump. Replace GDK usage by cairo. Fix crashers and memory leaks.
+  Translation updates.
 
   11 Sep 2010; Joseph Jezak <josejx@gentoo.org> metacity-2.30.1.ebuild:
   Marked ppc for bug #324077.
diff --git a/x11-wm/metacity/Manifest b/x11-wm/metacity/Manifest
index 4a09ae0dc8d6..18a1fce66aaa 100644
--- a/x11-wm/metacity/Manifest
+++ b/x11-wm/metacity/Manifest
@@ -8,15 +8,17 @@ AUX metacity-2.28.1-wif_macros.patch 500 RMD160 570a8b9e76e815cc5d207fddcf0278e1
 DIST metacity-2.26.0.tar.bz2 2289848 RMD160 26b75abb9b705f9fd7711dfbbff134e600dcfd56 SHA1 70593f69148960a0248527c8ae8d442a3d251d08 SHA256 29ba16411899d963bae69a4d72d37dec38a33e62412fe769d497de4555559078
 DIST metacity-2.28.1.tar.bz2 2348762 RMD160 3d93c7f0a771f8ba2d82ef03b13d79e90af4b62c SHA1 752d1aff3a1a96d63069bcf58de5cc21de9a240d SHA256 38e4d389d6fb375e82544fd572b3a32bbcd6d26ebe58a9a0a92c461edadf95e2
 DIST metacity-2.30.1.tar.bz2 2314657 RMD160 4f83b671a75606723cc8a02196a257a65a53ae00 SHA1 d963931d69da258adfc9aba3e5cd8cb95f9fddf3 SHA256 0057b6e0562cf51b648a2d7b3729def8365ccefd12a9b1373f93312da1ebe5d8
+DIST metacity-2.30.2.tar.bz2 2357718 RMD160 1102e27b8c5e63163ec64a69a33642234b1c7714 SHA1 063ac72c328c53c588cf3bc19dda5906ca3dc077 SHA256 d4c1cbf74cce4c099e95cc440c834833e3efc287a3cf952ba0b4cfc84351ffe3
 EBUILD metacity-2.26.0-r1.ebuild 1610 RMD160 07741287e3f4bbaf61d2ecc6b8914a9b1271f6ec SHA1 683b0e5eab049f1a87abfd4ade008688a9693d43 SHA256 ed0a86e1b450d0eef182c3128add362e0b91a20d418de7600fe99392a56b613a
 EBUILD metacity-2.28.1.ebuild 2547 RMD160 3f69251b87202f535ac6c437a2b7324c110c4efe SHA1 79ca6024aecadae63cbbd5dd76f1694201137564 SHA256 cc7e781cf3c174723fbe20a4620120e234f7c6e7b6ab1db9234ac16153a65054
 EBUILD metacity-2.30.1.ebuild 2551 RMD160 ed47d2bca1fe2afc2a6c14308748c669bbcfc843 SHA1 91cb9f5cd5662acac1a50b9b50a76e377149f012 SHA256 ed2bf7e3942ec246c1a460de90b4bf8870bde3298a7cfc8d003b1413d8b51152
-MISC ChangeLog 30958 RMD160 c90340bfb6ff5147e478dc53bbdd663cb02cb2bb SHA1 7e983e6f8f05753c66cba5891b4e6b2c636e7ffd SHA256 e19d0ca134b37dc1d7abfb3bcadcbd98612c8ae36a89551c1701f2083de660cd
+EBUILD metacity-2.30.2.ebuild 2571 RMD160 bccb88ceebc28168bbeadfc8c64cdeb45e1fbddf SHA1 5e379bba336a6fe99aed24026f1a28d13af0ecab SHA256 a018370af0c35104d3e2ba7c624fffc5b1a32a807a10dda984170c397f207fcf
+MISC ChangeLog 31167 RMD160 e71c079d7a418ae75281daa76b437d004b422fd9 SHA1 8dd17154ad73cc4ea3faa38f2a6f8250db936220 SHA256 dbb849149342257c324ef1867b3226630ea1eb1de9fe627c7b476a1e24afd873
 MISC metadata.xml 409 RMD160 cd76d1e78c03fb5379abca2a1e136cba116eacae SHA1 703d6a46d96d2734062f1496880b983b89f837c9 SHA256 cbc77bb6077444f8b66e4f8a4cd4cf1af7dbbe8d410b4819ef5e1af049378218
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAkyLzIgACgkQcsIHjyDViGReSQCg027Ly0+m4styIxbzChQBK2fq
-Z7YAn2okg4/XthCY/TNJHLcc18fqUJOW
-=yn3s
+iEYEARECAAYFAkyShXwACgkQ1fmVwcYIWAZkHgCfVn1y7UlR68CWZi2q76leHQfa
+vlsAoJTcXNn4frjsWQqOlLwDPSe+8wyH
+=I+iu
 -----END PGP SIGNATURE-----
diff --git a/x11-wm/metacity/metacity-2.30.2.ebuild b/x11-wm/metacity/metacity-2.30.2.ebuild
new file mode 100644
index 000000000000..59123ee5bc19
--- /dev/null
+++ b/x11-wm/metacity/metacity-2.30.2.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/metacity/metacity-2.30.2.ebuild,v 1.1 2010/09/16 21:00:39 eva Exp $
+
+EAPI="2"
+# debug only changes CFLAGS
+GCONF_DEBUG="no"
+
+inherit eutils gnome2
+
+DESCRIPTION="GNOME default window manager"
+HOMEPAGE="http://blogs.gnome.org/metacity/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE="test xinerama"
+
+# XXX: libgtop is automagic, hard-enabled instead
+RDEPEND=">=x11-libs/gtk+-2.20:2
+	>=x11-libs/pango-1.2[X]
+	>=gnome-base/gconf-2
+	>=dev-libs/glib-2.6
+	>=x11-libs/startup-notification-0.7
+	>=x11-libs/libXcomposite-0.2
+	x11-libs/libXfixes
+	x11-libs/libXrender
+	x11-libs/libXdamage
+	x11-libs/libXcursor
+	x11-libs/libX11
+	xinerama? ( x11-libs/libXinerama )
+	x11-libs/libXext
+	x11-libs/libXrandr
+	x11-libs/libSM
+	x11-libs/libICE
+	media-libs/libcanberra[gtk]
+	gnome-base/libgtop
+	gnome-extra/zenity
+	!x11-misc/expocity"
+DEPEND="${RDEPEND}
+	>=app-text/gnome-doc-utils-0.8
+	sys-devel/gettext
+	>=dev-util/pkgconfig-0.9
+	>=dev-util/intltool-0.35
+	test? ( app-text/docbook-xml-dtd:4.5 )
+	xinerama? ( x11-proto/xineramaproto )
+	x11-proto/xextproto
+	x11-proto/xproto"
+
+DOCS="AUTHORS ChangeLog HACKING NEWS README *.txt doc/*.txt"
+
+pkg_setup() {
+	G2CONF="${G2CONF}
+		--enable-compositor
+		--enable-gconf
+		--enable-render
+		--enable-shape
+		--enable-sm
+		--enable-startup-notification
+		--enable-xsync
+		--with-gtk=2.0
+		$(use_enable xinerama)"
+}
+
+src_prepare() {
+	gnome2_src_prepare
+
+	# Fix intltoolize broken file, see upstream #577133
+	sed "s:'\^\$\$lang\$\$':\^\$\$lang\$\$:g" -i po/Makefile.in.in \
+		|| die "sed failed"
+
+	# Remove stupid CFLAGS, bug #259179
+	sed "s:-Werror::g" -i configure.in configure || die "sed failed"
+
+	# Should set RestartStyleHint to RestartIfRunning when replaced,
+	# this fix a strange issue with gnome-session (100% of the CPU,
+	# and try to restart metacity infinitively when compiz is started)
+	# patch import from upstream bug #588119.
+	epatch "${FILESDIR}/${PN}-2.28.0-restartstylehint-when-replace.patch"
+
+	# Use sys/wait.h header instead of wait.h as described in posix specs,
+	# bug 292009
+	epatch "${FILESDIR}/${PN}-2.28.0-sys-wait-header.patch"
+
+	# WIFEXITED and friends are defined in sys/wait.h
+	# Fixes a build failure on BSD.
+	# https://bugs.gentoo.org/show_bug.cgi?id=309443
+	# https://bugzilla.gnome.org/show_bug.cgi?id=605460
+	epatch "${FILESDIR}/${PN}-2.28.1-wif_macros.patch"
+}