Remove useless CFLAGS affecting USE=debug; tweak the description; Fix some missing build dependencies and be more inclusive for X library depends that are checked for in metacity configure

(Portage version: 2.2_rc12/cvs/Linux 2.6.26-gentoo-r1 x86_64)

3 files changed, 38 insertions, 15 deletions

diff --git a/x11-wm/metacity/ChangeLog b/x11-wm/metacity/ChangeLog
index c62142f6b939..936a8e8a28c4 100644
--- a/x11-wm/metacity/ChangeLog
+++ b/x11-wm/metacity/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-wm/metacity
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/metacity/ChangeLog,v 1.218 2008/10/10 16:54:29 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/metacity/ChangeLog,v 1.219 2008/10/11 17:45:39 leio Exp $
+
+  11 Oct 2008; Mart Raudsepp <leio@gentoo.org> metadata.xml,
+  metacity-2.24.0.ebuild:
+  Remove useless CFLAGS affecting USE=debug; tweak the description; Fix some
+  missing build dependencies and be more inclusive for X library depends
+  that are checked for in metacity configure
 
 *metacity-2.24.0 (10 Oct 2008)
 
diff --git a/x11-wm/metacity/metacity-2.24.0.ebuild b/x11-wm/metacity/metacity-2.24.0.ebuild
index c49c9a30439c..6f26e491a4b1 100644
--- a/x11-wm/metacity/metacity-2.24.0.ebuild
+++ b/x11-wm/metacity/metacity-2.24.0.ebuild
@@ -1,32 +1,44 @@
 # 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.24.0.ebuild,v 1.1 2008/10/10 16:54:29 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/metacity/metacity-2.24.0.ebuild,v 1.2 2008/10/11 17:45:39 leio Exp $
 
 inherit gnome2
 
-DESCRIPTION="Gnome default windowmanager"
+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="debug xinerama"
+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/libXcursor
-		 >=x11-libs/startup-notification-0.7
-		 !x11-misc/expocity"
+	>=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"
+	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="$(use_enable debug) $(use_enable xinerama)"
+	G2CONF="${G2CONF} $(use_enable xinerama)"
 }
diff --git a/x11-wm/metacity/metadata.xml b/x11-wm/metacity/metadata.xml
index da6fd63d0085..79e95168d928 100644
--- a/x11-wm/metacity/metadata.xml
+++ b/x11-wm/metacity/metadata.xml
@@ -2,4 +2,9 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>gnome</herd>
+<longdescription>
+A window manager for GNOME, with a focus on simplicity and usability
+rather than novelties or gimmicks.  It uses GTK+ 2 for drawing window frames,
+so that it inherits colours, fonts, and so on from the GTK+ theme.
+</longdescription>
 </pkgmetadata>