From 4f2d7949f03e1c198bc888f2d05f421d35c57e21 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 9 Oct 2017 18:53:29 +0100 Subject: reinit the tree, so we can have metadata --- dev-lang/helium/Manifest | 11 +++ ...helium-1.6-respect-cflags-ldflags-nostrip.patch | 59 ++++++++++++ dev-lang/helium/files/helium-1.8.1-ghc-7.10.patch | 55 +++++++++++ dev-lang/helium/files/helium-wrapper-1.6 | 31 ++++++ dev-lang/helium/helium-1.6.ebuild | 104 +++++++++++++++++++++ dev-lang/helium/helium-1.8.1.ebuild | 35 +++++++ dev-lang/helium/metadata.xml | 8 ++ 7 files changed, 303 insertions(+) create mode 100644 dev-lang/helium/Manifest create mode 100644 dev-lang/helium/files/helium-1.6-respect-cflags-ldflags-nostrip.patch create mode 100644 dev-lang/helium/files/helium-1.8.1-ghc-7.10.patch create mode 100644 dev-lang/helium/files/helium-wrapper-1.6 create mode 100644 dev-lang/helium/helium-1.6.ebuild create mode 100644 dev-lang/helium/helium-1.8.1.ebuild create mode 100644 dev-lang/helium/metadata.xml (limited to 'dev-lang/helium') diff --git a/dev-lang/helium/Manifest b/dev-lang/helium/Manifest new file mode 100644 index 000000000000..b7f8e49abd06 --- /dev/null +++ b/dev-lang/helium/Manifest @@ -0,0 +1,11 @@ +AUX helium-1.6-respect-cflags-ldflags-nostrip.patch 1847 SHA256 333b77e13e38d7639e79251d32346c9f1857d2b6585ec2c85ec2b325c13ca34e SHA512 cd3f176f618cc32bb4feb1b693e9b281e388897380172c85645b478d6be79b164e57754b5c7cb58bc55b956644323900bb6bca5bfa74b28857a69f9eeeb52635 WHIRLPOOL 406de1a3a23c089e9bc4936f487522c9df81eab741ec5cb52c2885e295398984d5a734993fc4665de4faedd1d853810de798ed4811547ada34fe171c5067e813 +AUX helium-1.8.1-ghc-7.10.patch 2459 SHA256 99ec8923844a6a95a3001c7f89160024ff89f5845d7d0cfa88ed6c48c3dc6fee SHA512 fd63893965fefce259d01a464e95ee081dd1d46d36a2ae2901b541e14fc5a5eca9f44fb96de58775e0ca2d4b758d40bfb4f6acc746f6a8c98e3c552c04513531 WHIRLPOOL 9e8cbde8d32d3ca02bda77309576a807b067a67ebba8c1aea70d9ad87004765dec3670c369702e95528c20840f663310e06b24522d534e5007fce7e4b8f50cf2 +AUX helium-wrapper-1.6 549 SHA256 32fd3f3e349cb23f19b467d27180ef5af20fb538b17ba6fd95ed1743670d703a SHA512 254fc560106914ca992ff6318f6a69c3a284f54791eed55ec1a332123b09a6fc840f66caf3af977fcb3a9ee0019e825819d22e26747f40a3c11eb5f8fbf382f6 WHIRLPOOL ff1e149136427991fe7d5ea226004bbb2bcb4a72757678478388d5b0f5af06db75472dc479ecf33812d4d3478bb1f6a53adf52e0f8b5f211d2380b62e51da1a0 +DIST helium-1.6-ghc.patch.bz2 34579 SHA256 da463fe2a27689ec702eaf7c687446272f983845228cbb45d0fa91e1542cd7ab SHA512 ac86750a98d3c87cb00e8777ad0e5a838df9d87ebdd8540d1c5a297a8488c810acbecf4d665ef7754da0f99729785f48fb77d24fc09f3c963fe972e06dc952c8 WHIRLPOOL 516bba56183eeeede84d3974c725024d90df92f280692ba921cea627044fe95dc2fd93eb20aea94f3476569a68a7ea6fc4141274e3f5d38abd5637fe85a86e93 +DIST helium-1.6-src.tar.gz 960254 SHA256 a93632d031a16c0ea516f4fa7ce63acd0950543c74265e22abd0993856a0a053 SHA512 f102c5a4f669cb0b7fecdf3efdf9dacf0cddb97e9bf5cbdebd0801169802dbfefbe3de08d3f36c1c66a3839a3b080e241840f5135eea40860a91157815026a95 WHIRLPOOL c1f76f87e37d8bcf41a8c919ee5306dc9067a09af55b7bbd66363d14865eddf010d04d5fb9e01a15c71b2bcd6fea44cfb0399758e79aad905d72f879aec80a50 +DIST helium-1.8.1.tar.gz 774509 SHA256 b2c0c29c31f495c4d4ab55bec3cfa84dba19efc3cdf2e699bcc350ee0a44936f SHA512 4523d7323251354ea9f4fd0f6f5a112659119bef2fc0c790bb139cdcdf25e7f740ae4c7d584d0c93aabc3baaace8be49931808c59ad9133b81a64ae115e0f9b9 WHIRLPOOL 97de6fe8a2a0923300ebb7b9536f27144b7a0ae263ad36eae85c7bbc939cf1a37349e7485682d6f4f0e3171811b8e58bd11bb1268f0c9f7330dc72d21198ed6a +EBUILD helium-1.6.ebuild 3767 SHA256 7d079f64fcb6b06ebe51d7e41ea6c93b91db76a68847f5b83f1ffb006e8c1a03 SHA512 364896529dde2998b28d8d21d62c80c04a688f55939c36281b356647c456051478a198754d3ae8091cbab3edb2995a08b6b92391795252a8111582dad063ce95 WHIRLPOOL 874becaf0dbb64b2e73e240fd015d355f416bd68f1d1e4ac47b2f98699faeb6abd80b67cff7ff7daa3a04c2ecfdf4e0732347d2d46816e3f72f269b5ac19dd42 +EBUILD helium-1.8.1.ebuild 858 SHA256 ac4c75ebdc59d517371ae5ef74a4fd6a192a601edb6fb35e3b637aa216b4af41 SHA512 68990388e9f231d1cc5d8b26af8f89acd59b47883a414eac31d2a6f8b22d98422a05cdcc5e9c333001e0fbd04748668096287ef8e0077b0427f7229896184aea WHIRLPOOL 3b534bd3da86c9e9a7421e1fe38566eba5b45c25410187824c364cf3f4b838835ec0cc5d31cf418b4f7e71dd232befe17790c43bd9fc37c6004a757dd07db1ae +MISC ChangeLog 2757 SHA256 f7d0b835c6f3a1ff19b15da0272e7d7625ea6172aaf04b6e0dc5ebd0e9a19ab6 SHA512 03d12cb09fb79d5919a8e5f69be7fd85b10eeb24da28b0d5bb485cdbadc244834fff9d034de34f46def9d62768e5735ab3958b8fcdfb7b80749ae85c3ac26c6b WHIRLPOOL 7f596eb73f2463fe0a6674191f688ffac47503ce316303c9276953c7e14272468a08643714714bbe32578fcacb28f642981623c7884b0ed8261829e566c47c0a +MISC ChangeLog-2015 4411 SHA256 c9964acdfa13168ddd32214d926b211a496d7da4a7f56af1cad2f9374e5c59a7 SHA512 e1b0de1248ef1a30557fdfa046dc76fb9c3904bcabc6e45fabe2fd8e7aa66655acb489ac0c46fd5b30ae380f5d9ed9bf98fc19dbf0552d78a9d158f929da9303 WHIRLPOOL d81f2b6bede7936cf454f08e89fb4c37873abf9b2997b2e0ac1477802028f6ea664fa6121a7fe53b5d0d06d65931e28236557c6316ce4bcb42349f1f84a8a1b4 +MISC metadata.xml 249 SHA256 42d7c7dd941e18315af7fac3764608244765e6ff2ef268e05606543f7c1d2356 SHA512 ce055b41ff1c10209e88579fe21ce16550be7e9b21f87724564f06430aa6f478974f186a10c8ff7e92398f534c09109aeed57eae1c6d2b56b5c99ebfb64a0015 WHIRLPOOL d7559dc58d8f1945ae7523fee4bf65454c971fa788032e0a767f2b6a6366db3ad86e21ab6a46412db18549ecf39575a6f21b94a421f839b0efe47a7b5200648a 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 new file mode 100644 index 000000000000..6c035ad3b8fc --- /dev/null +++ b/dev-lang/helium/files/helium-1.6-respect-cflags-ldflags-nostrip.patch @@ -0,0 +1,59 @@ +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-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 000000000000..43af33ecac89 --- /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/files/helium-wrapper-1.6 b/dev-lang/helium/files/helium-wrapper-1.6 new file mode 100644 index 000000000000..926e18cc6171 --- /dev/null +++ b/dev-lang/helium/files/helium-wrapper-1.6 @@ -0,0 +1,31 @@ +#! /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 new file mode 100644 index 000000000000..fcf75d263bbf --- /dev/null +++ b/dev-lang/helium/helium-1.6.ebuild @@ -0,0 +1,104 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +inherit autotools eutils + +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 + mirror://gentoo/${P}-ghc.patch.bz2" + +LICENSE="GPL-2" +SLOT="0" +# compilation breaks on amd64, suspect lvm doesn't work properly +KEYWORDS="-amd64 ~ppc -sparc ~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 +} diff --git a/dev-lang/helium/helium-1.8.1.ebuild b/dev-lang/helium/helium-1.8.1.ebuild new file mode 100644 index 000000000000..5228a742d89f --- /dev/null +++ b/dev-lang/helium/helium-1.8.1.ebuild @@ -0,0 +1,35 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=5 + +# ebuild generated by hackport 0.4.5.9999 + +CABAL_FEATURES="bin lib profile haddock hoogle hscolour" +inherit haskell-cabal + +DESCRIPTION="The Helium Compiler" +HOMEPAGE="http://www.cs.uu.nl/wiki/bin/view/Helium/WebHome" +SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0/${PV}" +KEYWORDS="~amd64 ~x86" +IUSE="" + +RDEPEND=">=dev-haskell/lvmlib-1.1:=[profile?] + dev-haskell/mtl:=[profile?] + dev-haskell/network:=[profile?] + dev-haskell/parsec:=[profile?] + >=dev-haskell/top-1.7:=[profile?] + dev-haskell/transformers:=[profile?] + dev-haskell/wl-pprint:=[profile?] + >=dev-lang/ghc-7.4.1:= +" +DEPEND="${RDEPEND} + >=dev-haskell/cabal-1.10.1.0 +" + +src_prepare() { + epatch "${FILESDIR}"/${PN}-1.8.1-ghc-7.10.patch +} diff --git a/dev-lang/helium/metadata.xml b/dev-lang/helium/metadata.xml new file mode 100644 index 000000000000..b7878815d80d --- /dev/null +++ b/dev-lang/helium/metadata.xml @@ -0,0 +1,8 @@ + + + + + haskell@gentoo.org + Gentoo Haskell + + -- cgit v1.2.3