net-libs/libsoup: moved to gx86

    * Sync live ebuild with gx86 changes.
    * USE=introspection is now global

4 files changed, 20 insertions, 116 deletions

diff --git a/net-libs/libsoup/Manifest b/net-libs/libsoup/Manifest
deleted file mode 100644
index c1313a30..00000000
--- a/net-libs/libsoup/Manifest
+++ /dev/null
@@ -1,11 +0,0 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
-
-DIST libsoup-2.40.2.tar.xz 707104 SHA256 32e81220f53abb1f5bbe7d8b0717119df70667fc48e2342d82209ed1593e71dc SHA512 7803517ed8d594ef5ee2cd67e4a16baa91c22057fcf9aa2758a7d88659e6cc357017b79a7e5d32b6dafa4a95eaf5eba2b659616c5675669d891399c309316c93 WHIRLPOOL fc1a1c45f65fab56533d122bb545184e96bdfb5dd5af112ac10ffbc8461f14ab390ca9f7aaf67bf5bcb282fe3a5e6321f6eab7dee63084ee51a79f9aba296f54
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
-
-iEYEAREKAAYFAlCupUcACgkQ1fmVwcYIWAah8ACffjOKkxZaC2SCW0fHs/JWQETV
-FhUAoNgB357fl8kattmVJgVcHXIhzXPd
-=OR7b
------END PGP SIGNATURE-----
diff --git a/net-libs/libsoup/libsoup-2.40.2.ebuild b/net-libs/libsoup/libsoup-2.40.2.ebuild
deleted file mode 100644
index a5c65224..00000000
--- a/net-libs/libsoup/libsoup-2.40.2.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="4"
-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-libs/glib-2.33.1: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}
-	sys-devel/gettext
-	virtual/pkgconfig
-	=dev-lang/python-2*
-	>=dev-util/intltool-0.35
-	>=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,
-#		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() {
-	# Disable apache tests until they are usable on Gentoo, bug #326957
-	DOCS="AUTHORS NEWS README"
-	G2CONF="${G2CONF}
-		--disable-static
-		--disable-tls-check
-		--without-gnome
-		--without-apache-httpd
-		$(use_enable introspection)
-		$(use_with samba ntlm-auth ${EPREFIX}/usr/bin/ntlm_auth)"
-
-	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() {
-	# FIXME: we need addpredict to workaround bug #324779 until
-	# root cause (bug #249496) is solved
-	addpredict /usr/share/snmp/mibs/.index
-	gnome2_src_configure
-}
diff --git a/net-libs/libsoup/libsoup-9999.ebuild b/net-libs/libsoup/libsoup-9999.ebuild
index a5c65224..f1d960da 100644
--- a/net-libs/libsoup/libsoup-9999.ebuild
+++ b/net-libs/libsoup/libsoup-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="4"
+EAPI="5"
 GCONF_DEBUG="yes"
 GNOME2_LA_PUNT="yes"
 
@@ -28,15 +28,19 @@ RDEPEND=">=dev-libs/glib-2.33.1: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 )"
+	samba? ( net-fs/samba )
+"
 DEPEND="${RDEPEND}
-	sys-devel/gettext
-	virtual/pkgconfig
 	=dev-lang/python-2*
 	>=dev-util/intltool-0.35
-	>=dev-util/gtk-doc-am-1.10"
-[[ ${PV} = 9999 ]] && DEPEND="${DEPEND}
-	doc? ( >=dev-util/gtk-doc-1.10 )"
+	>=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]
@@ -50,16 +54,6 @@ pkg_setup() {
 }
 
 src_prepare() {
-	# Disable apache tests until they are usable on Gentoo, bug #326957
-	DOCS="AUTHORS NEWS README"
-	G2CONF="${G2CONF}
-		--disable-static
-		--disable-tls-check
-		--without-gnome
-		--without-apache-httpd
-		$(use_enable introspection)
-		$(use_with samba ntlm-auth ${EPREFIX}/usr/bin/ntlm_auth)"
-
 	if [[ ${PV} = 9999 ]]; then
 		# prevent SOUP_MAINTAINER_FLAGS from getting set
 		mv .git .git-bck || die
@@ -79,6 +73,15 @@ src_prepare() {
 }
 
 src_configure() {
+	# Disable apache tests until they are usable on Gentoo, bug #326957
+	G2CONF="${G2CONF}
+		--disable-static
+		--disable-tls-check
+		--without-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
diff --git a/net-libs/libsoup/metadata.xml b/net-libs/libsoup/metadata.xml
index b2d538bd..5e2dfbb1 100644
--- a/net-libs/libsoup/metadata.xml
+++ b/net-libs/libsoup/metadata.xml
@@ -3,8 +3,6 @@
 <pkgmetadata>
   <herd>gnome</herd>
   <use>
-    <flag name="introspection">Use <pkg>dev-libs/gobject-introspection</pkg>
-			for introspection</flag>
     <flag name="samba">Use <pkg>net-fs/samba</pkg> for NTLM Single
 			Sign-On</flag>
   </use>