dev-haskell/doctest: bump up to 0.11.1

Package-Manager: Portage-2.3.3, Repoman-2.3.1

4 files changed, 104 insertions, 0 deletions

diff --git a/dev-haskell/doctest/Manifest b/dev-haskell/doctest/Manifest
index c88029251429..0aaa003e1117 100644
--- a/dev-haskell/doctest/Manifest
+++ b/dev-haskell/doctest/Manifest
@@ -1,2 +1,3 @@
 DIST doctest-0.10.1.tar.gz 18046 SHA256 357b99c0975171a61de3bf5a9b9265e82a15f336f2ceb5cf73d94111d7877ec9 SHA512 f12d3f30c6dcdd9e088362039b4d99d6b9fb499d0a78016e1e6e7b54968950490a1418dd5a7d94d5f509a08f3cf3111276ac15e84775278a77737099ac9bfd67 WHIRLPOOL 3fab795075d40e48795ad2df8bba6fea44c0d6219488794f9d1668aac08a917774b82702c0a3da3f404b837a76a1491a5eae57685d6c293cf676c7e613bc3cb0
+DIST doctest-0.11.1.tar.gz 18086 SHA256 5b6ab30f0bf4061707b7bb33445da4c8a00df3e8b3ed04cf7c86f18a6007ad2a SHA512 ca95e0b5f09514e8236507856ae610016bd549b9e685b4a94cf1c0682d1cf7bffb344b471aab22ae3fd47c29ada0dcc0ba52b8f012800e9199c340b764971894 WHIRLPOOL 6fb8fe825875f447219162e8176b9ecea6a5a2cc0d66871f78501cba46645dc0e472dd81a09af671f6312ecafd17e247cffed0ef7757d638b4ae04ec95334a49
 DIST doctest-0.9.12.tar.gz 15806 SHA256 a3e0e67d7f18572128d7de9b2c55e1559b689e77f6b254c659cc5cb47029756b SHA512 9d0d24ddba3f4ddaa386dc4ea7f15483f4d756dd48f62bcc8cad6e375c57a5660d8c7a12ff5bbc803bde04d65d8a28d3940cc390cd0d2ced2c5cc9895eba7916 WHIRLPOOL 200938a9ac2ebde5279b167da7f2b43c341d670702da5831bdf78de789719c6fc66c551f6b0a32196c0407df3e90e3e3ac249b49e53cc3708ac831bb87b66c53
diff --git a/dev-haskell/doctest/doctest-0.11.1.ebuild b/dev-haskell/doctest/doctest-0.11.1.ebuild
new file mode 100644
index 000000000000..a767f0d1fcca
--- /dev/null
+++ b/dev-haskell/doctest/doctest-0.11.1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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="mirror://hackage/packages/archive/${PN}/${PV}/${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/files/doctest-0.11.0-unamb-2.patch b/dev-haskell/doctest/files/doctest-0.11.0-unamb-2.patch
new file mode 100644
index 000000000000..9e8de3fe994a
--- /dev/null
+++ b/dev-haskell/doctest/files/doctest-0.11.0-unamb-2.patch
@@ -0,0 +1,26 @@
+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
new file mode 100644
index 000000000000..88c5f89fb9b0
--- /dev/null
+++ b/dev-haskell/doctest/files/doctest-0.11.0-unamb.patch
@@ -0,0 +1,35 @@
+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