4.7 in stable x86 now, and old 4.2 removed from tree for bug #55139.

diff --git a/sci-mathematics/glpk/ChangeLog b/sci-mathematics/glpk/ChangeLog
index 075d01d72cda458d568c2fb4561e622a9e09397f..9675880d4a823d4d656cd3895764a1d345e64937 100644 (file)
--- a/sci-mathematics/glpk/ChangeLog
+++ b/sci-mathematics/glpk/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-mathematics/glpk
-# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/glpk/ChangeLog,v 1.2 2004/12/28 20:09:11 swegener Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/glpk/ChangeLog,v 1.3 2005/01/06 11:57:06 robbat2 Exp $
+
+  06 Jan 2005; Robin H. Johnson <robbat2@gentoo.org> -glpk-4.2.ebuild,
+  glpk-4.7.ebuild: 
+  4.7 in stable x86 now, and old 4.2 removed from tree for bug #55139.
 
 *glpk-4.7 (28 Dec 2004)
 

diff --git a/sci-mathematics/glpk/Manifest b/sci-mathematics/glpk/Manifest
index 3be7d0756756c7179cb936b4e620aed77c736c58..21d3ffdea6b73d860cf896bc57287404459e024a 100644 (file)
--- a/sci-mathematics/glpk/Manifest
+++ b/sci-mathematics/glpk/Manifest
@@ -1,16 +1,4 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 c03b4bc4876b7d584e1e32eb74a29fbc glpk-4.7.ebuild 903
-MD5 2d5cd721fa18ef88dded53ba9ceef5bc glpk-4.2.ebuild 1522
-MD5 586c4f9249808768ea1fd4d9e6909480 ChangeLog 1167
+MD5 1dae7c9330c9bacb927ed512fc8ec14e glpk-4.7.ebuild 901
+MD5 08392eb96aaa32ca8fed76a79f47a179 ChangeLog 1329
 MD5 f9b985eff5cf629c334273be8fbdee5c metadata.xml 219
-MD5 19c5df347fc8cf8bcfec4351c072bdcf files/digest-glpk-4.2 61
 MD5 8b0aabaae9e61d7aa12c4bb982b2a996 files/digest-glpk-4.7 60
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.9.10 (GNU/Linux)
-
-iD8DBQFB0b1tI1lqEGTUzyQRAiw9AJ96I8AvRtOIUgtVDxsUPPrGiwv6OACfcg3V
-r1V6t6law+a5qmgIUdILG0w=
-=2D+6
------END PGP SIGNATURE-----

diff --git a/sci-mathematics/glpk/files/digest-glpk-4.2 b/sci-mathematics/glpk/files/digest-glpk-4.2
deleted file mode 100644 (file)
index f8d00f0..0000000
--- a/sci-mathematics/glpk/files/digest-glpk-4.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 91687659163237aa9c051c715b4f5c66 glpk-4.2.tar.gz 1005483

diff --git a/sci-mathematics/glpk/glpk-4.2.ebuild b/sci-mathematics/glpk/glpk-4.2.ebuild
deleted file mode 100644 (file)
index 918cec9..0000000
--- a/sci-mathematics/glpk/glpk-4.2.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/glpk/glpk-4.2.ebuild,v 1.1 2004/12/28 05:39:58 ribosome Exp $
-
-inherit java-pkg
-
-DESCRIPTION="GNU Linear Programming Kit"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
-HOMEPAGE="http://www.gnu.org/software/glpk/"
-
-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
-               local extrainclude="-I ${S}/contrib/jni/java -I ${S}/include"
-               emake CFLAGS="${CFLAGS} ${extrainclude}"  || die "emake java failed"
-       fi
-}
-
-src_install() {
-       make DESTDIR=${D} install || die "make install failed"
-       # base docs
-       dodoc AUTHORS COPYING ChangeLog INSTALL NEWS README
-       #examples
-       docinto examples
-
-       dodoc ${S}/examples/*
-       #docs
-       if use doc; then
-               cd ${S}/doc
-               for i in *.ps; do
-                       ps2pdf14 ${i}
-               done
-       fi
-       dodoc ${S}/doc/*
-       #java
-       if use java; then
-               cd ${S}/contrib/jni
-               dolib c/libglpk_jni.so
-               java-pkg_dojar java/glpk.jar
-               docinto java
-               mv contrib/java/sample/README contrib/java/sample/README.sample
-               dodoc contrib/java/README contrib/java/sample/*
-       fi
-}

diff --git a/sci-mathematics/glpk/glpk-4.7.ebuild b/sci-mathematics/glpk/glpk-4.7.ebuild
index 393ee2010561e22ab72f1f98342e5e4baa3d5b4b..af389103f1e9d3f7da331b0840f006e418db3ac1 100644 (file)
--- a/sci-mathematics/glpk/glpk-4.7.ebuild
+++ b/sci-mathematics/glpk/glpk-4.7.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/glpk/glpk-4.7.ebuild,v 1.1 2004/12/28 05:39:58 ribosome Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/glpk/glpk-4.7.ebuild,v 1.2 2005/01/06 11:57:06 robbat2 Exp $
 
 DESCRIPTION="GNU Linear Programming Kit"
 SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
@@ -8,7 +8,7 @@ HOMEPAGE="http://www.gnu.org/software/glpk/"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="x86 ~amd64"
 IUSE="doc"
 
 RDEPEND="sys-libs/glibc"