New version for GNOME 2.28. Clean up old revision.

(Portage version: 2.2_rc46/cvs/Linux x86_64)

3 files changed, 15 insertions, 62 deletions

diff --git a/net-libs/libsoup/ChangeLog b/net-libs/libsoup/ChangeLog
index 355f51410ed9..71a022f2131e 100644
--- a/net-libs/libsoup/ChangeLog
+++ b/net-libs/libsoup/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-libs/libsoup
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libsoup/ChangeLog,v 1.199 2009/10/02 15:42:06 volkmar Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libsoup/ChangeLog,v 1.200 2009/10/29 21:22:03 eva Exp $
+
+*libsoup-2.28.1 (29 Oct 2009)
+
+  29 Oct 2009; Gilles Dartiguelongue <eva@gentoo.org>
+  -libsoup-2.26.2.ebuild, -libsoup-2.26.3-r2.ebuild, +libsoup-2.28.1.ebuild:
+  New version for GNOME 2.28. Clean up old revision.
 
   02 Oct 2009; Mounir Lamouri <volkmar@gentoo.org> libsoup-2.26.3-r3.ebuild:
   Stable for ppc, bug 271865
diff --git a/net-libs/libsoup/libsoup-2.26.2.ebuild b/net-libs/libsoup/libsoup-2.26.2.ebuild
deleted file mode 100644
index f9ffec19ba76..000000000000
--- a/net-libs/libsoup/libsoup-2.26.2.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libsoup/libsoup-2.26.2.ebuild,v 1.3 2009/05/21 18:14:56 nirbheek Exp $
-
-EAPI="2"
-
-inherit 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
-	gnome? (
-		net-libs/libproxy
-		>=gnome-base/gconf-2
-		dev-db/sqlite:3 )
-	ssl? ( >=net-libs/gnutls-1 )"
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.9
-	doc? ( >=dev-util/gtk-doc-1 )"
-#	test? (
-#		www-servers/apache
-#		dev-lang/php
-#		net-misc/curl )
-
-DOCS="AUTHORS NEWS README"
-
-pkg_setup() {
-	G2CONF="${G2CONF}
-		--disable-static
-		$(use_with 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"
-}
diff --git a/net-libs/libsoup/libsoup-2.26.3-r2.ebuild b/net-libs/libsoup/libsoup-2.28.1.ebuild
index 2b458ebfd0f2..b6ad10c6e27e 100644
--- a/net-libs/libsoup/libsoup-2.26.3-r2.ebuild
+++ b/net-libs/libsoup/libsoup-2.28.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 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-r2.ebuild,v 1.1 2009/09/11 18:03:22 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libsoup/libsoup-2.28.1.ebuild,v 1.1 2009/10/29 21:22:03 eva Exp $
 
 EAPI="2"
 
@@ -15,44 +15,39 @@ 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
+RDEPEND=">=dev-libs/glib-2.21.3
 	>=dev-libs/libxml2-2
-	gnome? (
-		net-libs/libproxy
-		>=gnome-base/gconf-2
-		dev-db/sqlite:3 )
-	ssl? ( >=net-libs/gnutls-1 )"
+	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/libsoup-gnome-${PV} )"
 
 DOCS="AUTHORS NEWS README"
 
 pkg_setup() {
 	G2CONF="${G2CONF}
 		--disable-static
-		$(use_with gnome)
+		--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 gnome && use doc; then
+	if use doc; then
 		# Fix bug 268592 (build fails !gnome && doc)
-		epatch "${FILESDIR}/${P}-fix-build-without-gnome-with-doc.patch"
+		epatch "${FILESDIR}/${PN}-2.26.3-fix-build-without-gnome-with-doc.patch"
 		eautoreconf
 	fi
 }