Drop useless USE=doc flag. Update license. Drop old.

(Portage version: 2.2.0_alpha134/cvs/Linux x86_64)

7 files changed, 22 insertions, 234 deletions

diff --git a/net-libs/libsoup/ChangeLog b/net-libs/libsoup/ChangeLog
index c43bfedc957c..2e9738f9f3f7 100644
--- a/net-libs/libsoup/ChangeLog
+++ b/net-libs/libsoup/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-libs/libsoup
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libsoup/ChangeLog,v 1.289 2012/10/07 00:41:43 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libsoup/ChangeLog,v 1.290 2012/10/10 03:18:13 tetromino Exp $
+
+  10 Oct 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+  -files/libsoup-2.30.1-fix-build-without-gnome-with-doc.patch,
+  -libsoup-2.34.3.ebuild, libsoup-2.36.1.ebuild, libsoup-2.36.1-r1.ebuild,
+  -libsoup-2.38.0.ebuild, libsoup-2.38.1.ebuild:
+  Drop useless USE=doc flag. Update license. Drop old.
 
   07 Oct 2012; Anthony G. Basile <blueness@gentoo.org> libsoup-2.38.1.ebuild:
   stable ppc64, bug #427544
diff --git a/net-libs/libsoup/files/libsoup-2.30.1-fix-build-without-gnome-with-doc.patch b/net-libs/libsoup/files/libsoup-2.30.1-fix-build-without-gnome-with-doc.patch
deleted file mode 100644
index 2b5a39d83e41..000000000000
--- a/net-libs/libsoup/files/libsoup-2.30.1-fix-build-without-gnome-with-doc.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From c8ff78e489ccf5becd1ae309222b7977510558e6 Mon Sep 17 00:00:00 2001
-From: Priit Laes <plaes@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
----
- docs/reference/Makefile.am           |    5 ++++-
- docs/reference/libsoup-2.4-docs.sgml |    2 ++
- 2 files changed, 6 insertions(+), 1 deletions(-)
-
-diff --git a/docs/reference/Makefile.am b/docs/reference/Makefile.am
-index 64d3cf8..8b91b7f 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 = 
- 
-@@ -62,7 +65,7 @@ GTKDOC_CFLAGS =				\
- 	$(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
-diff --git a/docs/reference/libsoup-2.4-docs.sgml b/docs/reference/libsoup-2.4-docs.sgml
-index 3cb3d11..707e525 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.0
-
diff --git a/net-libs/libsoup/libsoup-2.34.3.ebuild b/net-libs/libsoup/libsoup-2.34.3.ebuild
deleted file mode 100644
index 5b8df6caed2d..000000000000
--- a/net-libs/libsoup/libsoup-2.34.3.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# 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.3.ebuild,v 1.8 2012/05/05 02:54:27 jdhore Exp $
-
-EAPI="4"
-GCONF_DEBUG="yes"
-GNOME2_LA_PUNT="yes"
-
-inherit autotools eutils gnome2
-
-DESCRIPTION="An HTTP library implementation in C"
-HOMEPAGE="http://live.gnome.org/LibSoup"
-
-LICENSE="LGPL-2"
-SLOT="2.4"
-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"
-IUSE="debug doc +introspection ssl test"
-
-RDEPEND=">=dev-libs/glib-2.27.5:2
-	>=dev-libs/libxml2-2:2
-	net-libs/glib-networking[ssl?]
-	introspection? ( >=dev-libs/gobject-introspection-0.9.5 )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	>=dev-util/gtk-doc-am-1.10
-	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,
-#		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() {
-	# Set invalid apache module dir until apache tests are ready, bug #326957
-	DOCS="AUTHORS NEWS README"
-	G2CONF="${G2CONF}
-		--disable-static
-		--disable-tls-check
-		--without-gnome
-		--with-apache-module-dir="${T}"
-		$(use_enable introspection)"
-}
-
-src_configure() {
-	# FIXME: we need addpredict to workaround bug #324779 until
-	# root cause (bug #249496) is solved
-	addpredict /usr/share/snmp/mibs/.index
-	gnome2_src_configure
-}
-
-src_prepare() {
-	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
-
-	# 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"
-		eautoreconf
-	fi
-
-	gnome2_src_prepare
-}
diff --git a/net-libs/libsoup/libsoup-2.36.1-r1.ebuild b/net-libs/libsoup/libsoup-2.36.1-r1.ebuild
index ce151af1f2f2..0597b9019a1a 100644
--- a/net-libs/libsoup/libsoup-2.36.1-r1.ebuild
+++ b/net-libs/libsoup/libsoup-2.36.1-r1.ebuild
@@ -1,20 +1,20 @@
 # 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.36.1-r1.ebuild,v 1.10 2012/07/15 18:18:02 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libsoup/libsoup-2.36.1-r1.ebuild,v 1.11 2012/10/10 03:18:13 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="yes"
 GNOME2_LA_PUNT="yes"
 
-inherit autotools eutils gnome2
+inherit eutils gnome2
 
 DESCRIPTION="An HTTP library implementation in C"
 HOMEPAGE="http://live.gnome.org/LibSoup"
 
-LICENSE="LGPL-2"
+LICENSE="LGPL-2+"
 SLOT="2.4"
 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"
-IUSE="debug doc +introspection samba ssl test"
+IUSE="debug +introspection samba ssl test"
 
 # glib-networking-2.29.18 needed to avoid a tls bug, see NEWS file
 RDEPEND=">=dev-libs/glib-2.30.0:2
@@ -24,8 +24,7 @@ RDEPEND=">=dev-libs/glib-2.30.0:2
 	samba? ( net-fs/samba )"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
-	>=dev-util/gtk-doc-am-1.10
-	doc? ( >=dev-util/gtk-doc-1.10 )"
+	>=dev-util/gtk-doc-am-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,
 #		apache2_modules_mime,apache2_modules_proxy,apache2_modules_proxy_http,apache2_modules_proxy_connect]
@@ -59,13 +58,6 @@ 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"
-		eautoreconf
-	fi
-
 	# Patch from 2.37.x, fixes 'Too many open files' error
 	epatch "${FILESDIR}/${P}-SoupHTTPInputStream-GCancellable.patch"
 
diff --git a/net-libs/libsoup/libsoup-2.36.1.ebuild b/net-libs/libsoup/libsoup-2.36.1.ebuild
index 195083845bf1..087ab48d8a74 100644
--- a/net-libs/libsoup/libsoup-2.36.1.ebuild
+++ b/net-libs/libsoup/libsoup-2.36.1.ebuild
@@ -1,20 +1,20 @@
 # 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.36.1.ebuild,v 1.10 2012/05/05 02:54:27 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libsoup/libsoup-2.36.1.ebuild,v 1.11 2012/10/10 03:18:13 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="yes"
 GNOME2_LA_PUNT="yes"
 
-inherit autotools eutils gnome2
+inherit gnome2
 
 DESCRIPTION="An HTTP library implementation in C"
 HOMEPAGE="http://live.gnome.org/LibSoup"
 
-LICENSE="LGPL-2"
+LICENSE="LGPL-2+"
 SLOT="2.4"
 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"
-IUSE="debug doc +introspection samba ssl test"
+IUSE="debug +introspection samba ssl test"
 
 # glib-networking-2.29.18 needed to avoid a tls bug, see NEWS file
 RDEPEND=">=dev-libs/glib-2.30.0:2
@@ -24,8 +24,7 @@ RDEPEND=">=dev-libs/glib-2.30.0:2
 	samba? ( net-fs/samba )"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
-	>=dev-util/gtk-doc-am-1.10
-	doc? ( >=dev-util/gtk-doc-1.10 )"
+	>=dev-util/gtk-doc-am-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,
 #		apache2_modules_mime,apache2_modules_proxy,apache2_modules_proxy_http,apache2_modules_proxy_connect]
@@ -59,12 +58,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"
-		eautoreconf
-	fi
-
 	gnome2_src_prepare
 }
diff --git a/net-libs/libsoup/libsoup-2.38.0.ebuild b/net-libs/libsoup/libsoup-2.38.0.ebuild
deleted file mode 100644
index 7b8eafce8f51..000000000000
--- a/net-libs/libsoup/libsoup-2.38.0.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# 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.38.0.ebuild,v 1.2 2012/05/05 02:54:27 jdhore Exp $
-
-EAPI="4"
-GCONF_DEBUG="yes"
-GNOME2_LA_PUNT="yes"
-
-inherit autotools eutils gnome2
-
-DESCRIPTION="An HTTP library implementation in C"
-HOMEPAGE="http://live.gnome.org/LibSoup"
-
-LICENSE="LGPL-2"
-SLOT="2.4"
-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"
-IUSE="debug doc +introspection samba ssl test"
-
-RDEPEND=">=dev-libs/glib-2.31.7:2
-	>=dev-libs/libxml2-2:2
-	>=net-libs/glib-networking-2.30.0[ssl?]
-	introspection? ( >=dev-libs/gobject-introspection-0.9.5 )
-	samba? ( net-fs/samba )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	>=dev-util/gtk-doc-am-1.10
-	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,
-#		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() {
-	# Set invalid apache module dir until apache tests are ready, bug #326957
-	DOCS="AUTHORS NEWS README"
-	G2CONF="${G2CONF}
-		--disable-static
-		--disable-tls-check
-		--without-gnome
-		--with-apache-module-dir="${T}"
-		$(use_enable introspection)
-		$(use_with samba ntlm-auth ${EPREFIX}/usr/bin/ntlm_auth)"
-}
-
-src_configure() {
-	# FIXME: we need addpredict to workaround bug #324779 until
-	# root cause (bug #249496) is solved
-	addpredict /usr/share/snmp/mibs/.index
-	gnome2_src_configure
-}
-
-src_prepare() {
-	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
-
-	# 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"
-		eautoreconf
-	fi
-
-	gnome2_src_prepare
-}
diff --git a/net-libs/libsoup/libsoup-2.38.1.ebuild b/net-libs/libsoup/libsoup-2.38.1.ebuild
index be4feefcd873..622136a2b218 100644
--- a/net-libs/libsoup/libsoup-2.38.1.ebuild
+++ b/net-libs/libsoup/libsoup-2.38.1.ebuild
@@ -1,20 +1,20 @@
 # 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.38.1.ebuild,v 1.8 2012/10/07 00:41:43 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libsoup/libsoup-2.38.1.ebuild,v 1.9 2012/10/10 03:18:13 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="yes"
 GNOME2_LA_PUNT="yes"
 
-inherit autotools eutils gnome2
+inherit gnome2
 
 DESCRIPTION="An HTTP library implementation in C"
 HOMEPAGE="http://live.gnome.org/LibSoup"
 
-LICENSE="LGPL-2"
+LICENSE="LGPL-2+"
 SLOT="2.4"
 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"
-IUSE="debug doc +introspection samba ssl test"
+IUSE="debug +introspection samba ssl test"
 
 RDEPEND=">=dev-libs/glib-2.31.7:2
 	>=dev-libs/libxml2-2:2
@@ -23,8 +23,7 @@ RDEPEND=">=dev-libs/glib-2.31.7:2
 	samba? ( net-fs/samba )"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
-	>=dev-util/gtk-doc-am-1.10
-	doc? ( >=dev-util/gtk-doc-1.10 )"
+	>=dev-util/gtk-doc-am-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,
 #		apache2_modules_mime,apache2_modules_proxy,apache2_modules_proxy_http,apache2_modules_proxy_connect]
@@ -58,12 +57,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"
-		eautoreconf
-	fi
-
 	gnome2_src_prepare
 }