Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status
summaryrefslogtreecommitdiff
path: root/dev-haskell/doctest
diff options
context:
space:
mode:
Diffstat (limited to 'dev-haskell/doctest')
-rw-r--r--dev-haskell/doctest/Manifest7
-rw-r--r--dev-haskell/doctest/doctest-0.10.1.ebuild34
-rw-r--r--dev-haskell/doctest/doctest-0.11.1.ebuild41
-rw-r--r--dev-haskell/doctest/doctest-0.20.0.ebuild52
-rw-r--r--dev-haskell/doctest/doctest-0.22.0.ebuild (renamed from dev-haskell/doctest/doctest-0.16.3.ebuild)19
-rw-r--r--dev-haskell/doctest/doctest-0.9.12.ebuild34
-rw-r--r--dev-haskell/doctest/files/doctest-0.11.0-unamb-2.patch26
-rw-r--r--dev-haskell/doctest/files/doctest-0.11.0-unamb.patch35
-rw-r--r--dev-haskell/doctest/metadata.xml13
9 files changed, 66 insertions, 195 deletions
diff --git a/dev-haskell/doctest/Manifest b/dev-haskell/doctest/Manifest
index 38aa6cd4536c..a99680e4fb23 100644
--- a/dev-haskell/doctest/Manifest
+++ b/dev-haskell/doctest/Manifest
@@ -1,4 +1,3 @@
-DIST doctest-0.10.1.tar.gz 18046 BLAKE2B b91529c81d8c23838933e5e46107e6249e9cc16a4fc2435de1bbc0f6ffa95ca6c9b8e7a5cf98d41409ae7765b5ab357ce080ea61cc2906726bb8aedbcb197384 SHA512 f12d3f30c6dcdd9e088362039b4d99d6b9fb499d0a78016e1e6e7b54968950490a1418dd5a7d94d5f509a08f3cf3111276ac15e84775278a77737099ac9bfd67
-DIST doctest-0.11.1.tar.gz 18086 BLAKE2B 577a86638aa67205df198444b5b8fd307e7bdce12b4a77ce2102cc95ef7f967c2e612a10ed2cef9ea35cf9455bf2f4e3a01920be1553bc35472ad442fd88f3d6 SHA512 ca95e0b5f09514e8236507856ae610016bd549b9e685b4a94cf1c0682d1cf7bffb344b471aab22ae3fd47c29ada0dcc0ba52b8f012800e9199c340b764971894
-DIST doctest-0.16.3.tar.gz 43261 BLAKE2B 981779f93d014b8340318b931f06449914a6d44bb935ced021cdf40e96ac6741369899b25a8d6bf5f2087ed81b7a5f539c14a0d68fb24a0a500354b019930530 SHA512 c5fa7c5c49bdc1bda86a259177538fa573627772dcfa18dcb19a5c905eceeb4a086705bf40ea6f330df5273584068ba154ed664a124f8ec704c9926b86564ba1
-DIST doctest-0.9.12.tar.gz 15806 BLAKE2B 20b63bc3451c81c646acc09dbde4fa77b3b7b82e2b8c4e5edf0940f33e71a8b3ed296e5337b673b5a1342ecf9bb1ed4ae82358c615abb7be420aa32dbf966ef6 SHA512 9d0d24ddba3f4ddaa386dc4ea7f15483f4d756dd48f62bcc8cad6e375c57a5660d8c7a12ff5bbc803bde04d65d8a28d3940cc390cd0d2ced2c5cc9895eba7916
+DIST doctest-0.20.0.cabal 7121 BLAKE2B c9f87ca2f1a2250d042004ece7d6957683f487e2e87dca74e564792839019ce017ebdc19afa3742163cc1006177524ef130bc4ec701c3ac49e5a5918880af102 SHA512 08a3fcb4572b6c07266ae93505bc4a5ca0b52b03f1268dffcac291c5603babb9072503c7103a6b1f591235d26a52cdc66b86b2932f56b52d2beb06595510469a
+DIST doctest-0.20.0.tar.gz 43796 BLAKE2B 7fe8b54ea9be6983cc3ce8d4c340528df533e48eafcd4c36d1cc38813b1b17469f4702064205a05e356e41d3dcefa3ba8ad556596851970edf639a5e50104d4d SHA512 037866d709fdd371941132aea31d15c65cbfcad7832cec4fa98ed580b939930cc2ef87eb77e8bdbf77bee40088b673afe66d9021d6e227416ede25159f8d93fa
+DIST doctest-0.22.0.tar.gz 45053 BLAKE2B c0f04a2d0b00790e1057cefdab4953e58b651551f3d03b4b211b9901f43f4b7dc4cc3bb51fcc01f96ef28d4a64fe84a2351a2f5123a6c0ce1380027b71f3dbdf SHA512 9da37402421243367ca307517c63abe93e93cdd10564c56d510e6a43345b4934a52c3201d0bfb3a2459d7c000d0ff5776a0cbd8e5db67f7e3a87bbac0172cd14
diff --git a/dev-haskell/doctest/doctest-0.10.1.ebuild b/dev-haskell/doctest/doctest-0.10.1.ebuild
deleted file mode 100644
index ba5800049912..000000000000
--- a/dev-haskell/doctest/doctest-0.10.1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# 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 test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Test interactive Haskell examples"
-HOMEPAGE="https://github.com/sol/doctest#readme"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/ghc-paths-0.1.0.9:=[profile?]
- >=dev-haskell/syb-0.3:=[profile?]
- dev-haskell/transformers:=[profile?]
- >=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.8
- test? ( >=dev-haskell/base-compat-0.4.2
- >=dev-haskell/hspec-1.5.1
- dev-haskell/hunit
- >=dev-haskell/quickcheck-2.5
- dev-haskell/setenv
- >=dev-haskell/silently-1.2.4
- >=dev-haskell/stringbuilder-0.4 )
-"
diff --git a/dev-haskell/doctest/doctest-0.11.1.ebuild b/dev-haskell/doctest/doctest-0.11.1.ebuild
deleted file mode 100644
index bb34ec51fa5a..000000000000
--- a/dev-haskell/doctest/doctest-0.11.1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.1.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Test interactive Haskell examples"
-HOMEPAGE="https://github.com/sol/doctest#readme"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/base-compat-0.7.0:=[profile?]
- >=dev-haskell/code-page-0.1:=[profile?]
- >=dev-haskell/ghc-paths-0.1.0.9:=[profile?]
- >=dev-haskell/syb-0.3:=[profile?]
- >=dev-lang/ghc-7.0:=[profile?] <dev-lang/ghc-8.2:=[profile?]
- >=dev-lang/ghc-7.8.2:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.18.1.3
- test? ( >=dev-haskell/hspec-1.5.1
- dev-haskell/hunit
- >=dev-haskell/quickcheck-2.8.2
- dev-haskell/setenv
- >=dev-haskell/silently-1.2.4
- >=dev-haskell/stringbuilder-0.4
- dev-haskell/with-location )
-"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-0.11.0-unamb.patch
- "${FILESDIR}"/${PN}-0.11.0-unamb-2.patch
-)
diff --git a/dev-haskell/doctest/doctest-0.20.0.ebuild b/dev-haskell/doctest/doctest-0.20.0.ebuild
new file mode 100644
index 000000000000..04772720fc13
--- /dev/null
+++ b/dev-haskell/doctest/doctest-0.20.0.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.1.1.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour" # test-suite
+inherit haskell-cabal
+
+# Buggy tests
+# May be related: <https://github.com/sol/doctest/pull/135>
+RESTRICT="test"
+
+DESCRIPTION="Test interactive Haskell examples"
+HOMEPAGE="https://github.com/sol/doctest#readme"
+HACKAGE_REV="5"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz
+ https://hackage.haskell.org/package/${P}/revision/${HACKAGE_REV}.cabal -> ${PF}.cabal"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-haskell/base-compat-0.7.0:=[profile?]
+ >=dev-haskell/code-page-0.1:=[profile?]
+ >=dev-haskell/ghc-paths-0.1.0.9:=[profile?]
+ >=dev-haskell/syb-0.3:=[profile?]
+ >=dev-lang/ghc-8.10.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-3.2.0.0"
+# test? ( >=dev-haskell/hspec-2.3.0
+# >=dev-haskell/hspec-core-2.3.0
+# dev-haskell/hunit
+# dev-haskell/mockery
+# >=dev-haskell/quickcheck-2.13.1
+# dev-haskell/setenv
+# >=dev-haskell/silently-1.2.4
+# >=dev-haskell/stringbuilder-0.4 )
+BDEPEND="app-text/dos2unix"
+
+src_prepare() {
+ # pull revised cabal from upstream
+ cp "${DISTDIR}/${PF}.cabal" "${S}/${PN}.cabal" || die
+
+ # Convert to unix line endings
+ dos2unix "${S}/${PN}.cabal" || die
+
+ # Apply patches *after* pulling the revised cabal
+ default
+}
diff --git a/dev-haskell/doctest/doctest-0.16.3.ebuild b/dev-haskell/doctest/doctest-0.22.0.ebuild
index 012b822c494f..dc7c9f3630e0 100644
--- a/dev-haskell/doctest/doctest-0.16.3.ebuild
+++ b/dev-haskell/doctest/doctest-0.22.0.ebuild
@@ -1,32 +1,29 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
-# ebuild generated by hackport 0.6.4.9999
+# ebuild generated by hackport 0.8.4.0.9999
CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
inherit haskell-cabal
DESCRIPTION="Test interactive Haskell examples"
HOMEPAGE="https://github.com/sol/doctest#readme"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
LICENSE="MIT"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-# Upstream has no intention of fixing it:
-# https://github.com/sol/doctest/pull/135
-RESTRICT=test # module conflicts
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
RDEPEND=">=dev-haskell/base-compat-0.7.0:=[profile?]
>=dev-haskell/code-page-0.1:=[profile?]
>=dev-haskell/ghc-paths-0.1.0.9:=[profile?]
>=dev-haskell/syb-0.3:=[profile?]
- >=dev-lang/ghc-7.8.2:= <dev-lang/ghc-8.11:=
+ >=dev-lang/ghc-8.0:=[profile?] <dev-lang/ghc-9.7:=[profile?]
+ >=dev-lang/ghc-8.10.6:=
"
DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.18.1.3
+ >=dev-haskell/cabal-3.2.1.0
test? ( >=dev-haskell/hspec-2.3.0
>=dev-haskell/hspec-core-2.3.0
dev-haskell/hunit
diff --git a/dev-haskell/doctest/doctest-0.9.12.ebuild b/dev-haskell/doctest/doctest-0.9.12.ebuild
deleted file mode 100644
index ef03eee3ce9c..000000000000
--- a/dev-haskell/doctest/doctest-0.9.12.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.4.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Test interactive Haskell examples"
-HOMEPAGE="https://github.com/sol/doctest#readme"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/ghc-paths-0.1.0.9:=[profile?]
- >=dev-haskell/syb-0.3:=[profile?] <dev-haskell/syb-0.5:=[profile?]
- dev-haskell/transformers:=[profile?]
- >=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.8
- test? ( >=dev-haskell/base-compat-0.4.2
- >=dev-haskell/hspec-1.5.1
- dev-haskell/hunit
- >=dev-haskell/quickcheck-2.5
- dev-haskell/setenv
- >=dev-haskell/silently-1.2.4
- >=dev-haskell/stringbuilder-0.4 )
-"
diff --git a/dev-haskell/doctest/files/doctest-0.11.0-unamb-2.patch b/dev-haskell/doctest/files/doctest-0.11.0-unamb-2.patch
deleted file mode 100644
index 9e8de3fe994a..000000000000
--- a/dev-haskell/doctest/files/doctest-0.11.0-unamb-2.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/src/GhcUtil.hs b/src/GhcUtil.hs
-index baa9193..1792227 100644
---- a/src/GhcUtil.hs
-+++ b/src/GhcUtil.hs
-@@ -1,2 +1,3 @@
- {-# LANGUAGE CPP #-}
-+{-# LANGUAGE PackageImports #-}
- module GhcUtil (withGhc) where
-@@ -12,3 +13,3 @@ import DynFlags (gopt_set)
- #endif
--import Panic (throwGhcException)
-+import "ghc" Panic (throwGhcException)
-
-diff --git a/src/Run.hs b/src/Run.hs
-index fa9096f..dca590a 100644
---- a/src/Run.hs
-+++ b/src/Run.hs
-@@ -1,2 +1,3 @@
- {-# LANGUAGE CPP #-}
-+{-# LANGUAGE PackageImports #-}
- module Run (
-@@ -23,3 +24,3 @@ import System.IO
- import qualified Control.Exception as E
--import Panic
-+import "ghc" Panic
-
diff --git a/dev-haskell/doctest/files/doctest-0.11.0-unamb.patch b/dev-haskell/doctest/files/doctest-0.11.0-unamb.patch
deleted file mode 100644
index 88c5f89fb9b0..000000000000
--- a/dev-haskell/doctest/files/doctest-0.11.0-unamb.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-commit c3194e5e874bf7da4d9d1db3f435e902eeb60993
-Author: Sergei Trofimovich <siarheit@google.com>
-Date: Wed Apr 13 09:35:29 2016 +0100
-
- fix tests when config-value is present in system
-
- ghci fails to disambiguate 'Config' in this case as:
-
- src/Help.hs:8:18:
- Ambiguous module name ‘Config’:
- it was found in multiple packages:
- config-value-0.4.0.1@confi_JzUyuyr9gPE2bcxdUwNhUS ghc-7.10.3
-
- Fixed by explicitly importing moduls from 'ghc' package.
-
- Signed-off-by: Sergei Trofimovich <siarheit@google.com>
-
-diff --git a/src/Help.hs b/src/Help.hs
-index b8e76cf..4c11f85 100644
---- a/src/Help.hs
-+++ b/src/Help.hs
-@@ -1,3 +1,4 @@
-+{-# LANGUAGE PackageImports #-}
- module Help (
- usage
- , printVersion
-@@ -5,7 +6,7 @@ module Help (
-
- import Paths_doctest (version)
- import Data.Version (showVersion)
--import Config as GHC
-+import "ghc" Config as GHC
- import Interpreter (ghc)
-
- usage :: String
diff --git a/dev-haskell/doctest/metadata.xml b/dev-haskell/doctest/metadata.xml
index e92269d61b9e..eba755763568 100644
--- a/dev-haskell/doctest/metadata.xml
+++ b/dev-haskell/doctest/metadata.xml
@@ -1,19 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>haskell@gentoo.org</email>
<name>Gentoo Haskell</name>
</maintainer>
- <longdescription>
- The doctest program checks examples in source code comments.
- It is modeled after doctest for Python
- (&lt;http://docs.python.org/library/doctest.html&gt;).
-
- Documentation is at
- &lt;https://github.com/sol/doctest-haskell#readme&gt;.
- </longdescription>
<upstream>
- <remote-id type="github">sol/doctest-haskell#readme</remote-id>
+ <remote-id type="hackage">doctest</remote-id>
+ <remote-id type="github">sol/doctest</remote-id>
</upstream>
</pkgmetadata>