Add patch from overlay

(Portage version: 2.2_rc67/cvs/Linux x86_64)

3 files changed, 65 insertions, 3 deletions

diff --git a/net-libs/libsoup/ChangeLog b/net-libs/libsoup/ChangeLog
index 751433412e74..cf96a3e202fc 100644
--- a/net-libs/libsoup/ChangeLog
+++ b/net-libs/libsoup/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-libs/libsoup
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libsoup/ChangeLog,v 1.217 2010/06/13 15:48:57 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libsoup/ChangeLog,v 1.218 2010/06/14 23:03:41 dang Exp $
+
+  14 Jun 2010; Daniel Gryniewicz <dang@gentoo.org> libsoup-2.30.1.ebuild,
+  +files/libsoup-2.30.1-fix-build-without-gnome-with-doc.patch:
+  Add patch from overlay
 
 *libsoup-2.30.1 (13 Jun 2010)
 
diff --git a/net-libs/libsoup/files/libsoup-2.30.1-fix-build-without-gnome-with-doc.patch b/net-libs/libsoup/files/libsoup-2.30.1-fix-build-without-gnome-with-doc.patch
new file mode 100644
index 000000000000..2b5a39d83e41
--- /dev/null
+++ b/net-libs/libsoup/files/libsoup-2.30.1-fix-build-without-gnome-with-doc.patch
@@ -0,0 +1,58 @@
+From c8ff78e489ccf5becd1ae309222b7977510558e6 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
+---
+ docs/reference/Makefile.am           |    5 ++++-
+ docs/reference/libsoup-2.4-docs.sgml |    2 ++
+ 2 files changed, 6 insertions(+), 1 deletions(-)
+
+diff --git a/docs/reference/Makefile.am b/docs/reference/Makefile.am
+index 64d3cf8..8b91b7f 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 = 
+ 
+@@ -62,7 +65,7 @@ GTKDOC_CFLAGS =				\
+ 	$(GNUTLS_CFLAGS)		\
+ 	$(LIBPROXY_LIBS)
+ 
+-GTKDOC_LIBS = $(top_builddir)/libsoup/libsoup-gnome-2.4.la
++GTKDOC_LIBS = $(top_builddir)/libsoup/libsoup-2.4.la
+ 
+ # include common portion ...
+ include $(top_srcdir)/gtk-doc.make
+diff --git a/docs/reference/libsoup-2.4-docs.sgml b/docs/reference/libsoup-2.4-docs.sgml
+index 3cb3d11..707e525 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.0
+
diff --git a/net-libs/libsoup/libsoup-2.30.1.ebuild b/net-libs/libsoup/libsoup-2.30.1.ebuild
index 80fe8d52bdc8..0406d92b993f 100644
--- a/net-libs/libsoup/libsoup-2.30.1.ebuild
+++ b/net-libs/libsoup/libsoup-2.30.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libsoup/libsoup-2.30.1.ebuild,v 1.1 2010/06/13 15:48:57 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libsoup/libsoup-2.30.1.ebuild,v 1.2 2010/06/14 23:03:41 dang Exp $
 
 EAPI="2"
 
@@ -47,7 +47,7 @@ src_prepare() {
 	# Patch *must* be applied conditionally (see patch for details)
 	if use doc; then
 		# Fix bug 268592 (build fails !gnome && doc)
-		epatch "${FILESDIR}/${PN}-fix-build-without-gnome-with-doc.patch"
+		epatch "${FILESDIR}/${P}-fix-build-without-gnome-with-doc.patch"
 	fi
 	eautoreconf
 }