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

Package-Manager: portage-2.2.0_alpha149/cvs/Linux x86_64
Manifest-Sign-Key: 0xC6085806

5 files changed, 33 insertions, 126 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/Manifest b/x11-wm/mutter/Manifest
index 51ee71ae2170..0b79e7d21859 100644
--- a/x11-wm/mutter/Manifest
+++ b/x11-wm/mutter/Manifest
@@ -5,22 +5,17 @@ AUX mutter-3.2.1-ignore-shadow-and-padding.patch 2640 SHA256 765c04ba4d177789407
 AUX mutter-3.2.2-disable-introspection.patch 678 SHA256 5edfd4204142b4305f96ffe836de717a39cfcd9c5edc954161ab21fb49e98eb4 SHA512 8638ee809d7ffa63e7af6c4eead6d4bfe03414e25c1deeff3e1296f57df6b07bbc0f3de44ca793f71a440cb72025b5ae4b220d18e69943fdb2687e166d5aee49 WHIRLPOOL add1f3fe78296e835dc42a8e88cbe436837cf2c23d26cba944ae90d8a5a0e8bd15eba36b669b5d4abb5b7f515b65f98ef81fda6cc6175b97a831855dcef57318
 AUX mutter-3.2.2-frame-initialize-style-contexts.patch 1053 SHA256 1718f868b2e2f88519dfef69a67ecddcf411183579ea5497844cbbc11b324932 SHA512 be3da3d4640575e7b0156fe3f11cd95e70538794715df05916bb7bb9155b16ac0f764913bd1921b6c1f242c6797606f969cccaa184d00230e251f3837236bd37 WHIRLPOOL 78f5030c6fec1fdc159c9d3471c9e3785e5cb4b194a7378620d968ec34c16b0872d812bac11c70c6ed3a8db82d9321ad9df75aaf38def5b21a73900e42566aa7
 AUX mutter-3.4.1-meta_window_move_frame-crash.patch 1779 SHA256 5e8b565a223cab1055ecd65a85381ffd69f547b1efeb7b23ff69295869f6dfd8 SHA512 946b88a84b87d8f7a31120376633293e9dc3601a6aa1be846922f2333d0412a14c4b24712115bec88cc38cca027c88bd031cdb28d0be02ff2a736c3d891a791f WHIRLPOOL e8cfa08890a50d17acf5e004c2ddb265dc6c17c7549a53d462e93f15006b07970e7c0fccea647c3f02db3ded3cd7e9f031ebcfa9ed6d273fc5217c647938827f
-DIST mutter-3.2.2.tar.xz 1647416 SHA256 cd5977d86a100d89cfef557c22900b6d061730e2bda66e314e4943505d2bd5a1 SHA512 def486c808c0300087a2bc8872f203e376c59a6f669ed8d03586f0176e5d9102f3847229f28be50f5253f01474a9a32145e2d8d6b26f32270a3d394ac12dd466 WHIRLPOOL 49c30f3dfd9811f89bb98da3b42f970ea78ae14a3f839a43f1dfbe6c47a08ad8ca5556572009b47b8209dce2485b332eaad949d91818c28472c76b4297cb3a35
 DIST mutter-3.4.1-gtk-doc-syntax.patch.xz 18040 SHA256 5b2009794c91d582e91296ccb8ff1617bb701205de6a52a89728ae2eba6f3ada SHA512 b50e77132ce576db13b0feab90e28276d81ef263b0d4bef02693b2031dff395527da3e4b7a6913030e3b7b080320efd21d577784bad384613693db678d81230b WHIRLPOOL 7bf5366929a31317cb13e269753e93e3a8f0eb69e34fc51e58b2ffb4a51724a71e4462033407b4e48cb5bb654f396886dc38b82a3ec2267a0eae83749af38a05
 DIST mutter-3.4.1.tar.xz 1597536 SHA256 dbf08b014179980ab3d0cce645c5391c83b0ce070c73504feea8eec0ad000449 SHA512 d41c4f2995aabe865d8e513df197ff49eb951a697eedd76b50c4fcfab84b5a91420585637b130f15cdd604dad96eced6e5d4794ebcbcbd34554f740dc01c647d WHIRLPOOL 441b764c68bf798d2c0cfbaf49c85585ffcbdea9a4e70c405c7c3333037d49e14aafdbab3d83fc843a13572dbcf0f1b15bd9f2e3bafb35e4aec4eea938cf6385
-EBUILD mutter-3.2.2-r1.ebuild 2210 SHA256 fab24ea04244df0cb115e78931b8d7f862ed8b3b44387b6df726d351ae5a72c8 SHA512 00e216624d259fd7579e4b6b4bebf9e3949d6ac250032b461b8c27375b0c60f72b1b9b573c7673b8c6fb973cd4b2f714de2db2b787dd57614334118a462d28b0 WHIRLPOOL aba1197ac83ddb81da0ab3b6e62cdbec1698b8ff4c2f16dfc530d70b77ccd73caff36e11f914913e8f0abd038c3e48c525ad7ed050d71d6b22ca846325b39640
-EBUILD mutter-3.2.2.ebuild 2080 SHA256 d8c2d43d0028e2d536b9de68eb611397f23e983849eff48be76ff20e47e514e4 SHA512 1007d6454e646dc72a11c2419ebb864a73ee505cc5efea38c4e61abbfa8b31f21e42f115d5c7bb82e5a79048dc7252ead7de28b9ed1273d8ff2688df19e1eba8 WHIRLPOOL e08a06ebbc457235ab59671691f4fcfb379652449b1a71e4869893fff1012953da1dfb69bad125aee1a17a017ac57d0a94f3905925b093fe37043f6018e8ec3e
+DIST mutter-3.6.2.tar.xz 1615792 SHA256 924f47681c972c3e8da610608c6aef35e61f52b338b5690e5721ed7ef8c2befc SHA512 c70e5dc0c183a4ad1267a7dc19f1f0272692dfb5dbef4595719694170d9c7686957546920008c5061e8db71360ca7186c27e28cea31825c15718400e5c17f0a5 WHIRLPOOL 92d8cf34806ce54d45e5a7107515a41ee3a253ab4df87c74b8c26b6b21ad2f5cd22054f8c475e41e0a872e2a4ee6afca5d5b4ef371e0ec64b7d5d6c0e16cc073
 EBUILD mutter-3.4.1-r1.ebuild 2314 SHA256 6c7b75769d899127e2e5ffce8183238d5d0f5bf49257fe85273f33d0aef19ee7 SHA512 5d23a6c9cd5c07ca9e3db3b4b7b3096f8e2df23085680b2a8e8403894e508d0ada816ce71f8f4264ab78cec93bc03b7ab97f6d92209c8f3ceb5c1001092e080c WHIRLPOOL b9fa7b51aa86e5b1e5338a74124844b9110c1c7c48539a5123c5007907df839091554047ce535c3d5c7d6607ffcf9361be8240d1994a764b105256fbb4f81067
-MISC ChangeLog 2730 SHA256 b84a03bb2cdc2c4becbd7c1ab966a0a6b1d6a282a96ec022a8f75745b634f2c9 SHA512 bee0f504e7238e591c65fd529125f47cdd9199dc274beedd92cce50c0f624242c9874d1e8b479b47ecb222b3ee7b20accf97d331ef9de1c656734db0101c0785 WHIRLPOOL 725b17e4d3b5832dd96c26f8300bd12b83ba857f1046e94b997d54af93e55b85dc0130b3070c1094ad6335f44f93dbeda62b38f31b945ac8fa9d27bc1878c25b
-MISC metadata.xml 277 SHA256 3d52f90556a9db4ad09f2fbe34e2d25b21f345e474e829ac84669d49cb64c8bb SHA512 ca1d5e77776eb584f9e897f4abb7b4a1e2bc7942564d81c812ff94d64593c6e1e0a7996c0be8f6493cce579c815024e006bf5642b8fc57d59e3818d960b9cb0c WHIRLPOOL ea0c213f488fd7c0cf1783f9542feaed34859244150a79926029bad19b066db2ce6d2cd3e539c860e9eee50b3138bfe32c520e8c663dbe9a86999c04b28b140f
+EBUILD mutter-3.6.2.ebuild 1906 SHA256 f74ab9a38b83f5c6c06681ab2a1b6d94fa81b9315add93d2e8b423eb4e255998 SHA512 5e331d5a26ffea35f31e1e4a6080bb3f5fd0b610150e5d60e6bb499812b828a15f5f73e9ed60180df9a41cf341315574a2c1b9b965c91cc4c290614d44f9dc33 WHIRLPOOL 56a6486fd21cee42bb4852323c982e2456c693e1e2a1cda04e8c66ea844ab992295aced6b4f714b7de35b98b3d8bbcc558d580b37ab0ca8ee060131e3311ce59
+MISC ChangeLog 2977 SHA256 3ae24f756c444b1ccea6e728f3ec3b27109aa8cefd939bc9edeef60fed7a82a2 SHA512 2b9bc2e41401b7f38d9bc180f57a435488147252b511813c7d1cd5628069c41c725b7a73371d33ef33a708469ad430d4a27111c087c566b43749c6da8c612e23 WHIRLPOOL 8047b0d82ce9d7cc16da236720c94d22eed43c5dc34bee081063d2449048475f7c430b6b968bd80ea9d075bc75cf2491d509dde5f3762765ae5d6bc3939f3b0a
+MISC metadata.xml 158 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1 SHA512 7fbfbd2b3ed1b81867d55648509f778fdbe2091af53727b3426a3c7f453ae7e1663a99fdd2101508b8d6c85b3158459c93551b77a6a394f02d7e11cbc8a5ecf4 WHIRLPOOL 4bcd5662974877d42ebc4361b6eb412bfeea2af7144b436ce7ed152327d554afc321c376625ba0bb85a704b70d86e3c4882dff3573047acddd8ffccf655d4f7e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQCu0uAAoJEJ0WA1zPCt1hUBEH/1MPm+knCQUa3xiaeWrVJSyo
-BvnQ0GXhvLo60KiZlPjyxaZTvEOG7pvriYPaigqfMhhMtTt/ELDcWxx+uFpqt4Cj
-31sSg0odQhPLCle1z9W+eVqmZtH9OhST3HkrxJ8qS1MM43w6uiuqrGTBop8B1bHW
-iS7TGr3fTrwBH9csN07xlQt/2fPYYTwbM/onrU+cyv2hbeIvvbdwzeWYtp21w29P
-TMigKbGC0vSk+ASVMxKz56wQUBofw+fIJff3uFrze4ttK0M2a4dk296UD48OxYeb
-6Nln/T2DW77LZkgQ1JImSFdVhOWhReWShyW+SY7xIxpyKRUYK/Ffz40Kve0Lg5k=
-=jFLE
+iEYEAREIAAYFAlDOHDoACgkQ1fmVwcYIWAY9MgCfbekPN02esLg31KEJuYXUhkUk
+X6wAn1u/h9wJ/TCLKzMP6/hpf3GqClwJ
+=m6qj
 -----END PGP SIGNATURE-----
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
 }