Added proper dependencies and use flag iodbc, mysql and gmp. Fixed license. Closing bug #214702

Package-Manager: portage-2.1.4.4

3 files changed, 30 insertions, 22 deletions

diff --git a/sci-mathematics/glpk/ChangeLog b/sci-mathematics/glpk/ChangeLog
index dcfb71e2e55b..1ea702009ff4 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.16 2008/03/24 23:05:48 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/glpk/ChangeLog,v 1.17 2008/03/25 18:07:22 bicatali Exp $
+
+  25 Mar 2008; Sébastien Fabbro <bicatali@gentoo.org> glpk-4.27.ebuild:
+  Added proper dependencies and use flag iodbc, mysql and gmp. Fixed
+  license. Closing bug #214702
 
 *glpk-4.27 (24 Mar 2008)
 
diff --git a/sci-mathematics/glpk/Manifest b/sci-mathematics/glpk/Manifest
index 48337cb56baf..acc139180c71 100644
--- a/sci-mathematics/glpk/Manifest
+++ b/sci-mathematics/glpk/Manifest
@@ -5,14 +5,14 @@ DIST glpk-4.24.tar.gz 1449575 RMD160 8cacd508915e5e02422b369dc0f5ae778d20876e SH
 DIST glpk-4.27.tar.gz 1528244 RMD160 8168c08ea175e17001297ab5623912333b45e661 SHA1 d4d1e02c07fbb726eb0ddff773bb90ab1763444a SHA256 ee76a53032cf225e7f7620e5206b868ee0843db9c066c35c18de2144d6cd9a64
 DIST glpk-4.8.tar.gz 972875 RMD160 505921e0702996fec843e3704c33f07d4bfab869 SHA1 f45f7e0f8b38de7531aa84458877083a4094e0e8 SHA256 20d4cacf2bc241161ef647cd4715db701e861eb8bdbe80ff4aa87bd188cbc0da
 EBUILD glpk-4.24.ebuild 1101 RMD160 bc19f4d9cfa2c69a08815c70b9e8e8c71ebe4f68 SHA1 7577428b7f9419757fa77f85930118d8335f42c7 SHA256 6c49b15d7367a19085890900a74f5cb5ff0970b28cdddb012d5d11b7a601b276
-EBUILD glpk-4.27.ebuild 1101 RMD160 225b4e8d5f860160fc36ae8a8971e20255dca56b SHA1 0c435db19385cd85bbc3577257fa1f2aaf3de0a3 SHA256 f46b9cf7e991d624e798a214edc9f73317d30f341849e0566b337cf1fd13b361
+EBUILD glpk-4.27.ebuild 1161 RMD160 d1a57a96ab0fb2caae5fdcec6191fcbf91e5731d SHA1 ea50bac58f25024ed51c73d516d912fc5ec2f6d9 SHA256 01c5c5aac3cb82a1a901d0eb5f03fc700f820f53d60ec0335fd25aff46f8004f
 EBUILD glpk-4.8.ebuild 1171 RMD160 6284dccc42e71fc7691ecd5c34ce0b47fde1026a SHA1 0a3dd7c48c806cc62a7bed76916d16b8e6b93325 SHA256 b551d28f66377fe7d76daa6519dad4107ff835a54f50aecc5dd5c4046e9c5823
-MISC ChangeLog 3173 RMD160 7f609d4eaf4d0e262b185cc1cec02371a2c2b1b3 SHA1 176d2a74275bde9b42a773168854bbf7915374a8 SHA256 0d0a0f176fe322a17f5dac57b6cf62b3ad858861ef728926d77ae3079660a057
+MISC ChangeLog 3347 RMD160 814a28bde3ae60d068fb5b2a4d9086e70f6074ab SHA1 903875b600dae1efb9af706680de76f13e20e978 SHA256 2ff0e29095390b965caabddaa9a7122ee786c9f1b3e0ca3beaf7eb97f5197a2e
 MISC metadata.xml 891 RMD160 816d9dcb9d4a0726eaa5b49785201c93897019fb SHA1 50e05f61c89ad901803af5bb39ab4569b2f8cad5 SHA256 bd601c25c8e85573582c620a6bb2fd9de140f5668d5fedc89e172fe0f4818051
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFH6DPV1ycZbhPLE2ARAtwqAJ4u+lb+GsnmW+Y17KIUIVCwdwkIwACdFxCm
-yzk1sJhQg/rNIbkAYlAOnS8=
-=GvMy
+iD8DBQFH6T9m1ycZbhPLE2ARArXvAJwOGH8ZnugzGtH7XE/3WGKnPj8RwwCghcG8
+594EKx0eVIdFo5LplGRAPWo=
+=5TQP
 -----END PGP SIGNATURE-----
diff --git a/sci-mathematics/glpk/glpk-4.27.ebuild b/sci-mathematics/glpk/glpk-4.27.ebuild
index 078281eb32f7..6511c78a7cee 100644
--- a/sci-mathematics/glpk/glpk-4.27.ebuild
+++ b/sci-mathematics/glpk/glpk-4.27.ebuild
@@ -1,41 +1,45 @@
 # 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.27.ebuild,v 1.1 2008/03/24 23:05:48 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/glpk/glpk-4.27.ebuild,v 1.2 2008/03/25 18:07:22 bicatali Exp $
 
 DESCRIPTION="GNU Linear Programming Kit"
-LICENSE="GPL-2"
+LICENSE="GPL-3"
 HOMEPAGE="http://www.gnu.org/software/glpk/"
 SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 
 SLOT="0"
-IUSE="doc"
+IUSE="doc gmp iodbc mysql"
 KEYWORDS="~x86 ~amd64 ~ppc"
 
-DEPEND=">=sys-devel/gcc-3.2
-		virtual/libc
-		doc? ( virtual/ghostscript )"
-RDEPEND="virtual/libc"
+DEPEND="odbc? ( dev-db/libiodbc )
+	gmp? ( dev-libs/gmp )
+	mysql? ( virtual/mysql )"
+
+src_compile() {
+	econf \
+		$(use_enable gmp) \
+		$(use_enable iodbc) \
+		$(use_enable mysql) \
+		|| die "econf failed"
+	emake || die "emake failed"
+}
 
 src_install() {
 	emake DESTDIR="${D}" install || die "emake install failed"
 
 	# INSTALL include some usage docs
-	dodoc AUTHORS ChangeLog INSTALL NEWS README || \
+	dodoc AUTHORS ChangeLog NEWS README || \
 		die "failed to install docs"
 
-	# 385Kb
+	# 380Kb
 	insinto /usr/share/doc/${PF}/examples
 	doins examples/*.{c,mod,lp,mps,dat} || \
 		die "failed to install examples"
 
-	# manual/ is 2.5Mb in size
 	if use doc; then
 		cd "${S}"/doc
-		dvipdf refman.dvi
-		dvipdf lang.dvi
-		insinto /usr/share/doc/${PF}/manual
-		doins *.pdf || die "failed to install manual files"
-		docinto manual
-		dodoc *.txt || die "failed to install manual txt"
+		dodoc *.ps *.txt || die "failed to install manual files"
+		insinto /usr/share/doc/${PF}
+		doins memo/gomory.djvu || "failed to instal memo"
 	fi
 }