diff --git a/sdk_container/src/third_party/portage-stable/net-libs/libsoup/files/libsoup-2.30.1-fix-build-without-gnome-with-doc.patch b/sdk_container/src/third_party/portage-stable/net-libs/libsoup/files/libsoup-2.30.1-fix-build-without-gnome-with-doc.patch new file mode 100644 index 0000000000..2b5a39d83e --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/net-libs/libsoup/files/libsoup-2.30.1-fix-build-without-gnome-with-doc.patch @@ -0,0 +1,58 @@ +From c8ff78e489ccf5becd1ae309222b7977510558e6 Mon Sep 17 00:00:00 2001 +From: Priit Laes +Date: Thu, 25 Feb 2010 20:59:51 +0200 +Subject: [PATCH] Split docs into libsoup and libsoup-gnome. + +Fixes Gentoo Bug 268592, patch adapted from upstream patch. + +Modified to apply to a release tarball (no libsoup-2.4-docs.sgml.in) +Hence, to be applied ONLY when !gnome && doc +--- + docs/reference/Makefile.am | 5 ++++- + docs/reference/libsoup-2.4-docs.sgml | 2 ++ + 2 files changed, 6 insertions(+), 1 deletions(-) + +diff --git a/docs/reference/Makefile.am b/docs/reference/Makefile.am +index 64d3cf8..8b91b7f 100644 +--- a/docs/reference/Makefile.am ++++ b/docs/reference/Makefile.am +@@ -38,6 +38,9 @@ IGNORE_HFILES= soup.h soup-marshal.h soup-enum-types.h \ + soup-proxy-resolver.h soup-proxy-resolver-gnome.h \ + soup-proxy-resolver-static.h + ++IGNORE_HFILES += soup-cookie-jar-sqlite.h \ ++ soup-gnome.h soup-gnome-features.h ++ + # Images to copy into HTML directory. + HTML_IMAGES = + +@@ -62,7 +65,7 @@ GTKDOC_CFLAGS = \ + $(GNUTLS_CFLAGS) \ + $(LIBPROXY_LIBS) + +-GTKDOC_LIBS = $(top_builddir)/libsoup/libsoup-gnome-2.4.la ++GTKDOC_LIBS = $(top_builddir)/libsoup/libsoup-2.4.la + + # include common portion ... + include $(top_srcdir)/gtk-doc.make +diff --git a/docs/reference/libsoup-2.4-docs.sgml b/docs/reference/libsoup-2.4-docs.sgml +index 3cb3d11..707e525 100644 +--- a/docs/reference/libsoup-2.4-docs.sgml ++++ b/docs/reference/libsoup-2.4-docs.sgml +@@ -52,11 +52,13 @@ + + + ++ + + + Low-level Networking API +-- +1.7.0 + diff --git a/sdk_container/src/third_party/portage-stable/net-libs/libsoup/libsoup-2.32.2.ebuild b/sdk_container/src/third_party/portage-stable/net-libs/libsoup/libsoup-2.32.2.ebuild new file mode 100644 index 0000000000..903cbb58fb --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/net-libs/libsoup/libsoup-2.32.2.ebuild @@ -0,0 +1,65 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-libs/libsoup/libsoup-2.32.2.ebuild,v 1.9 2011/04/15 16:18:32 darkside Exp $ + +EAPI="3" +GCONF_DEBUG="yes" + +inherit autotools eutils gnome2 + +DESCRIPTION="An HTTP library implementation in C" +HOMEPAGE="http://live.gnome.org/LibSoup" + +LICENSE="LGPL-2" +SLOT="2.4" +KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris" +IUSE="debug doc +introspection ssl test" + +RDEPEND=">=dev-libs/glib-2.21.3 + >=dev-libs/libxml2-2 + introspection? ( >=dev-libs/gobject-introspection-0.9.5 ) + ssl? ( >=net-libs/gnutls-2.1.7 )" +DEPEND="${RDEPEND} + >=dev-util/pkgconfig-0.9 + >=dev-util/gtk-doc-am-1.10 + doc? ( >=dev-util/gtk-doc-1.10 )" +# test? ( www-servers/apache[ssl,apache2_modules_auth_digest,apache2_modules_alias,apache2_modules_auth_basic, +# apache2_modules_authn_file,apache2_modules_authz_host,apache2_modules_authz_user,apache2_modules_dir, +# apache2_modules_mime,apache2_modules_proxy,apache2_modules_proxy_http,apache2_modules_proxy_connect] +# dev-lang/php[apache2] +# net-misc/curl )" + +pkg_setup() { + # Set invalid apache module dir until apache tests are ready, bug #326957 + DOCS="AUTHORS NEWS README" + G2CONF="${G2CONF} + --disable-static + --without-gnome + --with-apache-module-dir="${T}" + $(use_enable introspection) + $(use_enable ssl)" +} + +src_configure() { + # FIXME: we need addpredict to workaround bug #324779 until + # root cause (bug #249496) is solved + addpredict /usr/share/snmp/mibs/.index + gnome2_src_configure +} + +src_prepare() { + gnome2_src_prepare + + if ! use test; then + # don't waste time building tests (bug #226271) + sed 's/^\(SUBDIRS =.*\)tests\(.*\)$/\1\2/' -i Makefile.am Makefile.in \ + || die "sed failed" + fi + + # Patch *must* be applied conditionally (see patch for details) + if use doc; then + # Fix bug 268592 (upstream #573685) (build fails without gnome && doc) + epatch "${FILESDIR}/${PN}-2.30.1-fix-build-without-gnome-with-doc.patch" + eautoreconf + fi +}