summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPatrick Kursawe <phosphan@gentoo.org>2004-04-19 10:15:48 +0000
committerPatrick Kursawe <phosphan@gentoo.org>2004-04-19 10:15:48 +0000
commit180987953473745cd63975bc6c1af505e207a2d7 (patch)
tree4c6c75569d850f66aff1cc8cb716fe45877a9222 /app-sci/glpk
parentCleanup (Manifest recommit) (diff)
downloadgentoo-2-180987953473745cd63975bc6c1af505e207a2d7.tar.gz
gentoo-2-180987953473745cd63975bc6c1af505e207a2d7.tar.bz2
gentoo-2-180987953473745cd63975bc6c1af505e207a2d7.zip
Added IUSE, fixed bugs #44467 and #46955.
Diffstat (limited to 'app-sci/glpk')
-rw-r--r--app-sci/glpk/ChangeLog7
-rw-r--r--app-sci/glpk/glpk-4.2.ebuild17
2 files changed, 18 insertions, 6 deletions
diff --git a/app-sci/glpk/ChangeLog b/app-sci/glpk/ChangeLog
index 99022515f680..9ef08be05cc8 100644
--- a/app-sci/glpk/ChangeLog
+++ b/app-sci/glpk/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for app-sci/glpk
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-sci/glpk/ChangeLog,v 1.2 2003/12/09 18:10:46 lanius Exp $
+# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-sci/glpk/ChangeLog,v 1.3 2004/04/19 10:15:48 phosphan Exp $
+
+ 19 Apr 2004; Patrick Kursawe <phosphan@gentoo.org> glpk-4.2.ebuild:
+ Added IUSE, fixed bugs #44467 and #46955.
09 Dec 2003; Heinrich Wendel <lanius@gentoo.org> glpk-4.2.ebuild:
changed app-text/ghostscript to virtual/ghostscript
diff --git a/app-sci/glpk/glpk-4.2.ebuild b/app-sci/glpk/glpk-4.2.ebuild
index 6fa23a4f4da1..deaa388b6f4e 100644
--- a/app-sci/glpk/glpk-4.2.ebuild
+++ b/app-sci/glpk/glpk-4.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-sci/glpk/glpk-4.2.ebuild,v 1.2 2003/12/09 18:10:46 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-sci/glpk/glpk-4.2.ebuild,v 1.3 2004/04/19 10:15:48 phosphan Exp $
DESCRIPTION="GNU Linear Programming Kit"
SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
@@ -9,18 +9,27 @@ HOMEPAGE="http://www.gnu.org/software/${PN}/"
SLOT="0"
LICENSE="GPL-2"
KEYWORDS="~x86"
+IUSE="java doc"
RDEPEND="java? ( >=virtual/jdk-1.4* )
sys-libs/glibc"
DEPEND=">=sys-devel/gcc-3.2* ${RDEPEND}
doc? ( virtual/ghostscript )"
+src_unpack() {
+ unpack ${A}
+ cd ${S}
+ sed -e "s:/usr/local/lib:${S}/src:g" -i contrib/jni/c/Makefile \
+ || die "sed failed correcting library path"
+}
+
src_compile() {
LIBS="${LIBS} -lm" econf --enable-shared || die
emake || die "emake failed"
if use java; then
cd ${S}/contrib/jni
- emake || die "emake java failed"
+ local extrainclude="-I ${S}/contrib/jni/java -I ${S}/include"
+ emake CFLAGS="${CFLAGS} ${extrainclude}" || die "emake java failed"
fi
}
@@ -30,7 +39,7 @@ src_install() {
dodoc AUTHORS COPYING ChangeLog INSTALL NEWS README
#examples
docinto examples
- rm ${S}/examples/{Make*,glpsol*}
+
dodoc ${S}/examples/*
#docs
if use doc; then