net-libs/libsoup-gnome: moved to gx86

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

3 files changed, 12 insertions, 86 deletions

diff --git a/net-libs/libsoup-gnome/libsoup-gnome-2.40.2.ebuild b/net-libs/libsoup-gnome/libsoup-gnome-2.40.2.ebuild
deleted file mode 100644
index ee2a1bf6..00000000
--- a/net-libs/libsoup-gnome/libsoup-gnome-2.40.2.ebuild
+++ /dev/null
@@ -1,67 +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"
-
-MY_PN=${PN/-gnome}
-MY_P=${MY_PN}-${PV}
-
-inherit autotools eutils gnome2
-if [[ ${PV} = 9999 ]]; then
-	GNOME_LIVE_MODULE=${MY_PN}
-	inherit gnome2-live
-fi
-
-DESCRIPTION="GNOME plugin for libsoup"
-HOMEPAGE="http://live.gnome.org/LibSoup"
-SRC_URI="${SRC_URI//-gnome}"
-
-LICENSE="LGPL-2+"
-SLOT="2.4"
-IUSE="debug +introspection"
-if [[ ${PV} = 9999 ]]; then
-	KEYWORDS=""
-else
-	KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-solaris"
-fi
-
-RDEPEND="~net-libs/libsoup-${PV}[introspection?]
-	|| ( gnome-base/libgnome-keyring <gnome-base/gnome-keyring-2.29.4 )
-	dev-db/sqlite:3
-	introspection? ( >=dev-libs/gobject-introspection-0.9.5 )"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	>=dev-util/intltool-0.35
-	>=dev-util/gtk-doc-am-1.10
-	virtual/pkgconfig"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-	# Disable apache tests until they are usable on Gentoo, bug #326957
-	G2CONF="${G2CONF}
-		--disable-static
-		--disable-tls-check
-		$(use_enable introspection)
-		--with-libsoup-system
-		--with-gnome
-		--without-apache-httpd"
-	DOCS="AUTHORS NEWS README"
-}
-
-src_prepare() {
-	# Use lib present on the system
-	epatch "${FILESDIR}"/${PN}-system-lib.patch
-	[[ ${PV} != 9999 ]] && eautoreconf
-	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-gnome/libsoup-gnome-9999.ebuild b/net-libs/libsoup-gnome/libsoup-gnome-9999.ebuild
index ee2a1bf6..13f4a773 100644
--- a/net-libs/libsoup-gnome/libsoup-gnome-9999.ebuild
+++ b/net-libs/libsoup-gnome/libsoup-gnome-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"
 
@@ -30,17 +30,24 @@ fi
 
 RDEPEND="~net-libs/libsoup-${PV}[introspection?]
 	|| ( gnome-base/libgnome-keyring <gnome-base/gnome-keyring-2.29.4 )
-	dev-db/sqlite:3
+	dev-db/sqlite:3=
 	introspection? ( >=dev-libs/gobject-introspection-0.9.5 )"
 DEPEND="${RDEPEND}
-	sys-devel/gettext
-	>=dev-util/intltool-0.35
 	>=dev-util/gtk-doc-am-1.10
+	>=dev-util/intltool-0.35
+	sys-devel/gettext
 	virtual/pkgconfig"
 
 S=${WORKDIR}/${MY_P}
 
-pkg_setup() {
+src_prepare() {
+	# Use lib present on the system
+	epatch "${FILESDIR}"/${PN}-system-lib.patch
+	[[ ${PV} != 9999 ]] && eautoreconf
+	gnome2_src_prepare
+}
+
+src_configure() {
 	# Disable apache tests until they are usable on Gentoo, bug #326957
 	G2CONF="${G2CONF}
 		--disable-static
@@ -49,17 +56,7 @@ pkg_setup() {
 		--with-libsoup-system
 		--with-gnome
 		--without-apache-httpd"
-	DOCS="AUTHORS NEWS README"
-}
-
-src_prepare() {
-	# Use lib present on the system
-	epatch "${FILESDIR}"/${PN}-system-lib.patch
-	[[ ${PV} != 9999 ]] && eautoreconf
-	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
diff --git a/net-libs/libsoup-gnome/metadata.xml b/net-libs/libsoup-gnome/metadata.xml
index 99b37959..6e0e2ecb 100644
--- a/net-libs/libsoup-gnome/metadata.xml
+++ b/net-libs/libsoup-gnome/metadata.xml
@@ -2,8 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>gnome</herd>
-  <use>
-    <flag name="introspection">Use <pkg>dev-libs/gobject-introspection</pkg>
-			for introspection</flag>
-  </use>
 </pkgmetadata>