New version for GNOME 2.26. Use zenity for dialogs, provide more user documentation. Clean up old revisions.

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

6 files changed, 43 insertions, 137 deletions

diff --git a/x11-wm/metacity/ChangeLog b/x11-wm/metacity/ChangeLog
index 46d4511b4a0b..ea809e915465 100644
--- a/x11-wm/metacity/ChangeLog
+++ b/x11-wm/metacity/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for x11-wm/metacity
 # Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/metacity/ChangeLog,v 1.232 2009/04/28 11:22:40 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/metacity/ChangeLog,v 1.233 2009/05/04 22:46:39 eva Exp $
+
+*metacity-2.26.0 (04 May 2009)
+
+  04 May 2009; Gilles Dartiguelongue <eva@gentoo.org>
+  -metacity-2.20.1.ebuild, -metacity-2.22.0.ebuild, -metacity-2.24.0.ebuild,
+  -metacity-2.24.0-r1.ebuild, +metacity-2.26.0.ebuild:
+  New version for GNOME 2.26. Use zenity for dialogs, provide more user
+  documentation. Clean up old revisions.
 
   28 Apr 2009; Raúl Porcel <armin76@gentoo.org> metacity-2.24.0-r2.ebuild:
   sh stable
diff --git a/x11-wm/metacity/Manifest b/x11-wm/metacity/Manifest
index 95f42618b556..8fc0a39d6ca2 100644
--- a/x11-wm/metacity/Manifest
+++ b/x11-wm/metacity/Manifest
@@ -1,14 +1,20 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX metacity-2.24.0-crash-login.patch 1381 RMD160 43f4622195e22971a2b806d9f4e4bb042479d818 SHA1 1c1e722322f18735b95b31fad9d02186f939ecb6 SHA256 c1d2ae0e5e425dd8daca501da654db0e979421a0502441d69b5ce0318b863254
 AUX metacity-2.24.0-fbsd.patch 454 RMD160 b105d90b271710930ba56adb0d26a881e808265f SHA1 bfd3101b865ee4d0ad1d425a50141b498df0a8df SHA256 4bb15fd9b0a9db418dd50dedd99a1cb1ec75a39a0608c8c39ccad9b8bbcd6e74
 AUX metacity-2.24.0-gslist-leak.patch 760 RMD160 18264a62e94ce8528c7b34b8c859207fdd3159e1 SHA1 81d0f88e3d43166b0962142fe9a9ecab5aa86203 SHA256 56bdf2afeadda49d38b0c99c903ba7dc543e627921995c3565314e074ee0c820
 AUX metacity-2.24.0-string-leak.patch 573 RMD160 fb139a74e26f75a1ecfa44c34efd791841a2f550 SHA1 30c8a1d76196c4708175932527b1a6059d26dec0 SHA256 e2ebb8487f275461a28acdb9004d69dd6869bfe234b749b4093a024a8a6abad4
-DIST metacity-2.20.1.tar.bz2 1880151 RMD160 dc1ba08bbe13249073766c02746d94d26ceadfb8 SHA1 55756426a69ea35a4c6b53180ed41fd583f20341 SHA256 11ab50586b2d89d00c1da2d35d1d8cbedfa73e2e500439d6f51d058e9c483a74
-DIST metacity-2.22.0.tar.bz2 2071931 RMD160 9432a4a809b70e1088d3eb5a54be1044ee4e5ccc SHA1 18e7761152d033b31b13a455be459d986f55a8ba SHA256 3c670b41a214311006dc05f9a005696b9d3fdcb5c80f1275367416600103b3bf
 DIST metacity-2.24.0.tar.bz2 2160557 RMD160 758c26e163fdc84dcee1e386ab8cbefc38cdd7a5 SHA1 0b2e37e372498e26a6926fbb68e96556c6db6497 SHA256 90eed0a36aae302db52af12220c4cf863c9cccebd233015104f2d88cb17ec076
-EBUILD metacity-2.20.1.ebuild 908 RMD160 435491cabdb08e47c7f32a45c73ff72dc00df30f SHA1 fa9a91c059bdc1cc50c126b53f460ba68f851d62 SHA256 cdc2ce0bb01b75208ba2808ac133a3a5af4fb785802cda90d1644bfce60b5a6e
-EBUILD metacity-2.22.0.ebuild 839 RMD160 e5b9317da9663fa37da5cce81217b4c861d9d3e5 SHA1 19337b4ef762c837a1f372875dd3fd7b81d11035 SHA256 c8d1887158f031ebfec23c53752a9f02794e4441fc4db162c954920eeb6da7dd
-EBUILD metacity-2.24.0-r1.ebuild 1341 RMD160 1a2752dfb808453f4ccb04b6ca10a1aea112af9b SHA1 ebe45a0dc5e4336f2645184793bcecb588c802fd SHA256 bc22e03031044e2ac01b0f4ef63c97f1cbe6c6ba470170d4e754601695e350ad
+DIST metacity-2.26.0.tar.bz2 2289848 RMD160 26b75abb9b705f9fd7711dfbbff134e600dcfd56 SHA1 70593f69148960a0248527c8ae8d442a3d251d08 SHA256 29ba16411899d963bae69a4d72d37dec38a33e62412fe769d497de4555559078
 EBUILD metacity-2.24.0-r2.ebuild 1513 RMD160 a007c6d28f0184533086d6114202ceea6e3f489a SHA1 a8871bcb693b9b6e193170399c93c3e397ecd46c SHA256 d789c688ac30fbb9a4a6c5c5682c9c80d31cfad5880b67ef7e71ed56cfb03a28
-EBUILD metacity-2.24.0.ebuild 1248 RMD160 85fdb5187412fb4dc683129a653ff0776bb0058e SHA1 0dfcb0967d8b9991510e7cc0ce36097d999e602a SHA256 d6a51c89860ae2d30604c6aaf47960d5be528c84362c06dcbbb4b2d77aa6887f
-MISC ChangeLog 27276 RMD160 65891dae3519fe2b224e7948cf7cfb3ac08c1470 SHA1 e8c2324d882c018650f75bd62262ffaeb2802362 SHA256 56622699e45ff0face017643c418eecebedcc374e9e50e5f6e0d149d014be2b8
+EBUILD metacity-2.26.0.ebuild 1524 RMD160 e822b58660487f1ad5ac80ad40a1b5f927f560ad SHA1 0f1e42a94942915ce54888b7402b32458d28be59 SHA256 df5efdb37755d02abe8a2cf4d35d1e7be424814edeb0c020b07c1f0ffbc435c8
+MISC ChangeLog 27604 RMD160 36dd03b7c440df17ca4be18fffaba8716f63ea6c SHA1 0177843467fc75ed3d4aa1720a52dc18f36e1b6a SHA256 605fec154048cf7ca7f676775b6543cce61d6d85b53d769bfb85f849e778ed1d
 MISC metadata.xml 409 RMD160 cd76d1e78c03fb5379abca2a1e136cba116eacae SHA1 703d6a46d96d2734062f1496880b983b89f837c9 SHA256 cbc77bb6077444f8b66e4f8a4cd4cf1af7dbbe8d410b4819ef5e1af049378218
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.11 (GNU/Linux)
+
+iEYEARECAAYFAkn/cFQACgkQ1fmVwcYIWAYMhwCg13v4bwjpI7doL32/9oyglcZx
+dsIAn1wG5QYKzUBSVGmn4BQd85tF4/J9
+=6P6F
+-----END PGP SIGNATURE-----
diff --git a/x11-wm/metacity/metacity-2.20.1.ebuild b/x11-wm/metacity/metacity-2.20.1.ebuild
deleted file mode 100644
index 06aede5e88dc..000000000000
--- a/x11-wm/metacity/metacity-2.20.1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/metacity/metacity-2.20.1.ebuild,v 1.10 2009/01/31 11:46:54 eva Exp $
-
-inherit eutils gnome2
-
-DESCRIPTION="Gnome default windowmanager"
-HOMEPAGE="http://blogs.gnome.org/metacity/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="arm sh"
-IUSE="xinerama"
-# compositor needs libcm as well, not activating it for the time being
-
-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"
-
-# needs libcm too
-#	compositor? ( >=x11-libs/libXcomposite-0.2 )
-
-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() {
-	G2CONF="$(use_enable xinerama) \
-		--disable-compositor"
-}
diff --git a/x11-wm/metacity/metacity-2.22.0.ebuild b/x11-wm/metacity/metacity-2.22.0.ebuild
deleted file mode 100644
index ac65a2a80e99..000000000000
--- a/x11-wm/metacity/metacity-2.22.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/metacity/metacity-2.22.0.ebuild,v 1.8 2008/11/13 19:15:19 ranger Exp $
-
-inherit gnome2
-
-DESCRIPTION="Gnome default windowmanager"
-HOMEPAGE="http://blogs.gnome.org/metacity/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 ~sh sparc x86 ~x86-fbsd"
-IUSE="xinerama"
-
-RDEPEND=">=x11-libs/gtk+-2.10
-		 >=x11-libs/pango-1.2
-		 >=gnome-base/gconf-2
-		 >=dev-libs/glib-2.6
-		 >=x11-libs/libXcomposite-0.2
-		 >=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() {
-	G2CONF="$(use_enable xinerama)"
-}
diff --git a/x11-wm/metacity/metacity-2.24.0.ebuild b/x11-wm/metacity/metacity-2.24.0.ebuild
deleted file mode 100644
index b1e4629e614b..000000000000
--- a/x11-wm/metacity/metacity-2.24.0.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/metacity/metacity-2.24.0.ebuild,v 1.3 2009/01/31 11:46:54 eva Exp $
-
-inherit eutils gnome2
-
-DESCRIPTION="GNOME default window manager"
-HOMEPAGE="http://blogs.gnome.org/metacity/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="xinerama"
-
-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-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
-	!x11-misc/expocity"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	>=dev-util/pkgconfig-0.9
-	>=dev-util/intltool-0.35
-	xinerama? ( x11-proto/xineramaproto )
-	x11-proto/xextproto
-	x11-proto/xproto"
-
-DOCS="AUTHORS ChangeLog HACKING NEWS README *.txt doc/*.txt"
-
-pkg_setup() {
-	G2CONF="${G2CONF} $(use_enable xinerama)"
-}
-
-src_unpack() {
-	gnome2_src_unpack
-
-	# Fix compilation on *bsd, bug #256224
-	epatch "${FILESDIR}/${P}-fbsd.patch"
-}
diff --git a/x11-wm/metacity/metacity-2.24.0-r1.ebuild b/x11-wm/metacity/metacity-2.26.0.ebuild
index c120eecb1504..fce90794c229 100644
--- a/x11-wm/metacity/metacity-2.24.0-r1.ebuild
+++ b/x11-wm/metacity/metacity-2.26.0.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/metacity/metacity-2.24.0-r1.ebuild,v 1.1 2009/02/08 21:31:50 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/metacity/metacity-2.26.0.ebuild,v 1.1 2009/05/04 22:46:39 eva Exp $
+
+EAPI="2"
 
 inherit eutils gnome2
 
@@ -10,10 +12,10 @@ HOMEPAGE="http://blogs.gnome.org/metacity/"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="xinerama"
+IUSE="test xinerama"
 
 RDEPEND=">=x11-libs/gtk+-2.10
-	>=x11-libs/pango-1.2
+	>=x11-libs/pango-1.2[X]
 	>=gnome-base/gconf-2
 	>=dev-libs/glib-2.6
 	>=x11-libs/startup-notification-0.7
@@ -28,11 +30,14 @@ RDEPEND=">=x11-libs/gtk+-2.10
 	x11-libs/libXrandr
 	x11-libs/libSM
 	x11-libs/libICE
+	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"
@@ -40,15 +45,20 @@ DEPEND="${RDEPEND}
 DOCS="AUTHORS ChangeLog HACKING NEWS README *.txt doc/*.txt"
 
 pkg_setup() {
-	G2CONF="${G2CONF} $(use_enable xinerama)"
+	G2CONF="${G2CONF}
+		--enable-compositor
+		--enable-gconf
+		--enable-render
+		--enable-shape
+		--enable-sm
+		--enable-startup-notification
+		--enable-xsync
+		$(use_enable xinerama)"
 }
 
-src_unpack() {
-	gnome2_src_unpack
-
-	# Fix compilation on *bsd, bug #256224
-	epatch "${FILESDIR}/${P}-fbsd.patch"
+src_prepare() {
+	gnome2_src_prepare
 
-	# Fix crash on login, upstream bug #553980
-	epatch "${FILESDIR}/${P}-crash-login.patch"
+	# Remove stupid CFLAGS, bug #259179
+	sed "s:-Werror::g" -i configure.in configure || die "sed failed"
 }