# 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:
------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
--- /dev/null
+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@\r
+ bindir = @bindir@\r
+ libdir = @prefix@/helium/lib\r
++tclibdir = @prefix@/helium/tclib\r
+ demodir = @prefix@/helium/demo\r
+ \r
+ status :\r
+@@ -40,6 +41,8 @@
+ @echo "Type \"make install\" to install."\r
+ @echo " Binaries will go into $(bindir)"\r
+ @echo " Libraries will go into $(libdir)"\r
++ @echo " Libraries supporting type classes will go into"\r
++ @echo " $(tclibdir)"\r
+ @echo " Demos will go into $(demodir)"\r
+ @echo "*******************************************************************"\r
+ \r
+@@ -432,15 +435,18 @@
+ install : smaller\r
+ # *** Copy sources to library directory\r
+- $(MKDIR) $(bindir) $(libdir) $(demodir)\r
+- $(INSTALL) -m 644 ../lib/Prelude.hs ../lib/List.hs ../lib/Maybe.hs $(libdir)\r
++ $(MKDIR) $(bindir) $(libdir) $(tclibdir) $(demodir)\r
++ $(INSTALL) -m 644 ../lib/simple/Prelude.hs ../lib/simple/List.hs ../lib/simple/Maybe.hs $(libdir)\r
++ $(INSTALL) -m 644 ../lib/Prelude.hs ../lib/List.hs ../lib/Maybe.hs $(tclibdir)\r
+ $(INSTALL) -m 755 $(HELIUMBINDIR)/$(MAIN)$(EXE) $(bindir)\r
+ $(INSTALL) -m 755 $(LVMRUNTIMEDIR)/lvmrun$(EXE) $(bindir)\r
+ $(INSTALL) -m 755 $(HELIUMBINDIR)/texthint$(EXE) $(bindir)\r
+ # *** Copying demos to demo directory\r
+ $(INSTALL) -m 644 ../demo/Calendar.hs ../demo/ParserLibrary.hs ../demo/ParserDemo.hs ../demo/TicTacToe.hs $(demodir)\r
+ # *** Copy generated lvms and touch them\r
+- $(INSTALL) -m 644 ../lib/*.lvm $(libdir)\r
++ $(INSTALL) -m 644 ../lib/simple/*.lvm $(libdir)\r
++ $(INSTALL) -m 644 ../lib/*.lvm $(tclibdir)\r
+ touch $(libdir)/*.lvm\r
++ touch $(tclibdir)/*.lvm\r
+ \r
+ movetohome: smaller\r
+ # *** Copying library sources to projects directory\r
#! /bin/sh
-BINNAME="$(basename $0)"
+BINNAME_LONG="$(basename $0)"
+BINNAME="${BINNAME_LONG%-tc}"
if [ -n "${HELIUM_TEMP}" ]; then
TEMP="${HELIUM_TEMP}";
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"
# 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"
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
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
}
projects / gentoo.git / commitdiff