Clean up old revisions.

Package-Manager: portage-2.2.0_alpha2/cvs/Linux x86_64

8 files changed, 16 insertions, 278 deletions

diff --git a/net-libs/libsoup/ChangeLog b/net-libs/libsoup/ChangeLog
index abf3076709f1..a511b876d9c4 100644
--- a/net-libs/libsoup/ChangeLog
+++ b/net-libs/libsoup/ChangeLog
@@ -1,6 +1,13 @@
 # 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.238 2010/10/24 13:43:42 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libsoup/ChangeLog,v 1.239 2010/10/29 20:05:13 eva Exp $
+
+  29 Oct 2010; Gilles Dartiguelongue <eva@gentoo.org> libsoup-2.24.3.ebuild,
+  -libsoup-2.26.3-r3.ebuild,
+  -files/libsoup-2.26.3-fix-build-without-gnome-with-doc.patch,
+  -files/libsoup-2.26.3-gnutls-strict.patch, -libsoup-2.28.2.ebuild,
+  -libsoup-2.28.2-r1.ebuild:
+  Clean up old revisions.
 
   24 Oct 2010; Pacho Ramos <pacho@gentoo.org> libsoup-2.32.0.ebuild:
   Drop PDEPEND on libsoup-gnome, it shouldn't be needed now (see bug #340293
diff --git a/net-libs/libsoup/Manifest b/net-libs/libsoup/Manifest
index 1d22492ccb34..3319cbfa3df9 100644
--- a/net-libs/libsoup/Manifest
+++ b/net-libs/libsoup/Manifest
@@ -1,28 +1,21 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX libsoup-2.26.3-fix-build-without-gnome-with-doc.patch 1510 RMD160 4e397e405a7b5877ffadbc5cd6f4f321d10df9ee SHA1 e9839c0b84bd4010041e765bacac8c1bff0432a2 SHA256 5ba4dfc1eef663baf387145f936a0b64032f0b59673e58086177b642a96b15b8
-AUX libsoup-2.26.3-gnutls-strict.patch 1585 RMD160 b76789792e7a2e294f879b748a4d7483521e3fac SHA1 fcc632a12052352161daa425a4de14b40ae4385a SHA256 43c826dbe6bb35542ea33907598c0dcea67f37ef8a0e32636a41b0facb4efece
 AUX libsoup-2.30.1-fix-build-without-gnome-with-doc.patch 1818 RMD160 e68eb491f87c83517c59107931ba185d29e4ffa1 SHA1 085fc78a332a356ce2cddc2d0b0af510eb21bf74 SHA256 f385b68a7a6db02634e2189e775bc2eea54529ccebe1eefc4b81a12c28ff0e89
 AUX libsoup-2.30.2-disable-tls1.2.patch 1289 RMD160 0bace30f6e158f8188c192a9864e3dce0b64caaf SHA1 b48eb37ddbc38306f49dff679f9f3692b34226b6 SHA256 0818ba3dcb53bf58bd0dafe06d66e19aa3ccbab80d2ab403ec9f787717f50ee3
 DIST libsoup-2.24.3.tar.bz2 661415 RMD160 9000d0355e65879f4031278bead9a4ad61a2bdea SHA1 b63cf9c0bc20264c59e84dea73eb76862be9329c SHA256 30055988d990f0f4db4dcffd5088115f1065a6fd7c22b555686449628375376b
-DIST libsoup-2.26.3.tar.bz2 686248 RMD160 adc6b621ecbe86bf9467ec610a670dbc6fcf31e6 SHA1 95e7c095c1059dc6f406f4bfd67a523b0f94cc61 SHA256 e6662e56e6987124891db62325622bc46fd5dcd42458285d5ead5afc6d5be1dc
-DIST libsoup-2.28.2.tar.bz2 721840 RMD160 8648fe507511f7c1c83b164ac0f5c86b995650f9 SHA1 91031a351ba260906a86e9f7155234dec524bff0 SHA256 9dd1fce9a051f8176e35c263fcb59b10bf4ffb572b78ca23d1f7f266a0ec5300
 DIST libsoup-2.30.1-build-gir-patches.tar.bz2 8678 RMD160 2043a4847d1d5830e1f2f204aa33d2027c39ead7 SHA1 30c54c319484e17512c66e0f1b0124bc51021176 SHA256 880de0050e92dbab2d9d94735fc3abce0d1ad1996810a0875b3a81c3d0d3fd25
 DIST libsoup-2.30.2.tar.bz2 644337 RMD160 e714287d93cf10d0775bfcb48676b4a4c487bff3 SHA1 bf3ce2efb5452f79758a05b010d21bdaa1ba985c SHA256 78ccbce84fccc74a49fb8168eeb409a6429a8a5854f197261d4108b8bb106bf6
 DIST libsoup-2.32.0.tar.bz2 649555 RMD160 76de379600e2210d3ba5a5fc8d11f56fad070b63 SHA1 7b57e7ca6de32937781c02f34052fa23e19bd78d SHA256 08cf2ed2357177b9763994a02cf4feeab41bac61b77252d7ee8090e3372c9cc9
-EBUILD libsoup-2.24.3.ebuild 818 RMD160 75c8fc7064d441751488184ec342c021cd044064 SHA1 3da373c5786356676ddeb680045deae24a3aa69c SHA256 5a66f531565536d05007f2668d5c9e3e6ee521589eb7b672d2592c96cdafa790
-EBUILD libsoup-2.26.3-r3.ebuild 1535 RMD160 feac050f758cbf31aba75190845f6e0c9895e54f SHA1 8523facf37d5c38d960fe2166ebc543c6d4b27d0 SHA256 a01e4c8ee96a08879da8b3483d7630588ec1761c32d4272dc5621e471238e864
-EBUILD libsoup-2.28.2-r1.ebuild 1676 RMD160 8b43ed7ab61b264608dc0a51f025378c6693ece5 SHA1 e2bb63b5cad3b70ba2ea9adb737627da427144ae SHA256 31ba6acf501b3be16554d51b54af6a916e2b25b06fbdbb4472def01f6de63ab7
-EBUILD libsoup-2.28.2.ebuild 1420 RMD160 b218106c6eff573f2aead84f38f0755a48dd87e3 SHA1 8847e7086b31bec4c91323de1a5f7b0f6e881edc SHA256 367fa9b56899b555cfb5b6dd2808e46abf289d0cdb72f1472f011b86d6cc4ed2
+EBUILD libsoup-2.24.3.ebuild 753 RMD160 ee9ae9c9ba3a02e2c5ff6536360ae35391db9649 SHA1 d0087721cb7d911be5bcd57ab8702b2dc32dcc75 SHA256 f4846d966545d2a1e749048f8bfca9ad728ed094e7947737d57ee7a63a431aea
 EBUILD libsoup-2.30.2-r1.ebuild 2050 RMD160 e8736dd121396246991da98415ee0b2ce60bf30e SHA1 8219519756d7d1949bec1e4e8ce956d0d4ba2e61 SHA256 1c8ec6f16be3ba48efbacd7cd9af988dfdcd8525e57e9f76edb5fd9768a61154
 EBUILD libsoup-2.32.0.ebuild 1615 RMD160 cf866c83de90b6feceb82ceb53e326917fc76aba SHA1 39a785af4afe88d044e19436f40e1c25b2ffef42 SHA256 68740841771c26d1de1bb4648626ed334bd6d39e1e5d90cfdff337414edaf575
-MISC ChangeLog 30870 RMD160 e634c5e859d01b9d3131c65f1e85b2f50d5d61be SHA1 9c0fda34b54b47fc976426c5248f9db86ce195e8 SHA256 4db957b9322438c9987cb530690627620fa59588f2abe45fe939b50dfa5355b0
+MISC ChangeLog 31163 RMD160 bb5bccd453c6d37be0b0876d2c2efef077bac2f0 SHA1 6a1f6e9ab6c29c643f1ff259d34fa03104033508 SHA256 5725e05f59564a54b5520578f9995541c6122f35e67c1d1971d13465ca7a2108
 MISC metadata.xml 277 RMD160 2ffb105a089a3b759ddef20bf72b06362a1d1c63 SHA1 82aa8cfe90fb0c9f7c02f295d2802d41ad2af380 SHA256 3d52f90556a9db4ad09f2fbe34e2d25b21f345e474e829ac84669d49cb64c8bb
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAkzEOBQACgkQCaWpQKGI+9QxngCfaYrqb+9LBnF83rPiPU5m4KC+
-eUwAoIXR0scPqZEyGu9m9Rn5YvnmIDI0
-=3F7Z
+iEYEARECAAYFAkzLKQcACgkQ1fmVwcYIWAb5BACgrwinmP57CIwrEmrUk32k1aQj
+dZMAni6hd9uguQOqQrm3505idYGV1EcG
+=uZBD
 -----END PGP SIGNATURE-----
diff --git a/net-libs/libsoup/files/libsoup-2.26.3-fix-build-without-gnome-with-doc.patch b/net-libs/libsoup/files/libsoup-2.26.3-fix-build-without-gnome-with-doc.patch
deleted file mode 100644
index d63d81f014a6..000000000000
--- a/net-libs/libsoup/files/libsoup-2.26.3-fix-build-without-gnome-with-doc.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-Fix 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
-
----
---- docs/reference/Makefile.am
-+++ docs/reference/Makefile.am
-@@ -13,7 +13,7 @@
- DOC_SOURCE_DIR=../../libsoup
- 
- # Extra options to supply to gtkdoc-scan.
--SCAN_OPTIONS=--deprecated-guards=LIBSOUP_DISABLE_DEPRECATED
-+SCAN_OPTIONS=--deprecated-guards=LIBSOUP_DISABLE_DEPRECATED --rebuild-types
- 
- # Extra options to supply to gtkdoc-scangobj.
- SCANGOBJ_OPTIONS=--type-init-func 'g_type_init(); g_thread_init(NULL)'
-@@ -38,6 +38,9 @@
- 	soup-proxy-resolver-libproxy.h soup-proxy-resolver-gconf.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 = 
- 
-@@ -61,7 +61,7 @@
- 	$(GNUTLS_CFLAGS)		\
- 	$(LIBPROXY_LIBS)
- 
--GTKDOC_LIBS = $(top_builddir)/libsoup/libsoup-gnome-2.4.la
-+GTKDOC_LIBS = $(top_builddir)/libsoup/libsoup-2.4.la
- 
- # include common portion ...
- include $(top_srcdir)/gtk-doc.make
---- docs/reference/libsoup-2.4-docs.sgml
-+++ docs/reference/libsoup-2.4-docs.sgml
-@@ -47,11 +47,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>
diff --git a/net-libs/libsoup/files/libsoup-2.26.3-gnutls-strict.patch b/net-libs/libsoup/files/libsoup-2.26.3-gnutls-strict.patch
deleted file mode 100644
index 5459e8c063e8..000000000000
--- a/net-libs/libsoup/files/libsoup-2.26.3-gnutls-strict.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 139502583e065520e1c7a31e73c6e68969153d70 Mon Sep 17 00:00:00 2001
-From: Patrick Ohly <patrick.ohly@gmx.de>
-Date: Thu, 23 Jul 2009 16:03:34 +0200
-Subject: [PATCH] Allow version 1 CA certificates in clients
-
-This is done by setting the GNUTLS_VERIFY_ALLOW_X509_V1_CA_CRT
-flag while setting up the credentials and parsing the CA certificate
-file. This is necessary because without it, some releases of gnutls
-reject certificates that are currently in use by major sites, including
-Google.
-
-Setting the flag is safe in libsoup because the file is meant to
-contain only CA certificates. The main weakness around version 1
-certs is that personal certificates could be mistaken for CA certs,
-which shouldn't happen if libsoup is used as intended.
-
-Servers don't have the possibility to verify their clients, so this
-problem doesn't apply to them.
-
-http://bugzilla.gnome.org/show_bug.cgi?id=589323
----
- libsoup/soup-gnutls.c |    4 ++++
- 1 files changed, 4 insertions(+), 0 deletions(-)
-
-diff --git a/libsoup/soup-gnutls.c b/libsoup/soup-gnutls.c
-index 46b4188..b4f0876 100644
---- a/libsoup/soup-gnutls.c
-+++ b/libsoup/soup-gnutls.c
-@@ -529,6 +529,10 @@ soup_ssl_get_client_credentials (const char *ca_file)
- 	creds = g_slice_new0 (SoupSSLCredentials);
- 	gnutls_certificate_allocate_credentials (&creds->creds);
- 
-+	/* http://bugzilla.gnome.org/show_bug.cgi?id=589323 */
-+	gnutls_certificate_set_verify_flags (creds->creds,
-+					     GNUTLS_VERIFY_ALLOW_X509_V1_CA_CRT);
-+
- 	if (ca_file) {
- 		creds->have_ca_file = TRUE;
- 		status = gnutls_certificate_set_x509_trust_file (
--- 
-1.6.3.3
-
diff --git a/net-libs/libsoup/libsoup-2.24.3.ebuild b/net-libs/libsoup/libsoup-2.24.3.ebuild
index 974001ec3408..ffb3bd29f5a8 100644
--- a/net-libs/libsoup/libsoup-2.24.3.ebuild
+++ b/net-libs/libsoup/libsoup-2.24.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# 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.24.3.ebuild,v 1.12 2009/12/23 23:24:14 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libsoup/libsoup-2.24.3.ebuild,v 1.13 2010/10/29 20:05:13 eva Exp $
 
 inherit gnome2
 
@@ -9,7 +9,7 @@ HOMEPAGE="http://www.gnome.org/"
 
 LICENSE="LGPL-2"
 SLOT="2.4"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd"
+KEYWORDS="~mips"
 # Do NOT build with --disable-debug/--enable-debug=no - gnome2.eclass takes care of that
 IUSE="debug doc ssl"
 
diff --git a/net-libs/libsoup/libsoup-2.26.3-r3.ebuild b/net-libs/libsoup/libsoup-2.26.3-r3.ebuild
deleted file mode 100644
index 7d0d2606a128..000000000000
--- a/net-libs/libsoup/libsoup-2.26.3-r3.ebuild
+++ /dev/null
@@ -1,56 +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.26.3-r3.ebuild,v 1.11 2010/01/16 16:58:48 armin76 Exp $
-
-EAPI="2"
-
-inherit autotools eutils gnome2
-
-DESCRIPTION="An HTTP library implementation in C"
-HOMEPAGE="http://www.gnome.org/"
-
-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 gnome ssl"
-
-RDEPEND=">=dev-libs/glib-2.15.3
-	>=dev-libs/libxml2-2
-	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 ssl)"
-}
-
-src_prepare() {
-	gnome2_src_prepare
-
-	# Allow validation of common certificates, upstream bug #589323
-	epatch "${FILESDIR}/${PN}-2.26.3-gnutls-strict.patch"
-
-	# Fix test to follow POSIX (for x86-fbsd)
-	# No patch to prevent having to eautoreconf
-	sed -e 's/\(test.*\)==/\1=/g' -i configure.in 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}/${P}-fix-build-without-gnome-with-doc.patch"
-		eautoreconf
-	fi
-}
diff --git a/net-libs/libsoup/libsoup-2.28.2-r1.ebuild b/net-libs/libsoup/libsoup-2.28.2-r1.ebuild
deleted file mode 100644
index 3146dea0e0d1..000000000000
--- a/net-libs/libsoup/libsoup-2.28.2-r1.ebuild
+++ /dev/null
@@ -1,59 +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.28.2-r1.ebuild,v 1.7 2010/09/09 13:34:13 ranger Exp $
-
-EAPI="2"
-
-inherit autotools eutils gnome2
-
-DESCRIPTION="An HTTP library implementation in C"
-HOMEPAGE="http://www.gnome.org/"
-
-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 gnome ssl"
-
-RDEPEND=">=dev-libs/glib-2.21.3
-	>=dev-libs/libxml2-2
-	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 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.in 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.26.3-fix-build-without-gnome-with-doc.patch"
-	fi
-
-	# Fix for new versions of gnutls (bug #307343, GNOME bug #622857)
-	epatch "${FILESDIR}/${PN}-2.30.2-disable-tls1.2.patch"
-
-	# Skip broken tests since gnutls fix (only needed for 2.28)
-	sed -i -e '/$(CURL_TESTS)/d' tests/Makefile.am || die "sed 2 failed"
-	eautoreconf
-}
diff --git a/net-libs/libsoup/libsoup-2.28.2.ebuild b/net-libs/libsoup/libsoup-2.28.2.ebuild
deleted file mode 100644
index a9ede51957b9..000000000000
--- a/net-libs/libsoup/libsoup-2.28.2.ebuild
+++ /dev/null
@@ -1,53 +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.28.2.ebuild,v 1.5 2010/03/24 18:22:54 armin76 Exp $
-
-EAPI="2"
-
-inherit autotools eutils gnome2
-
-DESCRIPTION="An HTTP library implementation in C"
-HOMEPAGE="http://www.gnome.org/"
-
-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 gnome ssl"
-
-RDEPEND=">=dev-libs/glib-2.21.3
-	>=dev-libs/libxml2-2
-	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 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.in 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.26.3-fix-build-without-gnome-with-doc.patch"
-		eautoreconf
-	fi
-}