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

(Portage version: 2.2.0_alpha134/cvs/Linux x86_64)

5 files changed, 47 insertions, 82 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/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
+