Version bump for Gnome 3.6. Drop old revision. USE=introspection is now global.

(Portage version: 2.2.0_alpha149/cvs/Linux x86_64, signed Manifest commit with key C6085806)

4 files changed, 26 insertions, 114 deletions

diff --git a/x11-wm/mutter/ChangeLog b/x11-wm/mutter/ChangeLog
index bb94a2589033..38f77adee4c6 100644
--- a/x11-wm/mutter/ChangeLog
+++ b/x11-wm/mutter/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-wm/mutter
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/mutter/ChangeLog,v 1.12 2012/07/21 17:55:53 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/mutter/ChangeLog,v 1.13 2012/12/16 19:08:41 eva Exp $
+
+*mutter-3.6.2 (16 Dec 2012)
+
+  16 Dec 2012; Gilles Dartiguelongue <eva@gentoo.org> -mutter-3.2.2.ebuild,
+  -mutter-3.2.2-r1.ebuild, +mutter-3.6.2.ebuild, metadata.xml:
+  Version bump for Gnome 3.6. Drop old revision. USE=introspection is now
+  global.
 
   21 Jul 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
   mutter-3.4.1-r1.ebuild:
diff --git a/x11-wm/mutter/metadata.xml b/x11-wm/mutter/metadata.xml
index 44825d13c084..da6fd63d0085 100644
--- a/x11-wm/mutter/metadata.xml
+++ b/x11-wm/mutter/metadata.xml
@@ -1,9 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>gnome</herd>
-	<use>
-		<flag name="introspection">Use <pkg>dev-libs/gobject-introspection</pkg>
-			for introspection</flag>
-	</use>
+<herd>gnome</herd>
 </pkgmetadata>
diff --git a/x11-wm/mutter/mutter-3.2.2-r1.ebuild b/x11-wm/mutter/mutter-3.2.2-r1.ebuild
deleted file mode 100644
index a65ed729e7c2..000000000000
--- a/x11-wm/mutter/mutter-3.2.2-r1.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/mutter/mutter-3.2.2-r1.ebuild,v 1.4 2012/05/22 06:38:59 tetromino Exp $
-
-EAPI="4"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-
-inherit eutils gnome2
-
-DESCRIPTION="GNOME 3 compositing window manager based on Clutter"
-HOMEPAGE="http://git.gnome.org/browse/mutter/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="+introspection test xinerama"
-KEYWORDS="~amd64 ~x86"
-
-COMMON_DEPEND=">=x11-libs/pango-1.2[X,introspection?]
-	>=x11-libs/cairo-1.10[X]
-	x11-libs/gdk-pixbuf:2[introspection?]
-	>=x11-libs/gtk+-2.91.7:3[introspection?]
-	>=gnome-base/gconf-2:2
-	>=dev-libs/glib-2.14:2
-	>=media-libs/clutter-1.7.5:1.0[introspection?]
-	>=media-libs/libcanberra-0.26[gtk3]
-	>=x11-libs/startup-notification-0.7
-	>=x11-libs/libXcomposite-0.2
-
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libX11
-	x11-libs/libXcursor
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXrandr
-	x11-libs/libXrender
-
-	gnome-extra/zenity
-
-	introspection? ( >=dev-libs/gobject-introspection-0.9.5 )
-	xinerama? ( x11-libs/libXinerama )
-"
-DEPEND="${COMMON_DEPEND}
-	>=app-text/gnome-doc-utils-0.8
-	sys-devel/gettext
-	virtual/pkgconfig
-	>=dev-util/intltool-0.35
-	test? ( app-text/docbook-xml-dtd:4.5 )
-	xinerama? ( x11-proto/xineramaproto )
-	x11-proto/xextproto
-	x11-proto/xproto"
-RDEPEND="${COMMON_DEPEND}
-	!x11-misc/expocity"
-
-pkg_setup() {
-	DOCS="AUTHORS ChangeLog HACKING MAINTAINERS NEWS README *.txt doc/*.txt"
-	G2CONF="${G2CONF}
-		--disable-static
-		--enable-gconf
-		--enable-shape
-		--enable-sm
-		--enable-startup-notification
-		--enable-xsync
-		--enable-verbose-mode
-		--enable-compile-warnings=maximum
-		--with-libcanberra
-		$(use_enable introspection)
-		$(use_enable xinerama)"
-}
-
-src_prepare() {
-	# Compat with Ubuntu metacity themes (e.g. x11-themes/light-themes)
-	epatch "${FILESDIR}/${PN}-3.2.1-ignore-shadow-and-padding.patch"
-
-	# Patch from 3.3.x, fixes building without introspection
-	epatch "${FILESDIR}/${P}-disable-introspection.patch"
-
-	# Patch from 3.3.92, fixes window decorations with gtk+-3.4
-	epatch "${FILESDIR}/${P}-frame-initialize-style-contexts.patch"
-
-	gnome2_src_prepare
-}
diff --git a/x11-wm/mutter/mutter-3.2.2.ebuild b/x11-wm/mutter/mutter-3.6.2.ebuild
index cf9d519eca19..9f5af85c0357 100644
--- a/x11-wm/mutter/mutter-3.2.2.ebuild
+++ b/x11-wm/mutter/mutter-3.6.2.ebuild
@@ -1,9 +1,8 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/mutter/mutter-3.2.2.ebuild,v 1.5 2012/05/22 06:38:59 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/mutter/mutter-3.6.2.ebuild,v 1.1 2012/12/16 19:08:41 eva Exp $
 
-EAPI="4"
-GCONF_DEBUG="no"
+EAPI="5"
 GNOME2_LA_PUNT="yes"
 
 inherit eutils gnome2
@@ -11,21 +10,22 @@ inherit eutils gnome2
 DESCRIPTION="GNOME 3 compositing window manager based on Clutter"
 HOMEPAGE="http://git.gnome.org/browse/mutter/"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
-IUSE="+introspection test xinerama"
+IUSE="+introspection test"
 KEYWORDS="~amd64 ~x86"
 
 COMMON_DEPEND=">=x11-libs/pango-1.2[X,introspection?]
 	>=x11-libs/cairo-1.10[X]
 	x11-libs/gdk-pixbuf:2[introspection?]
-	>=x11-libs/gtk+-2.91.7:3[introspection?]
-	>=gnome-base/gconf-2:2
-	>=dev-libs/glib-2.14:2
-	>=media-libs/clutter-1.7.5:1.0[introspection?]
+	>=x11-libs/gtk+-3.3.7:3[X,introspection?]
+	>=dev-libs/glib-2.25.11:2
+	>=media-libs/clutter-1.9.10:1.0[introspection?]
+	>=media-libs/cogl-1.9.6:1.0[introspection?]
 	>=media-libs/libcanberra-0.26[gtk3]
 	>=x11-libs/startup-notification-0.7
 	>=x11-libs/libXcomposite-0.2
+	>=gnome-base/gsettings-desktop-schemas-3.3.0[introspection?]
 
 	x11-libs/libICE
 	x11-libs/libSM
@@ -34,31 +34,30 @@ COMMON_DEPEND=">=x11-libs/pango-1.2[X,introspection?]
 	x11-libs/libXdamage
 	x11-libs/libXext
 	x11-libs/libXfixes
+	x11-libs/libXinerama
 	x11-libs/libXrandr
 	x11-libs/libXrender
 
 	gnome-extra/zenity
 
 	introspection? ( >=dev-libs/gobject-introspection-0.9.5 )
-	xinerama? ( x11-libs/libXinerama )
 "
 DEPEND="${COMMON_DEPEND}
-	>=app-text/gnome-doc-utils-0.8
+	>=dev-util/intltool-0.35
 	sys-devel/gettext
 	virtual/pkgconfig
-	>=dev-util/intltool-0.35
-	test? ( app-text/docbook-xml-dtd:4.5 )
-	xinerama? ( x11-proto/xineramaproto )
 	x11-proto/xextproto
-	x11-proto/xproto"
+	x11-proto/xineramaproto
+	x11-proto/xproto
+	test? ( app-text/docbook-xml-dtd:4.5 )
+"
 RDEPEND="${COMMON_DEPEND}
 	!x11-misc/expocity"
 
-pkg_setup() {
+src_prepare() {
 	DOCS="AUTHORS ChangeLog HACKING MAINTAINERS NEWS README *.txt doc/*.txt"
 	G2CONF="${G2CONF}
 		--disable-static
-		--enable-gconf
 		--enable-shape
 		--enable-sm
 		--enable-startup-notification
@@ -66,16 +65,10 @@ pkg_setup() {
 		--enable-verbose-mode
 		--enable-compile-warnings=maximum
 		--with-libcanberra
-		$(use_enable introspection)
-		$(use_enable xinerama)"
-}
+		$(use_enable introspection)"
 
-src_prepare() {
 	# Compat with Ubuntu metacity themes (e.g. x11-themes/light-themes)
 	epatch "${FILESDIR}/${PN}-3.2.1-ignore-shadow-and-padding.patch"
 
-	# Patch from 3.3.x, fixes building without introspection
-	epatch "${FILESDIR}/${P}-disable-introspection.patch"
-
 	gnome2_src_prepare
 }