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

4 files changed, 9 insertions, 69 deletions

diff --git a/sci-mathematics/glpk/ChangeLog b/sci-mathematics/glpk/ChangeLog
index 075d01d72cda..9675880d4a82 100644
--- 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/files/digest-glpk-4.2 b/sci-mathematics/glpk/files/digest-glpk-4.2
deleted file mode 100644
index f8d00f03dc80..000000000000
--- 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
index 918cec9bf0ac..000000000000
--- 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 393ee2010561..af389103f1e9 100644
--- 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"