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

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

diff --git a/net-libs/libsoup/ChangeLog b/net-libs/libsoup/ChangeLog
index 88012fdd79fc5ffc0318fa90c583b45624006a07..2c472420112893e16c6e4592fee478d9210237a4 100644 (file)
--- 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/Manifest b/net-libs/libsoup/Manifest
index d68d654cdcabf9321fa7b9e02c718feeebaa8b75..ca3bb3ca54fcedecc1bfab80775e1ade8d6a7999 100644 (file)
--- a/net-libs/libsoup/Manifest
+++ b/net-libs/libsoup/Manifest
@@ -14,14 +14,13 @@ EBUILD libsoup-2.24.3.ebuild 818 RMD160 75c8fc7064d441751488184ec342c021cd044064
 EBUILD libsoup-2.26.3-r3.ebuild 1535 RMD160 feac050f758cbf31aba75190845f6e0c9895e54f SHA1 8523facf37d5c38d960fe2166ebc543c6d4b27d0 SHA256 a01e4c8ee96a08879da8b3483d7630588ec1761c32d4272dc5621e471238e864
 EBUILD libsoup-2.28.2-r1.ebuild 1683 RMD160 27f019fb94dccba1285856a962d8b7aa4e89c20c SHA1 c11f1977928fd3d7dc905d5e67d8b4590316b99d SHA256 169acc1d0e2c6f2b0bc4877ad2e9188eaeed1d5be9a254ed27100141df7e25c1
 EBUILD libsoup-2.28.2.ebuild 1420 RMD160 b218106c6eff573f2aead84f38f0755a48dd87e3 SHA1 8847e7086b31bec4c91323de1a5f7b0f6e881edc SHA256 367fa9b56899b555cfb5b6dd2808e46abf289d0cdb72f1472f011b86d6cc4ed2
-EBUILD libsoup-2.30.2-r1.ebuild 1864 RMD160 0a3d5b24c64604f4c69ad188be06652493d82cdd SHA1 17007736e1dacc0f9cd274f2a499de5141bcae11 SHA256 f1a6ea4e504d625b96725f3f6a60119e29ce073c4b08482056abdbd11d811701
-EBUILD libsoup-2.30.2.ebuild 1746 RMD160 f64025218ea91c105270dcb9852e678b9a5f7d4d SHA1 0ebdfc2c4ec075102d1610089f4ca7f59d796375 SHA256 397ad86891065108bda023f20d61c47708cb1ef43c166e86dea37b0582e9c71a
-MISC ChangeLog 28577 RMD160 ae647c70cca4ea3536085e1a44931516844ef4fe SHA1 d3f0a5faadeb3c6180657d54304e958d1f9f58bd SHA256 6a63dec28836d6300bb8473dcb34d888581eb711b66a0fdf0edbf836ffa20f30
+EBUILD libsoup-2.30.2-r1.ebuild 2048 RMD160 cf3bb1482c1418a13ae1cb4f964a7dd5a652abe0 SHA1 194a9bc4b369518edae5189fe4158fd3c9ca0a81 SHA256 9df02204a02fb6bc138da4e9f981807de47aca8306b6a9b39fc48678b2d2364a
+MISC ChangeLog 28779 RMD160 ba0ea39baafa768314337decc4adf814ab73ecbb SHA1 756d3fd99d558c2adab7ba81f3e3a6c65f70c736 SHA256 298c34a6bd14a4b18c58394a46e5f1f0687ddf02166c365429ea59f4cd695f26
 MISC metadata.xml 277 RMD160 2ffb105a089a3b759ddef20bf72b06362a1d1c63 SHA1 82aa8cfe90fb0c9f7c02f295d2802d41ad2af380 SHA256 3d52f90556a9db4ad09f2fbe34e2d25b21f345e474e829ac84669d49cb64c8bb
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.15 (GNU/Linux)
 
-iEYEARECAAYFAkwzmwcACgkQCaWpQKGI+9Tg6ACeIPyCBH7GuYB59AOF+KHluPWO
-elMAnijJqmaHcRfL5OBpeyWCNs7r26rc
-=ICts
+iEYEARECAAYFAkw11CIACgkQCaWpQKGI+9RkgACfdtOEqjqoZFbyg59XDK9AsFEK
+xjIAn0Fef0T16mcaN8zhu7XLwVuR3W0c
+=F/0p
 -----END PGP SIGNATURE-----

diff --git a/net-libs/libsoup/libsoup-2.30.2-r1.ebuild b/net-libs/libsoup/libsoup-2.30.2-r1.ebuild
index cf2cfb24c6e134270e2adbeba67d0e24370dc2ac..2da5a07a4443571cc3b8f1f007f7e5f81c701880 100644 (file)
--- 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 (file)
index cd3435a..0000000
--- 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
-}