From 9e1a18100f84d427ca7d7c237cdedc68f68fdfbd Mon Sep 17 00:00:00 2001 From: Romain Perier Date: Sun, 13 Sep 2009 10:31:06 +0000 Subject: Fix circular dep by creating and moving libsoup-gnome-2.26.3 into PDEPEND, per bug #269747 (Portage version: 2.2_rc40/cvs/Linux x86_64) --- net-libs/libsoup/ChangeLog | 9 ++++- net-libs/libsoup/libsoup-2.26.3-r3.ebuild | 55 +++++++++++++++++++++++++++++++ 2 files changed, 63 insertions(+), 1 deletion(-) create mode 100644 net-libs/libsoup/libsoup-2.26.3-r3.ebuild (limited to 'net-libs') 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 + +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/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 +} -- cgit v1.2.3-65-gdbad