diff options
author | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 13:49:04 -0700 |
---|---|---|
committer | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 17:38:18 -0700 |
commit | 56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch) | |
tree | 3f91093cdb475e565ae857f1c5a7fd339e2d781e /dev-haskell/haskell-src-meta | |
download | gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2 gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip |
proj/gentoo: Initial commit
This commit represents a new era for Gentoo:
Storing the gentoo-x86 tree in Git, as converted from CVS.
This commit is the start of the NEW history.
Any historical data is intended to be grafted onto this point.
Creation process:
1. Take final CVS checkout snapshot
2. Remove ALL ChangeLog* files
3. Transform all Manifests to thin
4. Remove empty Manifests
5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$
5.1. Do not touch files with -kb/-ko keyword flags.
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests
X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project
X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration
X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn
X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts
X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration
X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging
X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'dev-haskell/haskell-src-meta')
6 files changed, 175 insertions, 0 deletions
diff --git a/dev-haskell/haskell-src-meta/Manifest b/dev-haskell/haskell-src-meta/Manifest new file mode 100644 index 000000000000..0f6b1c8e9bf1 --- /dev/null +++ b/dev-haskell/haskell-src-meta/Manifest @@ -0,0 +1,2 @@ +DIST haskell-src-meta-0.6.0.10.tar.gz 19432 SHA256 c15f7e3bd196d80e1458ee1925b5f194feaabfb050eb680ca68efc156bf48c3a SHA512 efd6e06dc856c05b815a8a36f3411f3d5c171ad5cd84be75baaef1d7a784f3f32d81e9de175fb2ab2455ab6f3a80c2f743e4a277964816d6e8198bc4bf67ab4d WHIRLPOOL 8ba230cedd597aa65a964a031f134ad36a3411e1ca1f8c64a181022faa75e218fc4c5eebda589dc028eafcc555582717ed5732221e36b01a56493ac8b1caf78a +DIST haskell-src-meta-0.6.0.8.tar.gz 19449 SHA256 d3f69a05701d85880472c9d30efb3056fc8733f5f31e1795280aaf9f2c1262bb SHA512 590e66c837bd64db9bb8d09a698f52fb8b7c3ab07523c0e7fadcbb17bf33ee0fa523ec34012db7622681b4055164288df60083992ddbfb7553087373efbdb751 WHIRLPOOL 436fde45e32fea88107a4462ad2392d7caffdee705a8537d54d1bbff3e1e9c0a3f3d526a84361b704be933fdf0633e25eb1581228084afbb40774308f4062138 diff --git a/dev-haskell/haskell-src-meta/files/haskell-src-meta-0.6.0.8-ghc-7.10.patch b/dev-haskell/haskell-src-meta/files/haskell-src-meta-0.6.0.8-ghc-7.10.patch new file mode 100644 index 000000000000..e023b53d3401 --- /dev/null +++ b/dev-haskell/haskell-src-meta/files/haskell-src-meta-0.6.0.8-ghc-7.10.patch @@ -0,0 +1,70 @@ +commit 24e6f45408083745080ff2f3710f58209041113c +Author: Luite Stegeman <stegeman@gmail.com> +Date: Sun Dec 28 21:33:22 2014 +0100 + + updates for GHC 7.10 and Template Haskell 2.10 + +diff --git a/haskell-src-meta.cabal b/haskell-src-meta.cabal +index de6a022..42d9619 100644 +--- a/haskell-src-meta.cabal ++++ b/haskell-src-meta.cabal +@@ -18,14 +18,14 @@ description: The translation from haskell-src-exts abstract syntax + extra-source-files: ChangeLog README examples/*.hs + + library +- build-depends: base >= 4.2 && < 4.8, ++ build-depends: base >= 4.2 && < 4.9, + haskell-src-exts == 1.16.*, + pretty >= 1.0 && < 1.2, + syb >= 0.1 && < 0.5, + th-orphans >= 0.5 && < 0.9 + + if impl(ghc >= 7.4) +- Build-depends: template-haskell >= 2.7 && < 2.10 ++ Build-depends: template-haskell >= 2.7 && < 2.11 + else + Build-depends: template-haskell >= 2.4 && < 2.7, + uniplate >= 1.3 && < 1.7 +diff --git a/src/Language/Haskell/Meta/Syntax/Translate.hs b/src/Language/Haskell/Meta/Syntax/Translate.hs +index 189d32e..36a08f1 100644 +--- a/src/Language/Haskell/Meta/Syntax/Translate.hs ++++ b/src/Language/Haskell/Meta/Syntax/Translate.hs +@@ -384,9 +384,15 @@ a .->. b = AppT (AppT ArrowT a) b + toCxt :: Hs.Context -> Cxt + toCxt = fmap toPred + where ++#if MIN_VERSION_template_haskell(2,10,0) ++ toPred (Hs.ClassA n ts) = foldl' AppT (ConT (toName n)) (fmap toType ts) ++ toPred (Hs.InfixA t1 n t2) = foldl' AppT (ConT (toName n)) (fmap toType [t1,t2]) ++ toPred (Hs.EqualP t1 t2) = foldl' AppT EqualityT (fmap toType [t1,t2]) ++#else + toPred (Hs.ClassA n ts) = ClassP (toName n) (fmap toType ts) + toPred (Hs.InfixA t1 n t2) = ClassP (toName n) (fmap toType [t1, t2]) + toPred (Hs.EqualP t1 t2) = EqualP (toType t1) (toType t2) ++#endif + toPred a@Hs.IParam{} = noTH "toCxt" a + + foldAppT :: Type -> [Type] -> Type +diff --git a/src/Language/Haskell/Meta/Utils.hs b/src/Language/Haskell/Meta/Utils.hs +index 36f7e96..d194f3e 100644 +--- a/src/Language/Haskell/Meta/Utils.hs ++++ b/src/Language/Haskell/Meta/Utils.hs +@@ -166,6 +166,9 @@ renameT env new (ForallT ns cxt t) = + unVarT (VarT n) = PlainTV n + renamePreds = renameThings renamePred + ++#if MIN_VERSION_template_haskell(2,10,0) ++ renamePred = renameT ++#else + renamePred env new (ClassP n ts) = let + (ts', env', new') = renameTs env new [] ts + in (ClassP (normaliseName n) ts', env', new') +@@ -174,7 +177,7 @@ renameT env new (ForallT ns cxt t) = + (t1', env1, new1) = renameT env new t1 + (t2', env2, new2) = renameT env1 new1 t2 + in (EqualP t1' t2', env2, new2) +- ++#endif + + -- | Remove qualification, etc. + normaliseName :: Name -> Name diff --git a/dev-haskell/haskell-src-meta/haskell-src-meta-0.6.0.10.ebuild b/dev-haskell/haskell-src-meta/haskell-src-meta-0.6.0.10.ebuild new file mode 100644 index 000000000000..1ff54ead1bd8 --- /dev/null +++ b/dev-haskell/haskell-src-meta/haskell-src-meta-0.6.0.10.ebuild @@ -0,0 +1,28 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +# ebuild generated by hackport 0.4.5.9999 + +CABAL_FEATURES="lib profile haddock hoogle hscolour" +inherit haskell-cabal + +DESCRIPTION="Parse source to template-haskell abstract syntax" +HOMEPAGE="http://hackage.haskell.org/package/haskell-src-meta" +SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz" + +LICENSE="BSD" +SLOT="0/${PV}" +KEYWORDS="~amd64 ~x86" +IUSE="" + +RDEPEND=">=dev-haskell/haskell-src-exts-1.16:=[profile?] <dev-haskell/haskell-src-exts-1.17:=[profile?] + >=dev-haskell/syb-0.1:=[profile?] <dev-haskell/syb-0.6:=[profile?] + >=dev-haskell/th-orphans-0.9.1:=[profile?] <dev-haskell/th-orphans-0.13:=[profile?] + >=dev-lang/ghc-7.4.1:= +" +DEPEND="${RDEPEND} + >=dev-haskell/cabal-1.6 +" diff --git a/dev-haskell/haskell-src-meta/haskell-src-meta-0.6.0.8-r1.ebuild b/dev-haskell/haskell-src-meta/haskell-src-meta-0.6.0.8-r1.ebuild new file mode 100644 index 000000000000..6f2904094143 --- /dev/null +++ b/dev-haskell/haskell-src-meta/haskell-src-meta-0.6.0.8-r1.ebuild @@ -0,0 +1,36 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +# ebuild generated by hackport 0.4.3 + +CABAL_FEATURES="lib profile haddock hoogle hscolour" +inherit base haskell-cabal + +DESCRIPTION="Parse source to template-haskell abstract syntax" +HOMEPAGE="http://hackage.haskell.org/package/haskell-src-meta" +SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz" + +LICENSE="BSD" +SLOT="0/${PV}" +KEYWORDS="~amd64 ~x86" +IUSE="" + +RDEPEND=">=dev-haskell/haskell-src-exts-1.16:=[profile?] <dev-haskell/haskell-src-exts-1.17:=[profile?] + >=dev-haskell/syb-0.1:=[profile?] <dev-haskell/syb-0.5:=[profile?] + >=dev-haskell/th-orphans-0.5:=[profile?] + >=dev-lang/ghc-7.4.1:= +" +DEPEND="${RDEPEND} + >=dev-haskell/cabal-1.6 +" + +PATCHES=("${FILESDIR}/${PN}-0.6.0.8-ghc-7.10.patch") + +src_prepare() { + base_src_prepare + cabal_chdeps \ + 'th-orphans >= 0.5 && < 0.9' 'th-orphans >= 0.5' +} diff --git a/dev-haskell/haskell-src-meta/haskell-src-meta-0.6.0.8.ebuild b/dev-haskell/haskell-src-meta/haskell-src-meta-0.6.0.8.ebuild new file mode 100644 index 000000000000..d6a20de57b94 --- /dev/null +++ b/dev-haskell/haskell-src-meta/haskell-src-meta-0.6.0.8.ebuild @@ -0,0 +1,30 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +# ebuild generated by hackport 0.4.3 + +CABAL_FEATURES="lib profile haddock hoogle hscolour" +inherit base haskell-cabal + +DESCRIPTION="Parse source to template-haskell abstract syntax" +HOMEPAGE="http://hackage.haskell.org/package/haskell-src-meta" +SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz" + +LICENSE="BSD" +SLOT="0/${PV}" +KEYWORDS="~amd64 ~x86" +IUSE="" + +RDEPEND=">=dev-haskell/haskell-src-exts-1.16:=[profile?] <dev-haskell/haskell-src-exts-1.17:=[profile?] + >=dev-haskell/syb-0.1:=[profile?] <dev-haskell/syb-0.5:=[profile?] + >=dev-haskell/th-orphans-0.5:=[profile?] <dev-haskell/th-orphans-0.9:=[profile?] + >=dev-lang/ghc-7.4.1:= +" +DEPEND="${RDEPEND} + >=dev-haskell/cabal-1.6 +" + +PATCHES=("${FILESDIR}/${PN}-0.6.0.8-ghc-7.10.patch") diff --git a/dev-haskell/haskell-src-meta/metadata.xml b/dev-haskell/haskell-src-meta/metadata.xml new file mode 100644 index 000000000000..160f468c1670 --- /dev/null +++ b/dev-haskell/haskell-src-meta/metadata.xml @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <herd>haskell</herd> + <longdescription> + The translation from haskell-src-exts abstract syntax + to template-haskell abstract syntax isn't 100% complete yet. + </longdescription> +</pkgmetadata> |