[gentoo-commits] proj/gnome:master commit in: net-libs/libsoup/, net-libs/libsoup/files/

[Priit Laes]

commit:     29397680c55e18a133e3d9683e7317bd7aebde92
Author:     Priit Laes <plaes <AT> plaes <DOT> org>
AuthorDate: Fri Mar 29 18:06:31 2013 +0000
Commit:     Priit Laes <plaes <AT> plaes <DOT> org>
CommitDate: Fri Mar 29 18:06:31 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=29397680

net-libs/libsoup: Moved to gx86, sync live version.

---
 ...p-2.34.2-fix-build-without-gnome-with-doc.patch |   58 -------------
 net-libs/libsoup/libsoup-2.41.91-r1.ebuild         |   89 --------------------
 net-libs/libsoup/libsoup-9999.ebuild               |   42 ++++------
 3 files changed, 17 insertions(+), 172 deletions(-)

diff --git a/net-libs/libsoup/files/libsoup-2.34.2-fix-build-without-gnome-with-doc.patch b/net-libs/libsoup/files/libsoup-2.34.2-fix-build-without-gnome-with-doc.patch
deleted file mode 100644
index 574b8be..0000000
--- a/net-libs/libsoup/files/libsoup-2.34.2-fix-build-without-gnome-with-doc.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From 4be4806401133389b2413267bc3f8ac58c1eeaf3 Mon Sep 17 00:00:00 2001
-From: Priit Laes <plaes@×××××.org>
-Date: Thu, 25 Feb 2010 20:59:51 +0200
-Subject: [PATCH] Split docs into libsoup and libsoup-gnome.
-
-Fixes 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
-
-[Alexandre Rostovtsev <tetromino@×××××.com>: adapted patch for libsoup-2.34.2]
----
- docs/reference/Makefile.am           |    4 +++-
- docs/reference/libsoup-2.4-docs.sgml |    2 ++
- 2 files changed, 5 insertions(+), 1 deletions(-)
-
-diff --git a/docs/reference/Makefile.am b/docs/reference/Makefile.am
-index 765d27c..07c92e9 100644
---- a/docs/reference/Makefile.am
-+++ b/docs/reference/Makefile.am
-@@ -38,6 +38,9 @@ IGNORE_HFILES= soup.h soup-marshal.h soup-enum-types.h \
- 	soup-proxy-resolver.h soup-proxy-resolver-gnome.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 = 
- 
-@@ -63,7 +66,6 @@ GTKDOC_CFLAGS =				\
- 
- GTKDOC_LIBS =						\
- 	$(top_builddir)/libsoup/libsoup-2.4.la		\
--	$(top_builddir)/libsoup/libsoup-gnome-2.4.la	\
- 	$(GLIB_LIBS)
- 
- # include common portion ...
-diff --git a/docs/reference/libsoup-2.4-docs.sgml b/docs/reference/libsoup-2.4-docs.sgml
-index c52208f..7117849 100644
---- a/docs/reference/libsoup-2.4-docs.sgml
-+++ b/docs/reference/libsoup-2.4-docs.sgml
-@@ -52,11 +52,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>
--- 
-1.7.5.3
\ No newline at end of file

diff --git a/net-libs/libsoup/libsoup-2.41.91-r1.ebuild b/net-libs/libsoup/libsoup-2.41.91-r1.ebuild
deleted file mode 100644
index 6490704..0000000
--- a/net-libs/libsoup/libsoup-2.41.91-r1.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="5"
-GCONF_DEBUG="yes"
-GNOME2_LA_PUNT="yes"
-
-inherit gnome2 python
-if [[ ${PV} = 9999 ]]; then
-	inherit eutils gnome2-live
-fi
-
-DESCRIPTION="An HTTP library implementation in C"
-HOMEPAGE="http://live.gnome.org/LibSoup"
-
-LICENSE="LGPL-2+"
-SLOT="2.4"
-if [[ ${PV} = 9999 ]]; then
-	KEYWORDS=""
-else
-	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 +introspection samba ssl test"
-[[ ${PV} = 9999 ]] && IUSE="${IUSE} doc"
-
-RDEPEND="
-	dev-db/sqlite:3=
-    >=dev-libs/glib-2.35.0:2
-	>=dev-libs/libxml2-2:2
-	>=net-libs/glib-networking-2.35.3[ssl?]
-	introspection? ( >=dev-libs/gobject-introspection-0.9.5 )
-	samba? ( net-fs/samba )
-"
-DEPEND="${RDEPEND}
-	=dev-lang/python-2*
-	>=dev-util/intltool-0.35
-	>=dev-util/gtk-doc-am-1.10
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-if [[ ${PV} = 9999 ]]; then
-	DEPEND="${DEPEND}
-		doc? ( >=dev-util/gtk-doc-1.10 )"
-fi
-#	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,
-#		apache2_modules_mime,apache2_modules_proxy,apache2_modules_proxy_http,apache2_modules_proxy_connect]
-#		dev-lang/php[apache2,xmlrpc]
-#		net-misc/curl
-#		net-libs/glib-networking[ssl])"
-
-pkg_setup() {
-	python_set_active_version 2
-	python_pkg_setup
-}
-
-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
-		# don't waste time building tests (bug #226271)
-		sed 's/^\(SUBDIRS =.*\)tests\(.*\)$/\1\2/' -i Makefile.am Makefile.in \
-			|| die "sed failed"
-	fi
-
-	gnome2_src_prepare
-}
-
-src_configure() {
-	# Disable apache tests until they are usable on Gentoo, bug #326957
-	# FIXME: we need addpredict to workaround bug #324779 until
-	# root cause (bug #249496) is solved
-	addpredict /usr/share/snmp/mibs/.index
-	gnome2_src_configure \
-		--disable-static \
-		--disable-tls-check \
-		--without-gnome \
-		--without-apache-httpd \
-		$(use_enable introspection) \
-		$(use_with samba ntlm-auth ${EPREFIX}/usr/bin/ntlm_auth)
-}

diff --git a/net-libs/libsoup/libsoup-9999.ebuild b/net-libs/libsoup/libsoup-9999.ebuild
index 6490704..423756e 100644
--- a/net-libs/libsoup/libsoup-9999.ebuild
+++ b/net-libs/libsoup/libsoup-9999.ebuild
@@ -1,12 +1,13 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
 EAPI="5"
 GCONF_DEBUG="yes"
 GNOME2_LA_PUNT="yes"
+PYTHON_COMPAT=( python{2_5,2_6,2_7} )
 
-inherit gnome2 python
+inherit gnome2 python-any-r1
 if [[ ${PV} = 9999 ]]; then
 	inherit eutils gnome2-live
 fi
@@ -21,24 +22,22 @@ if [[ ${PV} = 9999 ]]; then
 else
 	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 +introspection samba ssl test"
+IUSE="debug +introspection samba ssl test gnome"
 [[ ${PV} = 9999 ]] && IUSE="${IUSE} doc"
 
-RDEPEND="
-	dev-db/sqlite:3=
-    >=dev-libs/glib-2.35.0:2
+RDEPEND=">=dev-libs/glib-2.35.0:2
 	>=dev-libs/libxml2-2:2
-	>=net-libs/glib-networking-2.35.3[ssl?]
+	dev-db/sqlite:3
+	>=net-libs/glib-networking-2.30.0[ssl?]
 	introspection? ( >=dev-libs/gobject-introspection-0.9.5 )
-	samba? ( net-fs/samba )
-"
+	samba? ( net-fs/samba )"
 DEPEND="${RDEPEND}
-	=dev-lang/python-2*
+	${PYTHON_DEPS}
 	>=dev-util/intltool-0.35
 	>=dev-util/gtk-doc-am-1.10
 	sys-devel/gettext
-	virtual/pkgconfig
-"
+	virtual/pkgconfig"
+
 if [[ ${PV} = 9999 ]]; then
 	DEPEND="${DEPEND}
 		doc? ( >=dev-util/gtk-doc-1.10 )"
@@ -50,19 +49,10 @@ fi
 #		net-misc/curl
 #		net-libs/glib-networking[ssl])"
 
-pkg_setup() {
-	python_set_active_version 2
-	python_pkg_setup
-}
-
 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
@@ -76,14 +66,16 @@ src_prepare() {
 
 src_configure() {
 	# Disable apache tests until they are usable on Gentoo, bug #326957
-	# FIXME: we need addpredict to workaround bug #324779 until
-	# root cause (bug #249496) is solved
-	addpredict /usr/share/snmp/mibs/.index
 	gnome2_src_configure \
 		--disable-static \
 		--disable-tls-check \
-		--without-gnome \
+		$(use_with gnome) \
 		--without-apache-httpd \
 		$(use_enable introspection) \
 		$(use_with samba ntlm-auth ${EPREFIX}/usr/bin/ntlm_auth)
+
+	# FIXME: we need addpredict to workaround bug #324779 until
+	# root cause (bug #249496) is solved
+	addpredict /usr/share/snmp/mibs/.index
+	gnome2_src_configure
 }