commit: 142ad3a7118777c708e33cbb0fc8a93a15b1f8a4 Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> AuthorDate: Sat Sep 12 14:57:35 2020 +0000 Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> CommitDate: Sat Sep 12 14:58:55 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=142ad3a7
dev-haskell/doctest: drop old Package-Manager: Portage-3.0.6, Repoman-3.0.1 Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org> dev-haskell/doctest/Manifest | 3 -- dev-haskell/doctest/doctest-0.10.1.ebuild | 34 ------------------ dev-haskell/doctest/doctest-0.11.1.ebuild | 41 ---------------------- dev-haskell/doctest/doctest-0.9.12.ebuild | 34 ------------------ .../doctest/files/doctest-0.11.0-unamb-2.patch | 26 -------------- .../doctest/files/doctest-0.11.0-unamb.patch | 35 ------------------ 6 files changed, 173 deletions(-) diff --git a/dev-haskell/doctest/Manifest b/dev-haskell/doctest/Manifest index 38aa6cd4536..a5d722a789f 100644 --- a/dev-haskell/doctest/Manifest +++ b/dev-haskell/doctest/Manifest @@ -1,4 +1 @@ -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 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 ba580004991..00000000000 --- 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 bb34ec51fa5..00000000000 --- 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.9.12.ebuild b/dev-haskell/doctest/doctest-0.9.12.ebuild deleted file mode 100644 index ef03eee3ce9..00000000000 --- 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 9e8de3fe994..00000000000 --- 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 88c5f89fb9b..00000000000 --- a/dev-haskell/doctest/files/doctest-0.11.0-unamb.patch +++ /dev/null @@ -1,35 +0,0 @@ -commit c3194e5e874bf7da4d9d1db3f435e902eeb60993 -Author: Sergei Trofimovich <siarh...@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 <siarh...@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
