summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastien Fabbro <bicatali@gentoo.org>2008-07-23 17:35:15 +0000
committerSebastien Fabbro <bicatali@gentoo.org>2008-07-23 17:35:15 +0000
commit6456ff8180df9795e014d1eea40d61310e962e31 (patch)
treebf1ceb6ae1715c4c3f255a423644931b292ca112 /sci-mathematics/glpk
parentAdjusted dependencies to exclude octave-3* since the monolithic octave-forge ... (diff)
downloadhistorical-6456ff8180df9795e014d1eea40d61310e962e31.tar.gz
historical-6456ff8180df9795e014d1eea40d61310e962e31.tar.bz2
historical-6456ff8180df9795e014d1eea40d61310e962e31.zip
Added dev-db/unixODBC as a possible odbc implementation and changed use flag to odbc. Fixed bug #232755, thanks fmmcor
Package-Manager: portage-2.1.4.4
Diffstat (limited to 'sci-mathematics/glpk')
-rw-r--r--sci-mathematics/glpk/ChangeLog6
-rw-r--r--sci-mathematics/glpk/Manifest10
-rw-r--r--sci-mathematics/glpk/glpk-4.29.ebuild19
3 files changed, 24 insertions, 11 deletions
diff --git a/sci-mathematics/glpk/ChangeLog b/sci-mathematics/glpk/ChangeLog
index e4b96ace3105..3fb1f08fc43e 100644
--- a/sci-mathematics/glpk/ChangeLog
+++ b/sci-mathematics/glpk/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for sci-mathematics/glpk
# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/glpk/ChangeLog,v 1.24 2008/07/22 22:07:15 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/glpk/ChangeLog,v 1.25 2008/07/23 17:35:15 bicatali Exp $
+
+ 23 Jul 2008; SĂ©bastien Fabbro <bicatali@gentoo.org> glpk-4.29.ebuild:
+ Added dev-db/unixODBC as a possible odbc implementation and changed use
+ flag to odbc. Fixed bug #232755, thanks fmmcor
*glpk-4.29 (22 Jul 2008)
diff --git a/sci-mathematics/glpk/Manifest b/sci-mathematics/glpk/Manifest
index 4e9fd749636a..0badc0afbbae 100644
--- a/sci-mathematics/glpk/Manifest
+++ b/sci-mathematics/glpk/Manifest
@@ -5,14 +5,14 @@ DIST glpk-4.28.tar.gz 1546104 RMD160 d99f7e055c10dee4dc41f13abec746d440e59bc4 SH
DIST glpk-4.29.tar.gz 1557255 RMD160 26ce81f0a9a907af0ed11e30cb7a9822ceb53db1 SHA1 69559f51c7ecd36a4c23fe01fdb9897116231f5d SHA256 41f458ef830b8b4df730ff789fcb612bd9ad274c29fb8665a7039dba0865102c
DIST glpk-4.8.tar.gz 972875 RMD160 505921e0702996fec843e3704c33f07d4bfab869 SHA1 f45f7e0f8b38de7531aa84458877083a4094e0e8 SHA256 20d4cacf2bc241161ef647cd4715db701e861eb8bdbe80ff4aa87bd188cbc0da
EBUILD glpk-4.28.ebuild 1128 RMD160 c6ea22364ed71cb6907e07f5431a363e5b8fc744 SHA1 173d06fcee284db068d46bc55930fa87754175b1 SHA256 754f8c2e44a75c52a0a4987bbcffe4f8b83a7707554102b4d36cefb3ea4ba015
-EBUILD glpk-4.29.ebuild 1294 RMD160 5ca76d5c47f726cd209710e60f0655cb600c9917 SHA1 61e220112ac3abf8b5d9cf86a4def7040bc2be13 SHA256 e46d725b9b919d52b8e77585919be1495d846406d2a7ed5953339d24c66e4f2c
+EBUILD glpk-4.29.ebuild 1462 RMD160 ede65be7efcfbd96a78af027174e25488e573e7d SHA1 9a7c9680ca6da22888243eaff6b13a9fa7bffbd0 SHA256 0b78575dbf2c75f0e69bfe97b75869c97802e8ecbb2f9055178859f7986c3761
EBUILD glpk-4.8.ebuild 1171 RMD160 6284dccc42e71fc7691ecd5c34ce0b47fde1026a SHA1 0a3dd7c48c806cc62a7bed76916d16b8e6b93325 SHA256 b551d28f66377fe7d76daa6519dad4107ff835a54f50aecc5dd5c4046e9c5823
-MISC ChangeLog 4167 RMD160 d65afbc87b1c93ab6db96fb0beb7f944cfe4185a SHA1 baf65438bce609f749a18fe5a5e1543c38313818 SHA256 bd6c5de98dadcceb64197344e919bdee039069528660a096cebcf2c10ff2c703
+MISC ChangeLog 4364 RMD160 79ea2e1c2a8998cdcefd6713561a7e4fbf68f146 SHA1 a1a0fb74de4ae529f5f438507a1e76bea27a913a SHA256 26d3cf02c8c88fffa9e1af0f74329efffd7256a7d65b484a066872018ab779a2
MISC metadata.xml 891 RMD160 816d9dcb9d4a0726eaa5b49785201c93897019fb SHA1 50e05f61c89ad901803af5bb39ab4569b2f8cad5 SHA256 bd601c25c8e85573582c620a6bb2fd9de140f5668d5fedc89e172fe0f4818051
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.9 (GNU/Linux)
-iEYEARECAAYFAkiGWh0ACgkQ1ycZbhPLE2CkaACfYoQZXv9WoyDSsKCXRIo1KsFw
-cdsAn29RBMVSeRifk1ESNKcHlaFObH0y
-=/LaM
+iEYEARECAAYFAkiHa/QACgkQ1ycZbhPLE2CbzgCghCvTck6wMubZYCfng9Lu7RB/
+6FMAn0wiK0NDXslaFP5t+Er24DCJHFHh
+=T4Pm
-----END PGP SIGNATURE-----
diff --git a/sci-mathematics/glpk/glpk-4.29.ebuild b/sci-mathematics/glpk/glpk-4.29.ebuild
index 441eeea51e41..5a0f6d767fa9 100644
--- a/sci-mathematics/glpk/glpk-4.29.ebuild
+++ b/sci-mathematics/glpk/glpk-4.29.ebuild
@@ -1,6 +1,8 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/glpk/glpk-4.29.ebuild,v 1.1 2008/07/22 22:07:15 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/glpk/glpk-4.29.ebuild,v 1.2 2008/07/23 17:35:15 bicatali Exp $
+
+inherit flag-o-matic
DESCRIPTION="GNU Linear Programming Kit"
LICENSE="GPL-3"
@@ -8,22 +10,29 @@ HOMEPAGE="http://www.gnu.org/software/glpk/"
SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
SLOT="0"
-IUSE="doc examples gmp iodbc mysql"
+IUSE="doc examples gmp odbc mysql"
KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-DEPEND="iodbc? ( dev-db/libiodbc )
+RDEPEND="odbc? ( || ( dev-db/libiodbc dev-db/unixODBC ) )
gmp? ( dev-libs/gmp )
mysql? ( virtual/mysql )"
+DEPEND="${RDEPEND}
+ dev-util/pkgconfig"
+
src_compile() {
local myconf="--disable-dl"
- if use mysql || use iodbc; then
+ if use mysql || use odbc; then
myconf="--enable-dl"
fi
+
+ [[ -z $(type -P odbc-config) ]] && \
+ append-cppflags $(pkg-config --cflags libiodbc)
+
econf \
--with-zlib \
$(use_with gmp) \
- $(use_enable iodbc odbc) \
+ $(use_enable odbc) \
$(use_enable mysql) \
${myconf} || die "econf failed"
emake || die "emake failed"