Bump to 2.34.2

Package-Manager: portage-2.1.9.46/cvs/Linux x86_64

4 files changed, 137 insertions, 2 deletions

diff --git a/net-libs/libsoup-gnome/ChangeLog b/net-libs/libsoup-gnome/ChangeLog
index 079ac40097b0..48461c05decd 100644
--- a/net-libs/libsoup-gnome/ChangeLog
+++ b/net-libs/libsoup-gnome/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-libs/libsoup-gnome
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libsoup-gnome/ChangeLog,v 1.50 2011/05/26 21:23:25 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libsoup-gnome/ChangeLog,v 1.51 2011/06/02 15:37:19 nirbheek Exp $
+
+*libsoup-gnome-2.34.2 (02 Jun 2011)
+
+  02 Jun 2011; Nirbheek Chauhan <nirbheek@gentoo.org>
+  +libsoup-gnome-2.34.2.ebuild:
+  Bump to 2.34.2
 
   26 May 2011; Markus Meier <maekke@gentoo.org> libsoup-gnome-2.34.1.ebuild:
   add ~arm, bug #365331
diff --git a/net-libs/libsoup-gnome/libsoup-gnome-2.34.2.ebuild b/net-libs/libsoup-gnome/libsoup-gnome-2.34.2.ebuild
new file mode 100644
index 000000000000..7df0161adb35
--- /dev/null
+++ b/net-libs/libsoup-gnome/libsoup-gnome-2.34.2.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libsoup-gnome/libsoup-gnome-2.34.2.ebuild,v 1.1 2011/06/02 15:37:19 nirbheek Exp $
+
+EAPI="3"
+GCONF_DEBUG="yes"
+GNOME2_LA_PUNT="yes"
+
+inherit autotools eutils gnome2
+
+MY_PN=${PN/-gnome}
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="GNOME plugin for libsoup"
+HOMEPAGE="http://live.gnome.org/LibSoup"
+SRC_URI="${SRC_URI//-gnome}"
+
+LICENSE="LGPL-2"
+SLOT="2.4"
+KEYWORDS="~amd64 ~arm ~x86 ~x86-fbsd ~amd64-linux ~x86-solaris"
+IUSE="debug doc +introspection"
+
+RDEPEND="~net-libs/libsoup-${PV}
+	|| ( gnome-base/libgnome-keyring <gnome-base/gnome-keyring-2.29.4 )
+	dev-db/sqlite:3
+	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 )"
+
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+	G2CONF="${G2CONF}
+		--disable-static
+		--disable-tls-check
+		$(use_enable introspection)
+		--with-libsoup-system
+		--with-gnome"
+	DOCS="AUTHORS NEWS README"
+}
+
+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
+
+	# Use lib present on the system
+	epatch "${FILESDIR}"/${PN}-2.34.1-system-lib.patch
+	eautoreconf
+}
diff --git a/net-libs/libsoup/ChangeLog b/net-libs/libsoup/ChangeLog
index d031dacf5dc3..26b1a55b46e8 100644
--- a/net-libs/libsoup/ChangeLog
+++ b/net-libs/libsoup/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-libs/libsoup
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libsoup/ChangeLog,v 1.251 2011/05/27 15:53:32 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libsoup/ChangeLog,v 1.252 2011/06/02 15:37:17 nirbheek Exp $
+
+*libsoup-2.34.2 (02 Jun 2011)
+
+  02 Jun 2011; Nirbheek Chauhan <nirbheek@gentoo.org> +libsoup-2.34.2.ebuild:
+  Bump to 2.34.2
 
   27 May 2011; Jeroen Roovers <jer@gentoo.org> libsoup-2.34.1.ebuild:
   Marked ~hppa (bug #365331).
diff --git a/net-libs/libsoup/libsoup-2.34.2.ebuild b/net-libs/libsoup/libsoup-2.34.2.ebuild
new file mode 100644
index 000000000000..843cb42cede7
--- /dev/null
+++ b/net-libs/libsoup/libsoup-2.34.2.ebuild
@@ -0,0 +1,67 @@
+# 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.1 2011/06/02 15:37:17 nirbheek Exp $
+
+EAPI="3"
+GCONF_DEBUG="yes"
+GNOME2_LA_PUNT="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="~amd64 ~arm ~hppa ~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.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 ! 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
+}