Some rearrangement in the ebuild for more legibility; econf needs no die

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

3 files changed, 18 insertions, 10 deletions

diff --git a/dev-db/freetds/ChangeLog b/dev-db/freetds/ChangeLog
index 08bd3c628819..aaa7ebf66741 100644
--- a/dev-db/freetds/ChangeLog
+++ b/dev-db/freetds/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-db/freetds
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/freetds/ChangeLog,v 1.49 2011/08/26 20:06:13 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/freetds/ChangeLog,v 1.50 2011/09/20 09:51:34 jlec Exp $
+
+  20 Sep 2011; Justin Lecher <jlec@gentoo.org> freetds-0.64.ebuild,
+  freetds-0.82-r3.ebuild:
+  Some rearrangement in the ebuild for more legibility; econf needs no die
 
   26 Aug 2011; Fabian Groffen <grobian@gentoo.org> freetds-0.82-r3.ebuild:
   Fix compilation on platforms without iconv in their libc, keyworded
diff --git a/dev-db/freetds/freetds-0.64.ebuild b/dev-db/freetds/freetds-0.64.ebuild
index 2379fdf80e77..9c3abb305f0f 100644
--- a/dev-db/freetds/freetds-0.64.ebuild
+++ b/dev-db/freetds/freetds-0.64.ebuild
@@ -1,13 +1,14 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/freetds/freetds-0.64.ebuild,v 1.11 2007/11/14 15:53:32 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/freetds/freetds-0.64.ebuild,v 1.12 2011/09/20 09:51:34 jlec Exp $
 
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
 DESCRIPTION="Tabular Datastream Library."
 HOMEPAGE="http://www.freetds.org/"
 SRC_URI="http://ibiblio.org/pub/Linux/ALPHA/freetds/stable/${P}.tar.gz"
+
 LICENSE="GPL-2"
 SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
 IUSE="odbc mssql"
 
 DEPEND="odbc? ( dev-db/unixODBC )"
@@ -17,7 +18,7 @@ src_compile() {
 	local myconf
 	use odbc && myconf="--with-unixodbc=/usr"
 	use mssql && myconf="${myconf} --enable-msdblib"
-	econf --with-tdsver=7.0 ${myconf} --cache-file="${S}/config.cache" || die "econf failed"
+	econf --with-tdsver=7.0 ${myconf} --cache-file="${S}/config.cache"
 	emake || die "emake failed"
 }
 
diff --git a/dev-db/freetds/freetds-0.82-r3.ebuild b/dev-db/freetds/freetds-0.82-r3.ebuild
index d29772c79db4..588df0fed0ec 100644
--- a/dev-db/freetds/freetds-0.82-r3.ebuild
+++ b/dev-db/freetds/freetds-0.82-r3.ebuild
@@ -1,22 +1,25 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/freetds/freetds-0.82-r3.ebuild,v 1.3 2011/08/26 20:06:13 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/freetds/freetds-0.82-r3.ebuild,v 1.4 2011/09/20 09:51:34 jlec Exp $
 
 EAPI="3"
 
 inherit autotools flag-o-matic
 
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~ppc-macos ~sparc-solaris ~x86-solaris"
 DESCRIPTION="Tabular Datastream Library."
 HOMEPAGE="http://www.freetds.org/"
 SRC_URI="http://ibiblio.org/pub/Linux/ALPHA/freetds/stable/${P}.tar.gz"
+
 LICENSE="GPL-2"
 SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~ppc-macos ~sparc-solaris ~x86-solaris"
 IUSE="odbc iodbc mssql"
+
 RESTRICT="test"
 
-DEPEND="odbc? ( dev-db/unixODBC )
-		iodbc? ( dev-db/libiodbc )"
+DEPEND="
+	iodbc? ( dev-db/libiodbc )
+	odbc? ( dev-db/unixODBC )"
 RDEPEND="${DEPEND}"
 
 src_prepare() {
@@ -38,7 +41,7 @@ src_configure() {
 
 	use elibc_glibc || append-libs iconv
 
-	econf $myconf || die "econf failed"
+	econf $myconf
 }
 
 src_install() {