Fix up build with USE=doc that broke with the previous change, bug 211352. Thanks to P.L.Hayes, Ed Catmur and co

Package-Manager: portage-2.1.4.4

3 files changed, 20 insertions, 9 deletions

diff --git a/net-libs/libsoup/ChangeLog b/net-libs/libsoup/ChangeLog
index 3774100dbdca..1a5d54e1357a 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.142 2008/02/24 12:28:17 leio Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libsoup/ChangeLog,v 1.143 2008/03/09 13:44:00 leio Exp $
+
+*libsoup-2.2.105-r2 (09 Mar 2008)
+
+  09 Mar 2008; Mart Raudsepp <leio@gentoo.org> -libsoup-2.2.105-r1.ebuild,
+  +libsoup-2.2.105-r2.ebuild:
+  Fix up build with USE=doc that broke with the previous change, bug 211352.
+  Thanks to P.L.Hayes, Ed Catmur and co
 
 *libsoup-2.2.105-r1 (24 Feb 2008)
 
diff --git a/net-libs/libsoup/Manifest b/net-libs/libsoup/Manifest
index 4a77f46b1ba7..a3d00da147ed 100644
--- a/net-libs/libsoup/Manifest
+++ b/net-libs/libsoup/Manifest
@@ -8,14 +8,14 @@ DIST libsoup-2.2.105.tar.bz2 505095 RMD160 c6850dbccd074ab5bc3178248d139ecc953fd
 DIST libsoup-2.2.94.tar.bz2 482846 RMD160 9c357f4cf8697a81299acb1a831ab998535607d8 SHA1 493d6f0d67de8014378c595e7eae78b829abd923 SHA256 4f9abbf3eba8f3dff77b7d54f04fc63d8cf29ab7f04be138593e8851d8bdbae1
 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-r1.ebuild 1042 RMD160 95af9895421d3c92b63888fac642ee7f192db234 SHA1 f9eb5ce04042795074393711c1384ed274ef01e9 SHA256 76667084db4c62d0c459ca7cb3329bd2da5bc1b947833fdf929fd0afb06a27e6
+EBUILD libsoup-2.2.105-r2.ebuild 1168 RMD160 98e92029f1f9e3fba423674513033e95d009240d SHA1 6e51253327563b57f7b5aa73486fb8751ff6b3d8 SHA256 1e284d753ed65aa26d2dd43ae8d36f2959f5983bb17b1724e77a296a483ea5f8
 EBUILD libsoup-2.2.94.ebuild 741 RMD160 fbf87c969020d66b9460621905633a378e404d33 SHA1 ccc38abe7330f36268ed79639935e9aada371351 SHA256 7aaf9f47cca2bda5dfb05967b896ea84a7a6739ba9307a4d95c61e610ceac152
-MISC ChangeLog 17322 RMD160 295bc8248579f3682a4e52e1af2bd75aac8c4a34 SHA1 bfe5f77f6015060aca746e5a4fa0880d84105876 SHA256 615a65dc1639f7da814caddcd38b7a480733f5d8bd13159b04ebcfa09e0fe9fe
+MISC ChangeLog 17580 RMD160 366a8198edc36293e7621de8a34e749cdd51e54a SHA1 dbeb2889c5c38a87a5411bf94668d591589fca48 SHA256 7bc467188d659b73ac7fa27a17faee4a686e2532a63f1715e391214e3228355a
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.8 (GNU/Linux)
 
-iEYEARECAAYFAkfBd8AACgkQkeYb6olFHJeXsACg4QheASnCu47eHUe2V/NgzowE
-BX0AoI93BTEd7VC71e72YjoOKTqfK7LU
-=mVrU
+iEYEARECAAYFAkfT6ZEACgkQkeYb6olFHJcWDgCgzT5Cuo2aR2pAiv32nOa6sCus
+Tw0AoI4EsEoY/RtPi+raqJkzSSt36+2c
+=4mKU
 -----END PGP SIGNATURE-----
diff --git a/net-libs/libsoup/libsoup-2.2.105-r1.ebuild b/net-libs/libsoup/libsoup-2.2.105-r2.ebuild
index 751e8481d20e..4166c2eeacbc 100644
--- a/net-libs/libsoup/libsoup-2.2.105-r1.ebuild
+++ b/net-libs/libsoup/libsoup-2.2.105-r2.ebuild
@@ -1,6 +1,6 @@
 # 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-r1.ebuild,v 1.1 2008/02/24 12:28:17 leio Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libsoup/libsoup-2.2.105-r2.ebuild,v 1.1 2008/03/09 13:44:00 leio Exp $
 
 inherit gnome2 eutils
 
@@ -30,6 +30,10 @@ 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"
+	mv "${S}"/docs/reference/html/libsoup{,-2.2}.devhelp
+	mv "${S}"/docs/reference/html/libsoup{,-2.2}.devhelp2
+	mv "${S}"/docs/reference/libsoup{,-2.2}-docs.sgml
+	mv "${S}"/docs/reference/libsoup{,-2.2}-overrides.txt
+	mv "${S}"/docs/reference/libsoup{,-2.2}-sections.txt
+	mv "${S}"/docs/reference/libsoup{,-2.2}.types
 }