Version bump for Gnome 3.10

(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key A188FBD4)

2 files changed, 15 insertions, 16 deletions

diff --git a/media-libs/clutter/ChangeLog b/media-libs/clutter/ChangeLog
index 418b1a89a94e..af046fce2e2f 100644
--- a/media-libs/clutter/ChangeLog
+++ b/media-libs/clutter/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-libs/clutter
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/clutter/ChangeLog,v 1.76 2013/12/08 19:10:54 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/clutter/ChangeLog,v 1.77 2013/12/24 17:22:19 pacho Exp $
+
+*clutter-1.16.2 (24 Dec 2013)
+
+  24 Dec 2013; Pacho Ramos <pacho@gentoo.org> +clutter-1.16.2.ebuild,
+  -clutter-1.14.4-r1.ebuild:
+  Version bump for Gnome 3.10
 
   08 Dec 2013; Pacho Ramos <pacho@gentoo.org> clutter-1.14.6.ebuild:
   x86 stable, bug #478252
diff --git a/media-libs/clutter/clutter-1.14.4-r1.ebuild b/media-libs/clutter/clutter-1.16.2.ebuild
index b880be9cd74a..95abacc9545b 100644
--- a/media-libs/clutter/clutter-1.14.4-r1.ebuild
+++ b/media-libs/clutter/clutter-1.16.2.ebuild
@@ -1,18 +1,16 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/clutter/clutter-1.14.4-r1.ebuild,v 1.1 2013/07/20 11:07:37 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/clutter/clutter-1.16.2.ebuild,v 1.1 2013/12/24 17:22:19 pacho Exp $
 
 EAPI="5"
 CLUTTER_LA_PUNT="yes"
 
 # Inherit gnome2 after clutter to download sources from gnome.org
 # since clutter-project.org doesn't provide .xz tarballs
-inherit autotools eutils clutter gnome2 virtualx
+inherit clutter gnome2 virtualx
 
 DESCRIPTION="Clutter is a library for creating graphical user interfaces"
 
-SRC_URI="${SRC_URI} http://dev.gentoo.org/~pacho/gnome/${P}-patches.tar.xz"
-
 LICENSE="LGPL-2.1+ FDL-1.1+"
 SLOT="1.0"
 IUSE="debug doc gtk +introspection test" # evdev tslib
@@ -22,10 +20,10 @@ KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 # XXX: uprof needed for profiling
 # >=libX11-1.3.1 needed for X Generic Event support
 RDEPEND="
-	>=dev-libs/glib-2.31.19:2
+	>=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.14.0:1.0=[introspection?,pango]
+	>=media-libs/cogl-1.15.9:1.0=[introspection?,pango]
 	media-libs/fontconfig
 	>=x11-libs/cairo-1.10:=[glib]
 	>=x11-libs/pango-1.30[introspection?]
@@ -37,7 +35,6 @@ RDEPEND="
 	x11-libs/libXdamage
 	x11-proto/inputproto
 	>=x11-libs/libXi-1.3
-	>=x11-libs/libXfixes-3
 	>=x11-libs/libXcomposite-0.4
 
 	gtk? ( >=x11-libs/gtk+-3.3.18:3 )
@@ -55,19 +52,15 @@ DEPEND="${RDEPEND}
 
 # Tests fail with both swrast and llvmpipe
 # They pass under r600g or i965, so the bug is in mesa
-RESTRICT="test"
+#RESTRICT="test"
 
 src_prepare() {
 	# We only need conformance tests, the rest are useless for us
-	sed -e 's/^\(SUBDIRS =\).*/\1/g' \
+	sed -e 's/^\(SUBDIRS =\).*/\1 accessibility data conform/g' \
 		-i tests/Makefile.am || die "am tests sed failed"
-	sed -e 's/^\(SUBDIRS =\)[^\]*/\1/g' \
+	sed -e 's/^\(SUBDIRS =\)[^\]*/\1  accessibility data conform/g' \
 		-i tests/Makefile.in || die "in tests sed failed"
 
-	# Apply patches from 1.14 branch
-	epatch "${WORKDIR}/${P}-patches/"*.patch
-	eautoreconf
-
 	gnome2_src_prepare
 }
 
@@ -93,9 +86,9 @@ src_configure() {
 		--disable-tslib-input \
 		--disable-evdev-input \
 		$(usex debug --enable-debug=yes --enable-debug=minimum) \
+		$(use_enable doc docs) \
 		$(use_enable gtk gdk-backend) \
 		$(use_enable introspection) \
-		$(use_enable doc docs) \
 		$(use_enable test conformance) \
 		$(use_enable test gdk-pixbuf)
 }