Apply upstream fixes from 3.8 branch, also solving some games running slow. Drop old

Package-Manager: portage-2.1.13.1/cvs/Linux x86_64
Manifest-Sign-Key: 0xA188FBD4

3 files changed, 25 insertions, 12 deletions

diff --git a/x11-wm/mutter/ChangeLog b/x11-wm/mutter/ChangeLog
index 9c62c88b18de..b98cc27ac0cb 100644
--- a/x11-wm/mutter/ChangeLog
+++ b/x11-wm/mutter/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-wm/mutter
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/mutter/ChangeLog,v 1.29 2013/07/24 22:49:57 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/mutter/ChangeLog,v 1.30 2013/07/28 20:08:54 pacho Exp $
+
+*mutter-3.8.3-r1 (28 Jul 2013)
+
+  28 Jul 2013; Pacho Ramos <pacho@gentoo.org> +mutter-3.8.3-r1.ebuild,
+  -mutter-3.8.2.ebuild:
+  Apply upstream fixes from 3.8 branch, also solving some games running slow.
+  Drop old
 
   24 Jul 2013; Gilles Dartiguelongue <eva@gentoo.org> mutter-3.8.3.ebuild:
   Raise libXi dependency per configure. gtk-doc-am is not really used by it
diff --git a/x11-wm/mutter/Manifest b/x11-wm/mutter/Manifest
index 82475c9e14a7..20b92bb44d99 100644
--- a/x11-wm/mutter/Manifest
+++ b/x11-wm/mutter/Manifest
@@ -3,17 +3,17 @@ Hash: SHA256
 
 AUX mutter-3.2.1-ignore-shadow-and-padding.patch 2640 SHA256 765c04ba4d177789407a25d3cbdf358e3fa125170cfd37c53095372bc4ec883d SHA512 ba04a2265be9b2816ada33cb2dcf71ff02eb8667ada7c41139fc9e44e85a37030b8f0b7eb8064af2b6e691539a6dae5a0f8e66e06e2e3b803287eec798f13b52 WHIRLPOOL e85a2e27c9f036156dca68276793ea4bee5381ca43acdd85e7a37b4f577c6ae581be70866fa390a62fa4edf57d78b133185062642c96f30053a0b36f8c946893
 DIST mutter-3.6.3.tar.xz 1619444 SHA256 aa1d558210d58f9a835a7e718a6b6eb8318ac8fb276c43234c47b1efde755c86 SHA512 e4b62b348fa993521b29b201a91f0682d862f5ddf08135e6e733c695562ca8a4e50500cfe2dd4f93c5b87198688e7913513cb1994b9b628acb10bec8ee0be404 WHIRLPOOL 3bb0f9d1d7ffdf6e9d064ced15d1120204dd319d3602f9ee88b5e44e95a101060c24354e93dd736341112648424cc879b38c36d837a64e69e4989f360d3b6906
-DIST mutter-3.8.2.tar.xz 1733344 SHA256 2dddb1f699a94e9d294c36127e0642f5afa1fa8853cb1b47187ece16457fce65 SHA512 4e2d868a745f0748cd7972fed1d3c4dfaeddcb2b476cdfc07022ed1ed73687b1398421176c7079e63d9f6f2e9b7e30cd8c85ae151c4899a78971a94f32371fb2 WHIRLPOOL dc37cedb98568824a7aaed6c4866be5b792d9f36992902d2998586c49c4ec5e9e47b5028e7e35a7aa9240c97bdc6fc518237bdde570d2f35024584c363f0b150
+DIST mutter-3.8.3-patches.tar.xz 3932 SHA256 912868c56a331f51e30eb3dc9883e56bd5c76430f12d8a353e5efa060e4f3df6 SHA512 7170cbb76fba1b5b9eb7dd1a9b1c7cb9842c1774b53550cc3348ae0f33aea7dc85d3e2af237bc3162d45eb679e2d7d5de89bc88384be16f5473a526829101eec WHIRLPOOL adc29cfdbcf2609fbe1497b05a99790d71f184be67c20798bf0e55e9e700c760b8a17246f5de6a7747eb73cd92442c4e551410d3f73e344e56611c5146330e76
 DIST mutter-3.8.3.tar.xz 1736796 SHA256 3078162c3adef95fb207cc1945b863575ff180709d6394f5cf14e7d0f49b6c2a SHA512 9954bace86fa06cd70d3a9c8733121e55009bb7bd34ce440e49f474040ada46af71ebd8f51f917279325e23f0c0fae15ea231fdbdbfe95be26ddb0620d2d3a44 WHIRLPOOL b5aaed42d6b42332278fe917b5849d93b90333f0fd7ffffc0701e86706ad2401c2b6ff5b1b87e33224f481e31cdf828ed880446a94e157ebb0a235ca62dc828c
 EBUILD mutter-3.6.3.ebuild 1984 SHA256 7d26010d27f5340c46e658f4d76222874800c291b2fa1b681cbd2cda7e5bc4df SHA512 f120c24232fa54d0e08b68d32c97405c6519f6aff87d855e740b314ce9dec231e380c8d895b6c9bf3df07f2d5f65257727d0444e7a293249331da183e72900c0 WHIRLPOOL 4abf5f1a187ea8dedbbdc0be96999f96d7fed63dc49cc5e9edf97ab230cb089310c9d162e1829f061f67dd1ef2300093d8479ff7353c85a7c9efa42e8d96ce99
-EBUILD mutter-3.8.2.ebuild 2010 SHA256 acbb996b7be0a4c6f6a41d817ae88eb07c4a3b6f00581cf79d30bafd2d9dcd12 SHA512 6d5585bb3cad533648d3427370f24760136e9eea7d83d566390b3a023764dbc3ee1fe0e5da7e6a123d4901f905f5616b7e710ec5ad365a251c38c3f74b4aff4e WHIRLPOOL 9e3f8466f5cc62c9bf0a1f76a1baebcb5870d4b656dd24738755e2dcf16aa050f4bed8d59e7ff197f02c46b3bfffb0832e70a40db4330c9bf28058afa9f61757
+EBUILD mutter-3.8.3-r1.ebuild 2161 SHA256 ee060d38201ea6ff18aa1f2465e58f8c529f34449d5ba7bdb9466e02c69219df SHA512 3ff42c144a98122614e610299acd5f6cad9f8286c823563ebae3d15eca6f6529f4d396173bfd2b1c4f93ec83552ce3c332c09bf9aef65b421f6a4fcc1d3da1d7 WHIRLPOOL 0e7257f74a342356fa51d7cb64a19173515faad2f40506fae620137fad5c78ad1e0d93bd8177a438bc8fe0748b5edf8230350310b5115e5d886eb62c42aa78d6
 EBUILD mutter-3.8.3.ebuild 1997 SHA256 a1ff52aa5591c822be0118bc218c3787a5b4a8ba2ac692d6c02aad2c539385b6 SHA512 d2be86cd6c16e361671fc6b8a633aa884674e612c153c1908917a13b6a49419e7660c4904a9bc412a8626c10421effe1dc5c03401d076f6f0a2240bf7d7ee282 WHIRLPOOL 894d4c26c886685fe14c93f0b7f046f72f2e733e9c78f054e00f12cfa9355e55d21880708201bd1a22f7b1f4de0e03b93d60fa11f44e97bac8c79ec467b2c3ce
-MISC ChangeLog 5366 SHA256 8c12df7edf38ab597c59a1c09a90158a46cb7949385f27460ee61afd9c7249a9 SHA512 ac90f8d1371dd78f81c893bc70c3fff545f8f5ccd7daa6d2e1cd8fe2441d2d9220ff32eed321e56144e60953a990d5561d04322352cba633bcdf2a3b9f641772 WHIRLPOOL 4de40cebe98d1b896210a633234607e384fb1a0368ea52e051fb773630f2129166b6550cab206f0584b348abaf6d36bec2fb9c0114adab01a3875e54447b2e80
+MISC ChangeLog 5585 SHA256 d70c29b6838ba023bc9a78977d812d5f4809a0dba27155e0d8d9e8be21075f9e SHA512 f5a71a6f6b981e28c40f6a45166d112779f4d42bb95b5ad71b65074e09be8ece9fcb98f9d3a423b18c1402105752ba0a246247dc5869a76f1b0d232b017723d7 WHIRLPOOL 39d8fde10463f08ec7469dda9b2e237695f986b83f5f363692cc058c7f5ae375c6035e84df62f913f528ee2d3165a7ac84bec09d3d4701138097117c4d229d05
 MISC metadata.xml 158 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1 SHA512 7fbfbd2b3ed1b81867d55648509f778fdbe2091af53727b3426a3c7f453ae7e1663a99fdd2101508b8d6c85b3158459c93551b77a6a394f02d7e11cbc8a5ecf4 WHIRLPOOL 4bcd5662974877d42ebc4361b6eb412bfeea2af7144b436ce7ed152327d554afc321c376625ba0bb85a704b70d86e3c4882dff3573047acddd8ffccf655d4f7e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iEYEAREIAAYFAlHwWhYACgkQ1fmVwcYIWAY93wCeOloMFzlCJBuFf0yDsI35P8B1
-UwcAoMX72IfhZB8RkH664AdCZQmwp6AI
-=wf/S
+iEYEAREIAAYFAlH1elcACgkQCaWpQKGI+9SSDACfZ9JOOZxPjaftKwKmrtJsqvM7
+X50An1piYC49k6YlpuytGyW3rt2HVovq
+=bEhN
 -----END PGP SIGNATURE-----
diff --git a/x11-wm/mutter/mutter-3.8.2.ebuild b/x11-wm/mutter/mutter-3.8.3-r1.ebuild
index de4efda480f9..37954c47e860 100644
--- a/x11-wm/mutter/mutter-3.8.2.ebuild
+++ b/x11-wm/mutter/mutter-3.8.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/mutter/mutter-3.8.2.ebuild,v 1.1 2013/05/15 07:44:22 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/mutter/mutter-3.8.3-r1.ebuild,v 1.1 2013/07/28 20:08:54 pacho Exp $
 
 EAPI="5"
 GCONF_DEBUG="yes"
@@ -10,6 +10,8 @@ inherit eutils gnome2
 DESCRIPTION="GNOME 3 compositing window manager based on Clutter"
 HOMEPAGE="http://git.gnome.org/browse/mutter/"
 
+SRC_URI="${SRC_URI} http://dev.gentoo.org/~pacho/gnome/${P}-patches.tar.xz"
+
 LICENSE="GPL-2+"
 SLOT="0"
 IUSE="+introspection test"
@@ -21,7 +23,7 @@ COMMON_DEPEND="
 	x11-libs/gdk-pixbuf:2[introspection?]
 	>=x11-libs/gtk+-3.3.7:3[X,introspection?]
 	>=dev-libs/glib-2.36.0:2
-	>=media-libs/clutter-1.13.5:1.0[introspection?]
+	>=media-libs/clutter-1.14.3:1.0[introspection?]
 	>=media-libs/cogl-1.13.3:1.0=[introspection?]
 	>=media-libs/libcanberra-0.26[gtk3]
 	>=x11-libs/startup-notification-0.7
@@ -38,13 +40,14 @@ COMMON_DEPEND="
 	x11-libs/libXinerama
 	x11-libs/libXrandr
 	x11-libs/libXrender
-	>=x11-libs/libXi-1.6.2
+	>=x11-libs/libXi-1.7
 
 	gnome-extra/zenity
 
 	introspection? ( >=dev-libs/gobject-introspection-0.9.5 )
 "
 DEPEND="${COMMON_DEPEND}
+	>=dev-util/gtk-doc-am-1.15
 	>=dev-util/intltool-0.35
 	sys-devel/gettext
 	virtual/pkgconfig
@@ -54,7 +57,8 @@ DEPEND="${COMMON_DEPEND}
 	test? ( app-text/docbook-xml-dtd:4.5 )
 "
 RDEPEND="${COMMON_DEPEND}
-	!x11-misc/expocity"
+	!x11-misc/expocity
+"
 
 src_prepare() {
 	DOCS="AUTHORS ChangeLog HACKING MAINTAINERS NEWS README *.txt doc/*.txt"
@@ -62,6 +66,9 @@ src_prepare() {
 	# Compat with Ubuntu metacity themes (e.g. x11-themes/light-themes)
 	epatch "${FILESDIR}/${PN}-3.2.1-ignore-shadow-and-padding.patch"
 
+	# Apply patches from gnome-3.8 branch
+	epatch "${WORKDIR}/${P}-patches/"*.patch
+
 	gnome2_src_prepare
 }
 
@@ -73,7 +80,6 @@ src_configure() {
 		--enable-startup-notification \
 		--enable-xsync \
 		--enable-verbose-mode \
-		--enable-compile-warnings=maximum \
 		--with-libcanberra \
 		$(use_enable introspection)
 }