net-libs/libsoup{,-gnome}: 2.39.92 → 2.40.0 and sync with gx86

Drop useless USE=doc for non-live ebuilds.
Depend on python only at build time (tld-parser.py is not installed).
Fix libsoup-gnome[introspection] dep (bug #437762, thanks to Vicente
Olivert Riera).
Update license.

1 files changed, 14 insertions, 16 deletions

diff --git a/net-libs/libsoup/libsoup-9999.ebuild b/net-libs/libsoup/libsoup-9999.ebuild
index d25d35db..3b1b583c 100644
--- a/net-libs/libsoup/libsoup-9999.ebuild
+++ b/net-libs/libsoup/libsoup-9999.ebuild
@@ -1,11 +1,10 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libsoup/libsoup-2.34.2.ebuild,v 1.5 2011/07/15 11:08:46 xarthisius Exp $
+# $Header: $
 
 EAPI="4"
 GCONF_DEBUG="yes"
 GNOME2_LA_PUNT="yes"
-PYTHON_DEPEND="2"
 
 inherit autotools eutils gnome2 python
 if [[ ${PV} = 9999 ]]; then
@@ -15,14 +14,15 @@ fi
 DESCRIPTION="An HTTP library implementation in C"
 HOMEPAGE="http://live.gnome.org/LibSoup"
 
-LICENSE="LGPL-2"
+LICENSE="LGPL-2+"
 SLOT="2.4"
 if [[ ${PV} = 9999 ]]; then
 	KEYWORDS=""
 else
-	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 fi
-IUSE="debug doc +introspection samba ssl test"
+IUSE="debug +introspection samba ssl test"
+[[ ${PV} = 9999 ]] && IUSE="${IUSE} doc"
 
 RDEPEND=">=dev-libs/glib-2.33.1:2
 	>=dev-libs/libxml2-2:2
@@ -32,9 +32,10 @@ RDEPEND=">=dev-libs/glib-2.33.1:2
 DEPEND="${RDEPEND}
 	sys-devel/gettext
 	virtual/pkgconfig
-	dev-lang/python
+	=dev-lang/python-2*
 	>=dev-util/intltool-0.35
-	>=dev-util/gtk-doc-am-1.10
+	>=dev-util/gtk-doc-am-1.10"
+[[ ${PV} = 9999 ]] && DEPEND="${DEPEND}
 	doc? ( >=dev-util/gtk-doc-1.10 )"
 #	test? (	www-servers/apache[ssl,apache2_modules_auth_digest,apache2_modules_alias,apache2_modules_auth_basic,
 #		apache2_modules_authn_file,apache2_modules_authz_host,apache2_modules_authz_user,apache2_modules_dir,
@@ -54,6 +55,7 @@ pkg_setup() {
 		$(use_enable introspection)
 		$(use_with samba ntlm-auth ${EPREFIX}/usr/bin/ntlm_auth)"
 	python_set_active_version 2
+	python_pkg_setup
 }
 
 src_configure() {
@@ -67,6 +69,10 @@ src_prepare() {
 	if [[ ${PV} = 9999 ]]; then
 		# prevent SOUP_MAINTAINER_FLAGS from getting set
 		mv .git .git-bck || die
+
+		# Patch *must* be applied conditionally (see patch for details)
+		# Fix bug 268592 (upstream #573685) (build fails without gnome && doc)
+		use doc && epatch "${FILESDIR}/${PN}-2.34.2-fix-build-without-gnome-with-doc.patch"
 	fi
 
 	if ! use test; then
@@ -75,13 +81,5 @@ src_prepare() {
 			|| die "sed failed"
 	fi
 
-	# Patch *must* be applied conditionally (see patch for details)
-	if use doc; then
-		# Fix bug 268592 (upstream #573685) (build fails without gnome && doc)
-		epatch "${FILESDIR}/${PN}-2.34.2-fix-build-without-gnome-with-doc.patch"
-		[[ ${PV} != 9999 ]] && eautoreconf
-	fi
-	epatch "${FILESDIR}/${P}-avoid-double-free.patch"
-
 	gnome2_src_prepare
 }