From ccee134bf133327af1e70ee5e5f497ce5391adb7 Mon Sep 17 00:00:00 2001 From: Andres Loeh Date: Thu, 18 Nov 2004 13:36:59 +0000 Subject: 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). --- dev-lang/helium/ChangeLog | 10 +++- dev-lang/helium/Manifest | 19 ++---- dev-lang/helium/files/digest-helium-1.2 | 2 - dev-lang/helium/files/digest-helium-1.2-r1 | 2 + dev-lang/helium/files/helium-1.2-libraries.patch | 42 ++++++++++++++ dev-lang/helium/files/helium-wrapper | 16 ++++-- dev-lang/helium/helium-1.2-r1.ebuild | 73 ++++++++++++++++++++++++ dev-lang/helium/helium-1.2.ebuild | 63 -------------------- 8 files changed, 143 insertions(+), 84 deletions(-) delete mode 100644 dev-lang/helium/files/digest-helium-1.2 create mode 100644 dev-lang/helium/files/digest-helium-1.2-r1 create mode 100644 dev-lang/helium/files/helium-1.2-libraries.patch create mode 100644 dev-lang/helium/helium-1.2-r1.ebuild delete mode 100644 dev-lang/helium/helium-1.2.ebuild (limited to 'dev-lang') 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 + +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 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 deleted file mode 100644 index c3cf03e43437..000000000000 --- a/dev-lang/helium/files/digest-helium-1.2 +++ /dev/null @@ -1,2 +0,0 @@ -MD5 6ea1d6e4436e137d75f5354b4758f299 helium-1.2-src.tar.gz 1200565 -MD5 d9caae2afdbd60a4a1f58174d318464a Hint.jar 120170 diff --git a/dev-lang/helium/files/digest-helium-1.2-r1 b/dev-lang/helium/files/digest-helium-1.2-r1 new file mode 100644 index 000000000000..c3cf03e43437 --- /dev/null +++ b/dev-lang/helium/files/digest-helium-1.2-r1 @@ -0,0 +1,2 @@ +MD5 6ea1d6e4436e137d75f5354b4758f299 helium-1.2-src.tar.gz 1200565 +MD5 d9caae2afdbd60a4a1f58174d318464a Hint.jar 120170 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-r1.ebuild b/dev-lang/helium/helium-1.2-r1.ebuild new file mode 100644 index 000000000000..b9c221b0f8bb --- /dev/null +++ b/dev-lang/helium/helium-1.2-r1.ebuild @@ -0,0 +1,73 @@ +# 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-r1.ebuild,v 1.1 2004/11/18 13:36:59 kosmikus Exp $ + +inherit eutils java-pkg + +DESCRIPTION="Helium (for learning Haskell)" +HOMEPAGE="http://www.cs.uu.nl/helium" +SRC_URI="http://www.cs.uu.nl/helium/distr/${P}-src.tar.gz + http://www.cs.uu.nl/helium/distr/Hint.jar" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~x86" +IUSE="readline" + +DEPEND="virtual/libc + virtual/ghc + readline? ( sys-libs/readline )" +RDEPEND="virtual/libc + virtual/jdk + dev-libs/gmp + readline? ( sys-libs/readline )" + +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 + epatch ${FILESDIR}/${P}-readline.patch + fi +} + +src_compile() { + 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 "cannot cd to heliumNT" + econf --without-upx || die "econf failed" + 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 "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 "make failed" + # install hint + java-pkg_dojar ${DISTDIR}/Hint.jar + # create wrappers + dobin ${FILESDIR}/helium-wrapper + dosym /usr/bin/helium-wrapper /usr/bin/helium + 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 +} + diff --git a/dev-lang/helium/helium-1.2.ebuild b/dev-lang/helium/helium-1.2.ebuild deleted file mode 100644 index 3e01b15c9f7a..000000000000 --- a/dev-lang/helium/helium-1.2.ebuild +++ /dev/null @@ -1,63 +0,0 @@ -# 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 $ - -inherit java-pkg - -DESCRIPTION="Helium (for learning Haskell)" -HOMEPAGE="http://www.cs.uu.nl/helium" -SRC_URI="http://www.cs.uu.nl/helium/distr/${P}-src.tar.gz - http://www.cs.uu.nl/helium/distr/Hint.jar" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~x86" -IUSE="readline" - -DEPEND="virtual/libc - virtual/ghc - readline? ( sys-libs/readline )" -RDEPEND="virtual/libc - virtual/jdk - dev-libs/gmp - readline? ( sys-libs/readline )" - -src_unpack() { - unpack ${P}-src.tar.gz - - # patch for readline support if requested - if use readline; then - patch -p0 -i ${FILESDIR}/${P}-readline.patch || die - fi -} - -src_compile() { - pushd lvm || die - pushd src || die - ./configure - popd - popd - pushd heliumNT || die - econf --without-upx || die "econf failed" - pushd src || die - make depend || die - make || die # emake doesn't work safely -} - -src_install() { - cd heliumNT/src || die - make prefix=${D}/usr \ - bindir=${D}/usr/lib/helium/bin \ - libdir=${D}/usr/lib/helium/lib \ - demodir=${D}/usr/lib/helium/demo \ - install || die - # install hint - java-pkg_dojar ${DISTDIR}/Hint.jar - # create wrappers - dobin ${FILESDIR}/helium-wrapper - dosym /usr/bin/helium-wrapper /usr/bin/helium - dosym /usr/bin/helium-wrapper /usr/bin/lvmrun - dosym /usr/bin/helium-wrapper /usr/bin/texthint - dosym /usr/bin/helium-wrapper /usr/bin/hint -} - -- cgit v1.2.3-65-gdbad