[gentoo-commits] repo/gentoo:master commit in: dev-lang/helium/files/, dev-lang/helium/

[gentoo-commits] repo/gentoo:master commit in: dev-lang/helium/files/, dev-lang/helium/

[Sergei Trofimovich]

commit:     646f22b7c98f38e53377cbf18b64f540f7bdc162
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 16 19:00:26 2015 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Sun Aug 16 19:00:26 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=646f22b7

dev-lang/helium: port to ghc-7.10, bug #557938 by Toralf Förster

Package-Manager: portage-2.2.20

 dev-lang/helium/files/helium-1.8.1-ghc-7.10.patch | 55 +++++++++++++++++++++++
 dev-lang/helium/helium-1.8.1.ebuild               |  4 ++
 2 files changed, 59 insertions(+)

diff --git a/dev-lang/helium/files/helium-1.8.1-ghc-7.10.patch b/dev-lang/helium/files/helium-1.8.1-ghc-7.10.patch
new file mode 100644
index 0000000..43af33e
--- /dev/null
+++ b/dev-lang/helium/files/helium-1.8.1-ghc-7.10.patch
@@ -0,0 +1,55 @@
+diff --git a/src/Helium/Parser/LexerMonad.hs b/src/Helium/Parser/LexerMonad.hs
+index 75ac077..af35093 100644
+--- a/src/Helium/Parser/LexerMonad.hs
++++ b/src/Helium/Parser/LexerMonad.hs
+@@ -20,2 +20,4 @@ import Helium.Parser.LexerMessage
+ import Text.ParserCombinators.Parsec.Pos
++import Control.Applicative
++import Control.Monad
+ 
+@@ -47,2 +49,9 @@ returnLM x = LM (\_ pos brackets -> Right (x, [], pos, brackets))
+ 
++instance Functor LexerMonad where
++    fmap  = liftM
++
++instance Applicative LexerMonad where
++    pure  = return
++    (<*>) = ap  -- defined in Control.Monad
++
+ instance Monad LexerMonad where
+diff --git a/src/Helium/StaticAnalysis/Heuristics/OnlyResultHeuristics.hs b/src/Helium/StaticAnalysis/Heuristics/OnlyResultHeuristics.hs
+index 880ac0b..90574f0 100644
+--- a/src/Helium/StaticAnalysis/Heuristics/OnlyResultHeuristics.hs
++++ b/src/Helium/StaticAnalysis/Heuristics/OnlyResultHeuristics.hs
+@@ -1 +1,2 @@
++{-# LANGUAGE FlexibleContexts #-}
+ {-| Module      :  OnlyResultHeuristics
+diff --git a/src/Helium/StaticAnalysis/Heuristics/RepairHeuristics.hs b/src/Helium/StaticAnalysis/Heuristics/RepairHeuristics.hs
+index 89e43f2..251406f 100644
+--- a/src/Helium/StaticAnalysis/Heuristics/RepairHeuristics.hs
++++ b/src/Helium/StaticAnalysis/Heuristics/RepairHeuristics.hs
+@@ -1 +1,2 @@
++{-# LANGUAGE FlexibleContexts #-}
+ {-| Module      :  RepairHeuristics
+diff --git a/src/Helium/StaticAnalysis/Heuristics/TieBreakerHeuristics.hs b/src/Helium/StaticAnalysis/Heuristics/TieBreakerHeuristics.hs
+index d0b01a3..ba7ca19 100644
+--- a/src/Helium/StaticAnalysis/Heuristics/TieBreakerHeuristics.hs
++++ b/src/Helium/StaticAnalysis/Heuristics/TieBreakerHeuristics.hs
+@@ -1 +1,2 @@
++{-# LANGUAGE FlexibleContexts #-}
+ {-| Module      :  TieBreakerHeuristics
+diff --git a/src/Helium/StaticAnalysis/Heuristics/UnifierHeuristics.hs b/src/Helium/StaticAnalysis/Heuristics/UnifierHeuristics.hs
+index c2e91f5..493c882 100644
+--- a/src/Helium/StaticAnalysis/Heuristics/UnifierHeuristics.hs
++++ b/src/Helium/StaticAnalysis/Heuristics/UnifierHeuristics.hs
+@@ -1 +1,2 @@
++{-# LANGUAGE FlexibleContexts #-}
+ {-| Module      :  UnifierHeuristics
+diff --git a/src/Helium/Syntax/UHA_Pretty.hs b/src/Helium/Syntax/UHA_Pretty.hs
+index af970dc..ee42a48 100644
+--- a/src/Helium/Syntax/UHA_Pretty.hs
++++ b/src/Helium/Syntax/UHA_Pretty.hs
+@@ -17,2 +17,3 @@ import Control.Monad.Identity (Identity)
+ import qualified Control.Monad.Identity
++import Prelude hiding ((<$>))
+ 

diff --git a/dev-lang/helium/helium-1.8.1.ebuild b/dev-lang/helium/helium-1.8.1.ebuild
index f351f59..e896685 100644
--- a/dev-lang/helium/helium-1.8.1.ebuild
+++ b/dev-lang/helium/helium-1.8.1.ebuild
@@ -30,3 +30,7 @@ RDEPEND=">=dev-haskell/lvmlib-1.1:=[profile?]
 DEPEND="${RDEPEND}
 	>=dev-haskell/cabal-1.10.1.0
 "
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-1.8.1-ghc-7.10.patch
+}

[gentoo-commits] repo/gentoo:master commit in: dev-lang/helium/files/, dev-lang/helium/

[Michał Górny]

commit:     1836b9757e07372487de39b7e005278741232ad2
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Oct  4 21:08:24 2019 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Oct  4 21:35:02 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1836b975

dev-lang/helium: Drop old (EAPI 0)

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 dev-lang/helium/Manifest                           |   2 -
 ...helium-1.6-respect-cflags-ldflags-nostrip.patch |  59 ------------
 dev-lang/helium/files/helium-wrapper-1.6           |  31 ------
 dev-lang/helium/helium-1.6.ebuild                  | 106 ---------------------
 4 files changed, 198 deletions(-)

diff --git a/dev-lang/helium/Manifest b/dev-lang/helium/Manifest
index b252b04e270..2b63862803a 100644
--- a/dev-lang/helium/Manifest
+++ b/dev-lang/helium/Manifest
@@ -1,3 +1 @@
-DIST helium-1.6-ghc.patch.bz2 34579 BLAKE2B a2454589721e32a45e2adca41a4ba3bd0c17ecc9f1616aa276e590e56491f9b2e5b89bf0ed33624931edf4a72f24201245cd0873c8ea2448a3996ee6d1d8fd94 SHA512 ac86750a98d3c87cb00e8777ad0e5a838df9d87ebdd8540d1c5a297a8488c810acbecf4d665ef7754da0f99729785f48fb77d24fc09f3c963fe972e06dc952c8
-DIST helium-1.6-src.tar.gz 960254 BLAKE2B db7a23b6d18f3b19c024857a043aaee31837b81bd67c3133a566a21ab8615f3bc019322f3ca08437e3acdbb092a60d41a9162ff95026052caaf2da1bd777ae47 SHA512 f102c5a4f669cb0b7fecdf3efdf9dacf0cddb97e9bf5cbdebd0801169802dbfefbe3de08d3f36c1c66a3839a3b080e241840f5135eea40860a91157815026a95
 DIST helium-1.8.1.tar.gz 774509 BLAKE2B 05e28d1140cd48925a2c4d06c5c152e06879389d666d54b0c5d7592453489f8e2bbaa8e7c20dbd9d72fe57a3f9651bffa05d156a32e0208e41ef0e78599353fa SHA512 4523d7323251354ea9f4fd0f6f5a112659119bef2fc0c790bb139cdcdf25e7f740ae4c7d584d0c93aabc3baaace8be49931808c59ad9133b81a64ae115e0f9b9

diff --git a/dev-lang/helium/files/helium-1.6-respect-cflags-ldflags-nostrip.patch b/dev-lang/helium/files/helium-1.6-respect-cflags-ldflags-nostrip.patch
deleted file mode 100644
index 6c035ad3b8f..00000000000
--- a/dev-lang/helium/files/helium-1.6-respect-cflags-ldflags-nostrip.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-Original report: https://bugs.gentoo.org/attachment.cgi?id=244509
-
-The patch is not ideal as lvm/src/configure runs
-compiler tests without those flags enabled, but
-they are broken anyways.
-
-Added CFLAGS, LDFLAGS, remover STRIP call in C part of lvm.
-diff --git a/lvm/src/configure b/lvm/src/configure
-index 9aa1a1d..2789828 100755
---- a/helium-1.6/lvm/src/configure
-+++ b/helium-1.6/lvm/src/configure
-@@ -647,7 +647,7 @@ fi
- echo "CC=$ccomp" >> makefile
- echo "LINK=$link" >> makefile
- echo "STRIP=$strip" >> makefile
--echo "LINKOPTS=$cclinkopts" >> makefile
-+echo "LINKOPTS=$cclinkopts \$(LDFLAGS)" >> makefile
- echo "EXE=$exe" >> makefile
- echo "DLL=$dll" >> makefile
- echo "CP=cp" >> makefile
-@@ -662,7 +662,7 @@ case "$config" in
-      echo "CONFIGPATH=../config" >> makefile;;
- esac
- 
--echo "CCOPTS=$cccompopts -I\$(CONFIGPATH)" >> makefile
-+echo "CCOPTS=$cccompopts -I\$(CONFIGPATH) \$(CFLAGS)" >> makefile
-  
- rm -f tst$exe hasgot.c *.obj
- 
-diff --git a/lvm/src/lib/makefile b/lvm/src/lib/makefile
-index d9a0004..78cce0f 100644
---- a/helium-1.6/lvm/src/lib/makefile
-+++ b/helium-1.6/lvm/src/lib/makefile
-@@ -55,7 +55,6 @@ OBJS = $(SRCS:.hs=.o)
- # The main target
- $(MAIN)$(EXE): $(OBJS)
- 	  $(HC)	-o $@ $(HC_OPTS) $(OBJS)
--	  $(STRIP) $@
- 
- common/ghc/Special.hi: common/ghc/Special.hs
- 	$(HC) -c $< -cpp -fglasgow-exts $(HC_OPTS) 
-diff --git a/lvm/src/runtime/makefile b/lvm/src/runtime/makefile
-index 310a7b6..bde3550 100644
---- a/helium-1.6/lvm/src/runtime/makefile
-+++ b/helium-1.6/lvm/src/runtime/makefile
-@@ -47,11 +47,10 @@ OBJS	= $(SRCS:.c=.o)
- 
- 
- #lvmrun$(EXE): $(OBJS)
--#	$(LINK) -o $@ $(LINKOPT) $(OBJS) -g
-+#	$(LINK) -o $@ $(OBJS) -g  $(LINKOPT)
- 
- lvmrun$(EXE): $(OBJS)
--	$(LINK) -o $@ $(LINKOPT) $(OBJS)
--	$(STRIP) $@
-+	$(LINK) -o $@ $(OBJS) $(LINKOPT)
- 
- core/evaluator.o: core/evaluator.c
- 	$(CC) -o $@ -c $< $(CCOPT_FAST)

diff --git a/dev-lang/helium/files/helium-wrapper-1.6 b/dev-lang/helium/files/helium-wrapper-1.6
deleted file mode 100644
index 926e18cc617..00000000000
--- a/dev-lang/helium/files/helium-wrapper-1.6
+++ /dev/null
@@ -1,31 +0,0 @@
-#! /bin/sh
-
-BINNAME_LONG="$(basename $0)"
-BINNAME="${BINNAME_LONG%-tc}"
-
-if [ -n "${HELIUM_TEMP}" ]; then
-	TEMP="${HELIUM_TEMP}";
-else
-	TEMP="/tmp/helium-${USER}"	
-	if ! [ -d "${TEMP}" ]; then
-		mkdir ${TEMP};
-	fi;
-fi
-
-# if [ "${BINNAME_LONG}" = "${BINNAME}" ]; then
-#	HELIUM_LIBS="/usr/lib/helium/lib/simple";
-# else
-HELIUM_LIBS="/usr/lib/helium/lib";
-# fi
-
-if [ -z "${LVMPATH}" ]; then
-	LVMPATH=".:${HELIUM_LIBS}";
-else
-	LVMPATH="${LVMPATH}:${HELIUM_LIBS}";
-fi
-export LVMPATH
-export TEMP
-
-PROGCALL="/usr/lib/helium/bin/${BINNAME}"
-
-${PROGCALL} $*

diff --git a/dev-lang/helium/helium-1.6.ebuild b/dev-lang/helium/helium-1.6.ebuild
deleted file mode 100644
index ff730ad0010..00000000000
--- a/dev-lang/helium/helium-1.6.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit autotools eutils
-
-DESCRIPTION="Helium (for learning Haskell)"
-HOMEPAGE="https://github.com/Helium4Haskell/helium"
-SRC_URI="http://www.cs.uu.nl/helium/distr/${P}-src.tar.gz
-	mirror://gentoo/${P}-ghc.patch.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-# compilation breaks on amd64, suspect lvm doesn't work properly
-KEYWORDS="-amd64 ~x86"
-IUSE="readline"
-
-DEPEND=">=dev-lang/ghc-6.8
-	dev-haskell/mtl
-	dev-haskell/parsec
-	readline? ( dev-haskell/readline )"
-RDEPEND="dev-libs/gmp
-	readline? ( sys-libs/readline )"
-
-src_unpack() {
-	unpack ${A}
-	epatch "${P}-ghc.patch"
-	epatch "${FILESDIR}/helium-1.6-respect-cflags-ldflags-nostrip.patch"
-
-	# split base only
-	sed -e 's/^GHCFLAGS =.*$/& -package containers/' \
-	    -i "${S}/helium/src/Makefile.in"
-
-	# file has non-ASCII syms and it's pulled to ghc for dependency generaton
-	# ghc w/UTF-8 dislikes it:
-	sed -e 's/\xCA//g' \
-	    -i "${S}/helium/src/Makefile.in"
-
-	# mangle evil 'rec' to 'rec_'. It's not very accurate, but less,
-	# than manually patching ~250 occurences. (ghc-6.10+ has rec as reserved word)
-	local bad_file
-
-	for bad_file in Top/src/Top/Types/Unification.hs \
-			Top/src/Top/Types/Quantification.hs \
-			Top/src/Top/Types/Primitive.hs \
-			Top/src/Top/Solver/PartitionCombinator.hs \
-			Top/src/Top/Repair/Repair.hs \
-			Top/src/Top/Ordering/Tree.hs \
-			Top/src/Top/Implementation/TypeGraph/Standard.hs \
-			Top/src/Top/Implementation/TypeGraph/Path.hs \
-			Top/src/Top/Implementation/TypeGraph/EquivalenceGroup.hs \
-			Top/src/Top/Implementation/TypeGraph/Basics.hs \
-			Top/src/Top/Implementation/TypeGraph/ApplyHeuristics.hs \
-			lvm/src/lib/lvm/LvmRead.hs \
-			lvm/src/lib/core/CoreNoShadow.hs \
-			helium/src/utils/LoggerEnabled.hs \
-			helium/src/staticanalysis/miscellaneous/TypesToAlignedDocs.hs \
-			helium/src/staticanalysis/miscellaneous/TypeConversion.hs \
-			helium/src/staticanalysis/inferencers/TypeInferencing.hs \
-			helium/src/staticanalysis/heuristics/RepairSystem.hs \
-			helium/src/staticanalysis/heuristics/RepairHeuristics.hs \
-			helium/src/staticanalysis/heuristics/ListOfHeuristics.hs \
-			helium/src/staticanalysis/directives/TS_PatternMatching.ag
-	do
-		# take all symbols from exactly this source. This set is not universal,
-		# but it aims to catch (same) lexeme separators on the left and on the right
-		sed -e 's/\([^a-zA-Z_0-9"]\|^\)rec\([^a-zA-Z_0-9"]\|$\)/\1rec_\2/g' \
-	    -i "${S}/$bad_file"
-	done
-
-	# cabal is their friend (oneOf became polymorphic and breaks the test)
-	sed -e 's/Text.ParserCombinators.Parsec/&.Pos/g' \
-	    -e 's/oneOf/newPos/g' \
-	    -i "${S}/helium/configure.in"
-
-	cd "${S}/helium"
-	eautoreconf
-}
-
-src_compile() {
-	# helium consists of two components that have to be set up separately,
-	# lvm and the main compiler. both build systems are slightly strange.
-	# lvm uses a completely non-standard build system:
-	# the ./configure of lvm is not the usual autotools configure
-
-	cd "${S}/lvm/src" && ./configure || die "lvm configure failed"
-	echo "STRIP=echo" >> config/makefile || die "lvm postconfigure failed"
-	myconf="$(use_enable readline) --without-strip --without-upx --without-ag"
-	cd "${S}/helium" && econf --prefix="/usr/lib" ${myconf} || die "econf failed"
-	cd "${S}/helium/src" && make depend || die "make depend failed"
-
-	emake -j1 || die "make failed"
-}
-
-src_install() {
-	cd helium/src || die "cannot cd to helium/src"
-	make install bindir="/usr/lib/helium/bin" DESTDIR="${D}" || die "make install failed"
-
-	# create wrappers
-	newbin "${FILESDIR}/helium-wrapper-${PV}" helium-wrapper
-
-	dosym /usr/bin/helium-wrapper /usr/bin/texthint
-	dosym /usr/bin/helium-wrapper /usr/bin/helium
-	dosym /usr/bin/helium-wrapper /usr/bin/lvmrun
-}