We need addpredict to workaround bug #324779 until root cause (bug #249496) is solved. Remove old.

(Portage version: 2.1.8.3/cvs/Linux x86_64)

3 files changed, 14 insertions, 65 deletions

diff --git a/net-libs/libsoup/ChangeLog b/net-libs/libsoup/ChangeLog
index 88012fdd79fc..2c4724201128 100644
--- a/net-libs/libsoup/ChangeLog
+++ b/net-libs/libsoup/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-libs/libsoup
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libsoup/ChangeLog,v 1.223 2010/07/06 21:07:10 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libsoup/ChangeLog,v 1.224 2010/07/08 13:35:20 pacho Exp $
+
+  08 Jul 2010; Pacho Ramos <pacho@gentoo.org> -libsoup-2.30.2.ebuild,
+  libsoup-2.30.2-r1.ebuild:
+  We need addpredict to workaround bug #324779 until root cause (bug
+  #249496) is solved. Remove old.
 
   06 Jul 2010; Pacho Ramos <pacho@gentoo.org> libsoup-2.28.2-r1.ebuild:
   amd64 stable, bug 326589
diff --git a/net-libs/libsoup/libsoup-2.30.2-r1.ebuild b/net-libs/libsoup/libsoup-2.30.2-r1.ebuild
index cf2cfb24c6e1..2da5a07a4443 100644
--- a/net-libs/libsoup/libsoup-2.30.2-r1.ebuild
+++ b/net-libs/libsoup/libsoup-2.30.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libsoup/libsoup-2.30.2-r1.ebuild,v 1.1 2010/07/01 22:43:22 abcd Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libsoup/libsoup-2.30.2-r1.ebuild,v 1.2 2010/07/08 13:35:20 pacho Exp $
 
 EAPI="2"
 
@@ -41,6 +41,13 @@ pkg_setup() {
 		$(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
 
diff --git a/net-libs/libsoup/libsoup-2.30.2.ebuild b/net-libs/libsoup/libsoup-2.30.2.ebuild
deleted file mode 100644
index cd3435ae9f77..000000000000
--- a/net-libs/libsoup/libsoup-2.30.2.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libsoup/libsoup-2.30.2.ebuild,v 1.1 2010/06/23 11:46:31 pacho Exp $
-
-EAPI="2"
-
-inherit autotools eutils gnome2
-
-DESCRIPTION="An HTTP library implementation in C"
-HOMEPAGE="http://www.gnome.org/"
-SRC_URI="${SRC_URI}
-	mirror://gentoo/${PN}-2.30.1-build-gir-patches.tar.bz2"
-
-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 +introspection gnome ssl"
-
-RDEPEND=">=dev-libs/glib-2.21.3
-	>=dev-libs/libxml2-2
-	introspection? ( >=dev-libs/gobject-introspection-0.6.7 )
-	ssl? ( >=net-libs/gnutls-2.1.7 )"
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.9
-	dev-util/gtk-doc-am
-	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 introspection)
-		$(use_enable ssl)"
-}
-
-src_prepare() {
-	gnome2_src_prepare
-
-	# Fix test to follow POSIX (for x86-fbsd)
-	# No patch to prevent having to eautoreconf
-	sed -e 's/\(test.*\)==/\1=/g' -i configure.ac 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}/${PN}-2.30.1-fix-build-without-gnome-with-doc.patch"
-	fi
-
-	if use introspection; then
-		epatch "${WORKDIR}/${PN}-2.30.1-build-gir-1.patch"
-		epatch "${WORKDIR}/${PN}-2.30.1-build-gir-2.patch"
-	fi
-
-	eautoreconf
-}