[gentoo-commits] proj/gnome:master commit in: media-libs/clutter/

["Ole Reifschneider" <tranquility@gentoo.org>]

commit:     4c07f974cc086394c70910fb6bf3ce905421cc81
Author:     Ole Reifschneider <tranquility <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 13 18:45:02 2015 +0000
Commit:     Ole Reifschneider <tranquility <AT> gentoo <DOT> org>
CommitDate: Sun Sep 13 18:45:02 2015 +0000
URL:        https://gitweb.gentoo.org/proj/gnome.git/commit/?id=4c07f974

media-libs/clutter: Bump version to 1.23.6

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

 .../{clutter-9999.ebuild => clutter-1.23.6.ebuild} | 23 ++++++++--------------
 media-libs/clutter/clutter-9999.ebuild             | 14 ++++++-------
 2 files changed, 15 insertions(+), 22 deletions(-)

diff --git a/media-libs/clutter/clutter-9999.ebuild b/media-libs/clutter/clutter-1.23.6.ebuild
similarity index 87%
copy from media-libs/clutter/clutter-9999.ebuild
copy to media-libs/clutter/clutter-1.23.6.ebuild
index b74225e..ba2bdd4 100644
--- a/media-libs/clutter/clutter-9999.ebuild
+++ b/media-libs/clutter/clutter-1.23.6.ebuild
@@ -7,9 +7,6 @@ GCONF_DEBUG="no"
 GNOME2_LA_PUNT="yes"
 
 inherit gnome2 virtualx
-if [[ ${PV} = 9999 ]]; then
-	inherit gnome2-live
-fi
 
 HOMEPAGE="https://wiki.gnome.org/Projects/Clutter"
 DESCRIPTION="Clutter is a library for creating graphical user interfaces"
@@ -21,20 +18,16 @@ REQUIRED_USE="
 	|| ( aqua wayland X )
 	wayland? ( egl )
 "
-if [[ ${PV} = 9999 ]]; then
-	KEYWORDS=""
-else
-	KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-fi
+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/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 +35,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 +62,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"

diff --git a/media-libs/clutter/clutter-9999.ebuild b/media-libs/clutter/clutter-9999.ebuild
index b74225e..3e4ac26 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"