From 8c2fe10df52a506c9e1a012f351afff73e5fea1b Mon Sep 17 00:00:00 2001
From: Mart Raudsepp <leio@gentoo.org>
Date: Sun, 9 Mar 2008 13:44:00 +0000
Subject: Fix up build with USE=doc that broke with the previous change, bug
 211352. Thanks to P.L.Hayes, Ed Catmur and co (Portage version: 2.1.4.4)

---
 net-libs/libsoup/ChangeLog                 |  9 ++++++-
 net-libs/libsoup/libsoup-2.2.105-r1.ebuild | 35 ---------------------------
 net-libs/libsoup/libsoup-2.2.105-r2.ebuild | 39 ++++++++++++++++++++++++++++++
 3 files changed, 47 insertions(+), 36 deletions(-)
 delete mode 100644 net-libs/libsoup/libsoup-2.2.105-r1.ebuild
 create mode 100644 net-libs/libsoup/libsoup-2.2.105-r2.ebuild

(limited to 'net-libs/libsoup')

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/libsoup-2.2.105-r1.ebuild b/net-libs/libsoup/libsoup-2.2.105-r1.ebuild
deleted file mode 100644
index 751e8481d20e..000000000000
--- a/net-libs/libsoup/libsoup-2.2.105-r1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# 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 $
-
-inherit gnome2 eutils
-
-DESCRIPTION="An HTTP library implementation in C"
-HOMEPAGE="http://www.gnome.org/"
-
-LICENSE="LGPL-2"
-SLOT="2.2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="doc ssl"
-
-RDEPEND=">=dev-libs/glib-2.12
-	>=dev-libs/libxml2-2
-	ssl? ( >=net-libs/gnutls-1 )"
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.9
-	doc? ( >=dev-util/gtk-doc-1 )"
-
-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.105-r2.ebuild b/net-libs/libsoup/libsoup-2.2.105-r2.ebuild
new file mode 100644
index 000000000000..4166c2eeacbc
--- /dev/null
+++ b/net-libs/libsoup/libsoup-2.2.105-r2.ebuild
@@ -0,0 +1,39 @@
+# 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-r2.ebuild,v 1.1 2008/03/09 13:44:00 leio Exp $
+
+inherit gnome2 eutils
+
+DESCRIPTION="An HTTP library implementation in C"
+HOMEPAGE="http://www.gnome.org/"
+
+LICENSE="LGPL-2"
+SLOT="2.2"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="doc ssl"
+
+RDEPEND=">=dev-libs/glib-2.12
+	>=dev-libs/libxml2-2
+	ssl? ( >=net-libs/gnutls-1 )"
+DEPEND="${RDEPEND}
+	>=dev-util/pkgconfig-0.9
+	doc? ( >=dev-util/gtk-doc-1 )"
+
+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{,-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
+}
-- 
cgit v1.2.3-65-gdbad