net-libs/libsoup{,-gnome}: add 2.35.4 and live ebuild

Add gnome-3.1.x version and live ebuilds for libsoup and libsoup-gnome.

4 files changed, 220 insertions, 0 deletions

diff --git a/net-libs/libsoup/Manifest b/net-libs/libsoup/Manifest
new file mode 100644
index 00000000..05fcd1e6
--- /dev/null
+++ b/net-libs/libsoup/Manifest
@@ -0,0 +1,4 @@
+AUX libsoup-2.34.2-fix-build-without-gnome-with-doc.patch 1834 RMD160 d29d75b83b7203caf551c487074f24428dd062de SHA1 56a9e82576fb492b95b964d6879db15c3d6c1309 SHA256 d4c1e1a36eebb9264a2d33b4b6efcc5076c62d9669eed67151b5d777e6112986
+DIST libsoup-2.35.4.tar.xz 597184 RMD160 ba0dadd5b244d6601d5a52947ac0e6b51716f7c5 SHA1 14a315e0e94fac6715306f9255fc43a06aab7cd2 SHA256 58c229c424d3e055e8b0b7621b6825e836feef96ef42867ce0c272c22fddcd9d
+EBUILD libsoup-2.35.4.ebuild 2435 RMD160 99b8a26baabda5d274f70fff77b39b58c236eb78 SHA1 c20f18528be0d3087fbc8a8c36bbcb30d1b5350b SHA256 32ccaac2831279aae23ba50af2415e3c948b2a39c9130fee68f5ee8f5f46e04e
+EBUILD libsoup-9999.ebuild 2435 RMD160 99b8a26baabda5d274f70fff77b39b58c236eb78 SHA1 c20f18528be0d3087fbc8a8c36bbcb30d1b5350b SHA256 32ccaac2831279aae23ba50af2415e3c948b2a39c9130fee68f5ee8f5f46e04e
diff --git a/net-libs/libsoup/files/libsoup-2.34.2-fix-build-without-gnome-with-doc.patch b/net-libs/libsoup/files/libsoup-2.34.2-fix-build-without-gnome-with-doc.patch
new file mode 100644
index 00000000..574b8be7
--- /dev/null
+++ b/net-libs/libsoup/files/libsoup-2.34.2-fix-build-without-gnome-with-doc.patch
@@ -0,0 +1,58 @@
+From 4be4806401133389b2413267bc3f8ac58c1eeaf3 Mon Sep 17 00:00:00 2001
+From: Priit Laes <plaes@plaes.org>
+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
+
+[Alexandre Rostovtsev <tetromino@gmail.com>: adapted patch for libsoup-2.34.2]
+---
+ docs/reference/Makefile.am           |    4 +++-
+ docs/reference/libsoup-2.4-docs.sgml |    2 ++
+ 2 files changed, 5 insertions(+), 1 deletions(-)
+
+diff --git a/docs/reference/Makefile.am b/docs/reference/Makefile.am
+index 765d27c..07c92e9 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 = 
+ 
+@@ -63,7 +66,6 @@ GTKDOC_CFLAGS =				\
+ 
+ GTKDOC_LIBS =						\
+ 	$(top_builddir)/libsoup/libsoup-2.4.la		\
+-	$(top_builddir)/libsoup/libsoup-gnome-2.4.la	\
+ 	$(GLIB_LIBS)
+ 
+ # include common portion ...
+diff --git a/docs/reference/libsoup-2.4-docs.sgml b/docs/reference/libsoup-2.4-docs.sgml
+index c52208f..7117849 100644
+--- a/docs/reference/libsoup-2.4-docs.sgml
++++ b/docs/reference/libsoup-2.4-docs.sgml
+@@ -52,11 +52,13 @@
+     <xi:include href="xml/soup-value-utils.xml"/>
+   </chapter>
+ 
++<!--
+   <chapter>
+     <title>GNOME integration</title>
+     <xi:include href="xml/soup-gnome-features.xml"/>
+     <xi:include href="xml/soup-cookie-jar-sqlite.xml"/>
+   </chapter>
++-->
+ 
+   <chapter>
+     <title>Low-level Networking API</title>
+-- 
+1.7.5.3
\ No newline at end of file
diff --git a/net-libs/libsoup/libsoup-2.35.4.ebuild b/net-libs/libsoup/libsoup-2.35.4.ebuild
new file mode 100644
index 00000000..9927f586
--- /dev/null
+++ b/net-libs/libsoup/libsoup-2.35.4.ebuild
@@ -0,0 +1,79 @@
+# 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.34.2.ebuild,v 1.5 2011/07/15 11:08:46 xarthisius Exp $
+
+EAPI="4"
+GCONF_DEBUG="yes"
+GNOME2_LA_PUNT="yes"
+
+inherit autotools eutils gnome2
+if [[ ${PV} = 9999 ]]; then
+	inherit gnome2-live
+fi
+
+DESCRIPTION="An HTTP library implementation in C"
+HOMEPAGE="http://live.gnome.org/LibSoup"
+
+LICENSE="LGPL-2"
+SLOT="2.4"
+if [[ ${PV} = 9999 ]]; then
+	KEYWORDS=""
+else
+	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"
+fi
+IUSE="debug doc +introspection ssl test"
+
+RDEPEND=">=dev-libs/glib-2.27.5:2
+	>=dev-libs/libxml2-2:2
+	net-libs/glib-networking[ssl?]
+	introspection? ( >=dev-libs/gobject-introspection-0.9.5 )"
+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,xmlrpc]
+#		net-misc/curl
+#		net-libs/glib-networking[ssl])"
+
+pkg_setup() {
+	# Set invalid apache module dir until apache tests are ready, bug #326957
+	DOCS="AUTHORS NEWS README"
+	G2CONF="${G2CONF}
+		--disable-static
+		--disable-tls-check
+		--without-gnome
+		--with-apache-module-dir="${T}"
+		$(use_enable introspection)"
+}
+
+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 [[ ${PV} = 9999 ]]; then
+		# prevent SOUP_MAINTAINER_FLAGS from getting set
+		mv .git .git-bck || die
+	fi
+
+	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.34.2-fix-build-without-gnome-with-doc.patch"
+		eautoreconf
+	fi
+}
diff --git a/net-libs/libsoup/libsoup-9999.ebuild b/net-libs/libsoup/libsoup-9999.ebuild
new file mode 100644
index 00000000..9927f586
--- /dev/null
+++ b/net-libs/libsoup/libsoup-9999.ebuild
@@ -0,0 +1,79 @@
+# 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.34.2.ebuild,v 1.5 2011/07/15 11:08:46 xarthisius Exp $
+
+EAPI="4"
+GCONF_DEBUG="yes"
+GNOME2_LA_PUNT="yes"
+
+inherit autotools eutils gnome2
+if [[ ${PV} = 9999 ]]; then
+	inherit gnome2-live
+fi
+
+DESCRIPTION="An HTTP library implementation in C"
+HOMEPAGE="http://live.gnome.org/LibSoup"
+
+LICENSE="LGPL-2"
+SLOT="2.4"
+if [[ ${PV} = 9999 ]]; then
+	KEYWORDS=""
+else
+	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"
+fi
+IUSE="debug doc +introspection ssl test"
+
+RDEPEND=">=dev-libs/glib-2.27.5:2
+	>=dev-libs/libxml2-2:2
+	net-libs/glib-networking[ssl?]
+	introspection? ( >=dev-libs/gobject-introspection-0.9.5 )"
+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,xmlrpc]
+#		net-misc/curl
+#		net-libs/glib-networking[ssl])"
+
+pkg_setup() {
+	# Set invalid apache module dir until apache tests are ready, bug #326957
+	DOCS="AUTHORS NEWS README"
+	G2CONF="${G2CONF}
+		--disable-static
+		--disable-tls-check
+		--without-gnome
+		--with-apache-module-dir="${T}"
+		$(use_enable introspection)"
+}
+
+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 [[ ${PV} = 9999 ]]; then
+		# prevent SOUP_MAINTAINER_FLAGS from getting set
+		mv .git .git-bck || die
+	fi
+
+	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.34.2-fix-build-without-gnome-with-doc.patch"
+		eautoreconf
+	fi
+}