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

(Portage version: 2.2_rc31/cvs/Linux x86_64)

5 files changed, 30 insertions, 130 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/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"
 }