Fix a great number of bugs, now we have the latest release and working versions... working!

10 files changed, 145 insertions, 90 deletions

diff --git a/dev-lang/smlnj/ChangeLog b/dev-lang/smlnj/ChangeLog
index 82f6b47841d4..ae081f3f9b44 100644
--- a/dev-lang/smlnj/ChangeLog
+++ b/dev-lang/smlnj/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for dev-lang/smlnj
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/smlnj/ChangeLog,v 1.7 2004/06/08 17:33:05 mattam Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/smlnj/ChangeLog,v 1.8 2004/06/10 11:15:38 mattam Exp $
+
+  10 Jun 2004; Matthieu Sozeau <mattam@gentoo.org> smlnj-110.42.ebuild,
+  smlnj-110.43.ebuild, files/smlnj-110.43-gcc33-quirk-fix.patch:
+  Remove non-functionnal 110.4{2,3} ebuilds, add latest working version 110.45
+  and latest stable version 110.0.7. Also change SRC_URI's to gentoo mirrors to
+  fix Manifest/digest bugs. Thanks to Bernd Knochenhauer <bk@zerg.homelinux.net>
+  for help in the testing of these ebuilds. It should fix bugs #43045, #43018, 
+  #30207.
+
+  10 Jun 2004; Matthieu Sozeau <mattam@gentoo.org> smlnj-110.42.ebuild,
+  smlnj-110.43.ebuild, files/smlnj-110.43-gcc33-quirk-fix.patch:
+  change src_postinst to pkg_postinst
 
   08 Jun 2004; Matthieu Sozeau <mattam@gentoo.org> smlnj-110.42.ebuild:
   Fix bug #48509.
diff --git a/dev-lang/smlnj/Manifest b/dev-lang/smlnj/Manifest
index ddfc3db5bfa2..64bc52e165c2 100644
--- a/dev-lang/smlnj/Manifest
+++ b/dev-lang/smlnj/Manifest
@@ -1,7 +1,13 @@
-MD5 61b2b2674b5cc72eadbbc614c993aa7b ChangeLog 1186
-MD5 ddc9fc248582b3a2831f403a46e7ca8d smlnj-110.42.ebuild 2371
+MD5 9f54e48ec42970de1dbf69757fd6c5d6 ChangeLog 1362
 MD5 8b350f19c06fcabf1053b0421b7c3f5a metadata.xml 155
-MD5 3d637de8a2b21a9ecd110b275629d8e0 smlnj-110.43.ebuild 2602
+MD5 96ef12911426037858af1d451a16398d smlnj-110.42.ebuild 2385
+MD5 c1e0c1c92f36ad5b92157f18b3d26590 smlnj-110.43.ebuild 2850
+MD5 36b04ba290d6c086bfdea69a603debc1 smlnj-110.0.7.ebuild 2432
+MD5 033d3cd91e934ddfebaabec4533a2ba3 smlnj-110.45.ebuild 2277
 MD5 50048fd027712df53a1839a96ea71b92 files/digest-smlnj-110.42 501
-MD5 50048fd027712df53a1839a96ea71b92 files/digest-smlnj-110.43 501
-MD5 b371210cdd42e09c4c6c5d318d08109e files/smlnj-110.43-gcc33-quirk-fix.patch 501
+MD5 41ea9aa35bd731dd182f6b54c1839d22 files/digest-smlnj-110.43 694
+MD5 5c435461669d46e3febc88f7719211a6 files/smlnj-110.43-gcc33-quirk-fix.patch 934
+MD5 30591f243ab3c505e7a5c9d8b2ea5606 files/digest-smlnj-110.45 763
+MD5 1bbb6b968c7f7ba50fdd9abcac22343b files/smlnj-110.0.7-bindir.patch 364
+MD5 ad71c8d20ca50e85ceb5d44d0c7a4ea6 files/smlnj-110.0.7-gcc33-quirk-fix.patch 451
+MD5 052c6ec903df4598663eaaecb76a75cc files/digest-smlnj-110.0.7 857
diff --git a/dev-lang/smlnj/files/digest-smlnj-110.0.7 b/dev-lang/smlnj/files/digest-smlnj-110.0.7
new file mode 100644
index 000000000000..a7c6a03a15dd
--- /dev/null
+++ b/dev-lang/smlnj/files/digest-smlnj-110.0.7
@@ -0,0 +1,12 @@
+MD5 03c34f3718a00c34aaf369382c57dcef smlnj-110.0.7-bin.x86-unix.tar.Z 3620350
+MD5 747b58db2b4933fb028f99c2fa90c5eb smlnj-110.0.7-config.tar.Z 10397
+MD5 877e2a52828da4e971a4830f11e1635a smlnj-110.0.7-runtime.tar.Z 615867
+MD5 96723edc80cb58096c9e549141330c6e smlnj-110.0.7-ml-lex.tar.Z 46008
+MD5 5b92d0a6778b0687e865c89704fb5113 smlnj-110.0.7-ml-yacc.tar.Z 160157
+MD5 c49cc8d3023411476d33987b3521aaa4 smlnj-110.0.7-ml-burg.tar.Z 99341
+MD5 b224649816e19dfb1ed2642e71a15646 smlnj-110.0.7-sml-nj.tar.Z 1686021
+MD5 f6b9e6b81c8a0d5e3492135d6221db54 smlnj-110.0.7-smlnj-c.tar.Z 106309
+MD5 7e6d3fb3e62d8bd6348bf3c0306ec4cd smlnj-110.0.7-smlnj-lib.tar.Z 417409
+MD5 f39fa0bfd308273674b34d6c40789b66 smlnj-110.0.7-cml.tar.Z 259665
+MD5 419a7ca8f8d2de79f46b633e6a5abe97 smlnj-110.0.7-cm.tar.Z 543905
+MD5 343f860951e2b358b84674d13cea6cdd smlnj-110.0.7-eXene.tar.Z 1118845
diff --git a/dev-lang/smlnj/files/digest-smlnj-110.42 b/dev-lang/smlnj/files/digest-smlnj-110.42
deleted file mode 100644
index b019f5d109fd..000000000000
--- a/dev-lang/smlnj/files/digest-smlnj-110.42
+++ /dev/null
@@ -1,9 +0,0 @@
-MD5 43e569b0c702466d2a3c851fbf5cc8a8 config.tgz 13660
-MD5 2fbd0a8bf452c7ada0369fec1c3b732c runtime.tgz 313057
-MD5 68c57ff4f1e91c76abb47bab76476567 boot.x86-unix.tgz 5147025
-MD5 00569c04368da182310eed501a87f787 ml-lex.tgz 32108
-MD5 362edafbf2fdbda35505ac9784c86ee2 ml-yacc.tgz 95608
-MD5 efa7b9b411f2a674e39383d723040c64 ml-burg.tgz 31696
-MD5 294b04dd18877c1c7848adf12aae3c3f smlnj-lib.tgz 251230
-MD5 5418fecfdf569e356a6b5f00ed808ac9 cml.tgz 128485
-MD5 0f303ecba76f750ab1b0e38e17428fba eXene.tgz 695431
diff --git a/dev-lang/smlnj/files/digest-smlnj-110.43 b/dev-lang/smlnj/files/digest-smlnj-110.43
deleted file mode 100644
index b019f5d109fd..000000000000
--- a/dev-lang/smlnj/files/digest-smlnj-110.43
+++ /dev/null
@@ -1,9 +0,0 @@
-MD5 43e569b0c702466d2a3c851fbf5cc8a8 config.tgz 13660
-MD5 2fbd0a8bf452c7ada0369fec1c3b732c runtime.tgz 313057
-MD5 68c57ff4f1e91c76abb47bab76476567 boot.x86-unix.tgz 5147025
-MD5 00569c04368da182310eed501a87f787 ml-lex.tgz 32108
-MD5 362edafbf2fdbda35505ac9784c86ee2 ml-yacc.tgz 95608
-MD5 efa7b9b411f2a674e39383d723040c64 ml-burg.tgz 31696
-MD5 294b04dd18877c1c7848adf12aae3c3f smlnj-lib.tgz 251230
-MD5 5418fecfdf569e356a6b5f00ed808ac9 cml.tgz 128485
-MD5 0f303ecba76f750ab1b0e38e17428fba eXene.tgz 695431
diff --git a/dev-lang/smlnj/files/digest-smlnj-110.45 b/dev-lang/smlnj/files/digest-smlnj-110.45
new file mode 100644
index 000000000000..0e199263615c
--- /dev/null
+++ b/dev-lang/smlnj/files/digest-smlnj-110.45
@@ -0,0 +1,11 @@
+MD5 1ab6190a56b9b93a187143c2f7a94d7b smlnj-110.45-boot.x86-unix.tgz 5298523
+MD5 6f3c5658c9f9d2b8876d8998fa36273b smlnj-110.45-boot.ppc-unix.tgz 5211874
+MD5 41648889cc2b4f45e0a72ac13d319155 smlnj-110.45-config.tgz 12918
+MD5 8e6ee2b2cd4200bfabb7212212407c91 smlnj-110.45-MLRISC.tgz 1221377
+MD5 c2c9efcdfcaf1e70d3b546105b5ab7a2 smlnj-110.45-runtime.tgz 315758
+MD5 4fa0ae33f56a83b7294605bedc6a0c97 smlnj-110.45-ml-lex.tgz 32382
+MD5 30fd1c8b4132600f838d3cb2289a070c smlnj-110.45-ml-yacc.tgz 95048
+MD5 fd36faabc3e8833a4e32c55632c95b94 smlnj-110.45-ml-burg.tgz 31547
+MD5 aa42c2dc8ab6be7c8e4b41bd2bbfd25f smlnj-110.45-smlnj-lib.tgz 217129
+MD5 3386ad64c9cd321d6a398550827a8f84 smlnj-110.45-cml.tgz 103556
+MD5 a578a05fdb83d09b99fb7aa455f93877 smlnj-110.45-eXene.tgz 695211
diff --git a/dev-lang/smlnj/files/smlnj-110.0.7-bindir.patch b/dev-lang/smlnj/files/smlnj-110.0.7-bindir.patch
new file mode 100644
index 000000000000..4ebecef7e3ce
--- /dev/null
+++ b/dev-lang/smlnj/files/smlnj-110.0.7-bindir.patch
@@ -0,0 +1,11 @@
+--- 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.43-gcc33-quirk-fix.patch b/dev-lang/smlnj/files/smlnj-110.0.7-gcc33-quirk-fix.patch
index e54077f5f151..9056a977bf20 100644
--- a/dev-lang/smlnj/files/smlnj-110.43-gcc33-quirk-fix.patch
+++ b/dev-lang/smlnj/files/smlnj-110.0.7-gcc33-quirk-fix.patch
@@ -1,17 +1,15 @@
 diff -Naurp src.orig/runtime/objs/mk.x86-linux src/runtime/objs/mk.x86-linux
---- src.orig/runtime/objs/mk.x86-linux	2002-04-12 13:54:31.000000000 -0400
-+++ src/runtime/objs/mk.x86-linux	2003-10-02 19:05:56.000000000 -0400
-@@ -4,10 +4,10 @@
+--- 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 -ansi
+-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.43.ebuild b/dev-lang/smlnj/smlnj-110.0.7.ebuild
index 6549967130ac..43b405d9f4fe 100644
--- a/dev-lang/smlnj/smlnj-110.43.ebuild
+++ b/dev-lang/smlnj/smlnj-110.0.7.ebuild
@@ -1,34 +1,40 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/smlnj/smlnj-110.43.ebuild,v 1.6 2004/06/08 21:34:56 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/smlnj/smlnj-110.0.7.ebuild,v 1.1 2004/06/10 11:15:38 mattam Exp $
 
 inherit eutils
 
+IUSE=""
+
 DESCRIPTION="Standard ML of New Jersey compiler and libraries"
-HOMEPAGE="http://cm.bell-labs.com/cm/cs/what/smlnj/"
-SRC_URI="ftp://ftp.research.bell-labs.com/dist/smlnj/working/${PV}/config.tgz
-	ftp://ftp.research.bell-labs.com/dist/smlnj/working/${PV}/runtime.tgz
-	ftp://ftp.research.bell-labs.com/dist/smlnj/working/${PV}/boot.x86-unix.tgz
-	ftp://ftp.research.bell-labs.com/dist/smlnj/working/${PV}/ml-lex.tgz
-	ftp://ftp.research.bell-labs.com/dist/smlnj/working/${PV}/ml-yacc.tgz
-	ftp://ftp.research.bell-labs.com/dist/smlnj/working/${PV}/ml-burg.tgz
-	ftp://ftp.research.bell-labs.com/dist/smlnj/working/${PV}/smlnj-lib.tgz
-	ftp://ftp.research.bell-labs.com/dist/smlnj/working/${PV}/cml.tgz
-	ftp://ftp.research.bell-labs.com/dist/smlnj/working/${PV}/eXene.tgz"
+
+SRC_URI="mirror://${P}-bin.x86-unix.tar.Z
+mirror://${P}-config.tar.Z
+mirror://${P}-runtime.tar.Z
+mirror://${P}-ml-lex.tar.Z
+mirror://${P}-ml-yacc.tar.Z
+mirror://${P}-ml-burg.tar.Z
+mirror://${P}-sml-nj.tar.Z
+mirror://${P}-smlnj-c.tar.Z
+mirror://${P}-smlnj-lib.tar.Z
+mirror://${P}-cml.tar.Z
+mirror://${P}-cm.tar.Z
+mirror://${P}-eXene.tar.Z"
+
+HOMEPAGE="http://www.smlnj.org/"
 
 LICENSE="BSD"
-SLOT="0"
-KEYWORDS="-* ~x86"
-IUSE=""
+KEYWORDS="-* x86"
 
+SLOT="0"
 DEPEND="virtual/glibc"
 
-SMLNJ_DEST="/usr/share/smlnj"
+SMLNJ_DEST="/usr/lib/smlnj"
 SMLNJ_TARGETS="./config/targets"
 
 GEN_POSIX_NAMES_PATCH="15i\n#\n.\nj\nw\nq"
 
-ARCH_BOOT="sml.boot.x86-unix"
+ARCH_BOOT="bin.${ARCH}-unix"
 
 src_unpack() {
 	unpack ${A}
@@ -48,42 +54,43 @@ src_unpack() {
 	# 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() {
-	if test "${SMLNJ_HOME}" != ""; then
-		SMLNJ_HOME=""
-	fi
-
+	SMLNJ_HOME=${WORKDIR}
 	cd ${WORKDIR}
 
-	echo "request ml-burg" >> $SMLNJ_TARGETS
-	echo "request cml" >> $SMLNJ_TARGETS
-	echo "request cml-lib" >> $SMLNJ_TARGETS
-	echo "request eXene" >> $SMLNJ_TARGETS
-
 	./config/install.sh || die
 }
 
-src_install() {
+src_install () {
 	dodir ${SMLNJ_DEST}
+	cd ${WORKDIR}
+
+	sed -i -e "s/head -1/head -n 1/" bin/.run-sml
 
-	cp -r ${WORKDIR}/{bin,lib} ${D}${SMLNJ_DEST} || die
+	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-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()
-{
+pkg_postinst() {
+	einfo
 	einfo "You need to run env-update to get a working installation"
-}
+	einfo
+}
\ No newline at end of file
diff --git a/dev-lang/smlnj/smlnj-110.42.ebuild b/dev-lang/smlnj/smlnj-110.45.ebuild
index 6e2f95550b7b..144e56b82712 100644
--- a/dev-lang/smlnj/smlnj-110.42.ebuild
+++ b/dev-lang/smlnj/smlnj-110.45.ebuild
@@ -1,35 +1,37 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/smlnj/smlnj-110.42.ebuild,v 1.6 2004/06/08 21:34:56 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/smlnj/smlnj-110.45.ebuild,v 1.1 2004/06/10 11:15:38 mattam Exp $
 
-IUSE=""
+inherit eutils
 
-S=${WORKDIR}/${P}
 DESCRIPTION="Standard ML of New Jersey compiler and libraries"
-SRC_URI="ftp://ftp.research.bell-labs.com/dist/smlnj/working/${PV}/config.tgz
-	ftp://ftp.research.bell-labs.com/dist/smlnj/working/${PV}/runtime.tgz
-	ftp://ftp.research.bell-labs.com/dist/smlnj/working/${PV}/boot.x86-unix.tgz
-	ftp://ftp.research.bell-labs.com/dist/smlnj/working/${PV}/ml-lex.tgz
-	ftp://ftp.research.bell-labs.com/dist/smlnj/working/${PV}/ml-yacc.tgz
-	ftp://ftp.research.bell-labs.com/dist/smlnj/working/${PV}/ml-burg.tgz
-	ftp://ftp.research.bell-labs.com/dist/smlnj/working/${PV}/smlnj-lib.tgz
-	ftp://ftp.research.bell-labs.com/dist/smlnj/working/${PV}/cml.tgz
-	ftp://ftp.research.bell-labs.com/dist/smlnj/working/${PV}/eXene.tgz"
-
-HOMEPAGE="http://cm.bell-labs.com/cm/cs/what/smlnj/"
+HOMEPAGE="http://www.smlnj.org"
+
+SRC_URI="x86? ( mirror://${P}-boot.x86-unix.tgz )
+ppc? ( mirror://${P}-boot.ppc-unix.tgz )
+mirror://${P}-config.tgz
+mirror://${P}-MLRISC.tgz
+mirror://${P}-runtime.tgz
+mirror://${P}-ml-lex.tgz
+mirror://${P}-ml-yacc.tgz
+mirror://${P}-ml-burg.tgz
+mirror://${P}-smlnj-lib.tgz
+mirror://${P}-cml.tgz
+mirror://${P}-eXene.tgz"
 
 LICENSE="BSD"
-KEYWORDS="x86"
-
 SLOT="0"
+KEYWORDS="-* ~ppc ~x86"
+IUSE=""
+
 DEPEND="virtual/glibc"
 
-SMLNJ_DEST="/usr/share/smlnj"
+SMLNJ_DEST="/usr/lib/smlnj"
 SMLNJ_TARGETS="./config/targets"
 
 GEN_POSIX_NAMES_PATCH="15i\n#\n.\nj\nw\nq"
 
-ARCH_BOOT="sml.boot.x86-unix"
+ARCH_BOOT="sml.boot.${ARCH}-unix"
 
 src_unpack() {
 	unpack ${A}
@@ -47,25 +49,37 @@ src_unpack() {
 }
 
 src_compile() {
-	if test "${SMLNJ_HOME}" != ""; then
-		SMLNJ_HOME=""
-	fi
+	SMLNJ_HOME=${WORKDIR}
 
 	cd ${WORKDIR}
 
 	echo "request ml-burg" >> $SMLNJ_TARGETS
-	echo "request cml" >> $SMLNJ_TARGETS
-	echo "request cml-lib" >> $SMLNJ_TARGETS
 	echo "request eXene" >> $SMLNJ_TARGETS
 
 	./config/install.sh || die
 }
 
-src_install () {
-
+src_install() {
 	dodir ${SMLNJ_DEST}
+	cd ${WORKDIR}
+
+	sed -i -e "s/head -1/head -n 1/" bin/.run-sml
 
-	cp -r ${WORKDIR}/{bin,lib} ${D}${SMLNJ_DEST} || die
+	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
@@ -78,9 +92,11 @@ src_install () {
 	dosym ${SMLNJ_DEST}/bin/ml-makedepend /usr/bin
 	dosym ${SMLNJ_DEST}/bin/ml-yacc /usr/bin
 	dosym ${SMLNJ_DEST}/bin/sml /usr/bin
-
 }
 
-src_postint() {
+pkg_postinst()
+{
+	einfo
 	einfo "You need to run env-update to get a working installation"
+	einfo
 }