gentoo auto-resync : 23:07:2022 - 02:48:51

3 files changed, 157 insertions, 0 deletions

diff --git a/dev-haskell/vector/Manifest b/dev-haskell/vector/Manifest
index 03d36ed798ba..67901a2cae23 100644
--- a/dev-haskell/vector/Manifest
+++ b/dev-haskell/vector/Manifest
@@ -1,3 +1,7 @@
+AUX vector-0.12.3.1-cabal-doctest.patch 2520 BLAKE2B f211e31c01be3c7ef16b394f12f3326e9623b266b3fb19a205727888f1b3510220d93c02acd979af020caca29b8d59d2d6965fcfaa6146d6c8d62cef7705eb06 SHA512 e74d99c8b6384c43f426a071b7d6fc7bd8e9e5d4af7b824cce62f64793866f2813b69a0539f8ac0b200418451d41761e5f897ff467e6ed697129756d4f72e4a1
 DIST vector-0.12.1.2.tar.gz 131049 BLAKE2B d77981f49b89cab1aefa3237d87e84ae36c4586c20ca3f359c0855e3f3e15b8087849590bde06bd2017d83d92d8ff03ff1b9d8d949ceab382865707f16c723b0 SHA512 36d0237cf7c5a6b78f88b33ff09ea8b19baeaf85609efdeba9ab802ca588956457d4607304b73e8d58e9e802a9101c23da62caee71508f069047a6d531e50170
+DIST vector-0.12.3.1-rev1.cabal 7946 BLAKE2B f1545c06c3a2ce405c9bc498e471b640fa415acd3413fbb3514fd0ea9422f4c7d51ee9ff8b6041da842c45a156132f6eebf89ea11b843835fd360b7c1dafa8f3 SHA512 292df3231e4f34bc038efa769928813808e562553188547420a83a5d068e5d591a169957ef50da42da66b5ba9eea12408b3e739f0f9edb76f06977d6b75a4843
+DIST vector-0.12.3.1.tar.gz 151420 BLAKE2B 1d3bb37f1c2b7f3c74e8a934d855b0f1742df03f8526a8b7632d1f940abeeef5a03e476340a96840c9486aeafc404463bff078eb28db9176bc8989b554e87ac4 SHA512 bf117d53c7844c010dc1cee8b778851bd714155fd34e671ae2eb7bd324427de972389eb9f3f315832f20e7bbbecc93ec0f6296ab10e4935957d2a4e14c6cfd98
 EBUILD vector-0.12.1.2.ebuild 1365 BLAKE2B c7ce3ddcc514f6711f58afc2673782478be650b9844b1c68a591f90ed97fe7aada80371fa0e3888c3714bebad0c25839ec49f894b41b55d76235bcd70ff01350 SHA512 7944081c43ce39110055fe15f359b60187535404860ef6fe7e112e5aa0a77ecf53a6010ce4f6f1b5bb234df24b81197ae4ae157346d4454831176e7110db9c8c
+EBUILD vector-0.12.3.1.ebuild 1806 BLAKE2B f3bba3e5ec2488ef8797438f1a8f6e5a0ea9f07e51e51e8481d2a10179b1b592dac09e289c525ce27b6da4cc009d62b2bbaed94510fe77fb75d7fb757c539a29 SHA512 f3e40b4ca61fe5b39a0677969b4f464efc52f4888bb5e7ae6aafc1c12038e0a20b5183770678f42798374a55cc4e0f4043e3036906f64320e6bf2ab93641f1c9
 MISC metadata.xml 2432 BLAKE2B 68ccab0b08c3cd848b1e68df59d703e82da74bdb819471f8c867edffd33dd3832340b7bfbe255892ca0e81a810c8c6232154f8262172d71bb54e20341f48bcd1 SHA512 a28490c454bd52bdf1e2c1ce972eab4bf89bcef23f8f4b7e943ffe6be452bc65a51469a8645bb9505ff531af8bad9132afa2475ce067491296b535830cd78fdd
diff --git a/dev-haskell/vector/files/vector-0.12.3.1-cabal-doctest.patch b/dev-haskell/vector/files/vector-0.12.3.1-cabal-doctest.patch
new file mode 100644
index 000000000000..72f56dcb64de
--- /dev/null
+++ b/dev-haskell/vector/files/vector-0.12.3.1-cabal-doctest.patch
@@ -0,0 +1,86 @@
+From: hololeap <hololeap@protonmail.com>
+Signed-off-by: hololeap <hololeap@protonmail.com>
+Bug: https://github.com/gentoo-haskell/gentoo-haskell/issues/1231
+
+doctest pulls in the out-of-scope packages if they are installed on the
+system. The best workaround is to use migrate to cabal-doctest.
+
+diff -urN vector-0.12.3.1/Setup.hs vector-0.12.3.1-r1/Setup.hs
+--- vector-0.12.3.1/Setup.hs	2021-09-21 10:02:15.000000000 -0600
++++ vector-0.12.3.1-r1/Setup.hs	2022-03-22 22:12:57.107142731 -0600
+@@ -1,3 +1,6 @@
+-import Distribution.Simple
+-main = defaultMain
++module Main (main) where
+ 
++import Distribution.Extra.Doctest ( defaultMainWithDoctests )
++
++main :: IO ()
++main = defaultMainWithDoctests "vector-doctest"
+diff -urN vector-0.12.3.1/tests/doctests.hs vector-0.12.3.1-r1/tests/doctests.hs
+--- vector-0.12.3.1/tests/doctests.hs	2021-09-21 10:02:15.000000000 -0600
++++ vector-0.12.3.1-r1/tests/doctests.hs	2022-03-22 22:14:54.557142788 -0600
+@@ -1,4 +1,30 @@
+ import Test.DocTest (doctest)
++import GHC.IO.Encoding (setLocaleEncoding)
++import System.Directory (getCurrentDirectory, makeAbsolute)
++import System.FilePath.Posix ((</>))
++import System.IO (utf8)
++import Build_doctests (pkgs)
+ 
+ main :: IO ()
+-main = doctest ["-Iinclude", "-Iinternal", "Data"]
++main = do
++    setLocaleEncoding utf8
++    pwd    <- getCurrentDirectory
++    prefix <- makeAbsolute pwd
++
++    let customFlags =
++            [ "-package-env=-"
++            , "-hide-all-packages"
++            , "-no-user-package-db"
++            , "-package-db=" ++ prefix </> "dist/package.conf.inplace"
++            ]
++
++    let origFlags =
++            [ "-Iinclude"
++            , "-Iinternal"
++            ]
++
++    let modules =
++            [ "Data"
++            ]
++
++    doctest $ customFlags ++ pkgs ++ origFlags ++ modules
+diff -urN vector-0.12.3.1/vector.cabal vector-0.12.3.1-r1/vector.cabal
+--- vector-0.12.3.1/vector.cabal	2022-03-22 22:09:55.787142644 -0600
++++ vector-0.12.3.1-r1/vector.cabal	2022-03-22 22:12:23.547142715 -0600
+@@ -49,7 +49,7 @@
+ 
+ 
+ Cabal-Version:  >=1.10
+-Build-Type:     Simple
++Build-Type:     Custom
+ 
+ Extra-Source-Files:
+       changelog.md
+@@ -99,6 +99,11 @@
+   Default: False
+   Manual: True
+ 
++custom-setup
++  setup-depends:
++      base
++    , Cabal
++    , cabal-doctest
+ 
+ Library
+   Default-Language: Haskell2010
+@@ -288,4 +293,6 @@
+         base      -any
+       , doctest   >=0.15 && <0.19
+       , primitive >= 0.6.4.0 && < 0.8
+-      , vector    -any
++      , directory
++      , filepath
++      , base-compat
diff --git a/dev-haskell/vector/vector-0.12.3.1.ebuild b/dev-haskell/vector/vector-0.12.3.1.ebuild
new file mode 100644
index 000000000000..d427c9308787
--- /dev/null
+++ b/dev-haskell/vector/vector-0.12.3.1.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.1.1.9999
+#hackport: flags: -wall
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+CABAL_HACKAGE_REVISION="1"
+inherit haskell-cabal
+
+CABAL_FILE="${S}/${PN}.cabal"
+CABAL_DISTFILE="${P}-rev${CABAL_HACKAGE_REVISION}.cabal"
+
+DESCRIPTION="Efficient Arrays"
+HOMEPAGE="https://github.com/haskell/vector"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz
+	https://hackage.haskell.org/package/${P}/revision/${CABAL_HACKAGE_REVISION}.cabal
+		-> ${CABAL_DISTFILE}"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+IUSE="+boundschecks internalchecks unsafechecks"
+
+PATCHES=( "${FILESDIR}/${PN}-0.12.3.1-cabal-doctest.patch" )
+
+RDEPEND=">=dev-haskell/primitive-0.6.4.0:=[profile?] <dev-haskell/primitive-0.8:=[profile?]
+	>=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.2.0.1
+	dev-haskell/cabal-doctest
+	test? ( >=dev-haskell/base-orphans-0.6
+		dev-haskell/base-compat
+		>=dev-haskell/doctest-0.15
+		dev-haskell/hunit
+		>=dev-haskell/quickcheck-2.9 <dev-haskell/quickcheck-2.15
+		dev-haskell/random
+		dev-haskell/tasty
+		dev-haskell/tasty-hunit
+		dev-haskell/tasty-quickcheck )
+"
+BDEPEND="app-text/dos2unix"
+
+src_prepare() {
+	# pull revised cabal from upstream
+	cp "${DISTDIR}/${CABAL_DISTFILE}" "${CABAL_FILE}" || die
+
+	# Convert to unix line endings
+	dos2unix "${CABAL_FILE}" || die
+
+	# Apply patches *after* pulling the revised cabal
+	default
+
+	cabal_chdeps \
+		'doctest   >=0.15 && <0.19' 'doctest >=0.15'
+}
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag boundschecks boundschecks) \
+		$(cabal_flag internalchecks internalchecks) \
+		$(cabal_flag unsafechecks unsafechecks) \
+		--flag=-wall
+}