Version bump

Package-Manager: portage-2.2_rc11/cvs/Linux 2.6.25-gentoo-r7 x86_64

3 files changed, 37 insertions, 15 deletions

diff --git a/sci-mathematics/glpk/ChangeLog b/sci-mathematics/glpk/ChangeLog
index 3fb1f08fc43e..15ae7295f6ab 100644
--- a/sci-mathematics/glpk/ChangeLog
+++ b/sci-mathematics/glpk/ChangeLog
@@ -1,6 +1,12 @@
 # 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.25 2008/07/23 17:35:15 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/glpk/ChangeLog,v 1.26 2008/10/27 15:36:25 bicatali Exp $
+
+*glpk-4.32 (27 Oct 2008)
+
+  27 Oct 2008; Sébastien Fabbro <bicatali@gentoo.org> -glpk-4.28.ebuild,
+  +glpk-4.32.ebuild:
+  Version bump
 
   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
diff --git a/sci-mathematics/glpk/Manifest b/sci-mathematics/glpk/Manifest
index 0badc0afbbae..ad222ec948da 100644
--- a/sci-mathematics/glpk/Manifest
+++ b/sci-mathematics/glpk/Manifest
@@ -1,18 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-DIST glpk-4.28.tar.gz 1546104 RMD160 d99f7e055c10dee4dc41f13abec746d440e59bc4 SHA1 0297add513bb2007eebfb03a956615d9f0db4e5a SHA256 8faeb202e58a3a9f6a6a8b0e8ae557bcc30f712060b4871a530f070c14939fd8
 DIST glpk-4.29.tar.gz 1557255 RMD160 26ce81f0a9a907af0ed11e30cb7a9822ceb53db1 SHA1 69559f51c7ecd36a4c23fe01fdb9897116231f5d SHA256 41f458ef830b8b4df730ff789fcb612bd9ad274c29fb8665a7039dba0865102c
+DIST glpk-4.32.tar.gz 1826114 RMD160 77f08ec4166901b3e8542067fa5e25d0298b29c4 SHA1 3574d86b6779f6a20c8b6abf6798f4cf68d0f313 SHA256 fe52db8845be94c6dac5bc38f148bba31fd0099acb076f3aa25829c647fbc630
 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 1462 RMD160 ede65be7efcfbd96a78af027174e25488e573e7d SHA1 9a7c9680ca6da22888243eaff6b13a9fa7bffbd0 SHA256 0b78575dbf2c75f0e69bfe97b75869c97802e8ecbb2f9055178859f7986c3761
+EBUILD glpk-4.32.ebuild 1462 RMD160 3066cd190c8859f4c4a71969afae8dd0e0180380 SHA1 e1169eabaa4a3cfb89bd4fd07ca957c94ee7a96c SHA256 7adffe1cd834bb5968635ef8956bf2010b3790e53c36a009f51e9706dec0c004
 EBUILD glpk-4.8.ebuild 1171 RMD160 6284dccc42e71fc7691ecd5c34ce0b47fde1026a SHA1 0a3dd7c48c806cc62a7bed76916d16b8e6b93325 SHA256 b551d28f66377fe7d76daa6519dad4107ff835a54f50aecc5dd5c4046e9c5823
-MISC ChangeLog 4364 RMD160 79ea2e1c2a8998cdcefd6713561a7e4fbf68f146 SHA1 a1a0fb74de4ae529f5f438507a1e76bea27a913a SHA256 26d3cf02c8c88fffa9e1af0f74329efffd7256a7d65b484a066872018ab779a2
+MISC ChangeLog 4501 RMD160 a5df11fdb066da57c7a38ba7f9c15a96e478c427 SHA1 db95926d0222b7dc8be9161db63cfbfc75e81821 SHA256 83c3b6a484dc363c1b159c47b028e761bee88b359709b4bee10bdc801c3ef57a
 MISC metadata.xml 891 RMD160 816d9dcb9d4a0726eaa5b49785201c93897019fb SHA1 50e05f61c89ad901803af5bb39ab4569b2f8cad5 SHA256 bd601c25c8e85573582c620a6bb2fd9de140f5668d5fedc89e172fe0f4818051
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkiHa/QACgkQ1ycZbhPLE2CbzgCghCvTck6wMubZYCfng9Lu7RB/
-6FMAn0wiK0NDXslaFP5t+Er24DCJHFHh
-=T4Pm
+iEYEARECAAYFAkkF4AMACgkQ1ycZbhPLE2C8+QCfbESi3Pj8WFcHBeabaLXFRen1
+zfgAoI4ddYWDnUSVWj/XtzORCbdQOsm5
+=xbyn
 -----END PGP SIGNATURE-----
diff --git a/sci-mathematics/glpk/glpk-4.28.ebuild b/sci-mathematics/glpk/glpk-4.32.ebuild
index a5d28b9080a9..a801fc91456e 100644
--- a/sci-mathematics/glpk/glpk-4.28.ebuild
+++ b/sci-mathematics/glpk/glpk-4.32.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.28.ebuild,v 1.5 2008/05/06 19:31:50 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/glpk/glpk-4.32.ebuild,v 1.1 2008/10/27 15:36:25 bicatali Exp $
+
+inherit flag-o-matic
 
 DESCRIPTION="GNU Linear Programming Kit"
 LICENSE="GPL-3"
@@ -8,19 +10,31 @@ HOMEPAGE="http://www.gnu.org/software/glpk/"
 SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 
 SLOT="0"
-IUSE="doc 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 odbc; then
+		myconf="--enable-dl"
+	fi
+
+	[[ -z $(type -P odbc-config) ]] && \
+		append-cppflags $(pkg-config --cflags libiodbc)
+
 	econf \
-		$(use_enable gmp) \
-		$(use_enable iodbc) \
+		--with-zlib \
+		$(use_with gmp) \
+		$(use_enable odbc) \
 		$(use_enable mysql) \
-		|| die "econf failed"
+		${myconf} || die "econf failed"
 	emake || die "emake failed"
 }
 
@@ -32,8 +46,10 @@ src_install() {
 		die "failed to install docs"
 
 	insinto /usr/share/doc/${PF}
-	# 388Kb
-	doins -r examples || die "failed to install examples"
+	if use examples; then
+		emake distclean
+		doins -r examples || die "failed to install examples"
+	fi
 	if use doc; then
 		cd "${S}"/doc
 		doins memo/gomory.djvu || die "failed to instal memo"