Fix build failure with gobject-introspection-1.33.x; thanks to Johann Degenhardt for the report.

Package-Manager: portage-2.2.0_alpha120/cvs/Linux x86_64

3 files changed, 34 insertions, 23 deletions

diff --git a/x11-wm/mutter/ChangeLog b/x11-wm/mutter/ChangeLog
index a279d9a63ede..bb94a2589033 100644
--- a/x11-wm/mutter/ChangeLog
+++ b/x11-wm/mutter/ChangeLog
@@ -1,6 +1,11 @@
 # 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.11 2012/05/22 06:38:59 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/mutter/ChangeLog,v 1.12 2012/07/21 17:55:53 tetromino Exp $
+
+  21 Jul 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+  mutter-3.4.1-r1.ebuild:
+  Fix build failure with gobject-introspection-1.33.x; thanks to Johann
+  Degenhardt for the report.
 
   22 May 2012; Alexandre Rostovtsev <tetromino@gentoo.org> mutter-3.2.2.ebuild,
   mutter-3.2.2-r1.ebuild, mutter-3.4.1-r1.ebuild:
diff --git a/x11-wm/mutter/Manifest b/x11-wm/mutter/Manifest
index cedfc0e9afca..51ee71ae2170 100644
--- a/x11-wm/mutter/Manifest
+++ b/x11-wm/mutter/Manifest
@@ -1,25 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
-AUX mutter-3.2.1-ignore-shadow-and-padding.patch 2640 RMD160 408acd936e0a474714ffaa3c4a0a5c17bcc160ca SHA1 3705a09d1160c6a7ace480c5f51a3c413ac52a0d SHA256 765c04ba4d177789407a25d3cbdf358e3fa125170cfd37c53095372bc4ec883d
-AUX mutter-3.2.2-disable-introspection.patch 678 RMD160 c9a67368e6f618cadb446ca7c8b81158c097412c SHA1 f70de86c5b82be3ed9f6628925ea3b39754108be SHA256 5edfd4204142b4305f96ffe836de717a39cfcd9c5edc954161ab21fb49e98eb4
-AUX mutter-3.2.2-frame-initialize-style-contexts.patch 1053 RMD160 2d7540ee760e0dbc489270a0f81007962040fe64 SHA1 c7ba47d8042d50d9ecc13199ae8f16c73c577c8b SHA256 1718f868b2e2f88519dfef69a67ecddcf411183579ea5497844cbbc11b324932
-AUX mutter-3.4.1-meta_window_move_frame-crash.patch 1779 RMD160 48c3bb72646e5dff2281bedcc0b897fc24f2a183 SHA1 f8c7c4c1ca1f3b5dd53b0e5699085d77aeff7664 SHA256 5e8b565a223cab1055ecd65a85381ffd69f547b1efeb7b23ff69295869f6dfd8
-DIST mutter-3.2.2.tar.xz 1647416 RMD160 dd186b113149646ef120fa8c4fe89bdfe6c45ec5 SHA1 7ba5bdb7014311d3bfee1e201fdc039b96598471 SHA256 cd5977d86a100d89cfef557c22900b6d061730e2bda66e314e4943505d2bd5a1
-DIST mutter-3.4.1.tar.xz 1597536 RMD160 f4b1f5cdd1f5724f5af397b143b4bff6523882c8 SHA1 2d9a89f7dc682e683b5184c13568b643cd3dad52 SHA256 dbf08b014179980ab3d0cce645c5391c83b0ce070c73504feea8eec0ad000449
-EBUILD mutter-3.2.2-r1.ebuild 2210 RMD160 e267162dc5e7989509560ee185944f7111c0fa46 SHA1 f311e0e449da89d1d78a9fb9c86892160c07a4eb SHA256 fab24ea04244df0cb115e78931b8d7f862ed8b3b44387b6df726d351ae5a72c8
-EBUILD mutter-3.2.2.ebuild 2080 RMD160 6af04803cf560fea12c6b0553899eaf2185dffe8 SHA1 6c1a263b38bf27259d29d6bbde8f19d20e00a7bb SHA256 d8c2d43d0028e2d536b9de68eb611397f23e983849eff48be76ff20e47e514e4
-EBUILD mutter-3.4.1-r1.ebuild 2103 RMD160 df8635795c4424ac73a6404d20b40cdea4b5f592 SHA1 fadac5f3d63cf0b2729520f8767e0c54fc121695 SHA256 cb0ccebac0303c0e7051641d85a1a73d49fae5623213a90cd92db6ab05770627
-MISC ChangeLog 2543 RMD160 65b81297aa9da2bd165e836523a33fa372d09c54 SHA1 89d541566f17cedd22b41e3142a4025d679d2553 SHA256 595ecca36ff3b3bce10c698bfe7e8af5910e85d1e3aa0a002579549105e447f9
-MISC metadata.xml 277 RMD160 2ffb105a089a3b759ddef20bf72b06362a1d1c63 SHA1 82aa8cfe90fb0c9f7c02f295d2802d41ad2af380 SHA256 3d52f90556a9db4ad09f2fbe34e2d25b21f345e474e829ac84669d49cb64c8bb
+AUX mutter-3.2.1-ignore-shadow-and-padding.patch 2640 SHA256 765c04ba4d177789407a25d3cbdf358e3fa125170cfd37c53095372bc4ec883d SHA512 ba04a2265be9b2816ada33cb2dcf71ff02eb8667ada7c41139fc9e44e85a37030b8f0b7eb8064af2b6e691539a6dae5a0f8e66e06e2e3b803287eec798f13b52 WHIRLPOOL e85a2e27c9f036156dca68276793ea4bee5381ca43acdd85e7a37b4f577c6ae581be70866fa390a62fa4edf57d78b133185062642c96f30053a0b36f8c946893
+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
+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
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBAgAGBQJPuzSIAAoJEJ0WA1zPCt1h3DMH/272rFc2V4hlgeyxtqrocKJ5
-IK/kXcr01PJ33Z+m2KM1ZdmhoGMmfBqgtxQWKaOO7S6z4fGIlqAoabmGU5V5Wi8A
-szgcIUfrqvCpaV0CTgJkxIKKsONdNPVFMBFEzU9QJ0SNIPD9RL0hM+V4U4cJ91VU
-gvdENILbrYopROqNeDvCncRPlclFtUxs4gLtVRY+QiwbjhkyTJxmVtrzwGMyZDOY
-XLaTJg29jOBhz6zDL3mRTrHpb2dtpCXeVy1vnJE4cbRpKnRcaO0z7HvBJGVIesPW
-N/0qSyXvXwC0oyIQqc+3Z/6iDegslHdZlergBKp5PCkCLzapva7ix9cgZLHMeL8=
-=UQOo
+iQEcBAEBCAAGBQJQCu0uAAoJEJ0WA1zPCt1hUBEH/1MPm+knCQUa3xiaeWrVJSyo
+BvnQ0GXhvLo60KiZlPjyxaZTvEOG7pvriYPaigqfMhhMtTt/ELDcWxx+uFpqt4Cj
+31sSg0odQhPLCle1z9W+eVqmZtH9OhST3HkrxJ8qS1MM43w6uiuqrGTBop8B1bHW
+iS7TGr3fTrwBH9csN07xlQt/2fPYYTwbM/onrU+cyv2hbeIvvbdwzeWYtp21w29P
+TMigKbGC0vSk+ASVMxKz56wQUBofw+fIJff3uFrze4ttK0M2a4dk296UD48OxYeb
+6Nln/T2DW77LZkgQ1JImSFdVhOWhReWShyW+SY7xIxpyKRUYK/Ffz40Kve0Lg5k=
+=jFLE
 -----END PGP SIGNATURE-----
diff --git a/x11-wm/mutter/mutter-3.4.1-r1.ebuild b/x11-wm/mutter/mutter-3.4.1-r1.ebuild
index 9d94a7371fd3..a826d377d43e 100644
--- a/x11-wm/mutter/mutter-3.4.1-r1.ebuild
+++ b/x11-wm/mutter/mutter-3.4.1-r1.ebuild
@@ -1,6 +1,6 @@
 # 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.4.1-r1.ebuild,v 1.3 2012/05/22 06:38:59 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/mutter/mutter-3.4.1-r1.ebuild,v 1.4 2012/07/21 17:55:53 tetromino Exp $
 
 EAPI="4"
 GNOME2_LA_PUNT="yes"
@@ -9,6 +9,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/~tetromino/distfiles/${PN}/${PN}-3.4.1-gtk-doc-syntax.patch.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -18,7 +20,7 @@ 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+-3.3.7:3[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?]
@@ -46,9 +48,9 @@ DEPEND="${COMMON_DEPEND}
 	>=app-text/gnome-doc-utils-0.8
 	>=dev-util/intltool-0.35
 	sys-devel/gettext
-	virtual/pkgconfig
 	test? ( app-text/docbook-xml-dtd:4.5 )
 	xinerama? ( x11-proto/xineramaproto )
+	virtual/pkgconfig
 	x11-proto/xextproto
 	x11-proto/xproto"
 RDEPEND="${COMMON_DEPEND}
@@ -76,5 +78,8 @@ src_prepare() {
 	# In next release
 	epatch "${FILESDIR}/${P}-meta_window_move_frame-crash.patch"
 
+	# gobject-introspection-1.33 compat; in 3.5.x
+	epatch "${WORKDIR}/${PN}-3.4.1-gtk-doc-syntax.patch"
+
 	gnome2_src_prepare
 }