Version bump for Gnome 3.14. Clean up old revision.

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

5 files changed, 57 insertions, 77 deletions

diff --git a/media-libs/clutter/ChangeLog b/media-libs/clutter/ChangeLog
index 17c94e2b2f71..58943de7de60 100644
--- a/media-libs/clutter/ChangeLog
+++ b/media-libs/clutter/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-libs/clutter
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/clutter/ChangeLog,v 1.90 2014/12/19 13:39:56 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/clutter/ChangeLog,v 1.91 2014/12/23 22:53:28 eva Exp $
+
+*clutter-1.20.0 (23 Dec 2014)
+
+  23 Dec 2014; Gilles Dartiguelongue <eva@gentoo.org> -clutter-1.18.2.ebuild,
+  +clutter-1.20.0.ebuild, -files/clutter-1.16.4-buffer-age.patch, metadata.xml:
+  Version bump for Gnome 3.14. Clean up old revision.
 
   19 Dec 2014; Pacho Ramos <pacho@gentoo.org> clutter-1.18.4.ebuild:
   amd64 stable, bug 529964
diff --git a/media-libs/clutter/Manifest b/media-libs/clutter/Manifest
index 5bb406768ec4..5b73ad186009 100644
--- a/media-libs/clutter/Manifest
+++ b/media-libs/clutter/Manifest
@@ -1,17 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX clutter-1.16.4-buffer-age.patch 1565 SHA256 e254b26663c88dfba756934f011451c0551e52bb70e2de037835aea267ed7bda SHA512 17c89a67f0d4db00cc0d9bb329b197b3a7ab08d4718d9b832644e482d6849b5dbcc82d494d911bcd39eaed1546c74a30fae23706c543906c41f67088251ec356 WHIRLPOOL 7ed910e52b47c878bfa456f039cb92ca1a3103224163f11575e8580511ed8ecc31e3767195c97a05112a94c8ec99de465ba87ed3d88357097a7631a45b560ad6
-DIST clutter-1.18.2.tar.xz 5215180 SHA256 f9fe12e6148426063c90e67dfaeb56013bf1aea224ef502223d13eab6c1add63 SHA512 d7cf0d523dfd95f62910376d3958d50b9fd0debee0fd2e0c7c284500c78b5899fb0bb30dd279c638b4bc1cefaf63af376328f5e1c476d38c34ce4a79bd772b18 WHIRLPOOL e52c97e7c429b2a428e3749e8a6cafb2c9e5174a8437cd1f427b5c24c9df91f911a7ce76614d5131f6e6028504d5b23bf70ccf8b3e9b63a90af5a87329366f19
 DIST clutter-1.18.4.tar.xz 5237900 SHA256 4eea1015cd6d4b4945cb5d4a60e52275b0d70e13852d6d99c9abc0cd4deeb60c SHA512 a2ef71c3114cda5861cc88a3c826e6144dc44b8e63a1ece58d2bb7999e731cea612231c1f67af85f2bdddf02bbd80d27e5e35b4867fb378d6698c7b1b654aa62 WHIRLPOOL f03d6aaeca310da29b03b273a0695cd3407a9b76507195a6eca64d60bc4f0de6fac3f01eaf16b71dc1f0e04c0c40dd2e08caeb6dd44d47728ad7ceb2903146e5
-EBUILD clutter-1.18.2.ebuild 2949 SHA256 668b239a5aa49a7440d95083a928910b854cb6bafe34255dab8cdcfa153b35cb SHA512 edf03724607e8893c95fdbd1843f18dd158298df4866cffab8b56122e5481fd96e0b9dd8e299c329b969105634c15eceb72bfb1675ad3361b413ebc3d40e48b9 WHIRLPOOL cd456d0d4cddd1d6f8b79080f6efe6a9ec3f7fea36bf725e03d44b888c242a57a745f333fc1c2522a6bfc77f936bd9af491f5201a678f6e705ee5b6cd7166e3f
+DIST clutter-1.20.0.tar.xz 5237780 SHA256 cc940809e6e1469ce349c4bddb0cbcc2c13c087d4fc15cda9278d855ee2d1293 SHA512 2e6c582c0a31c61104c9f73fb870c61dd4331c247e111ecc3d9823c9cc3d24d9d3743f25d672498693170ca41419f13cc5ad2e1763e3a24bfd2c5c07b627b5e3 WHIRLPOOL 8e75af9837313db3d8a2c4d9191a1738140248b39a2e4bb5309c1c029a55825f7f306952d21677b2f9ad75b3d0d0a5488517955ba05a2a05274d3f866bc77868
 EBUILD clutter-1.18.4.ebuild 2815 SHA256 bf1cb7a6d96445754f27bf2d93361d8f49e87501171e6b028aa94d7edb01a087 SHA512 d3dea6ffaf82aa800647c035ecdfed5ef57c677f43b4c9fb60cab104b7544f54db5e93b421024dd6451aca2af4e192b5d3166bc558488d3a781d33123d40a743 WHIRLPOOL 37a4eed8f076224b11f2ce05636cd211d9642e5743457ab0771fcd99fe09a23a733a8c86b84369c91e5f4ffaa241afe39df7b1ecc070d48a6b921b63674dd7ba
-MISC ChangeLog 14248 SHA256 7fca35fb2ec3032353d14f6566dd865688c5071541557f9b186275fc344ee403 SHA512 45341db095918cc0e9558fbc4c870b6bd2e57b397c5cdb16704bc9f03c4d00f55c05742a922f2016ee3f75d175736862f099b0bea80a6405f21c0383d3344e4d WHIRLPOOL 64fe59613fe2f7077457e766c3f1ed8f5abea0279c40cd19e06ca124a3cccd27f9ecc208ff950ab72ca9f978fea6bedce10ed39ed8627fcdb1029add7419b4ee
-MISC metadata.xml 277 SHA256 7eb2ab11288fed65f3083eb88772f16ee9be5eb9d955aac3fdec7a22844e23b8 SHA512 b00a33228a347399f5ca4196f8c246663034543aaf2d6a285f33fb7c01ffed1304205e4316656177a28a730640b48b92290f84138cf2631ed8606c4320f3c372 WHIRLPOOL 7673455902c0e45cdc27b25661eecf106d65973590b6b82af90911a60d8f865b03ebb8e0f1292e23027b21f4c78dcc00d4abb9b47dc23785f5d60c9ef0c5ae22
+EBUILD clutter-1.20.0.ebuild 3138 SHA256 633475e4800937282a6472f8ff5902aa42cd895c3bc10d2a85454e22d0040eb9 SHA512 518c390427019bff207b9791e246236ce6a26fdb99d4fd0591ca4d82dc3bdb4dfbd19abd393a25d95a20559ac2eb55aaedc250c1467db4585b12264dd783fce3 WHIRLPOOL d2a7094dd15dd0c1c2295c0d1c69d8919f8601b8fe5e60d5fc3751c8990a4f7107cbfc3570d429f636149c3d5b9fd49260293f26feccf70889757c2305180ea4
+MISC ChangeLog 14490 SHA256 7f03c4a04420f40b6d1e7288b1723f0f8fec09465d68fdb439fee8e6aafa091f SHA512 e4c60b245f9bf11b46f62a4dc6d76b791a47e1d847b77d61b68e43dafebf23fe8196d9370f3e4ffa4097a5e66b6e7770a06d55a4fbb425d5cb5622ae98e7e2ac WHIRLPOOL bab7e2c7eb8ad3c0bc8f91914045dedb0d640763f1c2f0069b9e7ddae2425af4116fc07b1c22e6a2a36638440dc6417268959dd11e099f89e6a6889ffad56594
+MISC metadata.xml 322 SHA256 6d3e994cdd0ab9a54f0fc5507a6a30ff169d80218391b388afb261b6c9c2708c SHA512 704ff34a347ff87d97915e16166b2ae7e55db69e05dda0bc73724d9b73938c73f75a2b62815f0934fc4b5816a79841497501c0f4ed98fd00f42816576528ed9f WHIRLPOOL 93beab4d31d116edc299769391946eeac37f9662611f13dd833b1c3416cedc96e7d77d1fa7a739ce384dc67164b006924ae1ca7c453ca3c95bbc368bb68f7fce
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlSUKq0ACgkQCaWpQKGI+9T7uwCePhKKQya8UfwYCVr/haqzY7ot
-kzsAnj8X78c/yml5yYfJwkvitHELt4aF
-=KSlK
+iEYEAREIAAYFAlSZ8mkACgkQ1fmVwcYIWAZyuACfRFrXKXfhKQ27K65Kjqn3LP+R
+avkAoMCB3LgZT1uVKr/O83x1fx2C7OIM
+=eKJI
 -----END PGP SIGNATURE-----
diff --git a/media-libs/clutter/clutter-1.18.2.ebuild b/media-libs/clutter/clutter-1.20.0.ebuild
index 3d8eb0ced6d6..5762b3c63a99 100644
--- a/media-libs/clutter/clutter-1.18.2.ebuild
+++ b/media-libs/clutter/clutter-1.20.0.ebuild
@@ -1,50 +1,64 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/clutter/clutter-1.18.2.ebuild,v 1.3 2014/07/23 15:19:07 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/clutter/clutter-1.20.0.ebuild,v 1.1 2014/12/23 22:53:28 eva Exp $
 
 EAPI="5"
-CLUTTER_LA_PUNT="yes"
+GCONF_DEBUG="no"
+GNOME2_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
+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="debug doc gtk +introspection test" # evdev tslib
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
+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
-# XXX: evdev input requires libinput and gudev >= 136
+# do not depend on tslib, it does not build and is disable by default upstream
 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]
-	media-libs/fontconfig
-	>=x11-libs/cairo-1.12:=[glib]
+	>=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:=
-	>=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
 
-	gtk? ( >=x11-libs/gtk+-3.3.18:3 )
+	egl? (
+		>=dev-libs/libinput-0.4
+		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
-	virtual/pkgconfig
 	>=sys-devel/gettext-0.17
+	virtual/pkgconfig
 	doc? (
 		>=dev-util/gtk-doc-1.20
 		>=app-text/docbook-sgml-utils-0.6.14[jadetex]
@@ -66,37 +80,31 @@ src_prepare() {
 }
 
 src_configure() {
-	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?
+	# XXX: What about cex100/win32 backends?
 	gnome2_src_configure \
-		--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 \
+		$(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 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
 }
-
-src_install() {
-	clutter_src_install
-}
diff --git a/media-libs/clutter/files/clutter-1.16.4-buffer-age.patch b/media-libs/clutter/files/clutter-1.16.4-buffer-age.patch
deleted file mode 100644
index c42101e006d9..000000000000
--- a/media-libs/clutter/files/clutter-1.16.4-buffer-age.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 6665f47d66a871b6e1a5f4200282f42da043a0e8 Mon Sep 17 00:00:00 2001
-From: Adel Gadllah <adel.gadllah@gmail.com>
-Date: Sun, 16 Feb 2014 21:07:43 +0000
-Subject: stage-cogl: Fix buffer_age code path
-
-Currently we where checking whether the damage_history list contains
-more or equal then buffer_age entries. This is wrong because we prepend
-our current clip to the list just before the check.
-
-Fix that to check whether we have more entries instead of more or equal.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=724788
----
-diff --git a/clutter/cogl/clutter-stage-cogl.c b/clutter/cogl/clutter-stage-cogl.c
-index 86546b1..cff8444 100644
---- a/clutter/cogl/clutter-stage-cogl.c
-+++ b/clutter/cogl/clutter-stage-cogl.c
-@@ -483,11 +483,12 @@ clutter_stage_cogl_redraw (ClutterStageWindow *stage_window)
- 
-         stage_cogl->damage_history = g_slist_prepend (stage_cogl->damage_history, current_damage);
- 
--        if (age != 0 && !stage_cogl->dirty_backbuffer && g_slist_length (stage_cogl->damage_history) >= age)
-+        if (age != 0 && !stage_cogl->dirty_backbuffer && g_slist_length (stage_cogl->damage_history) > age)
-           {
-             int i = 0;
-             GSList *tmp = NULL;
--            for (tmp = stage_cogl->damage_history; tmp; tmp = tmp->next)
-+            /* We skip the first entry because it is the clip_region itself */
-+            for (tmp = stage_cogl->damage_history->next; tmp; tmp = tmp->next)
-               {
-                 _clutter_util_rectangle_union (clip_region, tmp->data, clip_region);
-                 i++;
---
-cgit v0.9.2
diff --git a/media-libs/clutter/metadata.xml b/media-libs/clutter/metadata.xml
index 029117044a1d..845747c5f63a 100644
--- a/media-libs/clutter/metadata.xml
+++ b/media-libs/clutter/metadata.xml
@@ -3,6 +3,7 @@
 <pkgmetadata>
   <herd>gnome</herd>
   <use>
+	<flag name="egl">Enable EGL backend.</flag>
     <flag name="gtk">Use gdk-pixbuf from <pkg>x11-libs/gtk+</pkg> as image rendering backend</flag>
   </use>
 </pkgmetadata>