Move gnome2_src_prepare after eautoreconf (bug #401415, thanks to Martin von Gagern for reporting).

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

4 files changed, 16 insertions, 11 deletions

diff --git a/net-libs/libsoup/ChangeLog b/net-libs/libsoup/ChangeLog
index ac93896ab6de..348cf5284ecd 100644
--- a/net-libs/libsoup/ChangeLog
+++ b/net-libs/libsoup/ChangeLog
@@ -1,6 +1,11 @@
 # 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.269 2012/01/27 17:33:42 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libsoup/ChangeLog,v 1.270 2012/01/30 20:03:06 tetromino Exp $
+
+  30 Jan 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+  libsoup-2.34.3.ebuild, libsoup-2.36.1.ebuild, libsoup-2.36.1-r1.ebuild:
+  Move gnome2_src_prepare after eautoreconf (bug #401415, thanks to Martin von
+  Gagern for reporting).
 
 *libsoup-2.36.1-r1 (27 Jan 2012)
 
diff --git a/net-libs/libsoup/libsoup-2.34.3.ebuild b/net-libs/libsoup/libsoup-2.34.3.ebuild
index 6b99ce934d42..c96bbfc9fc1b 100644
--- a/net-libs/libsoup/libsoup-2.34.3.ebuild
+++ b/net-libs/libsoup/libsoup-2.34.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# 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.6 2011/09/18 11:35:49 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libsoup/libsoup-2.34.3.ebuild,v 1.7 2012/01/30 20:03:06 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="yes"
@@ -50,8 +50,6 @@ src_configure() {
 }
 
 src_prepare() {
-	gnome2_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 \
@@ -64,4 +62,6 @@ src_prepare() {
 		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 dfb427bda83a..b1cf5afc68e1 100644
--- a/net-libs/libsoup/libsoup-2.36.1-r1.ebuild
+++ b/net-libs/libsoup/libsoup-2.36.1-r1.ebuild
@@ -1,6 +1,6 @@
 # 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.1 2012/01/27 17:33:42 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libsoup/libsoup-2.36.1-r1.ebuild,v 1.2 2012/01/30 20:03:06 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="yes"
@@ -53,8 +53,6 @@ src_configure() {
 }
 
 src_prepare() {
-	gnome2_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 \
@@ -70,4 +68,6 @@ src_prepare() {
 
 	# Patch from 2.37.x, fixes 'Too many open files' error
 	epatch "${FILESDIR}/${P}-SoupHTTPInputStream-GCancellable.patch"
+
+	gnome2_src_prepare
 }
diff --git a/net-libs/libsoup/libsoup-2.36.1.ebuild b/net-libs/libsoup/libsoup-2.36.1.ebuild
index 6b9e6c3a0a80..1eaa1d54eecf 100644
--- a/net-libs/libsoup/libsoup-2.36.1.ebuild
+++ b/net-libs/libsoup/libsoup-2.36.1.ebuild
@@ -1,6 +1,6 @@
 # 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.5 2012/01/18 21:03:29 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libsoup/libsoup-2.36.1.ebuild,v 1.6 2012/01/30 20:03:06 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="yes"
@@ -53,8 +53,6 @@ src_configure() {
 }
 
 src_prepare() {
-	gnome2_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 \
@@ -67,4 +65,6 @@ src_prepare() {
 		epatch "${FILESDIR}/${PN}-2.34.2-fix-build-without-gnome-with-doc.patch"
 		eautoreconf
 	fi
+
+	gnome2_src_prepare
 }