Version bump for Gnome 3.10

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0xA188FBD4

3 files changed, 21 insertions, 23 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/Manifest b/media-libs/clutter/Manifest
index 00211e1afed8..b3221427ff93 100644
--- a/media-libs/clutter/Manifest
+++ b/media-libs/clutter/Manifest
@@ -2,18 +2,17 @@
 Hash: SHA256
 
 DIST clutter-1.12.2.tar.xz 4996752 SHA256 27a8c4495099ea33de39c2d9a911a2c9e00ffa4dcc8f94fafedbcc752c0ddf13 SHA512 4d20a7319cffe5df0052b260879bf6fe75c5eb221306da7268d99925aa8f391ba509aab9df37f080cab7c58c88c6a289c420260dc5ac7abaf7cbceb588fc4997 WHIRLPOOL fee6d14620845e8b8c44b1518ca4b7da204c4fed0c4d6b8b7a6ce1f5640b0ef87f7f0dd482b4cda80bb685fa05b0f3ecee5b1da63df232918bc89fbafbea7798
-DIST clutter-1.14.4-patches.tar.xz 8744 SHA256 09abfe500a924d4d45bd1d068534ba023f90a1370f46c57ab9b339d890f82917 SHA512 e6b2ccb9db28cf72efe55fda7cb28541028a34c82d0b05c8abbc51079d4bd1c4f6d5ecd2b892759bea050cabbea885b272320150cf20a35d60629c7feba01d92 WHIRLPOOL 2e15385dcc1d08bb54f7528ce452b8b7c08133786d8c6eeb9c6f9ef6cb90305718e53a187311e3426b65963fc66ef459d2a0788b6606039fbcdccff304703aa9
-DIST clutter-1.14.4.tar.xz 5095688 SHA256 c996d91fff6fff24d9e23dcd545439ebc6b999fb1cf9ee44c28ca54c49c0ee1c SHA512 26d2561e0e10b01443d4a5de57f14f397578d8ddd59a2f78dbc20e3948c8a196ea13fe4ab79c60e2f4e4e2b6b840fb9ff29482262d70c51257b07515c28ff59a WHIRLPOOL fb6b884c1f4e7b3f8d072d568bd0fc60d7e93617fdfee1bb66ea5761bed87aaec0dbf0257a7707978beb641e36ba29838f34297a6fe9998eb149a982749875d8
 DIST clutter-1.14.6.tar.xz 5184056 SHA256 bbfac240e22f41a4f21dd0de6b697abcde198c911a612179ec52ecf11ded07fa SHA512 f6a31da5234f2a0369043bf6ac2fabdd20a3d27944c4514b887d4ca9e3a070a5db4e0fc3483eb250194e0e80af163fa44015b2d4cc114b8bbf23c093e8caa2c0 WHIRLPOOL 206210b471f1692c5f190f9a6d03a0f472fd2a841b041cc4e6cb07efca3745bb3d5a0ea9ec907745bc6fcdfcb45759cbfa0bc43bb4658f9e56577ca49e2c811f
+DIST clutter-1.16.2.tar.xz 5214020 SHA256 0cb7e88c80f43fc7fb869fc6d34c42e98aa1a0ef7aa02e6aeef1b099ad33df42 SHA512 c2208f0b256e9d160e4a1c2339b3ca1a30b8e96c5e65b4f5413870b489c6e2058e2aa8dad4b763948aa44beeeb28ee7f3237701a249cf97c095e0119e439c9f9 WHIRLPOOL cc57ab0d65ad9027f8ef327fff0f76164c25689484075c54e37984269c5ae80e12098f278be896a5f7090d5fc924863b53e7dbd31b4f9064a62cb90281e68b8d
 EBUILD clutter-1.12.2.ebuild 2916 SHA256 14d7b4e57487324b57b7e03ec48d30eb9afe8e784fc34bfaa4bd622faf2b4f33 SHA512 0c25f58878f1eb12bbbaf4b7f5f05b9aabfff3cfbd25e6031fdacf3124e3ad21e09c2b5108193491f1ed84a9f855764a1661ca72613ef1d8d9317f4ea0358782 WHIRLPOOL 835491d969cb4449ef1710179d39e925ce1140c81a313f30f6967b42a23b6968699f2e2852dfc78a741ac6f4fea3bdf76c764cda68ccacf97e28b9cffd8918ae
-EBUILD clutter-1.14.4-r1.ebuild 3159 SHA256 4843e9e17f15eb05dded7af33381ac58368e369de92d79cba26073e17949b9c4 SHA512 7022155f6520cc511e18be1bf573ba1fcf5054ca1d25077852ec5c8bed77c67c76e2596c263feb3f38f57408b90d97c1990801af85334f088d906a85afa656e2 WHIRLPOOL ec41cb7fed55c57de19e381e492d71461bd6fd62339f8dff65362e5fd926c8d950343644bd4e6ac25eca7577c7c303de294713ff84f47e15b260cf486c8b25b1
 EBUILD clutter-1.14.6.ebuild 2970 SHA256 563cac64475e9e2c8ba73753cda8dac5bd130504dddbcdc8ddf948ca436f3d99 SHA512 23a37172c96686ad76b15ce085d4ec948f4d8ca38b79bdf765329d2dac5660623b352beb08eaa3ee078e1cf1c1340927de933cb5e84b6e1753cbe5e384ccce45 WHIRLPOOL c69fc1a2d8e92913d8526541bb0cf65403938f00526b261e01b1216825c7fb37c6b1e1fb094a40eeb4e1839306c3c3ba725d4e9c9e0c820d355dbf2d9645a1b1
-MISC ChangeLog 12441 SHA256 20092cfa11877ce7387961edc8940a05e5cfcb0e756863fa6284a3fea1550148 SHA512 8f29d18273f0a3af2ea93b0ca56589abc6f5646661006cfaf11523b00a8c27a16a7f08f2f1626e05ab5dea1733742e45d8f7fc6d7166f0f4ae46302ecd2d5f81 WHIRLPOOL 42a8c5291cf5a18133a4ace8f6e2587b2e163a31bf697d0df0f9cd892c05e5aa31d52573949bc187c46d761ede0a49dfe2accb8261d657cd5f2be40ae8dd920f
+EBUILD clutter-1.16.2.ebuild 3003 SHA256 54fe46333b95efb9a2c68b96b96d6113cb3bcdb2368d37ed17bf5fa8c51665fb SHA512 f173c1ecf1efd97e56767d52f7e190c0a535cd01c6068b2bbd6e7eb1c1b330d8cb50761bd26e583f32b07422fc18c063cd9272f440c5319be8883554c136e6bd WHIRLPOOL 5f568964ed92b2deda8faab3a22b934531cd3a46383fd9e85ee8d50513c78803fb8996f7efa09161bc543890b7e1a6e1df71255b0714ffe4d6ff78ab7e879c5c
+MISC ChangeLog 12602 SHA256 c69e627794d6d7be94d6e54c9cd5682f7613886e5ffe4b6dfc711fb073046415 SHA512 c38d068e4af268d69746891ec45e7b9577d87cde6333ed1daaeadc3cc7eca8e0624aa9f389669325bd4ba2433cedeae13309b08d5eba0fef80976db6eefee8ca WHIRLPOOL d9553d09f8098b95ba88db6da24e546d64bb1972a1705dcac2a06b0d59e50ebc160a6bcc8a54376d7487445e39e5b6bc2b9f344b02a48df07057c4c7f74e3589
 MISC metadata.xml 277 SHA256 7eb2ab11288fed65f3083eb88772f16ee9be5eb9d955aac3fdec7a22844e23b8 SHA512 b00a33228a347399f5ca4196f8c246663034543aaf2d6a285f33fb7c01ffed1304205e4316656177a28a730640b48b92290f84138cf2631ed8606c4320f3c372 WHIRLPOOL 7673455902c0e45cdc27b25661eecf106d65973590b6b82af90911a60d8f865b03ebb8e0f1292e23027b21f4c78dcc00d4abb9b47dc23785f5d60c9ef0c5ae22
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlKkxD8ACgkQCaWpQKGI+9RUlQCdFQCP+dRBxSvoVF68+klJ8EiP
-AzcAnRRXFj7MyhpsXNJ7519TZaGJCyCs
-=KQDB
+iEYEAREIAAYFAlK5ws0ACgkQCaWpQKGI+9Tw2QCeNvhZDKTOdWTIzxxu59+gvWsh
+B/gAnA2IV3+MQCwqkjtRvB+QfcurRhlW
+=H5Gi
 -----END PGP SIGNATURE-----
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)
 }