Update to EAPI5 and enable subslots.

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

4 files changed, 29 insertions, 23 deletions

diff --git a/media-libs/cogl/ChangeLog b/media-libs/cogl/ChangeLog
index 3b1258678b72..5474f7701e08 100644
--- a/media-libs/cogl/ChangeLog
+++ b/media-libs/cogl/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/cogl
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/cogl/ChangeLog,v 1.14 2012/10/10 11:52:07 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/cogl/ChangeLog,v 1.15 2012/12/05 23:12:25 tetromino Exp $
+
+  05 Dec 2012; Alexandre Rostovtsev <tetromino@gentoo.org> cogl-1.8.2.ebuild,
+  cogl-1.10.4.ebuild:
+  Update to EAPI5 and enable subslots.
 
   10 Oct 2012; Alexandre Rostovtsev <tetromino@gentoo.org> cogl-1.8.2.ebuild,
   -cogl-1.10.2.ebuild, cogl-1.10.4.ebuild,
diff --git a/media-libs/cogl/Manifest b/media-libs/cogl/Manifest
index ed7794e128f2..b222686b3593 100644
--- a/media-libs/cogl/Manifest
+++ b/media-libs/cogl/Manifest
@@ -4,18 +4,18 @@ Hash: SHA256
 AUX cogl-1.10.4-cogl-clipping.xml.patch 1154 SHA256 0d1c0829149a644c7607adf8fe24147a1791ca1c4ddc3321052d843512e1eb9d SHA512 ff0d47e5cb2e7533d8f909504c66e07ac405ffb7606675d4bb937201d97d49099e57d2a34522c287e68eff46397fe6e2822e64e0e04a84f40a166c08aea0970a WHIRLPOOL ec8750a39a06fd72ac4e3321a21107fd01702aeedf25d8984bac3ed039a9d388d40c97c87dbafb426d30ba9a090f32009b23a311704dcad56b4ceb40c1129f42
 DIST cogl-1.10.4.tar.xz 1253708 SHA256 0b5c9989f1d07dbda000a68640eb7ebf734513d52e3707668c41eed19991adf9 SHA512 bbff0ae9731a12b5f9e493c7dacb8d02fe3289c30c4895fe277959b3e3155095b003b03e7c46a74ed0152916758484e3c305c599e73ceb81fd912ba491dda0ae WHIRLPOOL 65c11ee6eda657add0e0d5068cf8c055202901cb8bb19055d1f7bbe72c54373c3bed83ee3fb84edf6e0a37618d7517f3a38c3e521003c638e9850b09bdc39e82
 DIST cogl-1.8.2.tar.xz 1029304 SHA256 ec26fd90c4ba5643875b5f3a04b4ab14b24f0d618ba3d239d61e773c3e3ca8c7 SHA512 a09ee70d4baeac09382ef275394c475ff49d1a690bad6697e55a1de1de1777195becd479acac9ce347fd870c367c55e4376c90248e00e55396dafe258e60b402 WHIRLPOOL a8b90ea38526e5d1efb49d07c578c28789f304c85b73d4495d964301cf497fed143561852df602c422d1752dc6ef7220f924dc62554e1d69edb2e465a1286e65
-EBUILD cogl-1.10.4.ebuild 2647 SHA256 4377fc373e814d07c407bcc095acf93cf923f761fb3d31cebb98ed72dc713dda SHA512 d5b4c0f197d15e1181d46064b8de7c8a1804821f0e58cf9d0272d27c7b0d91e5f3435c1f44e887f99426c0f4d89c58ea58da0d4ae35916f4452183bfc2352f84 WHIRLPOOL 2d27e4f6381733aa084895b37e41d73025329ad372b63cdd9312127238ccc1719fb5488d71fcc70280fb5c69e59f38d3088044c1677f0ffb71a153e8b67414c4
-EBUILD cogl-1.8.2.ebuild 1758 SHA256 d6d0145f4933e9f7e3ee2d751b70e5374539566b84ea3f80d396b98cb3d60c18 SHA512 95db3cf01d935ce5865f582ebb10a4e2c52ad9cecfc58d940bc0954ba71907476869163b728eb7051ed24f3427f147861c2a6beb2cd8f66211e06477e31b9936 WHIRLPOOL c8971ac1418b4fa47dd2f1db078bc2bf4bb7885ab411ec968a972a715d81c1ade8e5dd445f1b9c86c7cb635c29e40faf641c0b5508ee8320c478afd594535b20
-MISC ChangeLog 2246 SHA256 9babb75ed2c2ef6c8ed5f50f3571987ac3ebe9b8c110fc8bf993b66e7a42daec SHA512 6e4fff0488b5a9739ca225648aa86a0ab1ebde8a1e0ad3d4c4b37d875b0354c00737058ddb4d5561fd178c67c7675f371b27b0d8c09b2173c0648021625244e4 WHIRLPOOL 3a15fe941f7a62f7b32408b4da2f1b3b74e8969abe1f6e44c1e20d14ce90bc9c85f537b42722d4b2caf12950e8c40e9b69dbb39c298f5fe23a98c9db3dc0bd0e
+EBUILD cogl-1.10.4.ebuild 2662 SHA256 0dcfe7ed184bd9584d5f8c1398f7769d43a4e51ec49e8ffed3ace7cc6ba90c9f SHA512 a12fbe5385d1392e7a67fb772c178a569475ed5ef5a9a1d55ba8304b9858c02c9c361ee4bcc73ae5549bf4c84022087fd895d3b3f880bd3fc9bab2123a8ea1e7 WHIRLPOOL e72460f259f9fe7e050c3353ff10b8df6cbdafd7f8cf1714340a0dddb739dadfabb3f5a40076b534b3cad89823a8bf01d5e17ad4209a707c27828a825279f00e
+EBUILD cogl-1.8.2.ebuild 1812 SHA256 8bef9f9caca02a054d1e88c4ed82b408f086b4891c027dbfdbb6fda3bf54f6ac SHA512 06f4394aaef68f18a580590500733d1fe5e5449ddfd8574cb7c883d9f21a8dad990670c403e0c61706f68cb18e7e0a274142bb93a7964eaa0bb322bea9ca8ef8 WHIRLPOOL 96312cfcbffb886f7a5e8d9a095876fef669168bfd82ed88edaf53e956db106d05034c92c4b580489c9518683e006a4154dedf6e5f53a584a8e13ea4ea5a48f1
+MISC ChangeLog 2386 SHA256 afeee9691806c9ca9835250e556574c5538ff9ce8e7954742fab36ddf6e8ea30 SHA512 d741368faa684a5fee1a1f9c54e84add5e9ff0583e147048265b31e0a404efac730288347f593c5aba5bf82f6ab43d95d2a3242ed0e26e060eb33dd81d970cfa WHIRLPOOL fd4637a36199b22760791ef115cf77ebd5fabea6bf9c7a8a9f132fcc9e43e920643ba39b2dcc661d7b5138a6dff6ec2767a0a6e28176f40c334b27543bca3f66
 MISC metadata.xml 431 SHA256 13ad2281980f4afc210ff119bec515845ffaceaf1fe2ba9d3f10d3d0aee9a8a1 SHA512 65b836333eb637018cff713b1095ecf7b50b7cd059f7acd3051df621f660b91291116b005049b01cecbc05b4d20340ee2b7f76d24e443d2d9b7c061479f72348 WHIRLPOOL 90ba3d8230ddd5acf0a8d4328ec3538586963f24bb4653295f45f2b3c1293ab9ad5676db466d6208b9b903e6dcd76f6d2ea78d1d018e1c1e6b5d2faf1937168e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQdWFoAAoJEJ0WA1zPCt1hYxgH/3GdG1RzoDFUxligAZgXGCKb
-WjOIcqhxdYE4nPJfwP2QDxfXC7hUQAB+Dd99svW9A7jN3/CaMPBPYApqwSlkb2tF
-sqf+nRZCXKwz4/Vc2AwHAWwjJDAoSKSVfOcgw91v0vsLJI6Y6FOujpqTL7WDXoKY
-6VzfA5uFO7ey+EgAyrVepxC0Q/4caLlZbz6NdYHiRxvMOfV8DKmdS14l1rsjkpTd
-m1g8n5Nui+cH4pexPIKC+Y/9D9rXC5XakBKPLaEeUke4SdHtpdYjjchJ+g+h5dJK
-2n1nbPhGTcrdnl/U5S22Rj7OSwWwGCxuT7fJ7e7C9PTu+wvd0lNXQtf3sriLsag=
-=yts0
+iQEcBAEBCAAGBQJQv9TaAAoJEJ0WA1zPCt1hJ4QIAKxwsmcI6BLsDor52qWmKbLr
+A4SOwtq8VydaNKeWS0BJgJDnx5utG3WZdToMDAqrUImYj5cxC7+FYPwBZU2JL4Rf
+yuz+VcDqYEOy2L/+MIss3mkIkvJ5Jo0BQu6WaAdeYejAvopptgvhc9JE/siakCV0
+BgfVvhSkdJVol5WRPKpnXtHPnaj3aQ/JB/j2pDEDODR9tQWpOkaX8zDSoj5cPOnR
+MDtJbSueV2YG22pqpP9oWtHIH4I6JQlrYKbN5jWrjP4y4CNgVjxMgB/jpDmjccB3
+wua+jhlu08z5E6tFuzssw8Uy1nXjZR+fvU+cBBJABFHQ7vVvp6bih6m1/a1dmkY=
+=yWmA
 -----END PGP SIGNATURE-----
diff --git a/media-libs/cogl/cogl-1.10.4.ebuild b/media-libs/cogl/cogl-1.10.4.ebuild
index 09e1268a57a1..92f877bac717 100644
--- a/media-libs/cogl/cogl-1.10.4.ebuild
+++ b/media-libs/cogl/cogl-1.10.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/cogl/cogl-1.10.4.ebuild,v 1.2 2012/10/10 11:52:07 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/cogl/cogl-1.10.4.ebuild,v 1.3 2012/12/05 23:12:24 tetromino Exp $
 
-EAPI="4"
+EAPI="5"
 CLUTTER_LA_PUNT="yes"
 
 # Inherit gnome2 after clutter to download sources from gnome.org
@@ -12,7 +12,7 @@ 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"
+SLOT="1.0/10"
 IUSE="doc examples +introspection +opengl gles2 +pango"
 KEYWORDS="~alpha ~amd64 ~mips ~ppc ~ppc64 ~x86"
 
@@ -43,7 +43,7 @@ DEPEND="${COMMON_DEPEND}
 		media-libs/mesa[classic] )"
 # Need classic mesa swrast for tests, llvmpipe causes a test failure
 
-pkg_setup() {
+src_prepare() {
 	DOCS="NEWS README"
 	EXAMPLES="examples/{*.c,*.jpg}"
 	# XXX: think about kms-egl, gles, quartz, sdl, wayland
@@ -60,10 +60,9 @@ pkg_setup() {
 		--enable-glib
 		--enable-deprecated
 		$(use_enable introspection)
-		$(use_enable pango cogl-pango)"
-}
+		$(use_enable pango cogl-pango)
+		$(use_enable doc gtk-doc)"
 
-src_prepare() {
 	# USE=doc build failure; in 1.12.x; bug #436308
 	epatch "${FILESDIR}/${PN}-1.10.4-cogl-clipping.xml.patch"
 	gnome2_src_prepare
diff --git a/media-libs/cogl/cogl-1.8.2.ebuild b/media-libs/cogl/cogl-1.8.2.ebuild
index 438acc57c230..f3ab9f066b99 100644
--- a/media-libs/cogl/cogl-1.8.2.ebuild
+++ b/media-libs/cogl/cogl-1.8.2.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/cogl/cogl-1.8.2.ebuild,v 1.9 2012/10/10 11:52:07 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/cogl/cogl-1.8.2.ebuild,v 1.10 2012/12/05 23:12:24 tetromino Exp $
 
-EAPI="4"
+EAPI="5"
 CLUTTER_LA_PUNT="yes"
 
 # Inherit gnome2 after clutter to download sources from gnome.org
@@ -12,7 +12,7 @@ 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"
+SLOT="1.0/5"
 IUSE="doc examples +introspection +pango"
 KEYWORDS="~alpha amd64 ~mips ppc ppc64 x86"
 
@@ -43,7 +43,7 @@ DEPEND="${COMMON_DEPEND}
 # matter whether "eselect opengl" is set to nvidia or xorg-x11.
 RESTRICT="test"
 
-pkg_setup() {
+src_prepare() {
 	DOCS="NEWS README"
 	EXAMPLES="examples/{*.c,*.jpg}"
 	# XXX: think about gles, quartz, wayland
@@ -55,7 +55,10 @@ pkg_setup() {
 		--enable-gl
 		--enable-glx
 		$(use_enable introspection)
-		$(use_enable pango cogl-pango)"
+		$(use_enable pango cogl-pango)
+		$(use_enable doc gtk-doc)"
+
+	gnome2_src_prepare
 }
 
 src_test() {