Sync gnome-shell stuff to the ebuilds from the gnome overlay

svn path=/; revision=162

4 files changed, 38 insertions, 54 deletions

diff --git a/x11-wm/mutter/Manifest b/x11-wm/mutter/Manifest
index ee0c24e..dea9e27 100644
--- a/x11-wm/mutter/Manifest
+++ b/x11-wm/mutter/Manifest
@@ -1,4 +1,3 @@
 DIST mutter-2.27.5.tar.bz2 1993935 RMD160 638cbe72fdcbccef1e43ad07707ca62b6bab1943 SHA1 6b54f677e523a18ea492b45096d9b14841bbdf1d SHA256 975360ba63a68554d97f6f6491617e029a862728fad0ab6f70f2724a6fa5f1b7
-EBUILD mutter-2.27.5.ebuild 1528 RMD160 fcf61e816600a0af8a0d09878f60325639708cd6 SHA1 8c48d93cdad8ab03f918eb27197662df681bbbac SHA256 40102848ed34acb6e0531c7a12fee05ab45c2c59866825ae443a737cf97a1336
-EBUILD mutter-9999.ebuild 1486 RMD160 9055a86fef628d4bb214cef0b23458b70a9f5fae SHA1 122d9e5a7c2a7b4ccb1db0b10004934a5708b36e SHA256 1a0d578bb155aca30dbb3ea442877ee98401e470b46eb7a75c9672e814140fda
-MISC metadata.xml 595 RMD160 e354511f8cf82c440781b7d2f2f48af495ac0ae2 SHA1 82abd21f65ca6e7275bc32aee890fe124ade7092 SHA256 977b829df1bda476da07f5be78d64cf40f86c5e3232e2f72554c3112d1621acb
+EBUILD mutter-2.27.5.ebuild 1368 RMD160 c3a0734034af6bbf282f6f1eb33809517962c76a SHA1 3088aeb488fdc75384bcb2e73e226a0985c16e04 SHA256 988f8af832cc0cc9e0ba9e028997a162331cbd36bbcc7a818436b92e819c647a
+EBUILD mutter-9999.ebuild 1540 RMD160 efaed58b1ea5fff96ab22db55cf0ba8903cf4ff7 SHA1 0437ef8e4fda229168612c55e5183ad1ace3833f SHA256 215db8000d9d36174526bec685799262224d3cdc1d7d5dd3a6e66babed777943
diff --git a/x11-wm/mutter/metadata.xml b/x11-wm/mutter/metadata.xml
deleted file mode 100644
index 34e9b06..0000000
--- a/x11-wm/mutter/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<use>
-	<flag name="fuse">Enables support for the filesystem in userspace plugin through <pkg>sys-fs/fuse</pkg>.</flag>
-	<flag name="kde4">Compile the kde4 window decorator and add support for <pkg>kde-base/kdebase-startkde:4.1</pkg>.</flag>
-	<flag name="annotate">Build the annotate plugin</flag>
-</use>
-<herd>desktop-effects</herd>
-<longdescription>
-compiz is a compositing window manager that uses 3D graphics acceleration via OpenGL.
-</longdescription>
-</pkgmetadata>
diff --git a/x11-wm/mutter/mutter-2.27.5.ebuild b/x11-wm/mutter/mutter-2.27.5.ebuild
index 784b89f..23fbd5c 100644
--- a/x11-wm/mutter/mutter-2.27.5.ebuild
+++ b/x11-wm/mutter/mutter-2.27.5.ebuild
@@ -4,15 +4,15 @@
 
 EAPI="2"
 
-inherit eutils gnome2
+inherit gnome2
 
-DESCRIPTION="New GNOME window manager"
+DESCRIPTION="Upcoming GNOME 3 window manager (derived from metacity)"
 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="test xinerama"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug introspection test xinerama"
 
 RDEPEND=">=x11-libs/gtk+-2.10
 	>=x11-libs/pango-1.2[X]
@@ -20,19 +20,21 @@ RDEPEND=">=x11-libs/gtk+-2.10
 	>=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
+
+	media-libs/clutter:1.0
+	x11-libs/libICE
+	x11-libs/libSM
 	x11-libs/libX11
-	xinerama? ( x11-libs/libXinerama )
+	x11-libs/libXcursor
+	x11-libs/libXdamage
 	x11-libs/libXext
+	x11-libs/libXfixes
 	x11-libs/libXrandr
-	x11-libs/libSM
-	x11-libs/libICE
+	x11-libs/libXrender
+
+	introspection? ( dev-libs/gobject-introspection )
+	xinerama? ( x11-libs/libXinerama )
 	gnome-extra/zenity
-	>=media-libs/clutter-1.0[introspection]
-	>=dev-libs/gir-repository-0.6.4
 	!x11-misc/expocity"
 DEPEND="${RDEPEND}
 	>=app-text/gnome-doc-utils-0.8
@@ -44,7 +46,7 @@ DEPEND="${RDEPEND}
 	x11-proto/xextproto
 	x11-proto/xproto"
 
-DOCS="AUTHORS ChangeLog HACKING NEWS README *.txt doc/*.txt"
+DOCS="AUTHORS ChangeLog HACKING MAINTAINERS NEWS README *.txt doc/*.txt"
 
 pkg_setup() {
 	G2CONF="${G2CONF}
@@ -53,15 +55,7 @@ pkg_setup() {
 		--enable-sm
 		--enable-startup-notification
 		--enable-xsync
+		--enable-verbose-mode
+		$(use_with introspection)
 		$(use_enable xinerama)"
 }
-
-src_prepare() {
-	gnome2_src_prepare
-
-	# Remove stupid CFLAGS, bug #259179
-	sed "s:-Werror::g" -i configure.in configure || die "sed failed"
-
-	export XDG_DATA_DIRS="${XDG_DATA_DIRS} ${WORKDIR}/${P}/src/include"
-
-}
diff --git a/x11-wm/mutter/mutter-9999.ebuild b/x11-wm/mutter/mutter-9999.ebuild
index 0889ed0..039fb0a 100644
--- a/x11-wm/mutter/mutter-9999.ebuild
+++ b/x11-wm/mutter/mutter-9999.ebuild
@@ -4,18 +4,18 @@
 
 EAPI="2"
 
-inherit autotools eutils gnome2 git
+inherit autotools gnome2 git
 
 EGIT_REPO_URI="git://git.gnome.org/mutter"
 
-DESCRIPTION="New GNOME window manager"
+DESCRIPTION="Upcoming GNOME 3 window manager (derived from metacity)"
 HOMEPAGE="http://blogs.gnome.org/metacity/"
 SRC_URI=""
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="test xinerama"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug introspection test xinerama"
 
 RDEPEND=">=x11-libs/gtk+-2.10
 	>=x11-libs/pango-1.2[X]
@@ -23,19 +23,21 @@ RDEPEND=">=x11-libs/gtk+-2.10
 	>=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
+
+	media-libs/clutter:1.0
+	x11-libs/libICE
+	x11-libs/libSM
 	x11-libs/libX11
-	xinerama? ( x11-libs/libXinerama )
+	x11-libs/libXcursor
+	x11-libs/libXdamage
 	x11-libs/libXext
+	x11-libs/libXfixes
 	x11-libs/libXrandr
-	x11-libs/libSM
-	x11-libs/libICE
+	x11-libs/libXrender
+
+	introspection? ( dev-libs/gobject-introspection )
+	xinerama? ( x11-libs/libXinerama )
 	gnome-extra/zenity
-	>=media-libs/clutter-1.0[introspection]
-	>=dev-libs/gir-repository-0.6.4
 	!x11-misc/expocity"
 DEPEND="${RDEPEND}
 	>=app-text/gnome-doc-utils-0.8
@@ -47,7 +49,7 @@ DEPEND="${RDEPEND}
 	x11-proto/xextproto
 	x11-proto/xproto"
 
-DOCS="AUTHORS ChangeLog HACKING NEWS README *.txt doc/*.txt"
+DOCS="AUTHORS ChangeLog HACKING MAINTAINERS NEWS README *.txt doc/*.txt"
 
 pkg_setup() {
 	G2CONF="${G2CONF}
@@ -56,6 +58,8 @@ pkg_setup() {
 		--enable-sm
 		--enable-startup-notification
 		--enable-xsync
+		--enable-verbose-mode
+		$(use_with introspection)
 		$(use_enable xinerama)"
 }