Made compatible with gcc-3.4 and fixed a bug that caused the wrong set of libraries to be used by default (both bug #71183).

6 files changed, 90 insertions, 31 deletions

diff --git a/dev-lang/helium/ChangeLog b/dev-lang/helium/ChangeLog
index b1ee401065e5..2ba46ade4422 100644
--- a/dev-lang/helium/ChangeLog
+++ b/dev-lang/helium/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-lang/helium
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/helium/ChangeLog,v 1.10 2004/10/16 23:10:26 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/helium/ChangeLog,v 1.11 2004/11/18 13:36:59 kosmikus Exp $
+
+*helium-1.2-r1 (18 Nov 2004)
+
+  18 Nov 2004; Andres Loeh <kosmikus@gentoo.org>
+  +files/helium-1.2-libraries.patch, files/helium-wrapper,
+  +helium-1.2-r1.ebuild:
+  Made compatible with gcc-3.4 and fixed a bug that caused the wrong set of
+  libraries to be used by default (both bug #71183).
 
   17 Oct 2004; Thomas Matthijs <axxo@gentoo.org> helium-1.1.ebuild,
   helium-1.2.ebuild:
diff --git a/dev-lang/helium/Manifest b/dev-lang/helium/Manifest
index 1ae49b3a0c8d..15690c6120a8 100644
--- a/dev-lang/helium/Manifest
+++ b/dev-lang/helium/Manifest
@@ -1,19 +1,10 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 401bb5915c18b1a3c3fe61f8a2fe52a3 helium-1.2.ebuild 1504
+MD5 cbab676d04d0391df427db7c4491abd7 helium-1.2-r1.ebuild 2245
 MD5 332305eb38cf10022f4ba01fb9764a28 helium-1.1.ebuild 1845
-MD5 d227ba572749f90944ea3fa1012e0762 ChangeLog 1353
+MD5 ef4365876dc50e338ea9232d2d7d47e7 ChangeLog 1650
 MD5 a769ecfcd1cdd2d40986627df7dfb249 metadata.xml 224
 MD5 fb82aad0fbf3d3cb5071c5fef803a7ec files/helium-1.2-readline.patch 1661
-MD5 3991ed4891d6455e980008f704211a97 files/helium-wrapper 558
+MD5 b52e9cf5c002e2c5ce007e523f7ec7b8 files/helium-wrapper 715
+MD5 24e12289b961bd308d3a79495d55952e files/helium-1.2-libraries.patch 1943
 MD5 538379c81a9dfdc87a15ce0e6a504c8a files/helium-1.1-readline.patch 1710
 MD5 9383829eb1e80fc6be12c53d3162d58b files/digest-helium-1.1 119
-MD5 62f20b4dc3f4e34dd748b64d19dbb6c8 files/digest-helium-1.2 120
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFBcapr/rLF9B432nYRAutXAJ9uwGHU4dRB/QS/4hT6omQR4BrOXQCgti27
-m0dClKjI0C5XCt6QbLmR0kY=
-=P4zO
------END PGP SIGNATURE-----
+MD5 62f20b4dc3f4e34dd748b64d19dbb6c8 files/digest-helium-1.2-r1 120
diff --git a/dev-lang/helium/files/digest-helium-1.2 b/dev-lang/helium/files/digest-helium-1.2-r1
index c3cf03e43437..c3cf03e43437 100644
--- a/dev-lang/helium/files/digest-helium-1.2
+++ b/dev-lang/helium/files/digest-helium-1.2-r1
diff --git a/dev-lang/helium/files/helium-1.2-libraries.patch b/dev-lang/helium/files/helium-1.2-libraries.patch
new file mode 100644
index 000000000000..8ee4aee6cf7a
--- /dev/null
+++ b/dev-lang/helium/files/helium-1.2-libraries.patch
@@ -0,0 +1,42 @@
+diff -Naur helium-1.2.orig/heliumNT/src/Makefile.in helium-1.2/heliumNT/src/Makefile.in
+--- helium-1.2.orig/heliumNT/src/Makefile.in	2004-11-18 12:37:28.025725408 +0100
++++ helium-1.2/heliumNT/src/Makefile.in	2004-11-18 12:39:54.000000000 +0100
+@@ -32,6 +32,7 @@
+ exec_prefix = @exec_prefix@

+ bindir      = @bindir@

+ libdir      = @prefix@/helium/lib

++tclibdir    = @prefix@/helium/tclib

+ demodir     = @prefix@/helium/demo

+ 

+ status :

+@@ -40,6 +41,8 @@
+ 	@echo "Type \"make install\" to install."

+ 	@echo "  Binaries will go into  $(bindir)"

+ 	@echo "  Libraries will go into $(libdir)"

++	@echo "  Libraries supporting type classes will go into"

++	@echo "                         $(tclibdir)"

+ 	@echo "  Demos will go into     $(demodir)"

+ 	@echo "*******************************************************************"

+ 

+@@ -432,15 +435,18 @@
+ install : smaller

+ 	# *** Copy sources to library directory

+-	$(MKDIR) $(bindir) $(libdir) $(demodir)

+-	$(INSTALL) -m 644 ../lib/Prelude.hs ../lib/List.hs ../lib/Maybe.hs $(libdir)

++	$(MKDIR) $(bindir) $(libdir) $(tclibdir) $(demodir)

++	$(INSTALL) -m 644 ../lib/simple/Prelude.hs ../lib/simple/List.hs ../lib/simple/Maybe.hs $(libdir)

++	$(INSTALL) -m 644 ../lib/Prelude.hs ../lib/List.hs ../lib/Maybe.hs $(tclibdir)

+ 	$(INSTALL) -m 755 $(HELIUMBINDIR)/$(MAIN)$(EXE) $(bindir)

+ 	$(INSTALL) -m 755 $(LVMRUNTIMEDIR)/lvmrun$(EXE) $(bindir)

+ 	$(INSTALL) -m 755 $(HELIUMBINDIR)/texthint$(EXE) $(bindir)

+ 	# *** Copying demos to demo directory

+ 	$(INSTALL) -m 644 ../demo/Calendar.hs ../demo/ParserLibrary.hs ../demo/ParserDemo.hs ../demo/TicTacToe.hs $(demodir)

+ 	# *** Copy generated lvms and touch them

+-	$(INSTALL) -m 644 ../lib/*.lvm $(libdir)

++	$(INSTALL) -m 644 ../lib/simple/*.lvm $(libdir)

++	$(INSTALL) -m 644 ../lib/*.lvm $(tclibdir)

+ 	touch $(libdir)/*.lvm

++	touch $(tclibdir)/*.lvm

+ 

+ movetohome: smaller

+ 	# *** Copying library sources to projects directory

diff --git a/dev-lang/helium/files/helium-wrapper b/dev-lang/helium/files/helium-wrapper
index e94e05e90d14..7bcd820e0b59 100644
--- a/dev-lang/helium/files/helium-wrapper
+++ b/dev-lang/helium/files/helium-wrapper
@@ -1,6 +1,7 @@
 #! /bin/sh
 
-BINNAME="$(basename $0)"
+BINNAME_LONG="$(basename $0)"
+BINNAME="${BINNAME_LONG%-tc}"
 
 if [ -n "${HELIUM_TEMP}" ]; then
 	TEMP="${HELIUM_TEMP}";
@@ -10,15 +11,22 @@ else
 		mkdir ${TEMP};
 	fi;
 fi
+
+if [ "${BINNAME_LONG}" = "${BINNAME}" ]; then
+	HELIUM_LIBS="/usr/lib/helium/lib";
+else
+	HELIUM_LIBS="/usr/lib/helium/tclib";
+fi
+
 if [ -z "${LVMPATH}" ]; then
-	LVMPATH=".:/usr/lib/helium/lib";
+	LVMPATH=".:${HELIUM_LIBS}";
 else
-	LVMPATH="${LVMPATH}:/usr/lib/helium/lib";
+	LVMPATH="${LVMPATH}:${HELIUM_LIBS}";
 fi
 export LVMPATH
 export TEMP
 
-if [ x${BINNAME} = xhint ]; then
+if [ "${BINNAME}" = "hint" ]; then
 
 	JAVA="$(java-config --java)"
         PROGCALL="${JAVA} -jar -DPATH=${PATH} -DLVMPATH=${LVMPATH} /usr/share/helium/lib/Hint.jar"
diff --git a/dev-lang/helium/helium-1.2.ebuild b/dev-lang/helium/helium-1.2-r1.ebuild
index 3e01b15c9f7a..b9c221b0f8bb 100644
--- a/dev-lang/helium/helium-1.2.ebuild
+++ b/dev-lang/helium/helium-1.2-r1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/helium/helium-1.2.ebuild,v 1.6 2004/10/16 23:10:26 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/helium/helium-1.2-r1.ebuild,v 1.1 2004/11/18 13:36:59 kosmikus Exp $
 
-inherit java-pkg
+inherit eutils java-pkg
 
 DESCRIPTION="Helium (for learning Haskell)"
 HOMEPAGE="http://www.cs.uu.nl/helium"
@@ -25,32 +25,38 @@ RDEPEND="virtual/libc
 src_unpack() {
 	unpack ${P}-src.tar.gz
 
+	# patch to use simple libraries by default
+	epatch ${FILESDIR}/${P}-libraries.patch
 	# patch for readline support if requested
 	if use readline; then
-		patch -p0 -i ${FILESDIR}/${P}-readline.patch || die
+		epatch ${FILESDIR}/${P}-readline.patch
 	fi
 }
 
 src_compile() {
-	pushd lvm || die
-	pushd src || die
-	./configure
+	pushd lvm || die "cannot cd to lvm"
+	pushd src || die "cannot cd to src"
+	./configure || die "lvm configure failed"
+	# for gcc 3.4 compatibility, patch file created by configure
+	sed -i 's/#define strncpy(dest,src,size)  strcpy(dest,src)/#define HAS_SNPRINTF\n#define HAS_VSNPRINTF\n/'  config/s.h \
+		|| die "patch to config/s.h didn't apply"
 	popd
 	popd
-	pushd heliumNT || die
+	pushd heliumNT || die "cannot cd to heliumNT"
 	econf --without-upx || die "econf failed"
-	pushd src || die
-	make depend || die
-	make || die # emake doesn't work safely
+	pushd src || die "cannot cd to src"
+	make depend || die "make depend failed"
+	make || die "make failed" # emake doesn't work safely
 }
 
 src_install() {
-	cd heliumNT/src || die
+	cd heliumNT/src || die "cannot cd to heliumNT/src"
 	make prefix=${D}/usr \
 		bindir=${D}/usr/lib/helium/bin \
 		libdir=${D}/usr/lib/helium/lib \
+		tclibdir=${D}/usr/lib/helium/tclib \
 		demodir=${D}/usr/lib/helium/demo \
-		install || die
+		install || die "make failed"
 	# install hint
 	java-pkg_dojar ${DISTDIR}/Hint.jar
 	# create wrappers
@@ -59,5 +65,9 @@ src_install() {
 	dosym /usr/bin/helium-wrapper /usr/bin/lvmrun
 	dosym /usr/bin/helium-wrapper /usr/bin/texthint
 	dosym /usr/bin/helium-wrapper /usr/bin/hint
+	dosym /usr/bin/helium-wrapper /usr/bin/helium-tc
+	dosym /usr/bin/helium-wrapper /usr/bin/lvmrun-tc
+	dosym /usr/bin/helium-wrapper /usr/bin/texthint-tc
+	dosym /usr/bin/helium-wrapper /usr/bin/hint-tc
 }