Fix gtk-docs not showing up in devhelp; also clean up an ancient version that was hanging around only due to it being last stable mips version, but gnutls does not have a stable mips version anymore

(Portage version: 2.1.4.4)

4 files changed, 87 insertions, 29 deletions

diff --git a/net-libs/libsoup/ChangeLog b/net-libs/libsoup/ChangeLog
index d22bf96e17f3..3774100dbdca 100644
--- a/net-libs/libsoup/ChangeLog
+++ b/net-libs/libsoup/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-libs/libsoup
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libsoup/ChangeLog,v 1.141 2008/02/11 22:07:13 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libsoup/ChangeLog,v 1.142 2008/02/24 12:28:17 leio Exp $
+
+*libsoup-2.2.105-r1 (24 Feb 2008)
+
+  24 Feb 2008; Mart Raudsepp <leio@gentoo.org>
+  +files/libsoup-2.2.105-fix-devhelp-docs.patch, -libsoup-2.2.3-r1.ebuild,
+  -libsoup-2.2.105.ebuild, +libsoup-2.2.105-r1.ebuild:
+  Fix gtk-docs not showing up in devhelp
 
 *libsoup-2.2.105 (11 Feb 2008)
 
diff --git a/net-libs/libsoup/files/libsoup-2.2.105-fix-devhelp-docs.patch b/net-libs/libsoup/files/libsoup-2.2.105-fix-devhelp-docs.patch
new file mode 100644
index 000000000000..a5c65bd57a6b
--- /dev/null
+++ b/net-libs/libsoup/files/libsoup-2.2.105-fix-devhelp-docs.patch
@@ -0,0 +1,68 @@
+http://bugzilla.gnome.org/show_bug.cgi?id=518384
+
+Bug 518384 – libsoup-2.2.105 and 2.3.x API documentation does not work in devhelp
+
+diff -urNp libsoup-2.2.105.orig/docs/reference/html/libsoup.devhelp libsoup-2.2.105/docs/reference/html/libsoup.devhelp
+--- libsoup-2.2.105.orig/docs/reference/html/libsoup.devhelp	2008-02-11 21:51:09.000000000 +0200
++++ libsoup-2.2.105/docs/reference/html/libsoup.devhelp	2008-02-24 13:54:57.000000000 +0200
+@@ -1,6 +1,6 @@
+ <?xml version="1.0" encoding="utf-8" standalone="no"?>
+ <!DOCTYPE book PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "">
+-<book xmlns="http://www.devhelp.net/book" title="libsoup Reference Manual" link="index.html" author="" name="libsoup">
++<book xmlns="http://www.devhelp.net/book" title="libsoup Reference Manual" link="index.html" author="" name="libsoup-2.2">
+   <chapters>
+     <sub name="libsoup Tutorial" link="ch01.html">
+       <sub name="Soup Client Basics" link="libsoup-client-howto.html"/>
+diff -urNp libsoup-2.2.105.orig/docs/reference/html/libsoup.devhelp2 libsoup-2.2.105/docs/reference/html/libsoup.devhelp2
+--- libsoup-2.2.105.orig/docs/reference/html/libsoup.devhelp2	2008-02-11 21:51:09.000000000 +0200
++++ libsoup-2.2.105/docs/reference/html/libsoup.devhelp2	2008-02-24 13:54:57.000000000 +0200
+@@ -1,6 +1,6 @@
+ <?xml version="1.0" encoding="utf-8" standalone="no"?>
+ <!DOCTYPE book PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "">
+-<book xmlns="http://www.devhelp.net/book" title="libsoup Reference Manual" link="index.html" author="" name="libsoup" version="2">
++<book xmlns="http://www.devhelp.net/book" title="libsoup Reference Manual" link="index.html" author="" name="libsoup-2.2" version="2">
+   <chapters>
+     <sub name="libsoup Tutorial" link="ch01.html">
+       <sub name="Soup Client Basics" link="libsoup-client-howto.html"/>
+diff -urNp libsoup-2.2.105.orig/docs/reference/Makefile.am libsoup-2.2.105/docs/reference/Makefile.am
+--- libsoup-2.2.105.orig/docs/reference/Makefile.am	2008-02-24 12:15:53.000000000 +0200
++++ libsoup-2.2.105/docs/reference/Makefile.am	2008-02-24 13:54:57.000000000 +0200
+@@ -2,7 +2,7 @@
+ AUTOMAKE_OPTIONS = 1.6
+ 
+ # The name of the module
+-DOC_MODULE=libsoup
++DOC_MODULE=libsoup-2.2
+ 
+ # The top-level SGML file.
+ DOC_MAIN_SGML_FILE=$(DOC_MODULE)-docs.sgml
+@@ -54,7 +54,3 @@ GTKDOC_LIBS = $(top_builddir)/libsoup/li
+ 
+ # include common portion ...
+ include $(top_srcdir)/gtk-doc.make
+-
+-# Override
+-override TARGET_DIR=$(HTML_DIR)/$(DOC_MODULE)-$(SOUP_API_VERSION)
+-
+diff -urNp libsoup-2.2.105.orig/docs/reference/Makefile.in libsoup-2.2.105/docs/reference/Makefile.in
+--- libsoup-2.2.105.orig/docs/reference/Makefile.in	2008-02-24 12:15:53.000000000 +0200
++++ libsoup-2.2.105/docs/reference/Makefile.in	2008-02-24 14:06:57.000000000 +0200
+@@ -192,7 +192,7 @@ top_srcdir = @top_srcdir@
+ AUTOMAKE_OPTIONS = 1.6
+ 
+ # The name of the module
+-DOC_MODULE = libsoup
++DOC_MODULE = libsoup-2.2
+ 
+ # The top-level SGML file.
+ DOC_MAIN_SGML_FILE = $(DOC_MODULE)-docs.sgml
+@@ -552,9 +552,6 @@ dist-hook: dist-check-gtkdoc dist-hook-l
+ .PHONY : dist-hook-local docs
+ 
+ # include common portion ...
+-
+-# Override
+-override TARGET_DIR=$(HTML_DIR)/$(DOC_MODULE)-$(SOUP_API_VERSION)
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:
diff --git a/net-libs/libsoup/libsoup-2.2.105.ebuild b/net-libs/libsoup/libsoup-2.2.105-r1.ebuild
index 48d6d7347fb6..751e8481d20e 100644
--- a/net-libs/libsoup/libsoup-2.2.105.ebuild
+++ b/net-libs/libsoup/libsoup-2.2.105-r1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libsoup/libsoup-2.2.105.ebuild,v 1.1 2008/02/11 22:07:13 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libsoup/libsoup-2.2.105-r1.ebuild,v 1.1 2008/02/24 12:28:17 leio Exp $
 
-inherit gnome2
+inherit gnome2 eutils
 
 DESCRIPTION="An HTTP library implementation in C"
 HOMEPAGE="http://www.gnome.org/"
@@ -24,3 +24,12 @@ DOCS="AUTHORS ChangeLog NEWS README"
 pkg_setup() {
 	G2CONF="${G2CONF} $(use_enable ssl)"
 }
+
+src_unpack() {
+	gnome2_src_unpack
+
+	# Fix GNOME bug #518384 - API docs not found by devhelp
+	epatch "${FILESDIR}/${P}-fix-devhelp-docs.patch"
+	mv "${S}/docs/reference/html/libsoup.devhelp" "${S}/docs/reference/html/libsoup-2.2.devhelp"
+	mv "${S}/docs/reference/html/libsoup.devhelp2" "${S}/docs/reference/html/libsoup-2.2.devhelp2"
+}
diff --git a/net-libs/libsoup/libsoup-2.2.3-r1.ebuild b/net-libs/libsoup/libsoup-2.2.3-r1.ebuild
deleted file mode 100644
index 1b6d6ee0923e..000000000000
--- a/net-libs/libsoup/libsoup-2.2.3-r1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libsoup/libsoup-2.2.3-r1.ebuild,v 1.10 2007/07/13 07:18:13 mr_bones_ Exp $
-
-inherit gnome2
-
-DESCRIPTION="Soup is a SOAP implementation"
-HOMEPAGE="http://www.gnome.org/"
-
-LICENSE="LGPL-2"
-SLOT="2.2"
-KEYWORDS="alpha ~amd64 arm hppa ia64 mips ppc ppc64 sparc x86"
-IUSE="doc ssl static"
-
-RDEPEND=">=dev-libs/glib-2
-	>=dev-libs/libxml2-2
-	ssl? ( >=net-libs/gnutls-1
-		>=dev-libs/libgpg-error-0.4 )"
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.12.0
-	doc? ( >=dev-util/gtk-doc-1 )"
-
-DOCS="AUTHORS ChangeLog README* TODO"
-
-G2CONF="${G2CONF} $(use_enable ssl) $(use_enable static) \
-$(use_enable static static-ssl)"