10 files changed, 25 insertions, 578 deletions
diff --git a/dev-lang/smlnj/ChangeLog b/dev-lang/smlnj/ChangeLog
index 88ad7cc35e60..281c155ae7b7 100644
--- a/dev-lang/smlnj/ChangeLog
+++ b/dev-lang/smlnj/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-lang/smlnj
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/smlnj/ChangeLog,v 1.23 2010/06/29 12:13:03 ssuominen Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/smlnj/ChangeLog,v 1.24 2012/10/19 09:31:58 hkbst Exp $
+
+*smlnj-110.75 (19 Oct 2012)
+
+  19 Oct 2012; Marijn Schouten <hkBst@gentoo.org> -smlnj-110.0.7.ebuild,
+  -smlnj-110.45.ebuild, -smlnj-110.67-r1.ebuild, -smlnj-110.67-r2.ebuild,
+  -smlnj-110.69.ebuild, +smlnj-110.75.ebuild:
+  bump and remove old stuff
 
   29 Jun 2010; Samuli Suominen <ssuominen@gentoo.org> smlnj-110.71.ebuild:
   Respect environment flags and targets wrt #243886 by Michael Weber.
diff --git a/dev-lang/smlnj/files/fetch_files.sh b/dev-lang/smlnj/files/fetch_files.sh
deleted file mode 100755
index c8cd899dc260..000000000000
--- a/dev-lang/smlnj/files/fetch_files.sh
+++ /dev/null
@@ -1,57 +0,0 @@
-#!/bin/bash
-
-PV=$1
-P=smlnj-${PV}
-TARGET_DIR=${2:-"/space/distfiles-local"}
-
-BASE_URI="http://smlnj.cs.uchicago.edu/dist/working/${PV}/"
-
-ARCHES="
-ppc
-sparc
-x86
-"
-
-FILES="
-config.tgz
-
-cm.tgz
-compiler.tgz
-runtime.tgz
-system.tgz
-MLRISC.tgz
-smlnj-lib.tgz
-
-ckit.tgz
-nlffi.tgz
-
-cml.tgz
-eXene.tgz
-
-ml-lex.tgz
-ml-yacc.tgz
-ml-burg.tgz
-ml-lpt.tgz
-
-pgraph.tgz
-trace-debug-profile.tgz
-
-heap2asm.tgz
-
-smlnj-c.tgz
-"
-
-for arch in ${ARCHES}; do
-    FILES+="boot.${arch}-unix.tgz "
-done
-
-echo ${BASE_URI}
-echo ${FILES}
-
-#FILES="heap2asm.tgz"
-
-for file in ${FILES}; do
-    wget ${BASE_URI}/${file} -O ${TARGET_DIR}/${P}-${file}
-done
-
-
diff --git a/dev-lang/smlnj/files/ml-makedepend.patch b/dev-lang/smlnj/files/ml-makedepend.patch
deleted file mode 100644
index 13c07ca4fa47..000000000000
--- a/dev-lang/smlnj/files/ml-makedepend.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- usr/bin/ml-makedepend.old	2008-03-27 11:35:09.000000000 +0100
-+++ usr/bin/ml-makedepend	2008-03-27 11:43:18.000000000 +0100
-@@ -4,7 +4,7 @@
- if [ x${SMLNJ_HOME} = x ] ; then
-     BIN_DIR="/var/tmp/portage/dev-lang/smlnj-110.67-r1/work/bin"
- else
--    if x${CM_PATHCONFIG} = x ] ; then
-+    if [ x${CM_PATHCONFIG} = x ] ; then
- 	CM_PATHCONFIG=${SMLNJ_HOME}/lib/pathconfig
- 	export CM_PATHCONFIG
-     fi
diff --git a/dev-lang/smlnj/files/smlnj-110.0.7-bindir.patch b/dev-lang/smlnj/files/smlnj-110.0.7-bindir.patch
deleted file mode 100644
index 4ebecef7e3ce..000000000000
--- a/dev-lang/smlnj/files/smlnj-110.0.7-bindir.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- config.orig/_run-sml	2000-10-20 18:02:25.000000000 +0200
-+++ config/_run-sml	2004-02-27 01:04:16.273394488 +0100
-@@ -21,7 +21,7 @@
- #
- 
- # the path of the directory in which executables (like this file) are kept.
--BIN_DIR=@BINDIR@
-+BIN_DIR=$SMLNJ_HOME/bin
- 
- # the path of the directory in which the runtime system executables are kept.
- RUN_DIR=$BIN_DIR/.run
diff --git a/dev-lang/smlnj/files/smlnj-110.0.7-gcc33-quirk-fix.patch b/dev-lang/smlnj/files/smlnj-110.0.7-gcc33-quirk-fix.patch
deleted file mode 100644
index 9056a977bf20..000000000000
--- a/dev-lang/smlnj/files/smlnj-110.0.7-gcc33-quirk-fix.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -Naurp src.orig/runtime/objs/mk.x86-linux src/runtime/objs/mk.x86-linux
---- src.orig/runtime/objs/mk.x86-linux	2004-06-09 16:48:42.214121992 +0200
-+++ src/runtime/objs/mk.x86-linux	2004-06-09 16:49:05.758542696 +0200
-@@ -4,9 +4,9 @@
- SHELL =		/bin/sh
- 
- MAKE =		make
--CC =		gcc -ansi
-+CC =		gcc
- CFLAGS =	-O2
--CPP =		gcc -x c -E -P -ansi
-+CPP =		gcc -x assembler-with-cpp -E -P
- #XOBJS =	xmonitor.o
- #LD_LIBS =	-lX11
- #BASE_DEFS =	-DHEAP_MONITOR
diff --git a/dev-lang/smlnj/smlnj-110.0.7.ebuild b/dev-lang/smlnj/smlnj-110.0.7.ebuild
deleted file mode 100644
index 578ec79074ab..000000000000
--- a/dev-lang/smlnj/smlnj-110.0.7.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/smlnj/smlnj-110.0.7.ebuild,v 1.8 2009/09/23 16:53:22 patrick Exp $
-
-inherit eutils
-
-IUSE=""
-
-DESCRIPTION="Standard ML of New Jersey compiler and libraries"
-
-SRC_URI="mirror://gentoo/${P}-bin.x86-unix.tar.Z
-mirror://gentoo/${P}-config.tar.Z
-mirror://gentoo/${P}-runtime.tar.Z
-mirror://gentoo/${P}-ml-lex.tar.Z
-mirror://gentoo/${P}-ml-yacc.tar.Z
-mirror://gentoo/${P}-ml-burg.tar.Z
-mirror://gentoo/${P}-sml-nj.tar.Z
-mirror://gentoo/${P}-smlnj-c.tar.Z
-mirror://gentoo/${P}-smlnj-lib.tar.Z
-mirror://gentoo/${P}-cml.tar.Z
-mirror://gentoo/${P}-cm.tar.Z
-mirror://gentoo/${P}-eXene.tar.Z"
-
-HOMEPAGE="http://www.smlnj.org/"
-
-LICENSE="BSD"
-KEYWORDS="-* x86"
-
-SLOT="0"
-DEPEND=""
-
-SMLNJ_DEST="/usr/lib/smlnj"
-SMLNJ_TARGETS="./config/targets"
-
-GEN_POSIX_NAMES_PATCH="15i\n#\n.\nj\nw\nq"
-
-ARCH_BOOT="bin.${ARCH}-unix"
-
-src_unpack() {
-	unpack ${A}
-
-	dirs=`ls ${WORKDIR}`
-	mkdir ${WORKDIR}/src
-
-	for i in $dirs; do
-		if test "$i" != "config" -a "$i" != ${ARCH_BOOT}; then
-			mv ${WORKDIR}/${i} ${WORKDIR}/src
-		fi
-	done
-
-	printf ${GEN_POSIX_NAMES_PATCH} | ed -s ${WORKDIR}/src/runtime/config/gen-posix-names.sh
-
-	# This patch removes -ansi flags from the x86-linux Makefiles because they conflict
-	# with both gcc-3.3 and will cause issues is sysmacros.h is included as well.
-	# Closes Bug #30207
-	epatch ${FILESDIR}/${P}-gcc33-quirk-fix.patch
-
-	# smlnj generates a startup script based on the location of the executables
-	# in the filesystem during bootstrapping phase. This solution gets fooled
-	# by portage as compilation location is different than installation location.
-	# This patch solves this problem:
-	epatch ${FILESDIR}/${P}-bindir.patch
-}
-
-src_compile() {
-	export SMLNJ_HOME=${WORKDIR}
-	cd ${WORKDIR}
-
-	./config/install.sh || die
-}
-
-src_install () {
-	dodir ${SMLNJ_DEST}
-	cd ${WORKDIR}
-
-	sed -i -e "s/head -1/head -n 1/" bin/.run-sml
-
-	cp -R bin ${D}/${SMLNJ_DEST}
-	cp -R lib ${D}/${SMLNJ_DEST}
-
-	dodir /etc/env.d
-	echo -e SMLNJ_HOME=${SMLNJ_DEST} > ${D}/etc/env.d/10smlnj
-
-	#need to provide symlinks into /usr/bin
-	dodir /usr/bin
-	dosym ${SMLNJ_DEST}/bin/ml-burg /usr/bin
-	dosym ${SMLNJ_DEST}/bin/ml-lex /usr/bin
-	dosym ${SMLNJ_DEST}/bin/ml-yacc /usr/bin
-	dosym ${SMLNJ_DEST}/bin/sml /usr/bin
-}
-
-pkg_postinst() {
-	elog
-	elog "You need to run env-update to get a working installation"
-	elog
-}
diff --git a/dev-lang/smlnj/smlnj-110.45.ebuild b/dev-lang/smlnj/smlnj-110.45.ebuild
deleted file mode 100644
index 63d3252d079f..000000000000
--- a/dev-lang/smlnj/smlnj-110.45.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/smlnj/smlnj-110.45.ebuild,v 1.8 2009/09/23 16:53:22 patrick Exp $
-
-inherit eutils
-
-DESCRIPTION="Standard ML of New Jersey compiler and libraries"
-HOMEPAGE="http://www.smlnj.org"
-
-SRC_URI="x86? ( mirror://gentoo/${P}-boot.x86-unix.tgz )
-ppc? ( mirror://gentoo/${P}-boot.ppc-unix.tgz )
-mirror://gentoo/${P}-config.tgz
-mirror://gentoo/${P}-MLRISC.tgz
-mirror://gentoo/${P}-runtime.tgz
-mirror://gentoo/${P}-ml-lex.tgz
-mirror://gentoo/${P}-ml-yacc.tgz
-mirror://gentoo/${P}-ml-burg.tgz
-mirror://gentoo/${P}-smlnj-lib.tgz
-mirror://gentoo/${P}-cml.tgz
-mirror://gentoo/${P}-eXene.tgz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="-* ~ppc ~x86"
-IUSE=""
-
-DEPEND=""
-
-SMLNJ_DEST="/usr/lib/smlnj"
-SMLNJ_TARGETS="./config/targets"
-
-GEN_POSIX_NAMES_PATCH="15i\n#\n.\nj\nw\nq"
-
-ARCH_BOOT="sml.boot.${ARCH}-unix"
-
-src_unpack() {
-	unpack ${A}
-
-	dirs=`ls ${WORKDIR}`
-	mkdir ${WORKDIR}/src
-
-	for i in $dirs; do
-		if test "$i" != "config" -a "$i" != ${ARCH_BOOT}; then
-			mv ${WORKDIR}/${i} ${WORKDIR}/src
-		fi
-	done
-
-	printf ${GEN_POSIX_NAMES_PATCH} | ed -s ${WORKDIR}/src/runtime/config/gen-posix-names.sh
-}
-
-src_compile() {
-	export SMLNJ_HOME=${WORKDIR}
-	cd ${WORKDIR}
-
-	echo "request ml-burg" >> $SMLNJ_TARGETS
-	echo "request eXene" >> $SMLNJ_TARGETS
-
-	LC_ALL=C ./config/install.sh || die
-}
-
-src_install() {
-	dodir ${SMLNJ_DEST}
-	cd ${WORKDIR}
-
-	sed -i -e "s/head -1/head -n 1/" bin/.run-sml
-
-	exeinto ${SMLNJ_DEST}/bin
-	doexe bin/{.run-sml,.link-sml,.arch-n-opsys,ml-makedepend,ml-build}
-
-	exeinto ${SMLNJ_DEST}/bin/.run
-	doexe bin/.run/*
-
-	insinto ${SMLNJ_DEST}/bin/.heap
-	doins bin/.heap/*
-
-	for i in ml-lex ml-yacc sml ml-burg
-	  do
-	  dosym .run-sml ${SMLNJ_DEST}/bin/$i
-	done
-
-	cp -Rp ${WORKDIR}/lib ${D}/${SMLNJ_DEST}
-
-	dodir /etc/env.d
-	echo -e SMLNJ_HOME=${SMLNJ_DEST} > ${D}/etc/env.d/10smlnj
-
-	#need to provide symlinks into /usr/bin
-	dodir /usr/bin
-	dosym ${SMLNJ_DEST}/bin/ml-build /usr/bin/
-	dosym ${SMLNJ_DEST}/bin/ml-burg /usr/bin
-	dosym ${SMLNJ_DEST}/bin/ml-lex /usr/bin
-	dosym ${SMLNJ_DEST}/bin/ml-makedepend /usr/bin
-	dosym ${SMLNJ_DEST}/bin/ml-yacc /usr/bin
-	dosym ${SMLNJ_DEST}/bin/sml /usr/bin
-}
-
-pkg_postinst()
-{
-	elog
-	elog "You need to run env-update to get a working installation"
-	elog
-}
diff --git a/dev-lang/smlnj/smlnj-110.67-r1.ebuild b/dev-lang/smlnj/smlnj-110.67-r1.ebuild
deleted file mode 100644
index 7e79344d7997..000000000000
--- a/dev-lang/smlnj/smlnj-110.67-r1.ebuild
+++ /dev/null
@@ -1,133 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/smlnj/smlnj-110.67-r1.ebuild,v 1.1 2007/11/18 17:50:49 hkbst Exp $
-
-inherit eutils
-
-DESCRIPTION="Standard ML of New Jersey compiler and libraries"
-HOMEPAGE="http://www.smlnj.org"
-
-#BASE_URI="http://smlnj.cs.uchicago.edu/dist/working/${PV}/"
-BASE_URI="mirror://gentoo/${P}-"
-
-#Use the fetch_files.sh script in subdir files/ to fetch and
-#version these files if they aren't on Gentoo mirrors.
-#For example if you're doing a local bump.
-FILES="
-config.tgz
-
-cm.tgz
-compiler.tgz
-runtime.tgz
-system.tgz
-MLRISC.tgz
-smlnj-lib.tgz
-
-ckit.tgz
-nlffi.tgz
-
-cml.tgz
-eXene.tgz
-
-ml-lex.tgz
-ml-yacc.tgz
-ml-burg.tgz
-ml-lpt.tgz
-
-pgraph.tgz
-trace-debug-profile.tgz
-
-heap2asm.tgz
-
-smlnj-c.tgz
-"
-
-#use amd64 in 32-bit mode
-SRC_URI="amd64? ( ${BASE_URI}boot.x86-unix.tgz )
-		 ppc?   ( ${BASE_URI}boot.ppc-unix.tgz )
-		 sparc? ( ${BASE_URI}boot.sparc-unix.tgz )
-		 x86?   ( ${BASE_URI}boot.x86-unix.tgz )"
-
-for file in ${FILES}; do
-	SRC_URI+=" ${BASE_URI}${file} "
-done
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~ppc ~x86"
-IUSE=""
-
-S="${WORKDIR}"
-
-#SMLNJ_DEST="/usr/lib/smlnj"
-#SMLNJ_TARGETS="./config/targets"
-
-#GEN_POSIX_NAMES_PATCH="15i\n#\n.\nj\nw\nq"
-
-#ARCH_BOOT="sml.boot.${ARCH}-unix"
-
-src_unpack() {
-	mkdir -p "${S}"
-	for file in ${A}; do
-		[[ ${file} != ${P}-config.tgz ]] && mv "${DISTDIR}/${file}" "${S}/${file#${P}-}"
-	done
-	unpack ${P}-config.tgz && rm config/*.bat
-	echo SRCARCHIVEURL=\"file:/${S}\" > "${S}"/config/srcarchiveurl
-}
-
-src_compile() {
-#	echo "request ml-burg" >> $SMLNJ_TARGETS
-#	echo "request eXene" >> $SMLNJ_TARGETS
-
-	SMLNJ_HOME="${S}" ./config/install.sh || die "compilation failed"
-}
-
-_src_install() {
-	insinto /usr
-	doins -R bin lib
-}
-
-src_install() {
-	mkdir -p "${D}"/usr
-	mv {bin,lib} "${D}"/usr
-
-	for file in "${D}"/usr/bin/{*,.*}; do
-		[[ -f ${file} ]] && sed "2iSMLNJ_HOME=/usr" -i ${file}
-#		[[ -f ${file} ]] && sed "s:${WORKDIR}:/usr:" -i ${file}
-	done
-}
-
-_src_install() {
-	dodir ${SMLNJ_DEST}
-	cd "${WORKDIR}"
-
-	sed -i -e "s/head -1/head -n 1/" bin/.run-sml
-
-	exeinto ${SMLNJ_DEST}/bin
-	doexe bin/{.run-sml,.link-sml,.arch-n-opsys,ml-makedepend,ml-build}
-
-	exeinto ${SMLNJ_DEST}/bin/.run
-	doexe bin/.run/*
-
-	insinto ${SMLNJ_DEST}/bin/.heap
-	doins bin/.heap/*
-
-	for i in ml-lex ml-yacc sml ml-burg
-	  do
-	  dosym .run-sml ${SMLNJ_DEST}/bin/$i
-	done
-
-	cp -Rp "${WORKDIR}"/lib "${D}/${SMLNJ_DEST}"
-
-	dodir /etc/env.d
-	echo -e SMLNJ_HOME=${SMLNJ_DEST} > "${D}"/etc/env.d/50smlnj
-
-	#need to provide symlinks into /usr/bin
-	dodir /usr/bin
-	dosym ${SMLNJ_DEST}/bin/ml-build /usr/bin/
-	dosym ${SMLNJ_DEST}/bin/ml-burg /usr/bin
-	dosym ${SMLNJ_DEST}/bin/ml-lex /usr/bin
-	dosym ${SMLNJ_DEST}/bin/ml-makedepend /usr/bin
-	dosym ${SMLNJ_DEST}/bin/ml-yacc /usr/bin
-	dosym ${SMLNJ_DEST}/bin/sml /usr/bin
-}
diff --git a/dev-lang/smlnj/smlnj-110.67-r2.ebuild b/dev-lang/smlnj/smlnj-110.67-r2.ebuild
deleted file mode 100644
index 38b4015efc88..000000000000
--- a/dev-lang/smlnj/smlnj-110.67-r2.ebuild
+++ /dev/null
@@ -1,136 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/smlnj/smlnj-110.67-r2.ebuild,v 1.1 2008/03/27 10:47:49 hkbst Exp $
-
-inherit eutils
-
-DESCRIPTION="Standard ML of New Jersey compiler and libraries"
-HOMEPAGE="http://www.smlnj.org"
-
-#BASE_URI="http://smlnj.cs.uchicago.edu/dist/working/${PV}/"
-BASE_URI="mirror://gentoo/${P}-"
-
-#Use the fetch_files.sh script in subdir files/ to fetch and
-#version these files if they aren't on Gentoo mirrors.
-#For example if you're doing a local bump.
-FILES="
-config.tgz
-
-cm.tgz
-compiler.tgz
-runtime.tgz
-system.tgz
-MLRISC.tgz
-smlnj-lib.tgz
-
-ckit.tgz
-nlffi.tgz
-
-cml.tgz
-eXene.tgz
-
-ml-lex.tgz
-ml-yacc.tgz
-ml-burg.tgz
-ml-lpt.tgz
-
-pgraph.tgz
-trace-debug-profile.tgz
-
-heap2asm.tgz
-
-smlnj-c.tgz
-"
-
-#use amd64 in 32-bit mode
-SRC_URI="amd64? ( ${BASE_URI}boot.x86-unix.tgz )
-		 ppc?   ( ${BASE_URI}boot.ppc-unix.tgz )
-		 sparc? ( ${BASE_URI}boot.sparc-unix.tgz )
-		 x86?   ( ${BASE_URI}boot.x86-unix.tgz )"
-
-for file in ${FILES}; do
-	SRC_URI+=" ${BASE_URI}${file} "
-done
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~ppc ~x86"
-IUSE=""
-
-S="${WORKDIR}"
-
-#SMLNJ_DEST="/usr/lib/smlnj"
-#SMLNJ_TARGETS="./config/targets"
-
-#GEN_POSIX_NAMES_PATCH="15i\n#\n.\nj\nw\nq"
-
-#ARCH_BOOT="sml.boot.${ARCH}-unix"
-
-src_unpack() {
-	mkdir -p "${S}"
-	for file in ${A}; do
-		[[ ${file} != ${P}-config.tgz ]] && mv "${DISTDIR}/${file}" "${S}/${file#${P}-}"
-	done
-	unpack ${P}-config.tgz && rm config/*.bat
-	echo SRCARCHIVEURL=\"file:/${S}\" > "${S}"/config/srcarchiveurl
-}
-
-src_compile() {
-#	echo "request ml-burg" >> $SMLNJ_TARGETS
-#	echo "request eXene" >> $SMLNJ_TARGETS
-
-	SMLNJ_HOME="${S}" ./config/install.sh || die "compilation failed"
-}
-
-_src_install() {
-	insinto /usr
-	doins -R bin lib
-}
-
-src_install() {
-	mkdir -p "${D}"/usr
-	mv {bin,lib} "${D}"/usr
-
-	for file in "${D}"/usr/bin/{*,.*}; do
-		[[ -f ${file} ]] && sed "2iSMLNJ_HOME=/usr" -i ${file}
-#		[[ -f ${file} ]] && sed "s:${WORKDIR}:/usr:" -i ${file}
-	done
-
-	cd "${D}"
-	epatch "${FILESDIR}"/ml-makedepend.patch
-}
-
-_src_install() {
-	dodir ${SMLNJ_DEST}
-	cd "${WORKDIR}"
-
-	sed -i -e "s/head -1/head -n 1/" bin/.run-sml
-
-	exeinto ${SMLNJ_DEST}/bin
-	doexe bin/{.run-sml,.link-sml,.arch-n-opsys,ml-makedepend,ml-build}
-
-	exeinto ${SMLNJ_DEST}/bin/.run
-	doexe bin/.run/*
-
-	insinto ${SMLNJ_DEST}/bin/.heap
-	doins bin/.heap/*
-
-	for i in ml-lex ml-yacc sml ml-burg
-	  do
-	  dosym .run-sml ${SMLNJ_DEST}/bin/$i
-	done
-
-	cp -Rp "${WORKDIR}"/lib "${D}/${SMLNJ_DEST}"
-
-	dodir /etc/env.d
-	echo -e SMLNJ_HOME=${SMLNJ_DEST} > "${D}"/etc/env.d/50smlnj
-
-	#need to provide symlinks into /usr/bin
-	dodir /usr/bin
-	dosym ${SMLNJ_DEST}/bin/ml-build /usr/bin/
-	dosym ${SMLNJ_DEST}/bin/ml-burg /usr/bin
-	dosym ${SMLNJ_DEST}/bin/ml-lex /usr/bin
-	dosym ${SMLNJ_DEST}/bin/ml-makedepend /usr/bin
-	dosym ${SMLNJ_DEST}/bin/ml-yacc /usr/bin
-	dosym ${SMLNJ_DEST}/bin/sml /usr/bin
-}
diff --git a/dev-lang/smlnj/smlnj-110.69.ebuild b/dev-lang/smlnj/smlnj-110.75.ebuild
index 88a03d091879..5b27a2344ecd 100644
--- a/dev-lang/smlnj/smlnj-110.69.ebuild
+++ b/dev-lang/smlnj/smlnj-110.75.ebuild
@@ -1,20 +1,16 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/smlnj/smlnj-110.69.ebuild,v 1.1 2009/03/09 23:36:41 hkbst Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/smlnj/smlnj-110.75.ebuild,v 1.1 2012/10/19 09:31:58 hkbst Exp $
 
-EAPI=2
+EAPI="4"
 
 inherit eutils
 
 DESCRIPTION="Standard ML of New Jersey compiler and libraries"
 HOMEPAGE="http://www.smlnj.org"
 
-BASE_URI="http://smlnj.cs.uchicago.edu/dist/working/${PV}/"
-#BASE_URI="mirror://gentoo/${P}-"
+BASE_URI="http://smlnj.cs.uchicago.edu/dist/working/${PV}"
 
-#Use the fetch_files.sh script in subdir files/ to fetch and
-#version these files if they aren't on Gentoo mirrors.
-#For example if you're doing a local bump.
 FILES="
 config.tgz
 
@@ -45,27 +41,31 @@ smlnj-c.tgz
 "
 
 #use amd64 in 32-bit mode
-SRC_URI="amd64? ( ${BASE_URI}boot.x86-unix.tgz -> ${P}-boot.x86-unix.tgz )
-		 ppc?   ( ${BASE_URI}boot.ppc-unix.tgz -> ${P}-boot.ppc-unix.tgz )
-		 sparc? ( ${BASE_URI}boot.sparc-unix.tgz -> ${P}-boot.sparc-unix.tgz )
-		 x86?   ( ${BASE_URI}boot.x86-unix.tgz -> ${P}-boot.x86-unix.tgz )"
+SRC_URI="amd64? ( ${BASE_URI}/boot.x86-unix.tgz -> ${P}-boot.x86-unix.tgz )
+		 ppc?   ( ${BASE_URI}/boot.ppc-unix.tgz -> ${P}-boot.ppc-unix.tgz )
+		 sparc? ( ${BASE_URI}/boot.sparc-unix.tgz -> ${P}-boot.sparc-unix.tgz )
+		 x86?   ( ${BASE_URI}/boot.x86-unix.tgz -> ${P}-boot.x86-unix.tgz )"
 
 for file in ${FILES}; do
-	SRC_URI+=" ${BASE_URI}${file} -> ${P}-${file} "
+	SRC_URI+=" ${BASE_URI}/${file} -> ${P}-${file} "
 done
 
 LICENSE="BSD"
 SLOT="0"
+
+#sparc support should be there but is untested
 KEYWORDS="-* ~amd64 ~ppc ~x86"
 IUSE=""
 
-S="${WORKDIR}"
+S=${WORKDIR}
 
 src_unpack() {
 	mkdir -p "${S}"
 	for file in ${A}; do
 		[[ ${file} != ${P}-config.tgz ]] && cp "${DISTDIR}/${file}" "${S}/${file#${P}-}"
 	done
+
+#	make sure we don't use the internet to download anything
 	unpack ${P}-config.tgz && rm config/*.bat
 	echo SRCARCHIVEURL=\"file:/${S}\" > "${S}"/config/srcarchiveurl
 }
@@ -76,10 +76,10 @@ src_compile() {
 
 src_install() {
 	mkdir -p "${D}"/usr
-	mv {bin,lib} "${D}"/usr
+	mv bin lib "${D}"/usr
 
 	for file in "${D}"/usr/bin/{*,.*}; do
 		[[ -f ${file} ]] && sed "2iSMLNJ_HOME=/usr" -i ${file}
-#		[[ -f ${file} ]] && sed "s:${WORKDIR}:/usr:" -i ${file}
+ #		[[ -f ${file} ]] && sed "s:${WORKDIR}:/usr:" -i ${file}
 	done
 }