From 52759cb20b14f41edfc60f99208f5c5c4026dabb Mon Sep 17 00:00:00 2001
From: Tomas Chvatal <scarabeus@gentoo.org>
Date: Fri, 17 Jun 2011 10:12:05 +0000
Subject: Reorder configure/compile phases for readability. No functional
 changes.

(Portage version: 2.2.0_alpha38/cvs/Linux x86_64)
---
 dev-db/postgis/ChangeLog               |  5 ++++-
 dev-db/postgis/postgis-1.5.2-r3.ebuild | 21 +++++++--------------
 2 files changed, 11 insertions(+), 15 deletions(-)

(limited to 'dev-db/postgis')

diff --git a/dev-db/postgis/ChangeLog b/dev-db/postgis/ChangeLog
index 6e2b487e04f3..4b520840daab 100644
--- a/dev-db/postgis/ChangeLog
+++ b/dev-db/postgis/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-db/postgis
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgis/ChangeLog,v 1.50 2011/05/02 11:40:31 titanofold Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgis/ChangeLog,v 1.51 2011/06/17 10:12:05 scarabeus Exp $
+
+  17 Jun 2011; Tomáš Chvátal <scarabeus@gentoo.org> postgis-1.5.2-r3.ebuild:
+  Reorder configure/compile phases for readability. No functional changes.
 
 *postgis-1.5.2-r3 (02 May 2011)
 
diff --git a/dev-db/postgis/postgis-1.5.2-r3.ebuild b/dev-db/postgis/postgis-1.5.2-r3.ebuild
index b89f88949eee..2239444a9488 100644
--- a/dev-db/postgis/postgis-1.5.2-r3.ebuild
+++ b/dev-db/postgis/postgis-1.5.2-r3.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/dev-db/postgis/postgis-1.5.2-r3.ebuild,v 1.1 2011/05/02 11:40:31 titanofold Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgis/postgis-1.5.2-r3.ebuild,v 1.2 2011/06/17 10:12:05 scarabeus Exp $
 
 EAPI="4"
 
@@ -60,25 +60,18 @@ pkg_setup() {
 }
 
 src_configure() {
-	# Configure interprets --without-gui as being the same as --with-gui
-	if use gtk ; then
-		econf --with-gui
-	else
-		econf
-	fi
+	local myargs=""
+	use gtk && myargs+=" --with-gui"
+	econf \
+		${myargs}
 }
 
 src_compile() {
 	# Occasionally, builds fail because of out of order compilation.
 	# Otherwise, it'd be fine.
 	emake -j1
-	cd topology/
-	emake -j1
-
-	if use doc ; then
-		cd "${S}/doc/"
-		emake -j1
-	fi
+	emake -j1 -C topology
+	use doc && emake -j1 -C doc
 }
 
 src_install() {
-- 
cgit v1.2.3-65-gdbad