Move gnome2_src_prepare to proper place. Drop old.

(Portage version: 2.1.10.44/cvs/Linux x86_64)

4 files changed, 7 insertions, 118 deletions

diff --git a/net-libs/libsoup-gnome/ChangeLog b/net-libs/libsoup-gnome/ChangeLog
index 3179118773f4..b17af36dc193 100644
--- a/net-libs/libsoup-gnome/ChangeLog
+++ b/net-libs/libsoup-gnome/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-libs/libsoup-gnome
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libsoup-gnome/ChangeLog,v 1.62 2011/10/30 02:38:34 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libsoup-gnome/ChangeLog,v 1.63 2011/12/28 16:41:30 pacho Exp $
+
+  28 Dec 2011; Pacho Ramos <pacho@gentoo.org> -libsoup-gnome-2.32.2.ebuild,
+  -libsoup-gnome-2.34.2.ebuild, libsoup-gnome-2.36.1.ebuild:
+  Move gnome2_src_prepare to proper place. Drop old.
 
 *libsoup-gnome-2.36.1 (30 Oct 2011)
 
diff --git a/net-libs/libsoup-gnome/libsoup-gnome-2.32.2.ebuild b/net-libs/libsoup-gnome/libsoup-gnome-2.32.2.ebuild
deleted file mode 100644
index 83e99ab1c9b4..000000000000
--- a/net-libs/libsoup-gnome/libsoup-gnome-2.32.2.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libsoup-gnome/libsoup-gnome-2.32.2.ebuild,v 1.6 2011/03/22 19:42:53 ranger Exp $
-
-EAPI="3"
-GCONF_DEBUG="yes"
-
-inherit autotools eutils gnome2
-
-MY_PN=${PN/-gnome}
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="GNOME plugin for libsoup"
-HOMEPAGE="http://live.gnome.org/LibSoup"
-SRC_URI="${SRC_URI//-gnome}"
-
-LICENSE="LGPL-2"
-SLOT="2.4"
-KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-solaris"
-IUSE="debug doc +introspection"
-
-RDEPEND="~net-libs/libsoup-${PV}
-	|| ( gnome-base/libgnome-keyring <gnome-base/gnome-keyring-2.29.4 )
-	net-libs/libproxy
-	>=gnome-base/gconf-2
-	dev-db/sqlite:3
-	introspection? ( >=dev-libs/gobject-introspection-0.9.5 )"
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.9
-	>=dev-util/gtk-doc-am-1.10
-	doc? ( >=dev-util/gtk-doc-1.10 )"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-	G2CONF="${G2CONF}
-		--disable-static
-		$(use_enable introspection)
-		--with-libsoup-system
-		--with-gnome"
-	DOCS="AUTHORS NEWS README"
-}
-
-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() {
-	gnome2_src_prepare
-
-	# Use lib present on the system
-	epatch "${FILESDIR}"/${PN}-2.31.92-system-lib.patch
-	eautoreconf
-}
diff --git a/net-libs/libsoup-gnome/libsoup-gnome-2.34.2.ebuild b/net-libs/libsoup-gnome/libsoup-gnome-2.34.2.ebuild
deleted file mode 100644
index 1c7092a081a7..000000000000
--- a/net-libs/libsoup-gnome/libsoup-gnome-2.34.2.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libsoup-gnome/libsoup-gnome-2.34.2.ebuild,v 1.4 2011/07/15 11:09:36 xarthisius Exp $
-
-EAPI="3"
-GCONF_DEBUG="yes"
-GNOME2_LA_PUNT="yes"
-
-inherit autotools eutils gnome2
-
-MY_PN=${PN/-gnome}
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="GNOME plugin for libsoup"
-HOMEPAGE="http://live.gnome.org/LibSoup"
-SRC_URI="${SRC_URI//-gnome}"
-
-LICENSE="LGPL-2"
-SLOT="2.4"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-solaris"
-IUSE="debug doc +introspection"
-
-RDEPEND="~net-libs/libsoup-${PV}
-	|| ( 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}
-	>=dev-util/pkgconfig-0.9
-	>=dev-util/gtk-doc-am-1.10
-	doc? ( >=dev-util/gtk-doc-1.10 )"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-	G2CONF="${G2CONF}
-		--disable-static
-		--disable-tls-check
-		$(use_enable introspection)
-		--with-libsoup-system
-		--with-gnome"
-	DOCS="AUTHORS NEWS README"
-}
-
-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() {
-	gnome2_src_prepare
-
-	# Use lib present on the system
-	epatch "${FILESDIR}"/${PN}-2.34.1-system-lib.patch
-	eautoreconf
-}
diff --git a/net-libs/libsoup-gnome/libsoup-gnome-2.36.1.ebuild b/net-libs/libsoup-gnome/libsoup-gnome-2.36.1.ebuild
index bc91b388197e..0ce49bdee405 100644
--- a/net-libs/libsoup-gnome/libsoup-gnome-2.36.1.ebuild
+++ b/net-libs/libsoup-gnome/libsoup-gnome-2.36.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libsoup-gnome/libsoup-gnome-2.36.1.ebuild,v 1.1 2011/10/30 02:38:34 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libsoup-gnome/libsoup-gnome-2.36.1.ebuild,v 1.2 2011/12/28 16:41:30 pacho Exp $
 
 EAPI="4"
 GCONF_DEBUG="yes"
@@ -49,9 +49,8 @@ src_configure() {
 }
 
 src_prepare() {
-	gnome2_src_prepare
-
 	# Use lib present on the system
 	epatch "${FILESDIR}"/${PN}-2.36.1-system-lib.patch
 	eautoreconf
+	gnome2_src_prepare
 }