media-libs/clutter: Bump version to 1.23.6

Package-Manager: portage-2.2.20.1
Manifest-Sign-Key: 7E8B4D42

3 files changed, 131 insertions, 7 deletions

diff --git a/media-libs/clutter/Manifest b/media-libs/clutter/Manifest
new file mode 100644
index 00000000..65f7ec80
--- /dev/null
+++ b/media-libs/clutter/Manifest
@@ -0,0 +1,15 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+DIST clutter-1.23.6.tar.xz 5304656 SHA256 fb8ea455b272f3b9bfe411cad5bb7109359c749f80a5b910fcf0eb26d8faafbe SHA512 8b19425e37e09307c94e644e4bb8d3414713cf1205a2a7df197bea5ba4d0b5cd4c37ad2898f34c41110c899abecb6e1721ab86bc07617f77d16a784458fa757d WHIRLPOOL acf511666e41008d76a7d61a48d78de916f4cdc6676aba2465e39f946db9d41332e4007c776c3914643e9e43ac5ec94642bc3c26d1a1ec9a0ab06f7eb4414832
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2
+
+iQEcBAEBCAAGBQJV9cQuAAoJEOnlaGd+i01CAPIIAI30YF833hQgOJgoKPgggGZn
+vq5bgWdEyVXhhcOVwQohRiTSMHZe+y+ql841xWFt49m+p/yFzDdiWakyq/anyaGs
++NSxNYe17bl6I+oP/lLjrLdGH+cknolof78Q2fKLBh5Sr5xAIgmrNtO/NsDD0dvn
+q/o+B32cuYAGPoABC/7z1Zn1zjBRIjt8td7wmAq4x0T/JlJrEpWVZO7pF9pIEzDx
+n8/xG1o4knh0d4ydh2l4BssqJWv7uHsdlLPswVL7Ihfu+E4KikEo2ewuaoXmULRO
+X+obH2f6Gxa3MKjuAn35AVLreIWiK+zc5YItg5qX02M3Fu8BnR2Ajxw6S97XaqE=
+=b8Ty
+-----END PGP SIGNATURE-----
diff --git a/media-libs/clutter/clutter-1.23.6.ebuild b/media-libs/clutter/clutter-1.23.6.ebuild
new file mode 100644
index 00000000..ba2bdd47
--- /dev/null
+++ b/media-libs/clutter/clutter-1.23.6.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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
+# >=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
+RDEPEND="
+	>=dev-libs/atk-2.5.3[introspection?]
+	>=dev-libs/glib-2.44.0:2
+	>=dev-libs/json-glib-0.12[introspection?]
+	>=media-libs/cogl-1.21.2:1.0=[introspection?,pango,wayland?]
+	>=x11-libs/cairo-1.14:=[aqua?,glib]
+	>=x11-libs/pango-1.30[introspection?]
+
+	virtual/opengl
+	x11-libs/libdrm:=
+
+	egl? (
+		>=dev-libs/libinput-0.19
+		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-1.39:= )
+	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: coverage disabled for now
+	# XXX: What about cex100/win32 backends?
+	gnome2_src_configure \
+		--disable-maintainer-flags \
+		--disable-mir-backend \
+		--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
+}
diff --git a/media-libs/clutter/clutter-9999.ebuild b/media-libs/clutter/clutter-9999.ebuild
index b74225ec..3e4ac266 100644
--- a/media-libs/clutter/clutter-9999.ebuild
+++ b/media-libs/clutter/clutter-9999.ebuild
@@ -31,10 +31,10 @@ fi
 # >=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
 RDEPEND="
-	>=dev-libs/glib-2.39.0:2
 	>=dev-libs/atk-2.5.3[introspection?]
+	>=dev-libs/glib-2.44.0:2
 	>=dev-libs/json-glib-0.12[introspection?]
-	>=media-libs/cogl-1.20.0:1.0=[introspection?,pango,wayland?]
+	>=media-libs/cogl-1.21.2:1.0=[introspection?,pango,wayland?]
 	>=x11-libs/cairo-1.14:=[aqua?,glib]
 	>=x11-libs/pango-1.30[introspection?]
 
@@ -42,13 +42,13 @@ RDEPEND="
 	x11-libs/libdrm:=
 
 	egl? (
-		>=dev-libs/libinput-0.8
-		media-libs/cogl[gles2,kms]
+		>=dev-libs/libinput-0.19
+		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-1.39 )
+	introspection? ( >=dev-libs/gobject-introspection-1.39:= )
 	X? (
 		media-libs/fontconfig
 		>=x11-libs/libX11-1.3.1
@@ -69,8 +69,8 @@ DEPEND="${RDEPEND}
 		>=dev-util/gtk-doc-1.20
 		>=app-text/docbook-sgml-utils-0.6.14[jadetex]
 		dev-libs/libxslt )
-	test? ( x11-libs/gdk-pixbuf )"
-
+	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"