Fix USE=doc build failure with libxslt-1.1.27 (bug #436308, thanks to bambucha14). Update license. Drop old.

Package-Manager: portage-2.2.0_alpha134/cvs/Linux x86_64

6 files changed, 58 insertions, 94 deletions

diff --git a/media-libs/cogl/ChangeLog b/media-libs/cogl/ChangeLog
index 2e09f5468710..3b1258678b72 100644
--- a/media-libs/cogl/ChangeLog
+++ b/media-libs/cogl/ChangeLog
@@ -1,6 +1,12 @@
 # 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.13 2012/07/17 23:32:02 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/cogl/ChangeLog,v 1.14 2012/10/10 11:52:07 tetromino Exp $
+
+  10 Oct 2012; Alexandre Rostovtsev <tetromino@gentoo.org> cogl-1.8.2.ebuild,
+  -cogl-1.10.2.ebuild, cogl-1.10.4.ebuild,
+  +files/cogl-1.10.4-cogl-clipping.xml.patch:
+  Fix USE=doc build failure with libxslt-1.1.27 (bug #436308, thanks to
+  bambucha14). Update license. Drop old.
 
 *cogl-1.10.4 (17 Jul 2012)
 
diff --git a/media-libs/cogl/Manifest b/media-libs/cogl/Manifest
index 69d8d4e5aca9..ed7794e128f2 100644
--- a/media-libs/cogl/Manifest
+++ b/media-libs/cogl/Manifest
@@ -1,22 +1,21 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST cogl-1.10.2.tar.xz 1209148 SHA256 042cf87ec35d2eac78719856356e415dd5333f9f613093c5db8b438630c1ecb3 SHA512 cd1c9d97812a27ce296a71aed36030609451c64715bf40ba14c7e3aba0e9be96686ba10ec4db81d2c5e0d85afb11c50f556c2d15039294e361161e87a38e4cb5 WHIRLPOOL 2d07fef4db8c5ba78e83e5e27440563eb249c036fb72b6bf85e88021b5a9e4e68800bd479634e49d2d8faf6255a2fe488e15c96eec47d8a0fded957c7905a654
+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.2.ebuild 2196 SHA256 6c3363c132f56ad9cfe783a03f3c95a708984d686e39646a05ca6d5bdfd8265e SHA512 8115e977dcc714007a0f05526ab3c958ab79a27a22c713b6f8dcee002a8d835592c6b8f97aba11ad9fccc1a754149b1d3d96b1e0d376c51bbcce4204023bb908 WHIRLPOOL ecd992b0fe3e492baf502de270e0ce17d6f81b212ce72547f71b3e7b3112305685be0c0bdda0e3e0956009b23b76c2d2c5f919301d4a2af777cd8260fa532fb5
-EBUILD cogl-1.10.4.ebuild 2483 SHA256 c783aad2330fd8b70f743e810d69ed379cb7401f6875876f93d374b876e34f00 SHA512 71ab3709c413cf6f7f67cd8402e192cfa3dbe6de68367c9ed26d359876df5332a649ea9de6b086155462d4cd81821ea6ec37477465350311da2b26fdb6ad64bc WHIRLPOOL 868d9c12b99e833858b12a80a6227b337e228c220cc16be564043a5403760e8a87347d952a06347cfc8cc7fcfbadb96b1de30438d8027600d7653b173aa9861b
-EBUILD cogl-1.8.2.ebuild 1747 SHA256 3bb34057082c7fa032511f7cdfcf669134ab5eda64fae8b1dd672373ea2d3fdc SHA512 b51e4b61d18c3f42d69452cce1fdafe98af6d8813c8ada8cbf849c33d95eb21f0512ea9116ae0957aed34d96219614b7f98baeacecc6e833eb3ea44c915c76c6 WHIRLPOOL 2eebf6433def233a3acf6ba9cf9c712f9fbbb132a030116eba0eb01aafdb3b47e3c17b477981f44b5d151b076ed3488cd07a1a0d546127f71f4f8e3a74977f35
-MISC ChangeLog 1965 SHA256 c2af4b9d3cbf6d9978f1d4c18b4e9e2eda02b46ebe3a7b31e043d3142ea34a8d SHA512 89aa7af2f8cf2f4800b090537f3ad1f414da835a605c793779bdb0cda7025d5eb3a1c8668a04b0615e2925d5e9b8b0d96d418902effec11da09c32681035f32e WHIRLPOOL d26dd244bd62d0a2820d20a14e7952dc1cf6cc5a3168518f42e8398c76f170e814a962246dc3c6165f6d7bcd508a18a00625e5d2c62dc530b4819e1b9a466cc5
+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
 MISC metadata.xml 431 SHA256 13ad2281980f4afc210ff119bec515845ffaceaf1fe2ba9d3f10d3d0aee9a8a1 SHA512 65b836333eb637018cff713b1095ecf7b50b7cd059f7acd3051df621f660b91291116b005049b01cecbc05b4d20340ee2b7f76d24e443d2d9b7c061479f72348 WHIRLPOOL 90ba3d8230ddd5acf0a8d4328ec3538586963f24bb4653295f45f2b3c1293ab9ad5676db466d6208b9b903e6dcd76f6d2ea78d1d018e1c1e6b5d2faf1937168e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQBfX6AAoJEJ0WA1zPCt1hvPIIAJNanm82k1Pp6oI2X+8qaXdq
-b5A7Dt+Sw9QKGbmVGBHA8eID5vAKm1p2b0dKuXwCXupo7dbIvYVHolsdUgw8NYA+
-nWvRIF+2/cN4N2ZJ66Isytvfcf2VWLJkxjeyuLsEVg07KYWennVTtnoIjLNk2Za2
-pI7t3cyX2cwxk3arHA5cw+Kg9j8+qh98Qpm/b4T3qIa4EgUQhQUgVkhogAIpfCAE
-AQ54CXbj2jUDmFmSIlplrU8jznl7AhcOKqX+t4ALb/AHRmx9exWQLQvUOfh9Jh6z
-/07GTOZin48+hyW7LVzIlKIXyz5vsLJTS5be9/x1BmpkpZEecpkGrJUCqFERLaM=
-=7UPN
+iQEcBAEBCAAGBQJQdWFoAAoJEJ0WA1zPCt1hYxgH/3GdG1RzoDFUxligAZgXGCKb
+WjOIcqhxdYE4nPJfwP2QDxfXC7hUQAB+Dd99svW9A7jN3/CaMPBPYApqwSlkb2tF
+sqf+nRZCXKwz4/Vc2AwHAWwjJDAoSKSVfOcgw91v0vsLJI6Y6FOujpqTL7WDXoKY
+6VzfA5uFO7ey+EgAyrVepxC0Q/4caLlZbz6NdYHiRxvMOfV8DKmdS14l1rsjkpTd
+m1g8n5Nui+cH4pexPIKC+Y/9D9rXC5XakBKPLaEeUke4SdHtpdYjjchJ+g+h5dJK
+2n1nbPhGTcrdnl/U5S22Rj7OSwWwGCxuT7fJ7e7C9PTu+wvd0lNXQtf3sriLsag=
+=yts0
 -----END PGP SIGNATURE-----
diff --git a/media-libs/cogl/cogl-1.10.2.ebuild b/media-libs/cogl/cogl-1.10.2.ebuild
deleted file mode 100644
index 345b3c79ea9a..000000000000
--- a/media-libs/cogl/cogl-1.10.2.ebuild
+++ /dev/null
@@ -1,76 +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/cogl/cogl-1.10.2.ebuild,v 1.4 2012/07/14 13:26:07 blueness Exp $
-
-EAPI="4"
-CLUTTER_LA_PUNT="yes"
-
-# Inherit gnome2 after clutter to download sources from gnome.org
-inherit clutter gnome2 virtualx
-
-DESCRIPTION="A library for using 3D graphics hardware to draw pretty pictures"
-HOMEPAGE="http://www.clutter-project.org/"
-
-LICENSE="LGPL-2.1"
-SLOT="1.0"
-IUSE="doc examples +introspection +opengl gles2 +pango"
-KEYWORDS="~alpha ~amd64 ~mips ~ppc ~ppc64 ~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-0.9.5 )
-	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}
-	virtual/pkgconfig
-	sys-devel/gettext
-	doc? ( app-text/docbook-xml-dtd:4.1.2
-		>=dev-util/gtk-doc-1.13 )
-	test? ( media-libs/mesa[classic] )"
-# Need classic mesa swrast for tests, llvmpipe causes a test failure
-
-pkg_setup() {
-	DOCS="NEWS README"
-	EXAMPLES="examples/{*.c,*.jpg}"
-	# XXX: think about kms-egl, gles, quartz, sdl, wayland
-	G2CONF="${G2CONF}
-		--disable-examples-install
-		--disable-profile
-		--disable-maintainer-flags
-		--enable-cairo
-		--enable-gdk-pixbuf
-		$(use_enable opengl glx)
-		$(use_enable opengl gl)
-		$(use_enable gles2)
-		$(use_enable gles2 xlib-egl-platform)
-		--enable-glib
-		--enable-deprecated
-		$(use_enable introspection)
-		$(use_enable pango cogl-pango)"
-}
-
-src_test() {
-	# Use swrast for tests, llvmpipe is incomplete and "test_sub_texture" fails
-	# NOTE: recheck if this is needed after every mesa bump
-	LIBGL_DRIVERS_PATH=${EROOT}/usr/$(get_libdir)/mesa Xemake check
-}
-
-src_install() {
-	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.10.4.ebuild b/media-libs/cogl/cogl-1.10.4.ebuild
index 812a3b2bdaa6..09e1268a57a1 100644
--- a/media-libs/cogl/cogl-1.10.4.ebuild
+++ b/media-libs/cogl/cogl-1.10.4.ebuild
@@ -1,17 +1,17 @@
 # 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.1 2012/07/17 23:32:02 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/cogl/cogl-1.10.4.ebuild,v 1.2 2012/10/10 11:52:07 tetromino Exp $
 
 EAPI="4"
 CLUTTER_LA_PUNT="yes"
 
 # Inherit gnome2 after clutter to download sources from gnome.org
-inherit clutter gnome2 multilib virtualx
+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"
+LICENSE="LGPL-2.1+ FDL-1.1+"
 SLOT="1.0"
 IUSE="doc examples +introspection +opengl gles2 +pango"
 KEYWORDS="~alpha ~amd64 ~mips ~ppc ~ppc64 ~x86"
@@ -63,6 +63,12 @@ pkg_setup() {
 		$(use_enable pango cogl-pango)"
 }
 
+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
+}
+
 src_test() {
 	# Use swrast for tests, llvmpipe is incomplete and "test_sub_texture" fails
 	# NOTE: recheck if this is needed after every mesa bump
diff --git a/media-libs/cogl/cogl-1.8.2.ebuild b/media-libs/cogl/cogl-1.8.2.ebuild
index 598a819c49f5..438acc57c230 100644
--- a/media-libs/cogl/cogl-1.8.2.ebuild
+++ b/media-libs/cogl/cogl-1.8.2.ebuild
@@ -1,6 +1,6 @@
 # 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.8 2012/07/14 13:26:07 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/cogl/cogl-1.8.2.ebuild,v 1.9 2012/10/10 11:52:07 tetromino Exp $
 
 EAPI="4"
 CLUTTER_LA_PUNT="yes"
@@ -11,7 +11,7 @@ inherit clutter gnome2 virtualx
 DESCRIPTION="A library for using 3D graphics hardware to draw pretty pictures"
 HOMEPAGE="http://www.clutter-project.org/"
 
-LICENSE="LGPL-2.1"
+LICENSE="LGPL-2.1+ FDL-1.1+"
 SLOT="1.0"
 IUSE="doc examples +introspection +pango"
 KEYWORDS="~alpha amd64 ~mips ppc ppc64 x86"
diff --git a/media-libs/cogl/files/cogl-1.10.4-cogl-clipping.xml.patch b/media-libs/cogl/files/cogl-1.10.4-cogl-clipping.xml.patch
new file mode 100644
index 000000000000..b27afbad8b71
--- /dev/null
+++ b/media-libs/cogl/files/cogl-1.10.4-cogl-clipping.xml.patch
@@ -0,0 +1,29 @@
+From f5ca6733c4389de9a5bd55b51b016ce40b8e983e Mon Sep 17 00:00:00 2001
+From: Damien Lespiau <damien.lespiau@intel.com>
+Date: Fri, 11 May 2012 12:24:29 +0100
+Subject: [PATCH] doc: Remove the inclusion of non-existent cogl-clipping.xml
+
+The API is now gone, so cogl-clipping.xml is not generated.
+
+Reviewed-by: Robert Bragg <robert@linux.intel.com>
+
+(cherry picked from commit ff3956c25676c898948c5c7239c85154564c0e16)
+---
+ doc/reference/cogl-2.0-experimental/cogl-2.0-experimental-docs.xml.in | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/doc/reference/cogl-2.0-experimental/cogl-2.0-experimental-docs.xml.in b/doc/reference/cogl-2.0-experimental/cogl-2.0-experimental-docs.xml.in
+index 411503f..55c88f7 100644
+--- a/doc/reference/cogl-2.0-experimental/cogl-2.0-experimental-docs.xml.in
++++ b/doc/reference/cogl-2.0-experimental/cogl-2.0-experimental-docs.xml.in
+@@ -113,7 +113,6 @@
+       <xi:include href="xml/cogl-texture-rectangle.xml"/>
+     </section>
+ 
+-    <xi:include href="xml/cogl-clipping.xml"/>
+     <section id="cogl-framebuffer-apis">
+       <title>Framebuffers</title>
+       <xi:include href="xml/cogl-framebuffer.xml"/>
+-- 
+1.7.12
+