Version bump for gnome-3.6. Switch to global introspection USE flag.

Package-Manager: portage-2.2.0_alpha148/cvs/Linux x86_64
Manifest-Sign-Key: 0xCF0ADD61

4 files changed, 125 insertions, 12 deletions

diff --git a/media-libs/clutter/ChangeLog b/media-libs/clutter/ChangeLog
index 8233e9e132fe..16a1d0ecd919 100644
--- a/media-libs/clutter/ChangeLog
+++ b/media-libs/clutter/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-libs/clutter
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/clutter/ChangeLog,v 1.59 2012/12/05 23:12:48 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/clutter/ChangeLog,v 1.60 2012/12/16 22:04:03 tetromino Exp $
+
+*clutter-1.12.2 (16 Dec 2012)
+
+  16 Dec 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+  +clutter-1.12.2.ebuild, metadata.xml:
+  Version bump for gnome-3.6. Switch to global introspection USE flag.
 
   05 Dec 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
   -clutter-1.2.14.ebuild, -clutter-1.6.16.ebuild, -clutter-1.6.20.ebuild,
diff --git a/media-libs/clutter/Manifest b/media-libs/clutter/Manifest
index 839ce0e6fb6b..d7a1c4a41edd 100644
--- a/media-libs/clutter/Manifest
+++ b/media-libs/clutter/Manifest
@@ -2,19 +2,21 @@
 Hash: SHA256
 
 DIST clutter-1.10.8.tar.xz 4761332 SHA256 7c08c2deff62c134c1a3d18e04dcb6fbae4bbc541c800638b9fc3d71fe4a64bf SHA512 8a2c30c31b221328ef502614503824ee1cbc3752d4344135361ee7df3be606e9bc0db7cdf6e3108f3a80a3012c2515f2841d0b340f81f5a3df9dd602143d2af0 WHIRLPOOL cbe15de502768dfdf87f93947f219ee1df43dd25c21bd5a011a06c6c0668cf8d288581e417eb33d682fb2b5b3c8bdf443c1ec3f1cdc637cdeac2c4fa0bccfec0
+DIST clutter-1.12.2.tar.xz 4996752 SHA256 27a8c4495099ea33de39c2d9a911a2c9e00ffa4dcc8f94fafedbcc752c0ddf13 SHA512 4d20a7319cffe5df0052b260879bf6fe75c5eb221306da7268d99925aa8f391ba509aab9df37f080cab7c58c88c6a289c420260dc5ac7abaf7cbceb588fc4997 WHIRLPOOL fee6d14620845e8b8c44b1518ca4b7da204c4fed0c4d6b8b7a6ce1f5640b0ef87f7f0dd482b4cda80bb685fa05b0f3ecee5b1da63df232918bc89fbafbea7798
 DIST clutter-1.8.4.tar.xz 4477772 SHA256 6fedb4c344b4cab37e249b8a5ffeccff2f384f11335dee25c6466927461e1345 SHA512 ca9b998d7f286867a57896506ad4db5e0b0da2d1d942afedce5afee50b60914a1fccc2048508d6f245916eed4107ddbe0ea07e0ea9d00f6aa86473587da155ae WHIRLPOOL 799b3c7c3d7aaa1e603e6dd772992b41ade27c118735e2c8ede99e8fab505d00ef572b7cdac2c7eb0b3fbb93b861280a3fc891ffda33b0547ca389eecd993ec0
 EBUILD clutter-1.10.8.ebuild 2950 SHA256 c197860ab815cfdcb5e1a95e7ac040fd3688c423cd00c5d6c9b917877c7afd49 SHA512 231b779075534fc1dec6cce20c5b53b9c3225429a5fc8dc168567bee9a0f78b7b9459c34cd246c61c1653ce5e8d8e837018fb4fd9905f2d09d76a7b1332ee1f8 WHIRLPOOL 922db320960f2617e6a7a3496d96e0af549734a47c95ac67298de28c88b7ccf8975acd8803ce73d5f35ad838da06f9508fa5ba766d39e8585cfe36fe8bb530c3
+EBUILD clutter-1.12.2.ebuild 2908 SHA256 cd57d8265c6bd75a20e4f0c5caa68df9a44446b185af007fd4da0f649ef10492 SHA512 a90fe28e8ea803ac65e3a68f0663bed2de452e0a8c131f27a7a0d5b64769b1a6ee285cb08dd74a545e9ea34fe5b8b98681d2c0fc84252a12e2f6f848038be4f8 WHIRLPOOL 49e8d66d83f0757b61b6c534f602b207864461406ac0dd48d1f8277238116669d07aaffaa8dd35856018df15c97226b7b407a4fcdeba6dd0f532af24a213ba8f
 EBUILD clutter-1.8.4.ebuild 2362 SHA256 1b59c25f2673a45c8a43d26c99c8278b52fe307e297ff801582b93bd3845ba78 SHA512 29621d9e9651b921c76fc2c4880d80efd876fc9fa6aa48db6e567fd1837e234097d314c13e6254bbd6de0e97f94c40ed6644d2044ba47c57ebb698d0ecf39d4b WHIRLPOOL 6fd83e1d6d15ebd34d0e3a78f004bf9fe42e84b48a85f987d9ac40ca9ac8b6b8779682e318d3b423461052df034cd0e0a278cfa52ebe5993e015d3a2981c8a93
-MISC ChangeLog 10142 SHA256 a98327020dccf3a919bf8e49c85a90e4df1c0bbc02409d117cc31394b7a8899d SHA512 04a58388fa7c51966499d905c1e40da9216596243f4caa3941b2f09d1b201ff155f7a44ab300acc162802ea47091496c72f9c9b29f6f2f161d848366b9cbfab2 WHIRLPOOL b9c10555c65e5b562f4a298df11bb041f36488bfe94a8ad5f002085750256924a9f02efe4834675cf976d726d8a2f18eb84da2219d08b5b3d9759532e16eefde
-MISC metadata.xml 369 SHA256 32aaa1d48a8c5b7837ada4c3d705d4a4d58280b4454d53cc6ef34f43e0675696 SHA512 ff09205e19ec9cd8fd0e53c8c75e68594c209b5d51f77da4b187d6110f653fff0888b31c6446236b871c7394641e27e0e9c8f8c17b231f9809b95fb342a11480 WHIRLPOOL de7ba443db745e35b9697f5e75417282e2df3d6cd1cc4ade026eb5f5d829ddc68574f07ec4411ecd0514a05f495ce6d955093d32315bc67dbd22e413d37c414d
+MISC ChangeLog 10344 SHA256 19bf3a7de076a4560b5acf676f94f728a64fba07d54a74341194190202d3b6a0 SHA512 9625cb9a18b8acf75532f064ad2adf3d721342a503039ef730d833e3fad5ab53022eca7acacf61c97c8864706889442b2e7dcc14e9861f6b8747d2dfdbc5af9c WHIRLPOOL bad213f3735e441977c29adcce8fcbfc62d8d150f48bc463481af27c5819e132e774c36586c0d77f927a105e10cc092ecdc80f22e380bd4e9ac9c35bb36acee0
+MISC metadata.xml 268 SHA256 a20cdf9f9acb3fd7400852008b48023362824c22d73fa9b085fe1b5697261c9c SHA512 beae5c1cfe5f31db01301fe3bfa39ee8819b13e77ed4da74879a9c194afb64480e3005c27dd20a2816abf0ac2cdb0dc2fa9f4443f2b85b62ef4cd3f630581d1e WHIRLPOOL 199bba58fd4b89d6cdf1c486ae6a68a9c8511bf120f44e849386c82913ba98dd745162153e2320b234668496e87670f81c297f85346efb999ab5d07e065df84c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQv9TxAAoJEJ0WA1zPCt1hBUEIAIQnK6hC597faYzYO6OfGx/3
-uX7EXuvs50/7M3cCzchNXKQyqmoODx8wgt2gi4Gz4VEOgHEq+BXRZU20aorF/QvI
-/BTlUgMP+HUmXvof5gPQBkZiVFvPRDI0XJJ598PKTbB9x+NVtGJk1//lbrzDSnu/
-Trn1QFUTFcpiinPwdRsPj8+XC7gjfcx/MmDa5AlhMQDPZlL46V8ni1woJI77DwWG
-wPVhSmihyvcvMvNeXHUTuQvWx1cGsxGckX6drMp1qN9nyTCngXKB4KCNIDSEB63j
-iE7I0fFmEU0NtsjED4fyxdYT7t7KUDFcIN9gM6ArqyxMZ7eENGrplSE668jitGU=
-=LlYl
+iQEcBAEBCAAGBQJQzkVUAAoJEJ0WA1zPCt1hs5kIAINePXdTNt8baiQDjJj5TBvt
+9AYcM9thUtLMu0CdEBJQRoNrgbXUkzx+4LH2SD2Azf4sfH0YlW3ZSbfK8bMfWWU4
+dmri/1n34RY4sBjb0rpiL9qBs62DiMlWZ447b5ud0/VRwkdsTRZti+gj7mSIJNQg
+7DFpaJRCdthrxJT4Ll8+PAPkt0UNQw25SdXCT2dfK1VXxmrWMF/kPO9aWYl2PDWh
+8onaFptLuwG+GDgqVjycUsGa6vm1aL4DpVVG3WNRPqlW+hCF2S8PBu6/CdIPaFcy
+FeWbmjkjthgRuNySYKLgZaqPwBeSFIc522yNg50koY2i7Kw38GrNp6mNiJ/Kqzg=
+=WYcu
 -----END PGP SIGNATURE-----
diff --git a/media-libs/clutter/clutter-1.12.2.ebuild b/media-libs/clutter/clutter-1.12.2.ebuild
new file mode 100644
index 000000000000..7cad398eecb9
--- /dev/null
+++ b/media-libs/clutter/clutter-1.12.2.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/clutter/clutter-1.12.2.ebuild,v 1.1 2012/12/16 22:04:03 tetromino Exp $
+
+EAPI="5"
+CLUTTER_LA_PUNT="yes"
+
+# Inherit gnome2 after clutter to download sources from gnome.org
+# since clutter-project.org doesn't provide .xz tarballs
+inherit clutter gnome2 virtualx
+
+DESCRIPTION="Clutter is a library for creating graphical user interfaces"
+
+LICENSE="LGPL-2.1+ FDL-1.1+"
+SLOT="1.0"
+IUSE="debug doc gtk +introspection test" # evdev tslib
+KEYWORDS="~alpha ~amd64 ~mips ~ppc ~ppc64 ~x86"
+
+# NOTE: glx flavour uses libdrm + >=mesa-7.3
+# XXX: uprof needed for profiling
+# >=libX11-1.3.1 needed for X Generic Event support
+RDEPEND="
+	>=dev-libs/glib-2.31.19:2
+	>=dev-libs/atk-2.5.3[introspection?]
+	>=dev-libs/json-glib-0.12[introspection?]
+	>=media-libs/cogl-1.9.6:1.0=[introspection?,pango]
+	media-libs/fontconfig
+	>=x11-libs/cairo-1.10:=[glib]
+	>=x11-libs/pango-1.30[introspection?]
+
+	virtual/opengl
+	x11-libs/libdrm:=
+	>=x11-libs/libX11-1.3.1
+	x11-libs/libXext
+	x11-libs/libXdamage
+	x11-proto/inputproto
+	>=x11-libs/libXi-1.3
+	>=x11-libs/libXfixes-3
+	>=x11-libs/libXcomposite-0.4
+
+	gtk? ( >=x11-libs/gtk+-3.3.18:3 )
+	introspection? ( >=dev-libs/gobject-introspection-0.9.6 )"
+DEPEND="${RDEPEND}
+	>=dev-util/gtk-doc-am-1.15
+	virtual/pkgconfig
+	>=sys-devel/gettext-0.17
+	doc? (
+		>=dev-util/gtk-doc-1.15
+		>=app-text/docbook-sgml-utils-0.6.14[jadetex]
+		dev-libs/libxslt )
+	test? ( x11-libs/gdk-pixbuf )"
+
+# Tests fail with both swrast and llvmpipe
+# They pass under r600g or i965, so the bug is in mesa
+RESTRICT="test"
+
+src_prepare() {
+	DOCS="README NEWS ChangeLog*"
+
+	# XXX: Conformance test suite (and clutter itself) does not work under Xvfb
+	# (GLX error blabla)
+	# XXX: Profiling, coverage disabled for now
+	# XXX: What about cex100/egl/osx/wayland/win32 backends?
+	# XXX: evdev/tslib input seem to be experimental?
+	G2CONF="${G2CONF} ${myconf}
+		--enable-xinput
+		--enable-x11-backend=yes
+		--disable-profile
+		--disable-maintainer-flags
+		--disable-gcov
+		--disable-cex100-backend
+		--disable-egl-backend
+		--disable-quartz-backend
+		--disable-wayland-backend
+		--disable-win32-backend
+		--disable-tslib-input
+		--disable-evdev-input
+		$(usex debug --enable-debug=yes --enable-debug=minimum)
+		$(use_enable gtk gdk-backend)
+		$(use_enable introspection)
+		$(use_enable doc docs)
+		$(use_enable test conformance)
+		$(use_enable test gdk-pixbuf)"
+
+	# We only need conformance tests, the rest are useless for us
+	sed -e 's/^\(SUBDIRS =\).*/\1/g' \
+		-i tests/Makefile.am || die "am tests sed failed"
+	sed -e 's/^\(SUBDIRS =\)[^\]*/\1/g' \
+		-i tests/Makefile.in || die "in tests sed failed"
+
+	gnome2_src_prepare
+}
+
+src_compile() {
+	default
+	if use test; then
+		emake -C tests/conform
+	fi
+}
+
+src_test() {
+	Xemake check
+}
+
+src_install() {
+	clutter_src_install
+}
diff --git a/media-libs/clutter/metadata.xml b/media-libs/clutter/metadata.xml
index 470e6fcbaad7..8fcea51eeef5 100644
--- a/media-libs/clutter/metadata.xml
+++ b/media-libs/clutter/metadata.xml
@@ -4,7 +4,5 @@
 <herd>gnome</herd>
 <use>
 	<flag name="gtk">Use gdk-pixbuf from <pkg>x11-libs/gtk+</pkg> as image rendering backend</flag>
-	<flag name="introspection">Use <pkg>dev-libs/gobject-introspection</pkg> for
-		introspection</flag>
 </use>
 </pkgmetadata>