Fix bug 369867, build failure with USE=doc

(Portage version: 2.1.9.46/cvs/Linux x86_64)

3 files changed, 65 insertions, 3 deletions

diff --git a/net-libs/libsoup/ChangeLog b/net-libs/libsoup/ChangeLog
index 26b1a55b46e8..dd83eac2d274 100644
--- a/net-libs/libsoup/ChangeLog
+++ b/net-libs/libsoup/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-libs/libsoup
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libsoup/ChangeLog,v 1.252 2011/06/02 15:37:17 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libsoup/ChangeLog,v 1.253 2011/06/03 13:26:27 nirbheek Exp $
+
+  03 Jun 2011; Nirbheek Chauhan <nirbheek@gentoo.org> libsoup-2.34.2.ebuild,
+  +files/libsoup-2.34.2-fix-build-without-gnome-with-doc.patch:
+  Fix bug 369867, build failure with USE=doc
 
 *libsoup-2.34.2 (02 Jun 2011)
 
diff --git a/net-libs/libsoup/files/libsoup-2.34.2-fix-build-without-gnome-with-doc.patch b/net-libs/libsoup/files/libsoup-2.34.2-fix-build-without-gnome-with-doc.patch
new file mode 100644
index 000000000000..574b8be7debf
--- /dev/null
+++ b/net-libs/libsoup/files/libsoup-2.34.2-fix-build-without-gnome-with-doc.patch
@@ -0,0 +1,58 @@
+From 4be4806401133389b2413267bc3f8ac58c1eeaf3 Mon Sep 17 00:00:00 2001
+From: Priit Laes <plaes@plaes.org>
+Date: Thu, 25 Feb 2010 20:59:51 +0200
+Subject: [PATCH] Split docs into libsoup and libsoup-gnome.
+
+Fixes Gentoo Bug 268592, patch adapted from upstream patch.
+
+Modified to apply to a release tarball (no libsoup-2.4-docs.sgml.in)
+Hence, to be applied ONLY when !gnome && doc
+
+[Alexandre Rostovtsev <tetromino@gmail.com>: adapted patch for libsoup-2.34.2]
+---
+ docs/reference/Makefile.am           |    4 +++-
+ docs/reference/libsoup-2.4-docs.sgml |    2 ++
+ 2 files changed, 5 insertions(+), 1 deletions(-)
+
+diff --git a/docs/reference/Makefile.am b/docs/reference/Makefile.am
+index 765d27c..07c92e9 100644
+--- a/docs/reference/Makefile.am
++++ b/docs/reference/Makefile.am
+@@ -38,6 +38,9 @@ IGNORE_HFILES= soup.h soup-marshal.h soup-enum-types.h \
+ 	soup-proxy-resolver.h soup-proxy-resolver-gnome.h \
+ 	soup-proxy-resolver-static.h
+ 
++IGNORE_HFILES += soup-cookie-jar-sqlite.h \
++	soup-gnome.h soup-gnome-features.h
++
+ # Images to copy into HTML directory.
+ HTML_IMAGES = 
+ 
+@@ -63,7 +66,6 @@ GTKDOC_CFLAGS =				\
+ 
+ GTKDOC_LIBS =						\
+ 	$(top_builddir)/libsoup/libsoup-2.4.la		\
+-	$(top_builddir)/libsoup/libsoup-gnome-2.4.la	\
+ 	$(GLIB_LIBS)
+ 
+ # include common portion ...
+diff --git a/docs/reference/libsoup-2.4-docs.sgml b/docs/reference/libsoup-2.4-docs.sgml
+index c52208f..7117849 100644
+--- a/docs/reference/libsoup-2.4-docs.sgml
++++ b/docs/reference/libsoup-2.4-docs.sgml
+@@ -52,11 +52,13 @@
+     <xi:include href="xml/soup-value-utils.xml"/>
+   </chapter>
+ 
++<!--
+   <chapter>
+     <title>GNOME integration</title>
+     <xi:include href="xml/soup-gnome-features.xml"/>
+     <xi:include href="xml/soup-cookie-jar-sqlite.xml"/>
+   </chapter>
++-->
+ 
+   <chapter>
+     <title>Low-level Networking API</title>
+-- 
+1.7.5.3
\ No newline at end of file
diff --git a/net-libs/libsoup/libsoup-2.34.2.ebuild b/net-libs/libsoup/libsoup-2.34.2.ebuild
index 843cb42cede7..1bbd1c399aa7 100644
--- a/net-libs/libsoup/libsoup-2.34.2.ebuild
+++ b/net-libs/libsoup/libsoup-2.34.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libsoup/libsoup-2.34.2.ebuild,v 1.1 2011/06/02 15:37:17 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libsoup/libsoup-2.34.2.ebuild,v 1.2 2011/06/03 13:26:27 nirbheek Exp $
 
 EAPI="3"
 GCONF_DEBUG="yes"
@@ -61,7 +61,7 @@ src_prepare() {
 	# Patch *must* be applied conditionally (see patch for details)
 	if use doc; then
 		# Fix bug 268592 (upstream #573685) (build fails without gnome && doc)
-		epatch "${FILESDIR}/${PN}-2.30.1-fix-build-without-gnome-with-doc.patch"
+		epatch "${FILESDIR}/${PN}-2.34.2-fix-build-without-gnome-with-doc.patch"
 		eautoreconf
 	fi
 }