Fix circular dep by creating and moving libsoup-gnome-2.26.3 into PDEPEND, per bug #269747

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

3 files changed, 65 insertions, 2 deletions

diff --git a/net-libs/libsoup/ChangeLog b/net-libs/libsoup/ChangeLog
index 022b3f9edf15..4542ddba792f 100644
--- a/net-libs/libsoup/ChangeLog
+++ b/net-libs/libsoup/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-libs/libsoup
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libsoup/ChangeLog,v 1.194 2009/09/11 18:03:22 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libsoup/ChangeLog,v 1.195 2009/09/13 10:31:06 mrpouet Exp $
+
+*libsoup-2.26.3-r3 (13 Sep 2009)
+
+  13 Sep 2009; Romain Perier <mrpouet@gentoo.org>
+  +libsoup-2.26.3-r3.ebuild:
+  Fix circular dep by creating and moving libsoup-gnome-2.26.3 into PDEPEND,
+  per bug #269747.
 
 *libsoup-2.26.3-r2 (11 Sep 2009)
 
diff --git a/net-libs/libsoup/Manifest b/net-libs/libsoup/Manifest
index 86ef0e6f4b2f..45c155ad15e7 100644
--- a/net-libs/libsoup/Manifest
+++ b/net-libs/libsoup/Manifest
@@ -10,5 +10,6 @@ EBUILD libsoup-2.2.105-r2.ebuild 1243 RMD160 f3e894a8269e730d40b45dca890b43f9c8a
 EBUILD libsoup-2.24.3.ebuild 816 RMD160 93b553c39d858a820ca1c2983d457b1f23a3ac68 SHA1 4760759bef0286a848ea966a6a3405324b91ff63 SHA256 cf823a988b03939734de21f5bf191c1ae4ace65ef845e2bdbce82043898c296e
 EBUILD libsoup-2.26.2.ebuild 1189 RMD160 ccba05cc78fddfcd063bd575de771e572b75bf22 SHA1 09f2709a812c90212a4e54c06a25e62e1b3875e7 SHA256 672d35f4354ba125064169e356c3b1243f5020cb30817cb9953a1c02841f9a97
 EBUILD libsoup-2.26.3-r2.ebuild 1561 RMD160 2f41fdacfb84ff94b64db7ccd499f121c3b90c3f SHA1 2be0f1a4bb08b27fbcd59529600c674d79df3e03 SHA256 f570bfdee100fad46641a92a0a5974348244f32e22d7a214b9a02b7516d25840
-MISC ChangeLog 24625 RMD160 5ead2850551345a05d43a3114ce12afb0340f518 SHA1 8a7324b724543745d6aa804f4c1f4d5440b23f66 SHA256 d5dc158e3bbab26347fadad9fb95a719a46a70c85954ebc294d65a91950455b0
+EBUILD libsoup-2.26.3-r3.ebuild 1519 RMD160 7108c033a3476c4c4ce7a82e2b5f60de07380eaa SHA1 8f0063f453f05a2adcbf71f688f0d5b30a8d039b SHA256 96c9f6752cf9b2a0f8f82608d6e8bfea3a39b4c5350916be89ee8302e8082027
+MISC ChangeLog 24834 RMD160 b1a44d2ecc9bfd731d275fe069c0e6ec8a45c861 SHA1 5dc42ac02d07cea105504b1d1264147271cf3817 SHA256 94376ee4deb3776610873f65f84c0f2093b33d67545c2de5b8006d19a11e410c
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
diff --git a/net-libs/libsoup/libsoup-2.26.3-r3.ebuild b/net-libs/libsoup/libsoup-2.26.3-r3.ebuild
new file mode 100644
index 000000000000..71d10a3d8e1f
--- /dev/null
+++ b/net-libs/libsoup/libsoup-2.26.3-r3.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libsoup/libsoup-2.26.3-r3.ebuild,v 1.1 2009/09/13 10:31:06 mrpouet Exp $
+
+EAPI="2"
+
+inherit autotools eutils gnome2
+
+DESCRIPTION="An HTTP library implementation in C"
+HOMEPAGE="http://www.gnome.org/"
+
+LICENSE="LGPL-2"
+SLOT="2.4"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+# Do NOT build with --disable-debug/--enable-debug=no - gnome2.eclass takes care of that
+IUSE="debug doc gnome ssl"
+
+RDEPEND=">=dev-libs/glib-2.15.3
+	>=dev-libs/libxml2-2
+	ssl? ( >=net-libs/gnutls-1 )"
+DEPEND="${RDEPEND}
+	>=dev-util/pkgconfig-0.9
+	doc? ( >=dev-util/gtk-doc-1 )"
+#	test? (
+#		www-servers/apache
+#		dev-lang/php
+#		net-misc/curl )
+PDEPEND="gnome? ( ~net-libs/${PN}-gnome-${PV} )"
+
+DOCS="AUTHORS NEWS README"
+
+pkg_setup() {
+	G2CONF="${G2CONF}
+		--disable-static
+		--without-gnome
+		$(use_enable ssl)"
+}
+
+src_prepare() {
+	gnome2_src_prepare
+
+	# Allow validation of common certificates, upstream bug #589323
+	epatch "${FILESDIR}/${PN}-2.26.3-gnutls-strict.patch"
+
+	# Fix test to follow POSIX (for x86-fbsd)
+	# No patch to prevent having to eautoreconf
+	sed -e 's/\(test.*\)==/\1=/g' -i configure.in configure || die "sed failed"
+
+	# Patch *must* be applied conditionally (see patch for details)
+	if use doc; then
+		# Fix bug 268592 (build fails !gnome && doc)
+		epatch "${FILESDIR}/${P}-fix-build-without-gnome-with-doc.patch"
+		eautoreconf
+	fi
+}