Update to EAPI5. Drop old.

Package-Manager: portage-2.2.0_alpha144/cvs/Linux x86_64
Manifest-Sign-Key: 0xCF0ADD61

13 files changed, 32 insertions, 710 deletions

diff --git a/media-libs/clutter/ChangeLog b/media-libs/clutter/ChangeLog
index 50015b497014..8233e9e132fe 100644
--- a/media-libs/clutter/ChangeLog
+++ b/media-libs/clutter/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for media-libs/clutter
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/clutter/ChangeLog,v 1.58 2012/07/14 13:19:30 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/clutter/ChangeLog,v 1.59 2012/12/05 23:12:48 tetromino Exp $
+
+  05 Dec 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+  -clutter-1.2.14.ebuild, -clutter-1.6.16.ebuild, -clutter-1.6.20.ebuild,
+  -clutter-1.8.2-r1.ebuild,
+  -files/clutter-1.8.2-cogl-fallback-to-non-transparent.patch,
+  -files/clutter-1.8.2-default-resolution.patch,
+  -files/clutter-1.8.2-em-computation.patch,
+  -files/clutter-1.8.2-offscreen-effect-actor-size.patch, clutter-1.8.4.ebuild,
+  -clutter-1.10.4.ebuild, clutter-1.10.8.ebuild:
+  Update to EAPI5. Drop old.
 
   14 Jul 2012; Anthony G. Basile <blueness@gentoo.org> clutter-1.8.4.ebuild,
   clutter-1.10.4.ebuild, clutter-1.10.8.ebuild:
diff --git a/media-libs/clutter/Manifest b/media-libs/clutter/Manifest
index ce61e5378e6a..839ce0e6fb6b 100644
--- a/media-libs/clutter/Manifest
+++ b/media-libs/clutter/Manifest
@@ -1,30 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX clutter-1.8.2-cogl-fallback-to-non-transparent.patch 2536 SHA256 664ce084745af2af753bfa9aadec5ef6f6e4d17d0c292840688a32f200417be4 SHA512 53eb871a9899bb51b7ea4b63227f70e2bfc8f416d3f9f7d10b58247bbc921746fc6dba149e37ac0d5333777ba4aaac7ec05b533ab67bee686b47596752e7c6a6 WHIRLPOOL f745d98a7fa762f0ace9554f76ce7396fe9f0adc34676874c9f27f4b232dd78bae5157886814de5563c331cd1cecd790f4ee85c36ff750d64f51dd5c899f9a9b
-AUX clutter-1.8.2-default-resolution.patch 1832 SHA256 1175b1a4f603715706d7b9c6840ad0fd902e82b4014100258e862deab9142787 SHA512 e748149f4b166e3765dd7948386ad654f80903b4f97e9e0564ee26cee669bc74f3e5e780376189778c39f67d685bd33ba2fdafe4fd84779331c8fe1a4e05ffd7 WHIRLPOOL d1c7f024953328eb4c4c1c72805c00f5b1cdee81cb6fa37b213f173cbc6abafa316fcc7d70a4b23a7406d286c1f55fa4350a2597a264b167a7da57152c8c0e65
-AUX clutter-1.8.2-em-computation.patch 1342 SHA256 8e9d727f3f135e2b740a6bd97654dff8b7352fd32a4020903a877f482959ba07 SHA512 1a37be4788cdd73e64c5f1611c314bc35ab3a39ac6139a70f227a7e28bf42abf862f99e2b89f78b1d873341c0edf7d1af0564cb026e8dbd4f11fed973bd4f143 WHIRLPOOL 4a11f72c21b75cdba1b7798563a11fe823377976b6ec172202835d621fd37f94f87125e475c3335119b094cd92848d00ea423836d3de9b8b1fe373fb5c25fba2
-AUX clutter-1.8.2-offscreen-effect-actor-size.patch 2769 SHA256 27a676201687de552aca8e0c10759721ec252fa5e57b538bbe8a7f395dffd9d3 SHA512 4d0f9dd2591ce6adb0d7341d997c980b1d62fa2e12fc241b5697333b6a9bfb014795a03728a61295516102491ecc92980dbaabf16f8656739285b900331fa03e WHIRLPOOL fd85b224217aa80a3de330c005cb0f670232f0134fc1c33784f513d45c8c7ef4035999db07fb1a920d78331835a914b3037f8ff00e09979bf47242d139a8d7a5
-DIST clutter-1.10.4.tar.xz 4805760 RMD160 04307001302984a31bc20ed4920fb14232d1a6fa SHA1 3bb54bac3e5cd367deba488e7730dca26cff74c1 SHA256 2f2f03c3f385db402898d2607e72d5ad9be2d14402a900c446273e5ae8be250a
-DIST clutter-1.10.8.tar.xz 4761332 RMD160 649eb1e392fa2b9074e1a996e85cb277ee4d3201 SHA1 6cf92539b2a0ce952c85079558b38d63b0c2ac2d SHA256 7c08c2deff62c134c1a3d18e04dcb6fbae4bbc541c800638b9fc3d71fe4a64bf
-DIST clutter-1.2.14.tar.bz2 2405660 RMD160 2498feed53d78946b6336b501711493d99abfe74 SHA1 bd8f770c3f3b48954652e87a100d2659bee2176d SHA256 f9b7e6b8338662f8b0961579f6ad0f56b6696e65f2f122353fa0390959acc744
-DIST clutter-1.6.16.tar.xz 4507324 RMD160 d094cda4d1534e9323a8d7bfd47716d247da2b44 SHA1 19e5ecdcd2c439a64a2333fa09b6ef0858ee7bbc SHA256 206517f8f74252105c46762d11a973b2bae3f2702d2d2ed0cac1206ff5605d9b
-DIST clutter-1.6.20.tar.xz 4519228 RMD160 b30704928847e4c80ad99b320f5c96e28c47084b SHA1 8329450f9dfe63050a74ac9598054f23371a4c74 SHA256 c5508856e51343ef0f5cf5a8526e4372ac96d31b740d6b09d37e890c653b4273
-DIST clutter-1.8.2.tar.xz 4457440 RMD160 a5f7a5d112525a6185d225c4500c1396e9fe3229 SHA1 03f92c8bfe4c01bff75c18a01d971cf11544f560 SHA256 dc899f26448f31cb31e72d80650b8c8ae05acacd5b5d5a44798eabaca0ddfa2f
-DIST clutter-1.8.4.tar.xz 4477772 RMD160 f0ca107ab12402b77769192b23e74a48325e0ed7 SHA1 2b09300b93245b6d48b3ee470407ab81ed913a5b SHA256 6fedb4c344b4cab37e249b8a5ffeccff2f384f11335dee25c6466927461e1345
-EBUILD clutter-1.10.4.ebuild 2937 SHA256 ea13bacad3ea08e674e5011f6c98f34cd61d96d8edf05c6404203b397e16d3a4 SHA512 0a21e8a474d8ab7dab740a00b865ceb4407d1d13beaa7748c4e6cc67cf913e643781ab64e89e1cd362caccc7bb300db479bb00efac3b1916d106e5d82f847627 WHIRLPOOL c1b9fdb1d5f270099d02d8983bcaf886bcfc2ea886d924d6274dc403bc0e2964414f81db5d28450fb3ac6ea220460188562d54acf1fd54b9b4f6d3cba1e213a5
-EBUILD clutter-1.10.8.ebuild 2937 SHA256 18a986ef2425670901bb83105a85ae52c6135edeb2b7529ceac4b184ce8f6f14 SHA512 b3798b3f156a617e606fe282258fb2ca97a4546571298b52d55e4d2e8fa60254c8d0d6ca76ab41c28e6c49933c4769722249b0e3ce3adb01434b35551d89a3bd WHIRLPOOL 5fbf91b52ce6fdf884df632405e2ef60a25ea6124d636eb435be6f5ad7a58b97fa26a06e5dcdc620d4e03ac43b18b9ceef64e7844658bb86f415c93dc9c44a45
-EBUILD clutter-1.2.14.ebuild 1780 SHA256 a0b93c32f50f9bf749b0eabedb8f891f0312ffa6b9c0eed80a1df1bc0f1576eb SHA512 e3a53676dba5399172711615c4ac6e7c0bdcbda72bc87687699af53f33cc76e01e26edc09948f33800245a97abcc84d2efc4a4828a958eb517182b31e2ee5ee8 WHIRLPOOL 01e456e1dcd94773dcd6da2bee6fb757f6b5b3f51712f5c8cd0c34fecd9f82b4dfd6eb7244af4b7625abc601278350096759858fb913e69fa7fdd2a33718906a
-EBUILD clutter-1.6.16.ebuild 2301 SHA256 b27b5310e91b8d80a4ebc3f5fac23d55ea00dbf905abf961ff9c128a1c874675 SHA512 9d20593e94d9826c3153729a3f4d5e50cb1c8864ef8fc3cb76e53cf939d18958a69fcbd674d63c087d6691905d8d5121be569d9cffd9d75d5f9807634dd6c008 WHIRLPOOL 6021fa0522d708bdb4ebea2084e3ff86594d8acdf1bb0163eabf9912f5ca0e82420207ae43afc4047c595a1cfc013c111a38a78f9e96deba2e9d2d49560b424f
-EBUILD clutter-1.6.20.ebuild 2299 SHA256 12317e173b57c6794304a13bee9c1cd07f79e2078d6607549b478d4a6effe6e8 SHA512 6a49cb2b053794c4879e171e28cdc1bece681d5284d0f6f25851f8a200ee32068bd68e4964d0325cace2558d25268a4f42c242c0328cb690858ac05c635d4608 WHIRLPOOL e2ab28d737b2191300b81db4ea1d4b4545533d6fa4cfd700e4b167215aeabd6ba389944cd8a13fdb8d359b0dc8f808d9686afaf9d14a9f4b59d8fd1091e3e965
-EBUILD clutter-1.8.2-r1.ebuild 2630 SHA256 c86a3b5b1833206fce1ca30fff99459b85713ff16e8550e45c7fda66de92ab97 SHA512 7d4ce5d6de28d7e35788ce0153e0e260f991deab86b8de712e831056bba22bdf6feff2a033b53932a88c4c1c6c40311f2907ec2b74247dea13cdc4a6953da041 WHIRLPOOL d66e5cda522afd1c0a77b7914b64e46d0be1037c19ac67a8c00e28feb6429f5d0b53252183f8f0ea3b96d30a2818a82f4c893314f9f246f9b783e39d5ba4fd6f
-EBUILD clutter-1.8.4.ebuild 2376 SHA256 7384745f87a709b561e6df4ae5616148770c8e0b743d95ce745aa45243b5d939 SHA512 18c3189463b5adfcd456f3cf0cf6227d39802f5d57471ba58c82535ba831a245449380e847e2f8378efda183ce1e8269c5370d07242b95799d51270ad35a4995 WHIRLPOOL 32073696f4102df1d483357ca608324f34f1254d23bb43cb975ebb83ec8a36aa42c7c85fa3c3ed1b7ff0c7a87b8f161cdb93bc15a17fa42565699e3ad3226a3d
-MISC ChangeLog 9664 SHA256 b66be929fb05af62afd52edb098cb6e4fca84bebd75c052eeda94e024d576b42 SHA512 f391cc0a8886125e5e4281df4629192c6818cd02b10a0233a271bcc92ff5bc48f454378d0da22f9541b2367c7c6b1cb12e972fce99a77a121ca3030d75693196 WHIRLPOOL bf95d97f8cf00b4d5d2a6267b5cc89fb2f07c8ca0f9a549cd06843d69a0d874ee948cca23aac6158abe64be1dfd3748a1426c6e11c65a36603aafcc471895a3f
+DIST clutter-1.10.8.tar.xz 4761332 SHA256 7c08c2deff62c134c1a3d18e04dcb6fbae4bbc541c800638b9fc3d71fe4a64bf SHA512 8a2c30c31b221328ef502614503824ee1cbc3752d4344135361ee7df3be606e9bc0db7cdf6e3108f3a80a3012c2515f2841d0b340f81f5a3df9dd602143d2af0 WHIRLPOOL cbe15de502768dfdf87f93947f219ee1df43dd25c21bd5a011a06c6c0668cf8d288581e417eb33d682fb2b5b3c8bdf443c1ec3f1cdc637cdeac2c4fa0bccfec0
+DIST clutter-1.8.4.tar.xz 4477772 SHA256 6fedb4c344b4cab37e249b8a5ffeccff2f384f11335dee25c6466927461e1345 SHA512 ca9b998d7f286867a57896506ad4db5e0b0da2d1d942afedce5afee50b60914a1fccc2048508d6f245916eed4107ddbe0ea07e0ea9d00f6aa86473587da155ae WHIRLPOOL 799b3c7c3d7aaa1e603e6dd772992b41ade27c118735e2c8ede99e8fab505d00ef572b7cdac2c7eb0b3fbb93b861280a3fc891ffda33b0547ca389eecd993ec0
+EBUILD clutter-1.10.8.ebuild 2950 SHA256 c197860ab815cfdcb5e1a95e7ac040fd3688c423cd00c5d6c9b917877c7afd49 SHA512 231b779075534fc1dec6cce20c5b53b9c3225429a5fc8dc168567bee9a0f78b7b9459c34cd246c61c1653ce5e8d8e837018fb4fd9905f2d09d76a7b1332ee1f8 WHIRLPOOL 922db320960f2617e6a7a3496d96e0af549734a47c95ac67298de28c88b7ccf8975acd8803ce73d5f35ad838da06f9508fa5ba766d39e8585cfe36fe8bb530c3
+EBUILD clutter-1.8.4.ebuild 2362 SHA256 1b59c25f2673a45c8a43d26c99c8278b52fe307e297ff801582b93bd3845ba78 SHA512 29621d9e9651b921c76fc2c4880d80efd876fc9fa6aa48db6e567fd1837e234097d314c13e6254bbd6de0e97f94c40ed6644d2044ba47c57ebb698d0ecf39d4b WHIRLPOOL 6fd83e1d6d15ebd34d0e3a78f004bf9fe42e84b48a85f987d9ac40ca9ac8b6b8779682e318d3b423461052df034cd0e0a278cfa52ebe5993e015d3a2981c8a93
+MISC ChangeLog 10142 SHA256 a98327020dccf3a919bf8e49c85a90e4df1c0bbc02409d117cc31394b7a8899d SHA512 04a58388fa7c51966499d905c1e40da9216596243f4caa3941b2f09d1b201ff155f7a44ab300acc162802ea47091496c72f9c9b29f6f2f161d848366b9cbfab2 WHIRLPOOL b9c10555c65e5b562f4a298df11bb041f36488bfe94a8ad5f002085750256924a9f02efe4834675cf976d726d8a2f18eb84da2219d08b5b3d9759532e16eefde
 MISC metadata.xml 369 SHA256 32aaa1d48a8c5b7837ada4c3d705d4a4d58280b4454d53cc6ef34f43e0675696 SHA512 ff09205e19ec9cd8fd0e53c8c75e68594c209b5d51f77da4b187d6110f653fff0888b31c6446236b871c7394641e27e0e9c8f8c17b231f9809b95fb342a11480 WHIRLPOOL de7ba443db745e35b9697f5e75417282e2df3d6cd1cc4ade026eb5f5d829ddc68574f07ec4411ecd0514a05f495ce6d955093d32315bc67dbd22e413d37c414d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlABcewACgkQl5yvQNBFVTW+0gCfe5YUhphDd7i+Fj05eTR8zLer
-UxwAnijNZN8r3UgISGBynftPg4gd3a/P
-=Wv9t
+iQEcBAEBCAAGBQJQv9TxAAoJEJ0WA1zPCt1hBUEIAIQnK6hC597faYzYO6OfGx/3
+uX7EXuvs50/7M3cCzchNXKQyqmoODx8wgt2gi4Gz4VEOgHEq+BXRZU20aorF/QvI
+/BTlUgMP+HUmXvof5gPQBkZiVFvPRDI0XJJ598PKTbB9x+NVtGJk1//lbrzDSnu/
+Trn1QFUTFcpiinPwdRsPj8+XC7gjfcx/MmDa5AlhMQDPZlL46V8ni1woJI77DwWG
+wPVhSmihyvcvMvNeXHUTuQvWx1cGsxGckX6drMp1qN9nyTCngXKB4KCNIDSEB63j
+iE7I0fFmEU0NtsjED4fyxdYT7t7KUDFcIN9gM6ArqyxMZ7eENGrplSE668jitGU=
+=LlYl
 -----END PGP SIGNATURE-----
diff --git a/media-libs/clutter/clutter-1.10.4.ebuild b/media-libs/clutter/clutter-1.10.4.ebuild
deleted file mode 100644
index 78319b2c48b3..000000000000
--- a/media-libs/clutter/clutter-1.10.4.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/clutter/clutter-1.10.4.ebuild,v 1.3 2012/07/14 13:19:30 blueness Exp $
-
-EAPI="4"
-CLUTTER_LA_PUNT="yes"
-WANT_AUTOMAKE="1.11"
-
-# Inherit gnome2 after clutter to download sources from gnome.org
-# since clutter-project.org doesn't provide .xz tarballs
-inherit clutter gnome2 virtualx
-
-DESCRIPTION="Clutter is a library for creating graphical user interfaces"
-
-SLOT="1.0"
-IUSE="debug doc gtk +introspection test" # evdev tslib
-KEYWORDS="~alpha ~amd64 ~mips ~ppc ~ppc64 ~x86"
-
-# NOTE: glx flavour uses libdrm + >=mesa-7.3
-# 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/atk-2.1.5[introspection?]
-	>=dev-libs/json-glib-0.12[introspection?]
-	>=media-libs/cogl-1.9.6:1.0[introspection?,pango]
-	media-libs/fontconfig
-	>=x11-libs/cairo-1.10[glib]
-	>=x11-libs/pango-1.20[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/libXfixes-3
-	>=x11-libs/libXcomposite-0.4
-
-	gtk? ( >=x11-libs/gtk+-3.3.18:3 )
-	introspection? ( >=dev-libs/gobject-introspection-0.9.6 )"
-DEPEND="${RDEPEND}
-	>=dev-util/gtk-doc-am-1.15
-	virtual/pkgconfig
-	>=sys-devel/gettext-0.17
-	doc? (
-		>=dev-util/gtk-doc-1.15
-		>=app-text/docbook-sgml-utils-0.6.14[jadetex]
-		dev-libs/libxslt )
-	test? ( x11-libs/gdk-pixbuf )"
-
-# Tests fail with both swrast and llvmpipe
-# They pass under r600g, so the bug is in mesa
-RESTRICT="test"
-
-pkg_setup() {
-	DOCS="README NEWS ChangeLog*"
-
-	# XXX: Conformance test suite (and clutter itself) does not work under Xvfb
-	# XXX: Profiling, coverage disabled for now
-	# XXX: What about cex100/egl/osx/wayland/win32 backends?
-	# XXX: evdev/tslib input seem to be experimental?
-	myconf="--enable-debug=minimum"
-	use debug && myconf="--enable-debug=yes"
-	G2CONF="${G2CONF} ${myconf}
-		--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 gtk gdk-backend)
-		$(use_enable introspection)
-		$(use_enable doc docs)
-		$(use_enable test conformance)
-		$(use_enable test gdk-pixbuf)"
-}
-
-src_prepare() {
-	gnome2_src_prepare
-
-	# We only need conformance tests, the rest are useless for us
-	sed -e 's/^\(SUBDIRS =\).*/\1/g' \
-		-i tests/Makefile.am || die "am tests sed failed"
-	sed -e 's/^\(SUBDIRS =\)[^\]*/\1/g' \
-		-i tests/Makefile.in || die "in tests sed failed"
-}
-
-src_test() {
-	# Run only the conformance tests
-	# The perf tests are useless because we run under sw rendering
-	cd tests/
-	Xemake test conform
-}
-
-src_install() {
-	clutter_src_install
-}
diff --git a/media-libs/clutter/clutter-1.10.8.ebuild b/media-libs/clutter/clutter-1.10.8.ebuild
index 5e4c2f4085f4..a356358e686c 100644
--- a/media-libs/clutter/clutter-1.10.8.ebuild
+++ b/media-libs/clutter/clutter-1.10.8.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/clutter/clutter-1.10.8.ebuild,v 1.2 2012/07/14 13:19:30 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/clutter/clutter-1.10.8.ebuild,v 1.3 2012/12/05 23:12:48 tetromino Exp $
 
-EAPI="4"
+EAPI="5"
 CLUTTER_LA_PUNT="yes"
 WANT_AUTOMAKE="1.11"
 
@@ -23,7 +23,8 @@ RDEPEND="
 	>=dev-libs/glib-2.31.19:2
 	>=dev-libs/atk-2.1.5[introspection?]
 	>=dev-libs/json-glib-0.12[introspection?]
-	>=media-libs/cogl-1.9.6:1.0[introspection?,pango]
+	>=media-libs/cogl-1.9.6:1.0=[introspection?,pango]
+	<media-libs/cogl-1.11:1.0
 	media-libs/fontconfig
 	>=x11-libs/cairo-1.10[glib]
 	>=x11-libs/pango-1.20[introspection?]
@@ -54,7 +55,7 @@ DEPEND="${RDEPEND}
 # They pass under r600g, so the bug is in mesa
 RESTRICT="test"
 
-pkg_setup() {
+src_prepare() {
 	DOCS="README NEWS ChangeLog*"
 
 	# XXX: Conformance test suite (and clutter itself) does not work under Xvfb
@@ -81,9 +82,7 @@ pkg_setup() {
 		$(use_enable doc docs)
 		$(use_enable test conformance)
 		$(use_enable test gdk-pixbuf)"
-}
 
-src_prepare() {
 	gnome2_src_prepare
 
 	# We only need conformance tests, the rest are useless for us
diff --git a/media-libs/clutter/clutter-1.2.14.ebuild b/media-libs/clutter/clutter-1.2.14.ebuild
deleted file mode 100644
index 071dc8228b7b..000000000000
--- a/media-libs/clutter/clutter-1.2.14.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/clutter/clutter-1.2.14.ebuild,v 1.11 2012/05/05 08:02:29 jdhore Exp $
-
-EAPI="2"
-
-inherit clutter
-
-DESCRIPTION="Clutter is a library for creating graphical user interfaces"
-
-SLOT="1.0"
-KEYWORDS="amd64 ppc ppc64 x86"
-IUSE="debug doc +gtk +introspection"
-
-RDEPEND=">=dev-libs/glib-2.16:2
-	>=x11-libs/cairo-1.4
-	>=x11-libs/pango-1.20[introspection?]
-	>=dev-libs/json-glib-0.8[introspection?]
-
-	virtual/opengl
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXdamage
-	x11-libs/libXi
-	x11-proto/inputproto
-	>=x11-libs/libXfixes-3
-	>=x11-libs/libXcomposite-0.4
-
-	gtk? ( || (
-		x11-libs/gdk-pixbuf:2
-		>=x11-libs/gtk+-2.0:2 ) )
-"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	virtual/pkgconfig
-	>=dev-util/gtk-doc-am-1.11
-	doc? (
-		>=dev-util/gtk-doc-1.11
-		>=app-text/docbook-sgml-utils-0.6.14[jadetex]
-		dev-libs/libxslt )
-	introspection? ( >=dev-libs/gobject-introspection-0.9.6 )"
-
-src_configure() {
-	# XXX: Conformance test suite (and clutter itself) does not work under Xvfb
-	# XXX: Profiling, coverage disabled for now
-	local myconf="
-		--enable-debug=minimum
-		--enable-cogl-debug=minimum
-		--enable-conformance=no
-		--disable-gcov
-		--enable-profile=no
-		--enable-maintainer-flags=no
-		--enable-xinput
-		--with-json=system
-		--with-flavour=glx
-		--with-imagebackend=gdk-pixbuf
-		$(use_enable introspection)
-		$(use_enable doc docs)"
-
-	if ! use gtk; then
-		myconf="${myconf} --with-imagebackend=internal"
-		# Internal image backend is experimental
-		ewarn "You have selected the experimental internal image backend"
-	fi
-
-	if use debug; then
-		myconf="${myconf}
-			--enable-debug=yes
-			--enable-cogl-debug=yes"
-	fi
-
-	econf ${myconf}
-}
diff --git a/media-libs/clutter/clutter-1.6.16.ebuild b/media-libs/clutter/clutter-1.6.16.ebuild
deleted file mode 100644
index ddb6c84ab44d..000000000000
--- a/media-libs/clutter/clutter-1.6.16.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/clutter/clutter-1.6.16.ebuild,v 1.5 2012/05/05 08:02:29 jdhore Exp $
-
-EAPI="3"
-GNOME_TARBALL_SUFFIX="xz"
-WANT_AUTOMAKE="1.11"
-
-# Inherit gnome.org last for new tarball location
-inherit clutter gnome.org
-
-DESCRIPTION="Clutter is a library for creating graphical user interfaces"
-
-SLOT="1.0"
-IUSE="debug doc +introspection"
-KEYWORDS="amd64 ppc ppc64 x86"
-
-# NOTE: glx flavour uses libdrm + >=mesa-7.3
-# We always use the gdk-pixbuf backend now since it's been split out
-RDEPEND="${RDEPEND}
-	>=dev-libs/glib-2.26:2
-	>=x11-libs/cairo-1.10[glib]
-	>=x11-libs/pango-1.20[introspection?]
-	>=dev-libs/json-glib-0.12[introspection?]
-	>=dev-libs/atk-1.17[introspection?]
-
-	virtual/opengl
-	x11-libs/libdrm
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXdamage
-	x11-proto/inputproto
-	>=x11-libs/libXi-1.3
-	>=x11-libs/libXfixes-3
-	>=x11-libs/libXcomposite-0.4
-
-	|| ( x11-libs/gdk-pixbuf:2
-		 >=x11-libs/gtk+-2.0:2 )
-
-	introspection? ( >=dev-libs/gobject-introspection-0.9.6 )
-"
-DEPEND="${RDEPEND}
-	${DEPEND}
-	sys-apps/sed
-	sys-devel/gettext
-	virtual/pkgconfig
-	>=dev-util/gtk-doc-am-1.13
-	doc? (
-		>=dev-util/gtk-doc-1.13
-		>=app-text/docbook-sgml-utils-0.6.14[jadetex]
-		dev-libs/libxslt )
-"
-DOCS="AUTHORS README NEWS ChangeLog*"
-
-src_configure() {
-	# We only need conformance tests, the rest are useless for us
-	sed -e 's/^\(SUBDIRS =\).*/\1/g' \
-		-i tests/Makefile.am || die "am tests sed failed"
-	sed -e 's/^\(SUBDIRS =\).*/\1/g' \
-		-i tests/Makefile.in || die "in tests sed failed"
-
-	# XXX: Conformance test suite (and clutter itself) does not work under Xvfb
-	# XXX: Profiling, coverage disabled for now
-	# XXX: What about eglx/eglnative/opengl-egl-xlib/osx/wayland/etc flavours?
-	#      Uses gudev-1.0 and libxkbcommon for eglnative/cex1000
-	local myconf="
-		--enable-debug=minimum
-		--enable-cogl-debug=minimum
-		--enable-conformance=no
-		--disable-gcov
-		--enable-profile=no
-		--enable-maintainer-flags=no
-		--enable-xinput
-		--with-flavour=glx
-		--with-imagebackend=gdk-pixbuf
-		$(use_enable introspection)
-		$(use_enable doc docs)"
-
-	if use debug; then
-		myconf="${myconf}
-			--enable-debug=yes
-			--enable-cogl-debug=yes"
-	fi
-
-	econf ${myconf}
-}
diff --git a/media-libs/clutter/clutter-1.6.20.ebuild b/media-libs/clutter/clutter-1.6.20.ebuild
deleted file mode 100644
index 10492fd819d2..000000000000
--- a/media-libs/clutter/clutter-1.6.20.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/clutter/clutter-1.6.20.ebuild,v 1.5 2012/05/05 08:02:29 jdhore Exp $
-
-EAPI="4"
-CLUTTER_LA_PUNT="yes"
-
-WANT_AUTOMAKE="1.11"
-
-# Inherit gnome.org last for new tarball location
-inherit clutter gnome.org
-
-DESCRIPTION="Clutter is a library for creating graphical user interfaces"
-
-SLOT="1.0"
-IUSE="debug doc +introspection"
-KEYWORDS="amd64 ppc ppc64 x86"
-
-# NOTE: glx flavour uses libdrm + >=mesa-7.3
-# We always use the gdk-pixbuf backend now since it's been split out
-RDEPEND="${RDEPEND}
-	>=dev-libs/glib-2.26:2
-	>=x11-libs/cairo-1.10[glib]
-	>=x11-libs/pango-1.20[introspection?]
-	>=dev-libs/json-glib-0.12[introspection?]
-	>=dev-libs/atk-1.17[introspection?]
-
-	virtual/opengl
-	x11-libs/libdrm
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXdamage
-	x11-proto/inputproto
-	>=x11-libs/libXi-1.3
-	>=x11-libs/libXfixes-3
-	>=x11-libs/libXcomposite-0.4
-
-	|| ( x11-libs/gdk-pixbuf:2
-		 >=x11-libs/gtk+-2.0:2 )
-
-	introspection? ( >=dev-libs/gobject-introspection-0.9.6 )
-"
-DEPEND="${RDEPEND}
-	${DEPEND}
-	sys-apps/sed
-	sys-devel/gettext
-	virtual/pkgconfig
-	>=dev-util/gtk-doc-am-1.13
-	doc? (
-		>=dev-util/gtk-doc-1.13
-		>=app-text/docbook-sgml-utils-0.6.14[jadetex]
-		dev-libs/libxslt )
-"
-
-DOCS="AUTHORS README NEWS ChangeLog*"
-
-src_configure() {
-	# We only need conformance tests, the rest are useless for us
-	sed -e 's/^\(SUBDIRS =\).*/\1/g' \
-		-i tests/Makefile.am || die "am tests sed failed"
-	sed -e 's/^\(SUBDIRS =\).*/\1/g' \
-		-i tests/Makefile.in || die "in tests sed failed"
-
-	# XXX: Conformance test suite (and clutter itself) does not work under Xvfb
-	# XXX: Profiling, coverage disabled for now
-	# XXX: What about eglx/eglnative/opengl-egl-xlib/osx/wayland/etc flavours?
-	#      Uses gudev-1.0 and libxkbcommon for eglnative/cex1000
-	local myconf="
-		--enable-debug=minimum
-		--enable-cogl-debug=minimum
-		--enable-conformance=no
-		--disable-gcov
-		--enable-profile=no
-		--enable-maintainer-flags=no
-		--enable-xinput
-		--with-flavour=glx
-		--with-imagebackend=gdk-pixbuf
-		$(use_enable introspection)
-		$(use_enable doc docs)"
-
-	if use debug; then
-		myconf="${myconf}
-			--enable-debug=yes
-			--enable-cogl-debug=yes"
-	fi
-
-	econf ${myconf}
-}
diff --git a/media-libs/clutter/clutter-1.8.2-r1.ebuild b/media-libs/clutter/clutter-1.8.2-r1.ebuild
deleted file mode 100644
index fd733621a9ce..000000000000
--- a/media-libs/clutter/clutter-1.8.2-r1.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/clutter/clutter-1.8.2-r1.ebuild,v 1.4 2012/05/05 08:02:29 jdhore Exp $
-
-EAPI="4"
-CLUTTER_LA_PUNT="yes"
-WANT_AUTOMAKE="1.11"
-
-# Inherit gnome2 after clutter to download sources from gnome.org
-# since clutter-project.org doesn't provide .xz tarballs
-inherit clutter eutils gnome2
-
-DESCRIPTION="Clutter is a library for creating graphical user interfaces"
-
-SLOT="1.0"
-IUSE="debug doc +introspection"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-
-# NOTE: glx flavour uses libdrm + >=mesa-7.3
-# XXX: uprof needed for profiling
-# >=libX11-1.3.1 needed for X Generic Event support
-RDEPEND="
-	>=dev-libs/glib-2.28:2
-	>=dev-libs/atk-2.1.5[introspection?]
-	>=dev-libs/json-glib-0.12[introspection?]
-	>=media-libs/cogl-1.8.0:1.0[introspection?,pango]
-	media-libs/fontconfig
-	>=x11-libs/cairo-1.10[glib]
-	>=x11-libs/pango-1.20[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/libXfixes-3
-	>=x11-libs/libXcomposite-0.4
-
-	introspection? ( >=dev-libs/gobject-introspection-0.9.6 )"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	virtual/pkgconfig
-	>=dev-util/gtk-doc-am-1.13
-	doc? (
-		>=dev-util/gtk-doc-1.13
-		>=app-text/docbook-sgml-utils-0.6.14[jadetex]
-		dev-libs/libxslt )"
-
-pkg_setup() {
-	DOCS="README NEWS ChangeLog*"
-
-	# XXX: Conformance test suite (and clutter itself) does not work under Xvfb
-	# XXX: Profiling, coverage disabled for now
-	# XXX: What about eglx/eglnative/opengl-egl-xlib/osx/wayland/etc flavours?
-	#      Uses gudev-1.0 and libxkbcommon for eglnative/cex1000
-	myconf="--enable-debug=minimum"
-	use debug && myconf="--enable-debug=yes"
-	G2CONF="${G2CONF} ${myconf}
-		--enable-conformance=no
-		--disable-gcov
-		--enable-profile=no
-		--enable-maintainer-flags=no
-		--enable-xinput
-		--with-flavour=glx
-		$(use_enable introspection)
-		$(use_enable doc docs)"
-}
-
-src_prepare() {
-	# Useful patches fom upstream, will be in next release
-	epatch "${FILESDIR}/${P}-cogl-fallback-to-non-transparent.patch"
-	epatch "${FILESDIR}/${P}-offscreen-effect-actor-size.patch"
-	epatch "${FILESDIR}/${P}-default-resolution.patch"
-	epatch "${FILESDIR}/${P}-em-computation.patch"
-
-	gnome2_src_prepare
-
-	# We only need conformance tests, the rest are useless for us
-	sed -e 's/^\(SUBDIRS =\).*/\1/g' \
-		-i tests/Makefile.am || die "am tests sed failed"
-	sed -e 's/^\(SUBDIRS =\)[^\]*/\1/g' \
-		-i tests/Makefile.in || die "in tests sed failed"
-}
-
-src_install() {
-	clutter_src_install
-}
diff --git a/media-libs/clutter/clutter-1.8.4.ebuild b/media-libs/clutter/clutter-1.8.4.ebuild
index 840f31e1cb9f..f1be8cc5d8ec 100644
--- a/media-libs/clutter/clutter-1.8.4.ebuild
+++ b/media-libs/clutter/clutter-1.8.4.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/clutter/clutter-1.8.4.ebuild,v 1.8 2012/07/14 13:19:30 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/clutter/clutter-1.8.4.ebuild,v 1.9 2012/12/05 23:12:48 tetromino Exp $
 
-EAPI="4"
+EAPI="5"
 CLUTTER_LA_PUNT="yes"
 WANT_AUTOMAKE="1.11"
 
@@ -23,7 +23,7 @@ RDEPEND="
 	>=dev-libs/glib-2.28:2
 	>=dev-libs/atk-2.1.5[introspection?]
 	>=dev-libs/json-glib-0.12[introspection?]
-	>=media-libs/cogl-1.8.0:1.0[introspection?,pango]
+	>=media-libs/cogl-1.8.0:1.0=[introspection?,pango]
 	<=media-libs/cogl-1.9.2:1.0
 	media-libs/fontconfig
 	>=x11-libs/cairo-1.10[glib]
@@ -49,7 +49,7 @@ DEPEND="${RDEPEND}
 		>=app-text/docbook-sgml-utils-0.6.14[jadetex]
 		dev-libs/libxslt )"
 
-pkg_setup() {
+src_prepare() {
 	DOCS="README NEWS ChangeLog*"
 
 	# XXX: Conformance test suite (and clutter itself) does not work under Xvfb
@@ -67,9 +67,7 @@ pkg_setup() {
 		--with-flavour=glx
 		$(use_enable introspection)
 		$(use_enable doc docs)"
-}
 
-src_prepare() {
 	gnome2_src_prepare
 
 	# We only need conformance tests, the rest are useless for us
diff --git a/media-libs/clutter/files/clutter-1.8.2-cogl-fallback-to-non-transparent.patch b/media-libs/clutter/files/clutter-1.8.2-cogl-fallback-to-non-transparent.patch
deleted file mode 100644
index cdf7c79a0ca4..000000000000
--- a/media-libs/clutter/files/clutter-1.8.2-cogl-fallback-to-non-transparent.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-From f05432d57e5e980d0841fd6c13a7f886a46107fe Mon Sep 17 00:00:00 2001
-From: Robert Bragg <robert@linux.intel.com>
-Date: Tue, 1 Nov 2011 13:42:40 +0000
-Subject: [PATCH] cogl: fallback to non-transparent stages if unsupported
-
-If our check of the CoglOnscreenTemplate during initialization fails
-then we disable the request for an alpha component in the swap chain and
-try the check again.
-
-Reviewed-by: Neil Roberts <neil@linux.intel.com>
-Reviewed-by: Emmanuele Bassi <ebassi@linux.intel.com>
----
- clutter/cogl/clutter-backend-cogl.c |   26 +++++++++++++++++++++++---
- 1 files changed, 23 insertions(+), 3 deletions(-)
-
-diff --git a/clutter/cogl/clutter-backend-cogl.c b/clutter/cogl/clutter-backend-cogl.c
-index 1ca8850..1343dd1 100644
---- a/clutter/cogl/clutter-backend-cogl.c
-+++ b/clutter/cogl/clutter-backend-cogl.c
-@@ -296,6 +296,7 @@ clutter_backend_cogl_create_context (ClutterBackend  *backend,
- #endif
-   CoglSwapChain *swap_chain = NULL;
-   CoglOnscreenTemplate *onscreen_template = NULL;
-+  gboolean status;
- 
-   if (backend->cogl_context)
-     return TRUE;
-@@ -325,9 +326,28 @@ clutter_backend_cogl_create_context (ClutterBackend  *backend,
-    * Conceptually should we be able to check an onscreen_template
-    * without more details about the CoglDisplay configuration?
-    */
--  if (!cogl_renderer_check_onscreen_template (backend->cogl_renderer,
--                                              onscreen_template,
--                                              error))
-+  status = cogl_renderer_check_onscreen_template (backend->cogl_renderer,
-+                                                  onscreen_template,
-+                                                  error);
-+#ifdef COGL_HAS_XLIB_SUPPORT
-+  if (!status && clutter_x11_get_use_argb_visual ())
-+    {
-+      g_clear_error (error);
-+      /* It's possible that the current renderer doesn't support transparency
-+       * in a swap_chain so lets see if we can fallback to not having any
-+       * transparency...
-+       *
-+       * XXX: It might be nice to have a CoglRenderer feature we could
-+       * explicitly check for ahead of time.
-+       */
-+      cogl_swap_chain_set_has_alpha (swap_chain, FALSE);
-+      status = cogl_renderer_check_onscreen_template (backend->cogl_renderer,
-+                                                      onscreen_template,
-+                                                      error);
-+    }
-+#endif
-+
-+  if (!status)
-     goto error;
- 
-   backend->cogl_display = cogl_display_new (backend->cogl_renderer,
--- 
-1.7.8.1
-
diff --git a/media-libs/clutter/files/clutter-1.8.2-default-resolution.patch b/media-libs/clutter/files/clutter-1.8.2-default-resolution.patch
deleted file mode 100644
index ddf65aac6a4c..000000000000
--- a/media-libs/clutter/files/clutter-1.8.2-default-resolution.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From 0e6e3a5d4b51331df8df5bebd60195fbcf5caec5 Mon Sep 17 00:00:00 2001
-From: Emmanuele Bassi <ebassi@linux.intel.com>
-Date: Mon, 5 Dec 2011 11:42:49 +0000
-Subject: [PATCH] backend: Return the correct default resolution
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-If ClutterSettings:font-dpi is set to -1 then the default resolution
-should be returned by ClutterBackend — i.e. 96.0.
-(cherry picked from commit 943a65b476431400bd0436e1be243a2917385866)
-
-Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
----
- clutter/clutter-backend.c |   11 ++++++++++-
- 1 files changed, 10 insertions(+), 1 deletions(-)
-
-diff --git a/clutter/clutter-backend.c b/clutter/clutter-backend.c
-index 80e4853..8267544 100644
---- a/clutter/clutter-backend.c
-+++ b/clutter/clutter-backend.c
-@@ -179,14 +179,20 @@ clutter_backend_real_resolution_changed (ClutterBackend *backend)
-   ClutterBackendPrivate *priv = backend->priv;
-   ClutterMainContext *context;
-   ClutterSettings *settings;
-+  gdouble resolution;
-   gint dpi;
- 
-   settings = clutter_settings_get_default ();
-   g_object_get (settings, "font-dpi", &dpi, NULL);
- 
-+  if (dpi < 0)
-+    resolution = 96.0;
-+  else
-+    resolution = dpi / 1024.0;
-+
-   context = _clutter_context_get_default ();
-   if (context->font_map != NULL)
--    cogl_pango_font_map_set_resolution (context->font_map, dpi / 1024.0);
-+    cogl_pango_font_map_set_resolution (context->font_map, resolution);
- 
-   priv->units_per_em = get_units_per_em (backend, NULL);
-   priv->units_serial += 1;
-@@ -788,6 +794,9 @@ clutter_backend_get_resolution (ClutterBackend *backend)
-   settings = clutter_settings_get_default ();
-   g_object_get (settings, "font-dpi", &resolution, NULL);
- 
-+  if (resolution < 0)
-+    return 96.0;
-+
-   return resolution / 1024.0;
- }
- 
--- 
-1.7.8.1
-
diff --git a/media-libs/clutter/files/clutter-1.8.2-em-computation.patch b/media-libs/clutter/files/clutter-1.8.2-em-computation.patch
deleted file mode 100644
index 3b4d3f4f21b3..000000000000
--- a/media-libs/clutter/files/clutter-1.8.2-em-computation.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 85a466268360ad007de90e34b24fa0f56692eaa8 Mon Sep 17 00:00:00 2001
-From: Emmanuele Bassi <ebassi@linux.intel.com>
-Date: Mon, 5 Dec 2011 11:43:48 +0000
-Subject: [PATCH] backend: Fix em computation for non-absolute fonts
-
-If a font description is not set to have an absolute size then we were
-using the wrong transformation for points to device units.
-(cherry picked from commit 158245fda31e7adad38aa49e4c12efcad0e326e0)
-
-Signed-off-by: Emmanuele Bassi <ebassi@linux.intel.com>
----
- clutter/clutter-backend.c |    8 ++------
- 1 files changed, 2 insertions(+), 6 deletions(-)
-
-diff --git a/clutter/clutter-backend.c b/clutter/clutter-backend.c
-index 8267544..db0a637 100644
---- a/clutter/clutter-backend.c
-+++ b/clutter/clutter-backend.c
-@@ -155,14 +155,10 @@ get_units_per_em (ClutterBackend       *backend,
-       if (is_absolute)
-         font_size = (gdouble) pango_size / PANGO_SCALE;
-       else
--        font_size = (gdouble) pango_size / PANGO_SCALE
--                  * dpi
--                  / 96.0f;
-+        font_size = dpi * ((gdouble) pango_size / PANGO_SCALE) / 72.0f;
- 
-       /* 10 points at 96 DPI is 13.3 pixels */
--      units_per_em = (1.2f * font_size)
--                   * dpi
--                   / 96.0f;
-+      units_per_em = (1.2f * font_size) * dpi / 96.0f;
-     }
-   else
-     units_per_em = -1.0f;
--- 
-1.7.8.1
-
diff --git a/media-libs/clutter/files/clutter-1.8.2-offscreen-effect-actor-size.patch b/media-libs/clutter/files/clutter-1.8.2-offscreen-effect-actor-size.patch
deleted file mode 100644
index b5711af252ea..000000000000
--- a/media-libs/clutter/files/clutter-1.8.2-offscreen-effect-actor-size.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-From 2e5980612bb0f27c1616960a5b4bcd3898af14c0 Mon Sep 17 00:00:00 2001
-From: Neil Roberts <neil@linux.intel.com>
-Date: Mon, 28 Nov 2011 13:08:57 +0000
-Subject: [PATCH] offscreen-effect: Track the size of the actor separately
-
-Previously the offscreen effect was keeping track of the size of the
-texture so that it could detect when a different size is requested and
-create a new texture. However this breaks if a subclass overrides
-create_texture to make the texture bigger because in that case the
-size of the texture will always be different from the calculated size
-of the actor. This patch makes it also track the size of the fbo that
-was requested before being passed through create_texture() and it
-instead uses that to detect when a new FBO is needed.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=665040
-
-Reviewed-by: Emmanuele Bassi <ebassi@linux.intel.com>
-
-(cherry picked from commit a2774fb0dcce0c92036b69fb75092ec8dc80905d)
----
- clutter/clutter-offscreen-effect.c |   17 +++++++++++++++--
- 1 files changed, 15 insertions(+), 2 deletions(-)
-
-diff --git a/clutter/clutter-offscreen-effect.c b/clutter/clutter-offscreen-effect.c
-index cf0d07c..071b415 100644
---- a/clutter/clutter-offscreen-effect.c
-+++ b/clutter/clutter-offscreen-effect.c
-@@ -85,9 +85,17 @@ struct _ClutterOffscreenEffectPrivate
-   gfloat x_offset;
-   gfloat y_offset;
- 
-+  /* The size of the texture */
-   gfloat target_width;
-   gfloat target_height;
- 
-+  /* This is the calculated size of the fbo before being passed
-+     through create_texture(). This needs to be tracked separately so
-+     that we can detect when a different size is calculated and
-+     regenerate the fbo */
-+  int fbo_width;
-+  int fbo_height;
-+
-   gint old_opacity_override;
- 
-   /* The matrix that was current the last time the fbo was updated. We
-@@ -154,8 +162,8 @@ update_fbo (ClutterEffect *effect, int fbo_width, int fbo_height)
-       return FALSE;
-     }
- 
--  if (priv->target_width == fbo_width &&
--      priv->target_height == fbo_height &&
-+  if (priv->fbo_width == fbo_width &&
-+      priv->fbo_height == fbo_height &&
-       priv->offscreen != COGL_INVALID_HANDLE)
-     return TRUE;
- 
-@@ -187,6 +195,9 @@ update_fbo (ClutterEffect *effect, int fbo_width, int fbo_height)
-   priv->target_width = cogl_texture_get_width (texture);
-   priv->target_height = cogl_texture_get_height (texture);
- 
-+  priv->fbo_width = fbo_width;
-+  priv->fbo_height = fbo_height;
-+
-   if (priv->offscreen != COGL_INVALID_HANDLE)
-     cogl_handle_unref (priv->offscreen);
- 
-@@ -200,6 +211,8 @@ update_fbo (ClutterEffect *effect, int fbo_width, int fbo_height)
- 
-       priv->target_width = 0;
-       priv->target_height = 0;
-+      priv->fbo_width = 0;
-+      priv->fbo_height = 0;
- 
-       return FALSE;
-     }
--- 
-1.7.8.1
-