gentoo resync : 14.07.2018

7 files changed, 198 insertions, 0 deletions

diff --git a/dev-haskell/doctest/Manifest b/dev-haskell/doctest/Manifest
new file mode 100644
index 000000000000..0d6af8fb6974
--- /dev/null
+++ b/dev-haskell/doctest/Manifest
@@ -0,0 +1,9 @@
+AUX doctest-0.11.0-unamb-2.patch 695 BLAKE2B 184ad9d6ab465278fd30e346e2cd5dcc024e882c1491fb7286c8d435d56adc4cc34b74d04c08b5b4a2a568fc7b56a0ea29a94376b5048faeacb16f86b0e6409a SHA512 365654f61f1a9dafc4d5eb8362ef8ab2ff74f5f9d4114f18e942bdf14da9a772634063c8100d5ab827bdb492f559b6bc11fea95fe52ee75aa7ec29c7161a4b7e
+AUX doctest-0.11.0-unamb.patch 1005 BLAKE2B 21fbda852728979e1469470f7a08dcf663266b5785a2ce3dae270f1c5818a30200ebb2264928d9d3e075e6b5fe4e66179eb5acf96ace2212e65e590a0b39d733 SHA512 aa527e0be7a13936c02a0c76dcd9ea841303f769c72aa5fe5729e3f52cfe2ec884eefd8859b19db2579f88bd79d40d6c59ade31222449de454ef5ab587c4e19c
+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.9.12.tar.gz 15806 BLAKE2B 20b63bc3451c81c646acc09dbde4fa77b3b7b82e2b8c4e5edf0940f33e71a8b3ed296e5337b673b5a1342ecf9bb1ed4ae82358c615abb7be420aa32dbf966ef6 SHA512 9d0d24ddba3f4ddaa386dc4ea7f15483f4d756dd48f62bcc8cad6e375c57a5660d8c7a12ff5bbc803bde04d65d8a28d3940cc390cd0d2ced2c5cc9895eba7916
+EBUILD doctest-0.10.1.ebuild 881 BLAKE2B d7c74c2a6b4aae1719c7cefd3ab39ae9c520f7375a4c1d3442ada0bbb3a0c745270974ab83aca69126f894e6a22a3216099f0a085eceb52be1ed6ae1b57b76b6 SHA512 3329a72e24c8724a562f89fa7b8dbcd8e16c5e9dd778fcc1240c1ba307e19fd4ac9f4b40b87d3f7692e77dce11f6e03f1c3f10e0155e3e9a4ef490faa5b045b0
+EBUILD doctest-0.11.1.ebuild 1083 BLAKE2B abbe9d07fab3c4511ec49359a4d0018698a96587295e6f7140a39815834fc196e97a8e357d0a7e7c7d5f0d05f7f7b022400947f5c7a48c1c19a6a2d2176b9b6a SHA512 90bde1d6ab61b6016ec46ca2a3a408eb7190d16aa7a4be86adb11ae06628aafb6cc1559d280a08cde707233af3c381f78b66c71dcc1c7fcb13392b5be5d8e94e
+EBUILD doctest-0.9.12.ebuild 914 BLAKE2B 028dec463a0daa8c5b718517fe301408e248bfbac7f03d9a28f948f9b8f78d51f58449dc2d99d550f925aee0ead270e20481a11d2dfa1841366a0c9d991a5617 SHA512 e184fac8d841475bd7ae11a2d55588e7d3f810926c91393de7382ce1e03b2de51f9c8f8260870eabd9dce1ccd38ed5f52de780e59c49c15b5308d8f2716376c1
+MISC metadata.xml 622 BLAKE2B 8d73447e653e98ac598157a57db77c576b4010575c712574456bd85d45a6a27a75f6dd583d9e7a480dcf78513acc5117afb5c223ce6d6dbca64f5cd4df5e0b03 SHA512 a9a18fe1831a4a70230ba2634aad01967e069710b6511de0489d62062393e1cb61c4139176830ab820e98b3784de84ad97d58683740162d64376a2b718c82671
diff --git a/dev-haskell/doctest/doctest-0.10.1.ebuild b/dev-haskell/doctest/doctest-0.10.1.ebuild
new file mode 100644
index 000000000000..36eda5d15aba
--- /dev/null
+++ b/dev-haskell/doctest/doctest-0.10.1.ebuild
@@ -0,0 +1,34 @@
+# 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 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/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
new file mode 100644
index 000000000000..95dc7ee01fb8
--- /dev/null
+++ b/dev-haskell/doctest/doctest-0.11.1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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="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/doctest-0.9.12.ebuild b/dev-haskell/doctest/doctest-0.9.12.ebuild
new file mode 100644
index 000000000000..2312e8de948a
--- /dev/null
+++ b/dev-haskell/doctest/doctest-0.9.12.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2015 Gentoo Foundation
+# 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="mirror://hackage/packages/archive/${PN}/${PV}/${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
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
diff --git a/dev-haskell/doctest/metadata.xml b/dev-haskell/doctest/metadata.xml
new file mode 100644
index 000000000000..e92269d61b9e
--- /dev/null
+++ b/dev-haskell/doctest/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://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>
+	</upstream>
+</pkgmetadata>