Version bump for Gnome 3.10. Clean up old revisions.

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

6 files changed, 41 insertions, 264 deletions

diff --git a/media-libs/cogl/ChangeLog b/media-libs/cogl/ChangeLog
index 795b303b0931..fc7da13ae2ed 100644
--- a/media-libs/cogl/ChangeLog
+++ b/media-libs/cogl/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-libs/cogl
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/cogl/ChangeLog,v 1.40 2013/12/08 19:11:28 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/cogl/ChangeLog,v 1.41 2013/12/23 23:28:44 eva Exp $
+
+*cogl-1.16.0 (23 Dec 2013)
+
+  23 Dec 2013; Gilles Dartiguelongue <eva@gentoo.org> -cogl-1.12.2-r1.ebuild,
+  -cogl-1.14.0.ebuild, -cogl-1.14.1_pre20130901.ebuild, +cogl-1.16.0.ebuild,
+  -files/cogl-1.12.2-dont-use-MSAA.patch:
+  Version bump for Gnome 3.10. Clean up old revisions.
 
   08 Dec 2013; Pacho Ramos <pacho@gentoo.org> cogl-1.14.1_pre20130901-r1.ebuild:
   x86 stable, bug #478252
diff --git a/media-libs/cogl/Manifest b/media-libs/cogl/Manifest
index 3f18fc341e01..d0649cc80e2b 100644
--- a/media-libs/cogl/Manifest
+++ b/media-libs/cogl/Manifest
@@ -2,23 +2,19 @@
 Hash: SHA256
 
 AUX cogl-1.10.4-cogl-clipping.xml.patch 1154 SHA256 0d1c0829149a644c7607adf8fe24147a1791ca1c4ddc3321052d843512e1eb9d SHA512 ff0d47e5cb2e7533d8f909504c66e07ac405ffb7606675d4bb937201d97d49099e57d2a34522c287e68eff46397fe6e2822e64e0e04a84f40a166c08aea0970a WHIRLPOOL ec8750a39a06fd72ac4e3321a21107fd01702aeedf25d8984bac3ed039a9d388d40c97c87dbafb426d30ba9a090f32009b23a311704dcad56b4ceb40c1129f42
-AUX cogl-1.12.2-dont-use-MSAA.patch 1565 SHA256 484e371b7d3b60af0c054bfe8fcd69870a3e1c30de6b1a155937b1da2b11d9cf SHA512 e145ccd45ad2b6e1859c031185d8c5d20a7b0b05bf3ff14cda77ea5822455b78c1324a77007c493a6a8d1670403ad75ab7051527222b5289cebb62bdfcb7411b WHIRLPOOL bf8a4596d4485ae6d61d84d63ed473c0aa5833ac7ca89ea538e8cd271c00f28637a376d805289978d5500c8f059cc6a66ab6cc125f266692048f502f075196a8
 AUX cogl-1.14.1-framebuffer-allocate.patch 1262 SHA256 ff62c540091022aacf65ef65c06c9a93a64a4e2ef0c4b37794e418e108f28a85 SHA512 0738dbad6a88cafa3ea8f500ae424946ac6f78fb4e25f0691eee2a25d7732a5f628de8348a7124cc875a23fe0d6e8c0635f1da07f9340d8a698639024c3288b9 WHIRLPOOL 9346e381d53bbb2c105a66cafef2497d48c4e04bdc138e9ebe192c0758c1e2370db11c07a53412e3183e39d8bad6eef6d3f5b8a7d1215d9b5ae441ba8c3faf4d
 DIST cogl-1.10.4.tar.xz 1253708 SHA256 0b5c9989f1d07dbda000a68640eb7ebf734513d52e3707668c41eed19991adf9 SHA512 bbff0ae9731a12b5f9e493c7dacb8d02fe3289c30c4895fe277959b3e3155095b003b03e7c46a74ed0152916758484e3c305c599e73ceb81fd912ba491dda0ae WHIRLPOOL 65c11ee6eda657add0e0d5068cf8c055202901cb8bb19055d1f7bbe72c54373c3bed83ee3fb84edf6e0a37618d7517f3a38c3e521003c638e9850b09bdc39e82
-DIST cogl-1.12.2.tar.xz 1301108 SHA256 31971d4c6543c589f6fc49ab1724dfbdc7062c58a7da842cb1935e32ca6e1d7e SHA512 5bf43434814be4d7beae9dedc0d2d8bc31c174a82386f581d705e2586da93cea930b5b66bb707036a8ed7b49147af003ab7dda125e86098fe3433e9418001b2d WHIRLPOOL f2c6e768f874c06e95c352fa23a3b7d8bacf3a0e05466cc508e690adfc97b9dc1c627f494078a76b883428d1b8b58cd5930be49385ad4c3867843bfe6a0e4b46
-DIST cogl-1.14.0.tar.xz 1656520 SHA256 276e8c9f5ff0fcd57c1eaf74cc245f41ad469a95a18ac831fac2d5960baa5ae8 SHA512 9e9f34d6dd9954512322ad2478a6ca9bdad60462b1930b39421fdb5f10d3a71ef62ac70d58929fd8448d39dc5a6227f0a895a6f9113bc0ecc83b6c0f26bfb3cb WHIRLPOOL a4f550f722e3c8d748b7008f09d02de5647bcf2f261983ec0cc05eb63dedb8e4950b11ce141ada88506225ad4b4007b1a54e83f972fb80c297411affa7c6f9b5
 DIST cogl-1.14.1_pre20130901.tar.xz 1482868 SHA256 7d4469651142d99074bc59bd37cd9699a1da21c60fd4c17ff2858060f24642af SHA512 528c799398920804c8f9e7b649822a0b2af7e34ef6ab884be000d7e32d0b1d1134ccbbc824c712b4a1457249bcdf73abe3c6196858be1008b1536447d907bb3e WHIRLPOOL e35ac2db1f16a20f5b6fb125c603587bd217247a0c5971464619434195c1f61e5eafde778931761a68b7abc25c5ed23fddda2e2b6ae0e9354431a65f66bcfc5a
+DIST cogl-1.16.0.tar.xz 1653292 SHA256 75c2c4636a050fda7ee8722ce3d9c618b08799ed92bbb72b4fdff3e73b096094 SHA512 d4e65216ad37680a58cd0a018bb2cb53b11d1e51baa2cd10e615812cbe5e1f9cd3365e248be6d84c8266cd3996039fcfb80e315bcc58f59a290555f57c013358 WHIRLPOOL 4fab497e0b7ab771a34dd53749b635bc87f16f8a2298a057497d60f9951ccaa17df200f2c120c57767007bd31c28e020ea58a7f12e2738ed5051f1d5deef164c
 EBUILD cogl-1.10.4.ebuild 2686 SHA256 01f3d78f7d9923c75a92b4b80646ed94baa58e044c01eaacb69a73461a9c2080 SHA512 f09233c6605cf2a75b3264c25ea0accfaf1be5715d90d17637bf721bde2fdd73791fb4dbaf589b3d48c8a92f0de299a8f5f52a03615b9148553d3b704b50a6da WHIRLPOOL 602db82a478d0010543d4930d5c77438f0d0d4594d3661895862b67cfed993e940ee0b5a7bb8bad6d1fa6ab2267b3914ee26396c4e35a24d10b7e906b103c5ab
-EBUILD cogl-1.12.2-r1.ebuild 3307 SHA256 2ad87b95ab76240ec2e825967f7bd9dff601c621276ef759981ab090e2fa688f SHA512 16f605cfc979e50d6fcd71443dee46222b63cfe0cd3bd9a0916acf3bcc5f8770ab670914c2fc9cbdc658f8baeda3bf7aee9e9f4d19fc9cc67c36da14a63c854f WHIRLPOOL 630ae3ecafa72e2e965383afb77c1ca25e41b2bca740591029037f3c0cfcb857ae98ab60c394d8414d10821f4ba4f951676ce7994e9f624fcb7dbe025ddb4e54
-EBUILD cogl-1.14.0.ebuild 2832 SHA256 6c59424dc5a3a663a5e7d777793429ee631d7822fb5bce38b208aafba6b55dbb SHA512 dbea28d6816eea7862ea4710740f7e89af97bcde24228dc0bf1d2f9543765acf776119b41e44e07393f4beeefe2fdb8d4e2119992e31afb96eb81ff42eef18db WHIRLPOOL 83a8ff186fec083d12270ba8c3490f2c6e7aa08789ac3bd97fc3bb5db5dcfd82e84463964abcd85c35be0aac12120f66a528b7e35bb3696ff00e26326011ffc9
 EBUILD cogl-1.14.1_pre20130901-r1.ebuild 3342 SHA256 39356c793b51a64996e09ce28da9af981ad2f80416b4c622d3151c740f0a435d SHA512 5b10e358b9e81a8bfaeb166d903111942699aec7eb4be5f461f0e87af99f1789649885675c801dfdecf1671a5391414aa3a9ea37b82fd70bf482583e4d0ab7f0 WHIRLPOOL 3f5b8c65a95c667e727e314da509f2dde7942ccfd99ba35fcb1d2b6a5192e5541bbfd3290cdb1d323609bff779b9310a14d4c310c88a95ead868dba7e9b5b50b
-EBUILD cogl-1.14.1_pre20130901.ebuild 3172 SHA256 75fa86080401ffb7a7438d7dc1129f71b2d15216062cc6fd4e2f09569b968d26 SHA512 d57f023503b2237c251a320a571d5fdd3c5855bff8eebcfdc8f5f607a5506530ef7033825149938330d8c6ab9a57f2b5f002150b4456b964fc6fb59b75f16887 WHIRLPOOL 2b8a9c31fb8cb8d9220f2ef60e33180af063bfc55a318db5b40b94c9b8351ab5e7ce9020e79798c752672c717bf0d3f7d83ac69ad1ce48379cc214cf8f80bc9b
-MISC ChangeLog 6300 SHA256 abb3bc4aeaa21263faabdd8ea6de9759bc1bf7d83f161856a6bcea013c60237e SHA512 4804d572dbd18fe48f379e53c23a2c794ceef721e9546664c9f91868d7aa1981e8f3e59d5d062f810a780b0cdfdf7238d29f4332fabfaa4788f14bf22889c9e8 WHIRLPOOL 7d0742228d76c549c1032ce39d0ef49fd64095543b07dbf874a3280e5fc5a7bb1697891e3012a15420f84a7b46e680ad2af0e57052f1513fccb6dffdb07d4e4c
+EBUILD cogl-1.16.0.ebuild 3699 SHA256 5115cc2e979ce95eaf2cd01dfacc25fb83770e732adffc1d433766f52a02ef3e SHA512 0eb565b7e307554eab116edd77a75eaf1b36f380b087f151aad2cdc5c0ce213fbf39d6ac062879e3828c562e184d5a74a3e9ec0a757f3100f777bc6d0a1c3c25 WHIRLPOOL eb9281484ff7f0f8f7401b13c5b52efb85509da3d26f04c1eddb01f581883e743945c4efb6aa594daced3cb0083ebc771bd6dfe99dc3f83067335439b9d89fec
+MISC ChangeLog 6579 SHA256 d8d0e84f0f23c02215150519c1b553de10b364618fee840fb66d5f0a79cdd117 SHA512 bc6e2e8d8d6b26dc266dd04916f82131211e9c782fc9162eab3cc8b1f5a68290008d685734e0d75fead973dd5ecb17bddf5253ca811487399f10b54c1d8792ef WHIRLPOOL 6fc5795307420aa721c897c17820f3ad6dff011ff31caa0061c76394c715c901b774a00ec2006047948537ab8ca7019608067292f5ad0584a581e4577b32476c
 MISC metadata.xml 327 SHA256 36794b496b8dd6ed4b11b365bf371c02bfc56f9649a6310429412d76c7dcf81a SHA512 1de5c9ae58ae76a8ebe747d7c26254c44cfba86d7b1b9fc02e293a9fb5ab37a57d0ee032848bc4c5ad724b3816d04fbcd3f6e442101f01bbba3c5aa860863dd0 WHIRLPOOL b9b8ba95849b1c86be5a300cf98ede297d4f6bfa6712c675db843fb558c3e4c8831fa5193cadf47736783a7121e97aaed5ff7a1cf07e401c14146c0f027c467c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlKkxGEACgkQCaWpQKGI+9Q4uACbB2lEd1Dc+7tvy5B5Cu/yun8w
-TpUAnRVgyoyVuSe/JJUlRfwvCT9Fs6AV
-=fFGF
+iEYEAREIAAYFAlK4xy0ACgkQ1fmVwcYIWAaDxACfQSebs8X1niHYlUUtVMT8i9RI
+4cwAniuqu0NfyQgkBLX5h1WhztvJXScC
+=h1OS
 -----END PGP SIGNATURE-----
diff --git a/media-libs/cogl/cogl-1.12.2-r1.ebuild b/media-libs/cogl/cogl-1.12.2-r1.ebuild
deleted file mode 100644
index b3d2010a08a6..000000000000
--- a/media-libs/cogl/cogl-1.12.2-r1.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/cogl/cogl-1.12.2-r1.ebuild,v 1.1 2013/05/03 05:43:15 leio Exp $
-
-EAPI="5"
-CLUTTER_LA_PUNT="yes"
-
-# Inherit gnome2 after clutter to download sources from gnome.org
-inherit eutils clutter gnome2 multilib virtualx
-
-DESCRIPTION="A library for using 3D graphics hardware to draw pretty pictures"
-HOMEPAGE="http://www.clutter-project.org/"
-
-LICENSE="LGPL-2.1+ FDL-1.1+"
-SLOT="1.0/11"
-IUSE="doc examples +introspection +opengl gles2 +pango"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-
-# XXX: need uprof for optional profiling support
-COMMON_DEPEND="
-	>=dev-libs/glib-2.28.0:2
-	x11-libs/cairo:=
-	>=x11-libs/gdk-pixbuf-2:2
-	x11-libs/libdrm:=
-	x11-libs/libX11
-	>=x11-libs/libXcomposite-0.4
-	x11-libs/libXdamage
-	x11-libs/libXext
-	>=x11-libs/libXfixes-3
-	virtual/opengl
-	gles2? ( media-libs/mesa[gles2] )
-
-	introspection? ( >=dev-libs/gobject-introspection-1.34.2 )
-	pango? ( >=x11-libs/pango-1.20.0[introspection?] )
-"
-# before clutter-1.7, cogl was part of clutter
-RDEPEND="${COMMON_DEPEND}
-	!<media-libs/clutter-1.7"
-DEPEND="${COMMON_DEPEND}
-	>=dev-util/gtk-doc-am-1.13
-	sys-devel/gettext
-	virtual/pkgconfig
-	doc? ( >=dev-util/gtk-doc-1.13 )
-	test? (	app-admin/eselect-opengl
-		media-libs/mesa[classic] )
-"
-# Need classic mesa swrast for tests, llvmpipe causes a test failure
-
-src_configure() {
-	# XXX: think about kms-egl, quartz, sdl, wayland
-	# Prefer gl over gles2 if both are selected
-	gnome2_src_configure \
-		--disable-examples-install \
-		--disable-profile          \
-		--disable-maintainer-flags \
-		--enable-cairo             \
-		--enable-deprecated        \
-		--enable-gdk-pixbuf        \
-		--enable-glib              \
-		$(use_enable doc gtk-doc)  \
-		$(use_enable opengl glx)   \
-		$(use_enable opengl gl)    \
-		$(use_enable gles2)        \
-		$(use_enable gles2 cogl-gles2) \
-		$(use_enable gles2 xlib-egl-platform) \
-		$(usex gles2 --with-default-driver=$(usex opengl gl gles2)) \
-		$(use_enable introspection) \
-		$(use_enable pango cogl-pango)
-}
-
-src_prepare() {
-	# Don't accidentally use MSAA visuals - it degrades performance and could
-	# crash gnome-shell with SIGBUS on large textures
-	# http://lists.freedesktop.org/archives/cogl/2013-April/001090.html
-	# https://bugs.freedesktop.org/show_bug.cgi?id=61182
-	epatch "${FILESDIR}/${P}-dont-use-MSAA.patch"
-	gnome2_src_prepare
-}
-
-src_test() {
-	# Use swrast for tests, llvmpipe is incomplete and "test_sub_texture" fails
-	# NOTE: recheck if this is needed after every mesa bump
-	if [[ "$(eselect opengl show)" != "xorg-x11" ]]; then
-		ewarn "Skipping tests because a binary OpenGL library is enabled. To"
-		ewarn "run tests for ${PN}, you need to enable the Mesa library:"
-		ewarn "# eselect opengl set xorg-x11"
-		return
-	fi
-	LIBGL_DRIVERS_PATH="${EROOT}/usr/$(get_libdir)/mesa" Xemake check
-}
-
-src_install() {
-	DOCS="NEWS README"
-	EXAMPLES="examples/{*.c,*.jpg}"
-
-	clutter_src_install
-
-	# Remove silly examples-data directory
-	rm -rvf "${ED}/usr/share/cogl/examples-data/" || die
-}
-
-pkg_preinst() {
-	gnome2_pkg_preinst
-	preserve_old_lib /usr/$(get_libdir)/libcogl.so.9
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	preserve_old_lib_notify /usr/$(get_libdir)/libcogl.so.9
-}
diff --git a/media-libs/cogl/cogl-1.14.0.ebuild b/media-libs/cogl/cogl-1.14.0.ebuild
deleted file mode 100644
index 7edae0255555..000000000000
--- a/media-libs/cogl/cogl-1.14.0.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/cogl/cogl-1.14.0.ebuild,v 1.3 2013/07/27 23:57:28 eva Exp $
-
-EAPI="5"
-CLUTTER_LA_PUNT="yes"
-
-# Inherit gnome2 after clutter to download sources from gnome.org
-inherit eutils clutter gnome2 multilib virtualx
-
-DESCRIPTION="A library for using 3D graphics hardware to draw pretty pictures"
-HOMEPAGE="http://www.clutter-project.org/"
-
-LICENSE="LGPL-2.1+ FDL-1.1+"
-SLOT="1.0/12" # subslot = .so version
-IUSE="doc examples +introspection +opengl gles2 +pango profile"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-
-# XXX: need uprof for optional profiling support
-COMMON_DEPEND="
-	>=dev-libs/glib-2.32:2
-	x11-libs/cairo:=
-	>=x11-libs/gdk-pixbuf-2:2
-	x11-libs/libdrm:=
-	x11-libs/libX11
-	>=x11-libs/libXcomposite-0.4
-	x11-libs/libXdamage
-	x11-libs/libXext
-	>=x11-libs/libXfixes-3
-	>=x11-libs/libXrandr-1.2
-	virtual/opengl
-	gles2? ( media-libs/mesa[gles2] )
-
-	introspection? ( >=dev-libs/gobject-introspection-1.34.2 )
-	pango? ( >=x11-libs/pango-1.20.0[introspection?] )
-"
-# before clutter-1.7, cogl was part of clutter
-RDEPEND="${COMMON_DEPEND}
-	!<media-libs/clutter-1.7"
-DEPEND="${COMMON_DEPEND}
-	>=dev-util/gtk-doc-am-1.13
-	sys-devel/gettext
-	virtual/pkgconfig
-	doc? ( >=dev-util/gtk-doc-1.13 )
-	test? (	app-admin/eselect-opengl
-		media-libs/mesa[classic] )
-"
-# Need classic mesa swrast for tests, llvmpipe causes a test failure
-
-src_configure() {
-	# XXX: think about kms-egl, quartz, sdl, wayland
-	# Prefer gl over gles2 if both are selected
-	gnome2_src_configure \
-		--disable-examples-install \
-		--disable-maintainer-flags \
-		--enable-cairo             \
-		--enable-deprecated        \
-		--enable-gdk-pixbuf        \
-		--enable-glib              \
-		$(use_enable doc gtk-doc)  \
-		$(use_enable opengl glx)   \
-		$(use_enable opengl gl)    \
-		$(use_enable gles2)        \
-		$(use_enable gles2 cogl-gles2) \
-		$(use_enable gles2 xlib-egl-platform) \
-		$(usex gles2 --with-default-driver=$(usex opengl gl gles2)) \
-		$(use_enable introspection) \
-		$(use_enable pango cogl-pango) \
-		$(use_enable profile)
-}
-
-src_test() {
-	# Use swrast for tests, llvmpipe is incomplete and "test_sub_texture" fails
-	# NOTE: recheck if this is needed after every mesa bump
-	if [[ "$(eselect opengl show)" != "xorg-x11" ]]; then
-		ewarn "Skipping tests because a binary OpenGL library is enabled. To"
-		ewarn "run tests for ${PN}, you need to enable the Mesa library:"
-		ewarn "# eselect opengl set xorg-x11"
-		return
-	fi
-	LIBGL_DRIVERS_PATH="${EROOT}/usr/$(get_libdir)/mesa" Xemake check
-}
-
-src_install() {
-	DOCS="NEWS README"
-	EXAMPLES="examples/{*.c,*.jpg}"
-
-	clutter_src_install
-
-	# Remove silly examples-data directory
-	rm -rvf "${ED}/usr/share/cogl/examples-data/" || die
-}
diff --git a/media-libs/cogl/cogl-1.14.1_pre20130901.ebuild b/media-libs/cogl/cogl-1.16.0.ebuild
index 3035d963f11c..20078333ad7a 100644
--- a/media-libs/cogl/cogl-1.14.1_pre20130901.ebuild
+++ b/media-libs/cogl/cogl-1.16.0.ebuild
@@ -1,22 +1,20 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/cogl/cogl-1.14.1_pre20130901.ebuild,v 1.2 2013/09/14 09:08:34 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/cogl/cogl-1.16.0.ebuild,v 1.1 2013/12/23 23:28:44 eva Exp $
 
 EAPI="5"
 CLUTTER_LA_PUNT="yes"
 
 # Inherit gnome2 after clutter to download sources from gnome.org
-inherit eutils clutter gnome2 multilib virtualx
+inherit clutter gnome2 multilib virtualx
 
 DESCRIPTION="A library for using 3D graphics hardware to draw pretty pictures"
 HOMEPAGE="http://www.clutter-project.org/"
 
-SRC_URI="${SRC_URI} http://dev.gentoo.org/~pacho/gnome/${P}.tar.xz"
-
 LICENSE="LGPL-2.1+ FDL-1.1+"
 SLOT="1.0/12" # subslot = .so version
 # doc and profile disable for now due bugs #484750 and #483332
-IUSE="examples +introspection +opengl gles2 +pango" # doc profile
+IUSE="examples gles2 gstreamer +introspection +opengl +pango test" # doc profile
 KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 
 COMMON_DEPEND="
@@ -32,6 +30,9 @@ COMMON_DEPEND="
 	>=x11-libs/libXrandr-1.2
 	virtual/opengl
 	gles2? ( media-libs/mesa[gles2] )
+	gstreamer? (
+		media-libs/gstreamer:1.0
+		media-libs/gst-plugins-base:1.0 )
 
 	introspection? ( >=dev-libs/gobject-introspection-1.34.2 )
 	pango? ( >=x11-libs/pango-1.20.0[introspection?] )
@@ -43,13 +44,29 @@ DEPEND="${COMMON_DEPEND}
 	>=dev-util/gtk-doc-am-1.13
 	sys-devel/gettext
 	virtual/pkgconfig
-	test? (	app-admin/eselect-opengl
+	test? (
+		app-admin/eselect-opengl
 		media-libs/mesa[classic] )
 "
 #	doc? ( >=dev-util/gtk-doc-1.13 )
 # Need classic mesa swrast for tests, llvmpipe causes a test failure
 
-S="${WORKDIR}/${PN}-1.14.1"
+src_prepare() {
+	# Do not build examples
+	sed -e "s/^\(SUBDIRS +=.*\)examples\(.*\)$/\1\2/" \
+		-i Makefile.am Makefile.in || die
+
+	if ! use test ; then
+		# For some reason the configure switch will not completely disable
+		# tests being built
+		sed -e "s/^\(SUBDIRS =.*\)test-fixtures\(.*\)$/\1\2/" \
+    		-e "s/^\(SUBDIRS +=.*\)tests\(.*\)$/\1\2/" \
+    		-e "s/^\(.*am__append.* \)tests\(.*\)$/\1\2/" \
+			-i Makefile.am Makefile.in || die
+	fi
+
+	gnome2_src_prepare
+}
 
 src_configure() {
 	# TODO: think about kms-egl, quartz, sdl, wayland
@@ -63,15 +80,17 @@ src_configure() {
 		--enable-deprecated        \
 		--enable-gdk-pixbuf        \
 		--enable-glib              \
-		--disable-gtk-doc	   \
+		--disable-gtk-doc          \
 		$(use_enable opengl glx)   \
 		$(use_enable opengl gl)    \
 		$(use_enable gles2)        \
 		$(use_enable gles2 cogl-gles2) \
 		$(use_enable gles2 xlib-egl-platform) \
 		$(usex gles2 --with-default-driver=$(usex opengl gl gles2)) \
+		$(use_enable gstreamer cogl-gst)    \
 		$(use_enable introspection) \
 		$(use_enable pango cogl-pango) \
+		$(use_enable test unit-tests) \
 		--disable-profile
 #		$(use_enable doc gtk-doc)  \
 #		$(use_enable profile)
diff --git a/media-libs/cogl/files/cogl-1.12.2-dont-use-MSAA.patch b/media-libs/cogl/files/cogl-1.12.2-dont-use-MSAA.patch
deleted file mode 100644
index 68570b6fe016..000000000000
--- a/media-libs/cogl/files/cogl-1.12.2-dont-use-MSAA.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 1f84b5c9b41fb053e7d96b93e3558ca03eed2ae0 Mon Sep 17 00:00:00 2001
-From: Jerome Glisse
-Date: Tue, 29 Jan 2013 18:37:41 -0500
-Subject: [PATCH] glx do not use multisample visual config for front or pixmap
-
-There is no guaranty that glXGetFBConfigs will return fbconfig ordered
-with non msaa config first. This patch make sure that non msaa config
-get choose.
-
-Signed-off-by: Jerome Glisse <jglisse@redhat.com>
-Reviewed-by: Robert Bragg <robert@linux.intel.com>
-
-(cherry picked from commit 93b7b4c850dd928bf21ee168a95641a8d631f713)
----
- cogl/winsys/cogl-winsys-glx.c | 31 ++++++++++++++++++++++++-------
- 1 file changed, 24 insertions(+), 7 deletions(-)
-
-commit 8a1353a215ab that removes a hunk as unnecessary is manually removed
-from this patchfile instead of reverting in a second patch for Gentoo.
-diff --git a/cogl/winsys/cogl-winsys-glx.c b/cogl/winsys/cogl-winsys-glx.c
-index 234e9da..24aee14 100644
---- a/cogl/winsys/cogl-winsys-glx.c
-+++ b/cogl/winsys/cogl-winsys-glx.c
-@@ -2024,6 +2031,16 @@ get_fbconfig_for_depth (CoglContext *context,
-       if (value != depth && (value - alpha) != depth)
-         continue;
- 
-+      if (glx_renderer->glx_major == 1 && glx_renderer->glx_minor >= 4)
-+        {
-+          glx_renderer->glXGetFBConfigAttrib (dpy,
-+                                              fbconfigs[i],
-+                                              GLX_SAMPLES,
-+                                              &value);
-+          if (value > 1)
-+            continue;
-+        }
-+
-       value = 0;
-       if (depth == 32)
-         {
--- 
-1.8.2.1
-