Add patch from overlay

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

diff --git a/net-libs/libsoup/ChangeLog b/net-libs/libsoup/ChangeLog
index 751433412e74fceeb9dba578d98dfa5038313ef5..cf96a3e202fc2ad8edd6405e4766d98fb0b90a5a 100644 (file)
--- 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/Manifest b/net-libs/libsoup/Manifest
index 7afacd7d19981dc45f46b8a25fad8b5ad7b21737..94ccc393c2938b5ec61b195a1523f48b71c6aa98 100644 (file)
--- a/net-libs/libsoup/Manifest
+++ b/net-libs/libsoup/Manifest
@@ -3,6 +3,7 @@ Hash: SHA1
 
 AUX libsoup-2.26.3-fix-build-without-gnome-with-doc.patch 1510 RMD160 4e397e405a7b5877ffadbc5cd6f4f321d10df9ee SHA1 e9839c0b84bd4010041e765bacac8c1bff0432a2 SHA256 5ba4dfc1eef663baf387145f936a0b64032f0b59673e58086177b642a96b15b8
 AUX libsoup-2.26.3-gnutls-strict.patch 1585 RMD160 b76789792e7a2e294f879b748a4d7483521e3fac SHA1 fcc632a12052352161daa425a4de14b40ae4385a SHA256 43c826dbe6bb35542ea33907598c0dcea67f37ef8a0e32636a41b0facb4efece
+AUX libsoup-2.30.1-fix-build-without-gnome-with-doc.patch 1818 RMD160 e68eb491f87c83517c59107931ba185d29e4ffa1 SHA1 085fc78a332a356ce2cddc2d0b0af510eb21bf74 SHA256 f385b68a7a6db02634e2189e775bc2eea54529ccebe1eefc4b81a12c28ff0e89
 DIST libsoup-2.24.3.tar.bz2 661415 RMD160 9000d0355e65879f4031278bead9a4ad61a2bdea SHA1 b63cf9c0bc20264c59e84dea73eb76862be9329c SHA256 30055988d990f0f4db4dcffd5088115f1065a6fd7c22b555686449628375376b
 DIST libsoup-2.26.3.tar.bz2 686248 RMD160 adc6b621ecbe86bf9467ec610a670dbc6fcf31e6 SHA1 95e7c095c1059dc6f406f4bfd67a523b0f94cc61 SHA256 e6662e56e6987124891db62325622bc46fd5dcd42458285d5ead5afc6d5be1dc
 DIST libsoup-2.28.2.tar.bz2 721840 RMD160 8648fe507511f7c1c83b164ac0f5c86b995650f9 SHA1 91031a351ba260906a86e9f7155234dec524bff0 SHA256 9dd1fce9a051f8176e35c263fcb59b10bf4ffb572b78ca23d1f7f266a0ec5300
@@ -10,13 +11,13 @@ DIST libsoup-2.30.1.tar.bz2 644401 RMD160 7de3ae172b3eff0a2d0aa26b0fa8e537b3431f
 EBUILD libsoup-2.24.3.ebuild 818 RMD160 75c8fc7064d441751488184ec342c021cd044064 SHA1 3da373c5786356676ddeb680045deae24a3aa69c SHA256 5a66f531565536d05007f2668d5c9e3e6ee521589eb7b672d2592c96cdafa790
 EBUILD libsoup-2.26.3-r3.ebuild 1535 RMD160 feac050f758cbf31aba75190845f6e0c9895e54f SHA1 8523facf37d5c38d960fe2166ebc543c6d4b27d0 SHA256 a01e4c8ee96a08879da8b3483d7630588ec1761c32d4272dc5621e471238e864
 EBUILD libsoup-2.28.2.ebuild 1420 RMD160 b218106c6eff573f2aead84f38f0755a48dd87e3 SHA1 8847e7086b31bec4c91323de1a5f7b0f6e881edc SHA256 367fa9b56899b555cfb5b6dd2808e46abf289d0cdb72f1472f011b86d6cc4ed2
-EBUILD libsoup-2.30.1.ebuild 1418 RMD160 0fb17531ef0def825f81b44811d67c3dee5d0b96 SHA1 4d0e64cec7ce3c10190a33b68cb0295e29c81131 SHA256 aa8b3f35a27126e02bfd6f103566a46aab8133984d61b0c3de4e0514a8ef2c87
-MISC ChangeLog 27603 RMD160 b82386df31d4ef24706801154f431aae94a58a2c SHA1 3a71b1791c03641b7bc12adfb0bedf311ab59388 SHA256 9017829b5eee33eec918f74560d045f4ee3ed2c3f0deb90f6b667e2bc8bd9589
+EBUILD libsoup-2.30.1.ebuild 1416 RMD160 9259801d2f08d8de8b56d3936bddbeb8491e9a8e SHA1 6fd4a77bc89d954a5c842d1ea42394683074bd32 SHA256 e9e961fb3bed012f3a303126effc6950a3ac822c2846aefb4d74cdbc82cb204d
+MISC ChangeLog 27766 RMD160 34b9654e5289ef3e9a6bcd96cc3dc1c6f488c5ed SHA1 ca809419615c6ffaaac639dca72ac7ae76bfb3a2 SHA256 6e6a0eda802004057afeb8655a6c4c241145847acd1f91e794c8e5ac3d3dec70
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.15 (GNU/Linux)
 
-iEYEARECAAYFAkwU/e8ACgkQCaWpQKGI+9QGhACeL5rqtX+BzAirwP/XyTvPVRjt
-NWEAn1ks6s8OEqHUvFxf72S5/bu1lMPh
-=N6GE
+iEYEARECAAYFAkwWtTEACgkQomPajV0RnrFDXACeNYEBgBRV8qA87I/VxebWz1I5
+d2IAn1kBQIddsNEJc8VR5PvbOfMyjxFy
+=76m0
 -----END PGP SIGNATURE-----

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 (file)
index 0000000..2b5a39d
--- /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 80fe8d52bdc8cf75799ad1a0aa7373c14b5417a6..0406d92b993f5d321513a6f29e796de9eafc4f3b 100644 (file)
--- 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
 }