Version bump, backport of fixes from 1.22.

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

3 files changed, 124 insertions, 5 deletions

diff --git a/media-libs/clutter/ChangeLog b/media-libs/clutter/ChangeLog
index 1ffb1b59a022..4a0d7246c74e 100644
--- a/media-libs/clutter/ChangeLog
+++ b/media-libs/clutter/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-libs/clutter
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/clutter/ChangeLog,v 1.94 2015/03/15 13:28:34 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/clutter/ChangeLog,v 1.95 2015/05/01 16:03:20 eva Exp $
+
+*clutter-1.20.2 (01 May 2015)
+
+  01 May 2015; Gilles Dartiguelongue <eva@gentoo.org> +clutter-1.20.2.ebuild:
+  Version bump, backport of fixes from 1.22.
 
   15 Mar 2015; Pacho Ramos <pacho@gentoo.org> clutter-1.20.0.ebuild:
   x86 stable, bug 534012
diff --git a/media-libs/clutter/Manifest b/media-libs/clutter/Manifest
index a337cf85e9c1..2d9a08e7c67e 100644
--- a/media-libs/clutter/Manifest
+++ b/media-libs/clutter/Manifest
@@ -3,14 +3,16 @@ Hash: SHA256
 
 DIST clutter-1.18.4.tar.xz 5237900 SHA256 4eea1015cd6d4b4945cb5d4a60e52275b0d70e13852d6d99c9abc0cd4deeb60c SHA512 a2ef71c3114cda5861cc88a3c826e6144dc44b8e63a1ece58d2bb7999e731cea612231c1f67af85f2bdddf02bbd80d27e5e35b4867fb378d6698c7b1b654aa62 WHIRLPOOL f03d6aaeca310da29b03b273a0695cd3407a9b76507195a6eca64d60bc4f0de6fac3f01eaf16b71dc1f0e04c0c40dd2e08caeb6dd44d47728ad7ceb2903146e5
 DIST clutter-1.20.0.tar.xz 5237780 SHA256 cc940809e6e1469ce349c4bddb0cbcc2c13c087d4fc15cda9278d855ee2d1293 SHA512 2e6c582c0a31c61104c9f73fb870c61dd4331c247e111ecc3d9823c9cc3d24d9d3743f25d672498693170ca41419f13cc5ad2e1763e3a24bfd2c5c07b627b5e3 WHIRLPOOL 8e75af9837313db3d8a2c4d9191a1738140248b39a2e4bb5309c1c029a55825f7f306952d21677b2f9ad75b3d0d0a5488517955ba05a2a05274d3f866bc77868
+DIST clutter-1.20.2.tar.xz 5255576 SHA256 8fa5287e964e1811c339d95252b434a2bc0c60f1f42f1c854f29c71c7efeca94 SHA512 c9d8283a9d562608f5af42b1a3d1199d83ab18262e7fde6d221e1440ed5cadd3a82f9cf3f41a67330178773b05e63d07f8c24d87efb55df52e1bf2dc9e668788 WHIRLPOOL 9743048c63030dbc83b00bb9380bcc50bd6fcf71b0a4d77f44510063a7e3f687d720b4e07537d7e215b0ce4423e0af78959bceb483fe7749703c32d9ffae8a67
 EBUILD clutter-1.18.4.ebuild 2818 SHA256 666e526478a35b5ab8e4bee634bc643440ebb22c77d67257b1bb49ccc04ccbe9 SHA512 d928387b75440c57ed7256223b96163ceb7fc1ebf3dc5dd5615367b848a53ef12c306b9e7936ae83773b136c51717816a1466727ed0bb249d8407f0627d03213 WHIRLPOOL 1cd2baf9f2ab0dcc6c4dfa9751a101d37484cbaf88fb02620a9991035ff7fe00f251e025d88c65b4ab49ed827aeec3ad2f0eadf4e965c69388e791fe3e55de71
 EBUILD clutter-1.20.0.ebuild 3218 SHA256 619f6370746d8601a1b5859ba71062cf61105215fdcd41044b8e05b2aa63a33d SHA512 13b580dda0a0168982bc8ee7f9bdd21a5c63ace69978753ee5c526df0a245511b275e9b11aa0bdbfde87fe2781202cce9eaed111faf2d2c83e3806db8a835d93 WHIRLPOOL 16313d1c2cefdb131998ce88ccf95996d2338e9580e6d3828a77493b8c0e82eff17c95cc2b90f022fc17ea95e8f41c606abf81c25407052b7eefbd8659d74ae1
-MISC ChangeLog 14847 SHA256 21abc9e05d2b2a7051e7cdcfb5756430508b2f8ea01f0e7a14e0edf3e94fc87a SHA512 861cf35b255b5c55abe713a07f213f1c4c1eb948bc888537180ac23afa268dd525a6e94a16fc9662d6688aafedf61a866860102070f1aafaf33db316c8ba2428 WHIRLPOOL 3efe5b71db1291b4b72e05fcd03a398b5dc79c6393bb19d5fbd6574b4cbc26709e79dbfe3038cddd3223471f0bbce756dac60a0c0bb8739d2ec22ee1f82bc47f
+EBUILD clutter-1.20.2.ebuild 3218 SHA256 7525f19a9b912876305af1658e5b1cf006b267c39c4bc6fe9c5e39e5125b14f5 SHA512 4a9146fefa2cf5576fcbfda453f069216b01f359f2c152314f89a7ff2f9a8a62b48b2e086929305417315a7300a7e9140d1f1a9fad0f42d0628aa9aac221c38e WHIRLPOOL 4d61953d955e94a520c7dfb78bdd2da616e1a3562f16390abca319f0c2f7373bffef85fb2834965c0f3e1e2620620841f768df2a0068c9c50d4b8adf80b0837c
+MISC ChangeLog 15000 SHA256 5ee3962ee86034551bc0e06c5afdd752352412cce1a0ee0f5427ae54288f19fe SHA512 a8aae6cad8cbf0fd028c25a4f268a2cd7986928f7a5263721302135d352755e12261bc766cb8dd5eb32576210651c419a4301bd2fa4f97cab629a22320a1e150 WHIRLPOOL 67f8c1cd3eb403108f83782a452397ee6715af2e6a35d0f8decb933d975c823dc09860267de04375091072fb2cc56be291ef6def952cddd4672e9254eec4f866
 MISC metadata.xml 322 SHA256 6d3e994cdd0ab9a54f0fc5507a6a30ff169d80218391b388afb261b6c9c2708c SHA512 704ff34a347ff87d97915e16166b2ae7e55db69e05dda0bc73724d9b73938c73f75a2b62815f0934fc4b5816a79841497501c0f4ed98fd00f42816576528ed9f WHIRLPOOL 93beab4d31d116edc299769391946eeac37f9662611f13dd833b1c3416cedc96e7d77d1fa7a739ce384dc67164b006924ae1ca7c453ca3c95bbc368bb68f7fce
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlUFiPUACgkQCaWpQKGI+9RukwCghKAFlaVJhM6kA54FG4BMZITe
-KfoAniEP9GrjEGOFv/42oE4CqsYfslP5
-=YKme
+iEYEAREIAAYFAlVDo8kACgkQ1fmVwcYIWAaYjQCfcXBKLKvO0y4jIvBbfkkBqV3r
+AL0AoK/Xx6WXBqi1SRQaCXg6xKcNk3zA
+=R4Ta
 -----END PGP SIGNATURE-----
diff --git a/media-libs/clutter/clutter-1.20.2.ebuild b/media-libs/clutter/clutter-1.20.2.ebuild
new file mode 100644
index 000000000000..270165b8217b
--- /dev/null
+++ b/media-libs/clutter/clutter-1.20.2.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/clutter/clutter-1.20.2.ebuild,v 1.1 2015/05/01 16:03:20 eva Exp $
+
+EAPI="5"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+
+inherit gnome2 virtualx
+
+HOMEPAGE="https://wiki.gnome.org/Projects/Clutter"
+DESCRIPTION="Clutter is a library for creating graphical user interfaces"
+
+LICENSE="LGPL-2.1+ FDL-1.1+"
+SLOT="1.0"
+IUSE="aqua debug doc egl gtk +introspection test wayland +X"
+REQUIRED_USE="
+	|| ( aqua wayland X )
+	wayland? ( egl )
+"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+
+# NOTE: glx flavour uses libdrm + >=mesa-7.3
+# XXX: uprof needed for profiling
+# >=libX11-1.3.1 needed for X Generic Event support
+# do not depend on tslib, it does not build and is disable by default upstream
+# <dev-libs/libinput-0.8 due to Gnome bugzilla #742829
+RDEPEND="
+	>=dev-libs/glib-2.37.3:2
+	>=dev-libs/atk-2.5.3[introspection?]
+	>=dev-libs/json-glib-0.12[introspection?]
+	>=media-libs/cogl-1.17.5:1.0=[introspection?,pango,wayland?]
+	>=x11-libs/cairo-1.12:=[aqua?,glib]
+	>=x11-libs/pango-1.30[introspection?]
+
+	virtual/opengl
+	x11-libs/libdrm:=
+
+	egl? (
+		>=dev-libs/libinput-0.4
+		<dev-libs/libinput-0.8
+		media-libs/cogl[gles2,kms]
+		>=virtual/libgudev-136
+		x11-libs/libxkbcommon
+	)
+	gtk? ( >=x11-libs/gtk+-3.3.18:3[aqua?] )
+	introspection? ( >=dev-libs/gobject-introspection-0.9.6 )
+	X? (
+		media-libs/fontconfig
+		>=x11-libs/libX11-1.3.1
+		x11-libs/libXext
+		x11-libs/libXdamage
+		x11-proto/inputproto
+		>=x11-libs/libXi-1.3
+		>=x11-libs/libXcomposite-0.4 )
+	wayland? (
+		dev-libs/wayland
+		x11-libs/gdk-pixbuf:2 )
+"
+DEPEND="${RDEPEND}
+	>=dev-util/gtk-doc-am-1.20
+	>=sys-devel/gettext-0.17
+	virtual/pkgconfig
+	doc? (
+		>=dev-util/gtk-doc-1.20
+		>=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() {
+	# We only need conformance tests, the rest are useless for us
+	sed -e 's/^\(SUBDIRS =\).*/\1 accessibility conform/g' \
+		-i tests/Makefile.am || die "am tests sed failed"
+	sed -e 's/^\(SUBDIRS =\)[^\]*/\1  accessibility conform/g' \
+		-i tests/Makefile.in || die "in tests sed failed"
+
+	gnome2_src_prepare
+}
+
+src_configure() {
+	# 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/win32 backends?
+	gnome2_src_configure \
+		--disable-profile \
+		--disable-maintainer-flags \
+		--disable-gcov \
+		--disable-cex100-backend \
+		--disable-win32-backend \
+		--disable-tslib-input \
+		$(use_enable aqua quartz-backend) \
+		$(usex debug --enable-debug=yes --enable-debug=minimum) \
+		$(use_enable doc docs) \
+		$(use_enable egl egl-backend) \
+		$(use_enable egl evdev-input) \
+		$(use_enable gtk gdk-backend) \
+		$(use_enable introspection) \
+		$(use_enable test gdk-pixbuf) \
+		$(use_enable wayland wayland-backend) \
+		$(use_enable wayland wayland-compositor) \
+		$(use_enable X xinput) \
+		$(use_enable X x11-backend)
+}
+
+src_test() {
+	Xemake check -C tests/conform
+}