Fix gtk-docs not showing up in devhelp; also clean up an ancient version that was...

Package-Manager: portage-2.1.4.4

diff --git a/net-libs/libsoup/ChangeLog b/net-libs/libsoup/ChangeLog
index d22bf96e17f3c92fc00dae628d866378b272b079..3774100dbdcad38c2e5bd85d58ad736dc0d8508e 100644 (file)
--- 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/Manifest b/net-libs/libsoup/Manifest
index 647a4404795b79aa6fcb92ba8ca742c2558a0d38..58d62675b32dd4532824707684d569e1a8e07586 100644 (file)
--- a/net-libs/libsoup/Manifest
+++ b/net-libs/libsoup/Manifest
@@ -1,24 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX libsoup-2.2.105-fix-devhelp-docs.patch 3343 RMD160 a286f5e4b5618b0da9c96f2359fbd5e1e33041a7 SHA1 6ab321d61239f657133faa266c7a87a42fdd5a5d SHA256 4f9690c379e6002d79856e113c7b7d56730fbc32c3ea6c5b1a7deb46fa763a85
 DIST libsoup-2.2.100.tar.bz2 508856 RMD160 ed213162c7c672bd0b12f22db810b365ac82be0c SHA1 d17c08ec3300d357d71758ce43b1ea5422c61d48 SHA256 fa9f33e96a11133adbfd10538d95ed9704e582ef334c0a119a2a0bfca302877d
 DIST libsoup-2.2.103.tar.bz2 495377 RMD160 4a218186b178b06ccdf5c8cbbf3b9abb3da6b7fa SHA1 4620529177afebc18a89ef1898197ca055bb61d5 SHA256 b60e267174c9dddf97a7a163ebf5357ed2fae9bb2c1d7a5e1fa59730edc43d51
 DIST libsoup-2.2.104.tar.bz2 504779 RMD160 d66fda4f5eede0bfef392ee8b9fcb90a79f6c098 SHA1 7e2e0be41dea4adef8390e115df8311a1b4c18aa SHA256 d81706c8c35e921282d3b9d5f52d83b6ec162a0dc8b3361b729c6dbab2b78b3b
 DIST libsoup-2.2.105.tar.bz2 505095 RMD160 c6850dbccd074ab5bc3178248d139ecc953fde63 SHA1 45756c61d48bc9ec3919d5375b06d952bb65bf58 SHA256 3760a127ee810cfd0fda257ff615d19a2dd8aeece199dad0d18690446df72e8f
-DIST libsoup-2.2.3.tar.bz2 358161 RMD160 525ec7ce84069d4b89f8a16385b12b96b5dbae2e SHA1 9df2f927ae2716d4e40279a9ffcc0ac70e83a41b SHA256 3328ff6f23b95ebd975edb413d6055ef7a268c4a6c2bf8217f62bd7567d5c624
 DIST libsoup-2.2.94.tar.bz2 482846 RMD160 9c357f4cf8697a81299acb1a831ab998535607d8 SHA1 493d6f0d67de8014378c595e7eae78b829abd923 SHA256 4f9abbf3eba8f3dff77b7d54f04fc63d8cf29ab7f04be138593e8851d8bdbae1
 EBUILD libsoup-2.2.100.ebuild 682 RMD160 d6a9b6859e3fdaa44d64add91ac72bc23c8830f6 SHA1 5b800b9e6b6fdcd804a3a9bd1a472ac4c007482c SHA256 eb0a1e1fc5a26a0619233bf88b65d5feeb452097ccff13e4c6f0457d85382083
 EBUILD libsoup-2.2.103.ebuild 679 RMD160 e679e264ea48fcef202cff2448cb821ae2866e0f SHA1 d9f161e25d16def7e22eb8b859f451c04acaa783 SHA256 3c8bee616b8e03d0d312196c4ba48174d98308b535a1b979d5259d7ca9d4e569
 EBUILD libsoup-2.2.104.ebuild 678 RMD160 33beaec06cc9f7a1a904b0724aab19d2ab5b0596 SHA1 60c5d361c5fa17507e18351a8aaea75ad5aa486f SHA256 97c056bafa4d4be57d0b21f0a916d6d6eeb975185e9baaaaaa892d3d0552783c
-EBUILD libsoup-2.2.105.ebuild 696 RMD160 5ceeb9bc971c9b82bcf387fd683b315cbd3a8d27 SHA1 ac8fbd47cdba2d580e4d6443f3f6ae438d7c2259 SHA256 6cdc0f2b5c2fb1d640122bf24cff40c311722605fc54c007fb27e98cc463476e
-EBUILD libsoup-2.2.3-r1.ebuild 757 RMD160 9b8fdf6597a58c91854a7c57932c52e71aea05e8 SHA1 ed287084d9d66497e69318c771066b053cf6a164 SHA256 aab158b83d2d3bfa8d5ea21b0bdeafdc61296906ea6b88b2d7f7357c59a1c8bb
+EBUILD libsoup-2.2.105-r1.ebuild 1042 RMD160 95af9895421d3c92b63888fac642ee7f192db234 SHA1 f9eb5ce04042795074393711c1384ed274ef01e9 SHA256 76667084db4c62d0c459ca7cb3329bd2da5bc1b947833fdf929fd0afb06a27e6
 EBUILD libsoup-2.2.94.ebuild 792 RMD160 4030534808a1281eeb9dffc9e87cea3ae4d0a76f SHA1 bad3c766c5d655273fa178226e9acb8376c6421f SHA256 26c748936beef26ff9576abcca40e07c5fa7cecafa65825e67813ef4a550f6fc
-MISC ChangeLog 17067 RMD160 1f7773020ce5fc579015ca7cceff5336d5e21755 SHA1 37bb7dfbcff417d9273f790c021afeaeebe4464a SHA256 76dbb9e992c2aa8811612ac0e6a5aaea9e28f24bd4acafffb328914b3e2e1b24
+MISC ChangeLog 17322 RMD160 295bc8248579f3682a4e52e1af2bd75aac8c4a34 SHA1 bfe5f77f6015060aca746e5a4fa0880d84105876 SHA256 615a65dc1639f7da814caddcd38b7a480733f5d8bd13159b04ebcfa09e0fe9fe
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.7 (GNU/Linux)
+Version: GnuPG v2.0.8 (GNU/Linux)
 
-iD8DBQFHsMcY1fmVwcYIWAYRAoLpAJ0doskCxYNPHxSm7ypw0EI5pkOV2ACgkpmk
-3cprqkDYEti5BF88jT95hY8=
-=72XS
+iEYEARECAAYFAkfBYuIACgkQkeYb6olFHJfeMwCgimsRf1Vg9tTbaefYGYuihFHi
+/QAAniUDGgMQfP9AZErn2oTayhLGzDbY
+=zkl4
 -----END PGP SIGNATURE-----

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 (file)
index 0000000..a5c65bd
--- /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
similarity index 60%
rename from net-libs/libsoup/libsoup-2.2.105.ebuild
rename to net-libs/libsoup/libsoup-2.2.105-r1.ebuild
index 48d6d7347fb63488e3bb53ddb638ede0e716053d..751e8481d20e08d72ee8b29818b1c8919b1f9bd5 100644 (file)
--- 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 (file)
index 1b6d6ee..0000000
--- 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)"