Fix #121430, remove stale versions.

Package-Manager: portage-2.1_pre6-r2

7 files changed, 20 insertions, 193 deletions

diff --git a/sci-mathematics/axiom/ChangeLog b/sci-mathematics/axiom/ChangeLog
index 6cca51797ed7..094d85ffcaf2 100644
--- a/sci-mathematics/axiom/ChangeLog
+++ b/sci-mathematics/axiom/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-mathematics/axiom
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/axiom/ChangeLog,v 1.8 2006/02/25 05:17:06 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/axiom/ChangeLog,v 1.9 2006/03/18 21:34:05 plasmaroo Exp $
+
+  18 Mar 2006; <plasmaroo@gentoo.org> axiom-3.9-r1.ebuild, -axiom-3.9.ebuild,
+  -axiom-9999.ebuild:
+  Fix #121430, remove stale versions.
 
 *axiom-3.9-r1 (25 Feb 2006)
 
diff --git a/sci-mathematics/axiom/Manifest b/sci-mathematics/axiom/Manifest
index 9d0608fa4c1b..3fe52e5b41a8 100644
--- a/sci-mathematics/axiom/Manifest
+++ b/sci-mathematics/axiom/Manifest
@@ -1,24 +1,12 @@
-MD5 54963164353a20ebe6eddfefc813f329 ChangeLog 1445
-RMD160 a93264cb6c48219259c53e503ea0235bda3dbb71 ChangeLog 1445
-SHA256 6198c8fe15255830ee4011e1600c4af6438dbf4b2ba081bc069281fef1e2d1fb ChangeLog 1445
-MD5 d2d981d80e5d5e5179e0a85674b64cfe axiom-3.9-r1.ebuild 2872
-RMD160 4ba73959a78469fbe31edc6d109078e2dbedbc29 axiom-3.9-r1.ebuild 2872
-SHA256 4bd3609995063ac3320d8744471cb8913097906ca6af0c1871da4c4ad4f7a077 axiom-3.9-r1.ebuild 2872
-MD5 89ff28d40f3c6a5fcb25f89ef3fd01b8 axiom-3.9.ebuild 2659
-RMD160 6825b2749e852e5e7a66cd8ff61d5a157ca3ae7a axiom-3.9.ebuild 2659
-SHA256 52aa4c03e71ed657b3866d1e925d0ffcc959048996ae79e47b84a9202d71d7c4 axiom-3.9.ebuild 2659
-MD5 89cca4dd61bbe92511fe1b73665920f8 axiom-9999.ebuild 2658
-RMD160 c5fc76a47bf0b9e66766e72b9fbd986b703c1b56 axiom-9999.ebuild 2658
-SHA256 3651d0a801ec9aaadf1ef9185a82ecd66714892f41e29f0dcaab3cfe64fa6cf5 axiom-9999.ebuild 2658
-MD5 f5325403baf7987627d722d86541cf13 files/digest-axiom-3.9 253
-RMD160 7163e15cb0087c7bd6221d1f760fb6e8b9970035 files/digest-axiom-3.9 253
-SHA256 10e35fdd3f04a38fbba5651b96ec5a78d461eafbb720f1f2f5253ee9fd99a7c8 files/digest-axiom-3.9 253
+MD5 a14cf6b6cc842c0fb29bd36d26b9dbb9 ChangeLog 1584
+RMD160 df19d48f5c401153aa597bbef47d967ba40eae2a ChangeLog 1584
+SHA256 880884c9de2a1a6612ecab8ee274d4a50a94c1212b3df2bdcd3e8af44ca28e62 ChangeLog 1584
+MD5 5d32bbe161aa58a82e1cb4b1a5aeeb7a axiom-3.9-r1.ebuild 2960
+RMD160 aa2790f98e256c902b81f705c6e72bf75c61db83 axiom-3.9-r1.ebuild 2960
+SHA256 012aee3ad19081ef280d10d9c5c2e98a2415144bf652d3e162a951973245112b axiom-3.9-r1.ebuild 2960
 MD5 f5325403baf7987627d722d86541cf13 files/digest-axiom-3.9-r1 253
 RMD160 7163e15cb0087c7bd6221d1f760fb6e8b9970035 files/digest-axiom-3.9-r1 253
 SHA256 10e35fdd3f04a38fbba5651b96ec5a78d461eafbb720f1f2f5253ee9fd99a7c8 files/digest-axiom-3.9-r1 253
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-axiom-9999 0
-RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-axiom-9999 0
-SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-axiom-9999 0
 MD5 d258cd9bae8894176e8b19f6062392f4 files/gcl-2.6.7.fix-configure.in-gentoo.Makefile.patch 1073
 RMD160 960a81bb50ef0b62dbc49e08ada7b08e900934c3 files/gcl-2.6.7.fix-configure.in-gentoo.Makefile.patch 1073
 SHA256 0324fdeb5dc9172e4c022bc7e99c9bc64ef991c617efacfa9d2cbff7b6c48d47 files/gcl-2.6.7.fix-configure.in-gentoo.Makefile.patch 1073
diff --git a/sci-mathematics/axiom/axiom-3.9-r1.ebuild b/sci-mathematics/axiom/axiom-3.9-r1.ebuild
index 2cf7b1128af5..969f8a2dd9ea 100644
--- a/sci-mathematics/axiom/axiom-3.9-r1.ebuild
+++ b/sci-mathematics/axiom/axiom-3.9-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/axiom/axiom-3.9-r1.ebuild,v 1.1 2006/02/25 05:17:06 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/axiom/axiom-3.9-r1.ebuild,v 1.2 2006/03/18 21:34:05 plasmaroo Exp $
 
 inherit eutils
 
@@ -68,6 +68,14 @@ src_install() {
 	dodir /usr/bin
 	einstall INSTALL=${D}/opt/axiom COMMAND=${D}/usr/bin/axiom || die 'Failed to install Axiom!'
 	sed -e '2d;3i AXIOM=/opt/axiom' -i ${D}/usr/bin/axiom ${D}/opt/axiom/mnt/linux/bin/axiom || die 'Failed to patch axiom runscript!'
+	cat <<- EOF > ${D}/usr/bin/AXIOMsys
+		#!/bin/sh -
+		AXIOM=/opt/axiom
+		export AXIOM
+		PATH=\${AXIOM}/bin:\${PATH}
+		export PATH
+		exec \$AXIOM/bin/AXIOMsys \$*
+	EOF
 
 	# Get rid of /mnt/linux
 	cd ${D}/opt/axiom
@@ -75,7 +83,6 @@ src_install() {
 	rm -rf mnt
 
 	sed -e 's/AXIOMsys/sman/g' ${D}/usr/bin/axiom > ${D}/usr/bin/sman
-	sed -e 's:$AXIOM/bin/clef -e ::g' ${D}/usr/bin/axiom > ${D}/usr/bin/AXIOMsys
 	chmod +x ${D}/usr/bin/sman
 	chmod +x ${D}/usr/bin/AXIOMsys
 }
diff --git a/sci-mathematics/axiom/axiom-3.9.ebuild b/sci-mathematics/axiom/axiom-3.9.ebuild
deleted file mode 100644
index 9c3a7ee6dc09..000000000000
--- a/sci-mathematics/axiom/axiom-3.9.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/axiom/axiom-3.9.ebuild,v 1.4 2006/02/14 18:30:54 plasmaroo Exp $
-
-inherit eutils
-
-DESCRIPTION="Axiom is a general purpose Computer Algebra system"
-HOMEPAGE="http://axiom.axiom-developer.org/"
-SRC_URI="http://axiom.axiom-developer.org/axiom-website/DOWNLOADS/axiom-Sept2005-src.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE=""
-
-DEPEND="virtual/tetex
-	|| (
-		x11-libs/libXaw
-		virtual/x11
-	)"
-
-S="${WORKDIR}/axiom"
-
-src_setenv() {
-	export AXIOM=`pwd`/mnt/linux
-	export PATH=${AXIOM}/bin:${PATH}
-}
-
-src_compile() {
-	src_setenv
-
-	# Patch the lsp Makefile since GCL goes kaboom with newer BFDs
-	# from Portage, so we need to use the BFD distributed with GCL for
-	# things to compile and work.
-	sed -i -e 's/--enable-statsysbfd/--enable-locbfd --disable-statsysbfd/' Makefile.pamphlet || die 'Failed to patch the lsp Makefile!'
-
-	# Fix gcl so the "real" Axiom can compile code after we're out of the chroot
-	cp ${FILESDIR}/gcl-2.6.7.fix-out-of-build-root-compile.patch.input ${S}/zips/gcl-2.6.7.fix-out-of-build-root-compile.patch
-	cp ${FILESDIR}/gcl-2.6.7.fix-configure.in-gentoo.patch.input ${S}/zips/gcl-2.6.7.fix-configure.in-gentoo.patch
-	epatch ${FILESDIR}/gcl-2.6.7.fix-out-of-build-root-compile.Makefile.patch || die 'Failed to patch the lsp pamphlet!'
-	epatch ${FILESDIR}/gcl-2.6.7.fix-configure.in-gentoo.Makefile.patch || die 'Failed to patch the lsp pamphlet!'
-
-	# Sandbox happiness, fix noweb
-	cd ${WORKDIR}
-	mkdir noweb
-	cd noweb
-	tar zxf ${S}/zips/noweb-2.10a.tgz
-	sed -i -e 's/-texhash || echo "Program texhash not found or failed"//' src/Makefile* ${S}/zips/noweb.src.Makefile*
-	tar czf ${S}/zips/noweb-2.10a.tgz *
-	cd ${S}
-	rm ${WORKDIR}/noweb -rf
-
-	# Fix compile bugs (if sed fails, it's fixed; so we don't || die :-])
-	#	(plasmaroo; 20050116)
-	sed -e 's/struct termio ptermio;/struct termios ptermio;/' -i src/clef/edible.c.pamphlet
-	mkdir src/graph/viewports
-
-	# Let the fun begin...
-	./configure
-	make || die # -jX breaks
-}
-
-src_install() {
-	src_setenv
-
-	dodir /usr/bin
-	einstall INSTALL=${D}/opt/axiom COMMAND=${D}/usr/bin/axiom || die 'Failed to install Axiom!'
-	sed -e '2d;3i AXIOM=/opt/axiom' -i ${D}/usr/bin/axiom ${D}/opt/axiom/mnt/linux/bin/axiom || die 'Failed to patch axiom runscript!'
-
-	# Get rid of /mnt/linux
-	cd ${D}/opt/axiom
-	mv mnt/linux/* .
-	rm -rf mnt
-
-	sed -e 's/AXIOMsys/sman/g' ${D}/usr/bin/axiom > ${D}/usr/bin/sman
-	sed -e 's:$AXIOM/bin/clef -e ::g' ${D}/usr/bin/axiom > ${D}/usr/bin/AXIOMsys
-	chmod +x ${D}/usr/bin/sman
-	chmod +x ${D}/usr/bin/AXIOMsys
-}
diff --git a/sci-mathematics/axiom/axiom-9999.ebuild b/sci-mathematics/axiom/axiom-9999.ebuild
deleted file mode 100644
index 7ec422870946..000000000000
--- a/sci-mathematics/axiom/axiom-9999.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/axiom/axiom-9999.ebuild,v 1.6 2006/02/14 18:30:54 plasmaroo Exp $
-
-ECVS_SERVER="cvs.savannah.nongnu.org:/sources/axiom"
-ECVS_MODULE="axiom"
-ECVS_AUTH="pserver"
-ECVS_USER="anonymous"
-
-inherit cvs eutils
-
-DESCRIPTION="Axiom is a general purpose Computer Algebra system"
-HOMEPAGE="http://axiom.axiom-developer.org/"
-SRC_URI=""
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE=""
-
-DEPEND="virtual/tetex
-	|| (
-		x11-libs/libXaw
-		virtual/x11
-	)"
-
-S=${WORKDIR}/${ECVS_MODULE}
-
-pkg_setup() {
-	echo
-	ewarn 'WARNING: This is a *live* *CVS* ebuild and thus may have'
-	ewarn '         serious stability issues and may even not build...'
-	echo
-	epause 5
-}
-
-src_setenv() {
-	export AXIOM=`pwd`/mnt/linux
-	export PATH=${AXIOM}/bin:${PATH}
-}
-
-src_compile() {
-	src_setenv
-
-	# Patch the lsp Makefile since GCL goes kaboom with newer BFDs
-	# from Portage, so we need to use the BFD distributed with GCL for
-	# things to compile and work.
-	sed -i -e 's/--enable-statsysbfd/--enable-locbfd --disable-statsysbfd/' Makefile.pamphlet || die 'Failed to patch the lsp Makefile!'
-
-	# Fix gcl so the "real" Axiom can compile code after we're out of the chroot
-	cp ${FILESDIR}/gcl-2.6.7.fix-out-of-build-root-compile.patch.input ${S}/zips/gcl-2.6.7.fix-out-of-build-root-compile.patch
-	epatch ${FILESDIR}/gcl-2.6.7.fix-out-of-build-root-compile.Makefile.patch || die 'Failed to patch the lsp pamphlet!'
-
-	# Sandbox happiness, fix noweb
-	cd ${WORKDIR}
-	mkdir noweb
-	cd noweb
-	tar zxf ${S}/zips/noweb-2.10a.tgz
-	sed -i -e 's/-texhash || echo "Program texhash not found or failed"//' src/Makefile* ${S}/zips/noweb.src.Makefile*
-	tar czf ${S}/zips/noweb-2.10a.tgz *
-	cd ${S}
-	rm ${WORKDIR}/noweb -rf
-
-	# Fix compile bugs (if sed fails, it's fixed; so we don't || die :-])
-	#	(plasmaroo; 20050116)
-	sed -e 's/struct termio ptermio;/struct termios ptermio;/' -i src/clef/edible.c.pamphlet
-	mkdir src/graph/viewports
-
-	# Let the fun begin...
-	./configure
-	make || die # -jX breaks
-}
-
-src_install() {
-	src_setenv
-
-	dodir /usr/bin
-	einstall INSTALL=${D}/opt/axiom COMMAND=${D}/usr/bin/axiom || die 'Failed to install Axiom!'
-	sed -e '2d;3i AXIOM=/opt/axiom' -i ${D}/usr/bin/axiom ${D}/opt/axiom/mnt/linux/bin/axiom || die 'Failed to patch axiom runscript!'
-
-	# Get rid of /mnt/linux
-	cd ${D}/opt/axiom
-	mv mnt/linux/* .
-	rm -rf mnt
-
-	sed -e 's/AXIOMsys/sman/g' ${D}/usr/bin/axiom > ${D}/usr/bin/sman
-	sed -e 's:$AXIOM/bin/clef -e ::g' ${D}/usr/bin/axiom > ${D}/usr/bin/AXIOMsys
-	chmod +x ${D}/usr/bin/sman
-	chmod +x ${D}/usr/bin/AXIOMsys
-}
diff --git a/sci-mathematics/axiom/files/digest-axiom-3.9 b/sci-mathematics/axiom/files/digest-axiom-3.9
deleted file mode 100644
index 26f751be5612..000000000000
--- a/sci-mathematics/axiom/files/digest-axiom-3.9
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 6b107a03b03595703d5e3e6bdd12f8c1 axiom-Sept2005-src.tgz 41447064
-RMD160 ae0a63e4dc7d772183001e688d5a5561d689f7d4 axiom-Sept2005-src.tgz 41447064
-SHA256 750da2f7960686c7f50fa4c6c859f51300909e4b488fe6395d75fe4405a1d1f3 axiom-Sept2005-src.tgz 41447064
diff --git a/sci-mathematics/axiom/files/digest-axiom-9999 b/sci-mathematics/axiom/files/digest-axiom-9999
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/sci-mathematics/axiom/files/digest-axiom-9999
+++ /dev/null