From: Justin Lecher <jlec@gentoo.org>
Date: Tue, 20 Sep 2011 09:51:34 +0000 (+0000)
Subject: Some rearrangement in the ebuild for more legibility; econf needs no die
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=eff68bedbf86fccf4dd9143eb89d57185f46f626;p=gentoo.git

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

Package-Manager: portage-2.2.0_alpha59/cvs/Linux x86_64
---

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/Manifest b/dev-db/freetds/Manifest
index 2536d969af93..1e8823365dac 100644
--- a/dev-db/freetds/Manifest
+++ b/dev-db/freetds/Manifest
@@ -1,17 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA512
 
 AUX config.rpath 18343 RMD160 271ca8b1b00851006172932101107f5f62adc21e SHA1 0ec08c5146b1d31c728c3ceb7ba90ac45a9f3972 SHA256 1b265617f3f91f84e0b8a71bc63fde74c57ad1b3296355266f757f27f52ecf6a
 DIST freetds-0.64.tar.gz 1414954 RMD160 3509fb86ce7edfb937e64041a6d6339883cff60e SHA1 c42f6800c91e5170ab4692d694fa40f3995eaca4 SHA256 27eeef4049590f459189f859fa73dae27604ea0bf4f197e304f9934c39312c3b
 DIST freetds-0.82.tar.gz 1596755 RMD160 d3596c512022332cdb3bab375950159f1e930a4b SHA1 7e2a0c9e41c240c2d1c7f69c6f278e9a5bb80c2d SHA256 e2731483614bd992c8cb133bcc38432de13cfa243cc1327f37412db50c99b2b6
-EBUILD freetds-0.64.ebuild 883 RMD160 7f425baf73f28dc8f18327be5ff04406900d71a3 SHA1 f2dd4a8e93a64cf799559992db2c60a7a2ff1cf0 SHA256 cd132a06dc72dcbeaa8ad5b11e22a5c56b820b6dff51bdd85ac005e314c6d9f3
-EBUILD freetds-0.82-r3.ebuild 1306 RMD160 0266b68c7b83a060db1507665f55fba3744cbd01 SHA1 f11018ac537f74ad28d52fa9cdd5e34e2ae1db49 SHA256 d9e37b889ab50503ffe4cad736001843b371ee99c06b43d6f11ca85e76e6096e
-MISC ChangeLog 6945 RMD160 220c5f385dddd5c0cc59943f00df7ab0685e1d7b SHA1 de82ee4f85423cc85b1bd62645c82b0f4b87b5c9 SHA256 cc22545bee670a988bb806746724ce2e04d00db381a1cf65ec97894b88be1cb9
+EBUILD freetds-0.64.ebuild 863 RMD160 3b6ce0b764ffc9fd628c71d2433744a47d72a3d3 SHA1 411d479f488e18b69f84f2c424e5b03641ef83c4 SHA256 6df869c8c8b16104eefc49997d1dba72825d5aaaceaaecb2d4e1ab9291ef1b02
+EBUILD freetds-0.82-r3.ebuild 1284 RMD160 3de17dde4ea1546fc7192f219ada36c2f4ee7e81 SHA1 ba72cb118cabb9c34808a08b5e38bd31fc786883 SHA256 7617ed6463b1fa7a3a81270fcf094a4c335d6d1165fa4e4285b57d5c4794cb62
+MISC ChangeLog 7112 RMD160 c7d397355f58815f2660bed1d23b74ccb7a24b14 SHA1 6585defa1f90f19e05492e32f696472174c42e02 SHA256 3bb9927ed757d8801f34b76fdf43caa00bef8205d184fa598e423619520ebdf7
 MISC metadata.xml 157 RMD160 a98db3a086fae3c09a903dadbc05f60443ec4b1a SHA1 ddaa23cc35eb917bf8962b652442bebb1ce0f440 SHA256 54f8878ca0228e380abbaa4b529806b5533a6b9b51b3b16c0909e906586a91a1
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (SunOS)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk5X/LsACgkQX3X2B8XHTokMlwCeNlQC5e0n2vUNIPN76FdLcXeN
-63oAn3gox8K6xW3sidFZDI4iThLrEU5M
-=w5Jt
+iEYEAREKAAYFAk54YiwACgkQgAnW8HDreRbM8wCfbLtxRpsUd2B2MhWyqzeb8Bow
+OgkAoIGkiDQ3jUsUTS2+FHm3Eof225QD
+=hUfl
 -----END PGP SIGNATURE-----
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() {