7 files changed, 43 insertions, 60 deletions
diff --git a/net-libs/libsoup/ChangeLog b/net-libs/libsoup/ChangeLog
index cdb9c44ece47..cd7e5969537b 100644
--- a/net-libs/libsoup/ChangeLog
+++ b/net-libs/libsoup/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-libs/libsoup
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libsoup/ChangeLog,v 1.70 2005/08/06 18:41:31 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libsoup/ChangeLog,v 1.71 2005/08/08 14:36:14 leonardop Exp $
+
+*libsoup-2.2.5 (08 Aug 2005)
+
+  08 Aug 2005; Leonardo Boshell <leonardop@gentoo.org> libsoup-2.2.5.ebuild:
+  New version.
 
   06 Aug 2005; Bryan Østergaard <kloeri@gentoo.org>
   libsoup-2.2.3-r1.ebuild:
diff --git a/net-libs/libsoup/Manifest b/net-libs/libsoup/Manifest
index 525584173ced..6511045aaea5 100644
--- a/net-libs/libsoup/Manifest
+++ b/net-libs/libsoup/Manifest
@@ -1,26 +1,16 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 9dc53ea9f218944e9106433f7a278399 ChangeLog 8379
-MD5 0ffa00e57cc842e0c26f596d56daee27 libsoup-1.99.28-r1.ebuild 1451
 MD5 ab2763b9426be6cf518c6febf807aca3 libsoup-1.99.28.ebuild 1380
-MD5 b85e689ae1865138ae9ff41428dfc77b libsoup-2.2.1.ebuild 815
-MD5 c88fee7b28c72a4be40d6feb34a24efc libsoup-2.2.3-r1.ebuild 756
 MD5 89428354354ead79d37795ca8c257e63 libsoup-2.2.3.ebuild 724
+MD5 765b05e171459f893eef1d4c8952a697 libsoup-2.2.5.ebuild 772
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
+MD5 0ffa00e57cc842e0c26f596d56daee27 libsoup-1.99.28-r1.ebuild 1451
+MD5 c88fee7b28c72a4be40d6feb34a24efc libsoup-2.2.3-r1.ebuild 756
 MD5 6c44713499ec52c81ca81ed58a6286bf files/digest-libsoup-1.99.28 68
+MD5 ec6f6594865b60d8ebcb6d049bffdd1a files/digest-libsoup-2.2.5 66
 MD5 6c44713499ec52c81ca81ed58a6286bf files/digest-libsoup-1.99.28-r1 68
-MD5 5ba8cbd6308ea46629bb3e6ef7232c4a files/digest-libsoup-2.2.1 66
-MD5 ef781f10152707123d5acdcca14603f5 files/digest-libsoup-2.2.3 66
-MD5 ef781f10152707123d5acdcca14603f5 files/digest-libsoup-2.2.3-r1 66
 MD5 6128cc7bbf088e07b4040e8296a7c57b files/libsoup-1.99.26-msn.patch 627
 MD5 09a0c3f27613d90ffeb8abb875598ace files/libsoup-1.99.26-with_ssl.patch 2861
-MD5 dc791ddf4cb75ab5325eea016e52e09b files/libsoup-1.99.28-gnutls.patch 1275
 MD5 8236edc0e5949f46d2a27e747c310889 files/libsoup-2.2.2-gnutls.patch 336
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFC9QR4Kf2g/qXtneoRAs8MAJ0edej47pPdQy9xkcR/EvzpCakN/QCgpzuC
-IP/K8uyexvr5LuBZ0sExZLw=
-=hGI7
------END PGP SIGNATURE-----
+MD5 ef781f10152707123d5acdcca14603f5 files/digest-libsoup-2.2.3 66
+MD5 dc791ddf4cb75ab5325eea016e52e09b files/libsoup-1.99.28-gnutls.patch 1275
+MD5 ef781f10152707123d5acdcca14603f5 files/digest-libsoup-2.2.3-r1 66
diff --git a/net-libs/libsoup/files/digest-libsoup-2.2.1 b/net-libs/libsoup/files/digest-libsoup-2.2.1
deleted file mode 100644
index a0f7e7650a80..000000000000
--- a/net-libs/libsoup/files/digest-libsoup-2.2.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 8132b0bce469affed688c4863702aa41 libsoup-2.2.1.tar.bz2 403907
diff --git a/net-libs/libsoup/files/digest-libsoup-2.2.5 b/net-libs/libsoup/files/digest-libsoup-2.2.5
new file mode 100644
index 000000000000..47d0d75cc49b
--- /dev/null
+++ b/net-libs/libsoup/files/digest-libsoup-2.2.5
@@ -0,0 +1 @@
+MD5 50ba7189fe1f645b48f4ddc509d4dec4 libsoup-2.2.5.tar.bz2 429340
diff --git a/net-libs/libsoup/files/libsoup-2.2.2-gnutls.patch b/net-libs/libsoup/files/libsoup-2.2.2-gnutls.patch
deleted file mode 100644
index cad63a4674f6..000000000000
--- a/net-libs/libsoup/files/libsoup-2.2.2-gnutls.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- libsoup-2.2.0/libsoup/soup-gnutls.c	2004-08-25 20:19:59.000000000 +0200
-+++ libsoup/soup-gnutls.new.c	2004-09-08 03:39:45.189822392 +0200
-@@ -58,7 +58,6 @@
- 	}
- 
- 	if (status & GNUTLS_CERT_INVALID ||
--	    status & GNUTLS_CERT_NOT_TRUSTED ||
- 	    status & GNUTLS_CERT_REVOKED)
- 	{
- 		g_warning ("The certificate is not trusted.");
diff --git a/net-libs/libsoup/libsoup-2.2.1.ebuild b/net-libs/libsoup/libsoup-2.2.1.ebuild
deleted file mode 100644
index 6418ac5ab03a..000000000000
--- a/net-libs/libsoup/libsoup-2.2.1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libsoup/libsoup-2.2.1.ebuild,v 1.16 2005/02/18 23:09:34 dragonheart Exp $
-
-inherit gnome2 eutils
-
-DESCRIPTION="Soup is a SOAP implementation"
-HOMEPAGE="http://www.gnome.org/"
-
-LICENSE="LGPL-2"
-SLOT="2.2"
-KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 sparc x86"
-IUSE="ssl doc ipv6"
-
-RDEPEND=">=dev-libs/glib-2
-	>=dev-libs/libxml2-2
-	ssl? ( >=net-libs/gnutls-1.0
-		>=dev-libs/libgpg-error-0.4 )"
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.12.0
-	doc? ( >=dev-util/gtk-doc-1.0 )"
-
-G2CONF="${G2CONF} $(use_enable ssl) $(use_enable ipv6)"
-DOCS="AUTHORS ChangeLog README* TODO"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/libsoup-2.2.2-gnutls.patch
-}
-
diff --git a/net-libs/libsoup/libsoup-2.2.5.ebuild b/net-libs/libsoup/libsoup-2.2.5.ebuild
new file mode 100644
index 000000000000..9cf93dfe8894
--- /dev/null
+++ b/net-libs/libsoup/libsoup-2.2.5.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libsoup/libsoup-2.2.5.ebuild,v 1.1 2005/08/08 14:36:14 leonardop Exp $
+
+inherit gnome2
+
+DESCRIPTION="An HTTP library implementation in C"
+HOMEPAGE="http://www.gnome.org/"
+
+LICENSE="LGPL-2"
+SLOT="2.2"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="doc ssl static"
+
+RDEPEND=">=dev-libs/glib-2.4
+	>=dev-libs/libxml2-2
+	ssl? ( >=net-libs/gnutls-1
+		>=dev-libs/libgpg-error-0.4 )"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	doc? ( >=dev-util/gtk-doc-1 )"
+
+DOCS="AUTHORS ChangeLog NEWS README* TODO"
+
+
+pkg_setup() {
+	G2CONF="$(use_enable ssl) $(use_enable static) \
+		$(use_enable static static-ssl)"
+}