media-libs/clutter: Bump version to 1.26.0

Package-Manager: portage-2.2.28
Manifest-Sign-Key: 0xE9E568677E8B4D42

3 files changed, 18 insertions, 24 deletions

diff --git a/media-libs/clutter/Manifest b/media-libs/clutter/Manifest
index 65f7ec80..ccf70953 100644
--- a/media-libs/clutter/Manifest
+++ b/media-libs/clutter/Manifest
@@ -1,15 +1,15 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST clutter-1.23.6.tar.xz 5304656 SHA256 fb8ea455b272f3b9bfe411cad5bb7109359c749f80a5b910fcf0eb26d8faafbe SHA512 8b19425e37e09307c94e644e4bb8d3414713cf1205a2a7df197bea5ba4d0b5cd4c37ad2898f34c41110c899abecb6e1721ab86bc07617f77d16a784458fa757d WHIRLPOOL acf511666e41008d76a7d61a48d78de916f4cdc6676aba2465e39f946db9d41332e4007c776c3914643e9e43ac5ec94642bc3c26d1a1ec9a0ab06f7eb4414832
+DIST clutter-1.26.0.tar.xz 5378576 SHA256 67514e7824b3feb4723164084b36d6ce1ae41cb3a9897e9f1a56c8334993ce06 SHA512 86284152dd07bde1513e4a005cb4596ea5bb1ff88cc009e12bb6f550e01a5c9252e2d84dbebb6778458ba5352f1aaba30233576a9aba3d821c38f2fcb30a9a4d WHIRLPOOL acfdd3a7ceff43fddd605211bc0dda4a0055ef648c88eff6ae5133b58027df2c914c9f2a767b64ede209024361340440dc4f48748cbbdd32d1097d6c6ccc0805
 -----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
+iQEcBAEBCAAGBQJW9HNaAAoJEOnlaGd+i01Ce3sH/0+zOdeNVT54UVisj5uLSCFh
+EnGnEjJDPsdTFXbc90dF1x7afRiBWfj6HtFrjwLajCAo+4+Z9k+q+oVuung952p3
+esEt9l8XAuvPDzfIa/IgL4G/ONyrtZ1yVh9xWy0HR6vfrSPBp5CBYMQ0MJGZnkvD
+31XqZTY5t28459MzeRC+YXDMtJgr2xy848aPMMN5oF+esSlKB8NIq74IvUrps+2v
+8rdXkCOUTFVqaVyOdFVBZB3+K/R13ST4HRs2IGiJkjiv6k5F66eSexNi5VoS7xwe
+Tj2yTcg8HmrLOG3L+OgsWcJ8jSIl3KvjvwnbIIn9xAPJKnVA+s4eyKVH0HSkJdM=
+=wsBi
 -----END PGP SIGNATURE-----
diff --git a/media-libs/clutter/clutter-1.23.6.ebuild b/media-libs/clutter/clutter-1.26.0.ebuild
index ba2bdd47..de3b11f4 100644
--- a/media-libs/clutter/clutter-1.23.6.ebuild
+++ b/media-libs/clutter/clutter-1.26.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -13,7 +13,7 @@ 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"
+IUSE="aqua debug doc egl gtk +introspection test wayland X"
 REQUIRED_USE="
 	|| ( aqua wayland X )
 	wayland? ( egl )
@@ -24,8 +24,8 @@ KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 # >=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/atk-2.5.3[introspection?]
 	>=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]
@@ -35,8 +35,8 @@ RDEPEND="
 	x11-libs/libdrm:=
 
 	egl? (
-		>=dev-libs/libinput-0.19
-		media-libs/cogl:=[gles2,kms]
+		>=dev-libs/libinput-0.19.0
+		media-libs/cogl:1.0=[gles2,kms]
 		>=virtual/libgudev-136
 		x11-libs/libxkbcommon
 	)
@@ -64,9 +64,6 @@ DEPEND="${RDEPEND}
 		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
diff --git a/media-libs/clutter/clutter-9999.ebuild b/media-libs/clutter/clutter-9999.ebuild
index 3e4ac266..815f3e09 100644
--- a/media-libs/clutter/clutter-9999.ebuild
+++ b/media-libs/clutter/clutter-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -16,7 +16,7 @@ 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"
+IUSE="aqua debug doc egl gtk +introspection test wayland X"
 REQUIRED_USE="
 	|| ( aqua wayland X )
 	wayland? ( egl )
@@ -31,8 +31,8 @@ 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/atk-2.5.3[introspection?]
 	>=dev-libs/glib-2.44.0:2
+	>=dev-libs/atk-2.5.3[introspection?]
 	>=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]
@@ -42,8 +42,8 @@ RDEPEND="
 	x11-libs/libdrm:=
 
 	egl? (
-		>=dev-libs/libinput-0.19
-		media-libs/cogl:=[gles2,kms]
+		>=dev-libs/libinput-0.19.0
+		media-libs/cogl:1.0=[gles2,kms]
 		>=virtual/libgudev-136
 		x11-libs/libxkbcommon
 	)
@@ -71,9 +71,6 @@ DEPEND="${RDEPEND}
 		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