From 386855c4d1ef509c1fd32abd721589c81669613b Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 23 Oct 2023 08:35:49 +0100 Subject: gentoo auto-resync : 23:10:2023 - 08:35:49 --- dev-haskell/vector/Manifest | 8 ++- .../files/vector-0.12.3.1-disable-doctests.patch | 27 +++++++++ .../files/vector-0.12.3.1-fix-testdata-float.patch | 42 ++++++++++++++ dev-haskell/vector/metadata.xml | 66 ++-------------------- dev-haskell/vector/vector-0.12.3.1-r1.ebuild | 50 ++++++++++++++++ dev-haskell/vector/vector-0.12.3.1.ebuild | 24 +++----- 6 files changed, 138 insertions(+), 79 deletions(-) create mode 100644 dev-haskell/vector/files/vector-0.12.3.1-disable-doctests.patch create mode 100644 dev-haskell/vector/files/vector-0.12.3.1-fix-testdata-float.patch create mode 100644 dev-haskell/vector/vector-0.12.3.1-r1.ebuild (limited to 'dev-haskell/vector') diff --git a/dev-haskell/vector/Manifest b/dev-haskell/vector/Manifest index f531091d61a6..de47c10ed9b5 100644 --- a/dev-haskell/vector/Manifest +++ b/dev-haskell/vector/Manifest @@ -1,5 +1,9 @@ AUX vector-0.12.3.1-cabal-doctest.patch 2520 BLAKE2B f211e31c01be3c7ef16b394f12f3326e9623b266b3fb19a205727888f1b3510220d93c02acd979af020caca29b8d59d2d6965fcfaa6146d6c8d62cef7705eb06 SHA512 e74d99c8b6384c43f426a071b7d6fc7bd8e9e5d4af7b824cce62f64793866f2813b69a0539f8ac0b200418451d41761e5f897ff467e6ed697129756d4f72e4a1 +AUX vector-0.12.3.1-disable-doctests.patch 719 BLAKE2B 0e0da2eafcf2fc9796fd2fed5c6179ac4b86e07d40866d8aa3e00b5ea3bf3dcb2c88f7b580a2e85b7f9baee39dda9d95c28e3788c33ae96f0882feef645eb6ba SHA512 ca9e5ca5d75afc723516d51a420395bca4575293014c3b625682f301f4d6fe2eadd25ba14779c54343ce74a20a12ea42210296b8d481d1c3aa4edd1693de5b7d +AUX vector-0.12.3.1-fix-testdata-float.patch 1245 BLAKE2B e4c699749e67b82396fd92ff0f277fe5035a4075f278f2b6da997b5a7679d486305543a9f00c83469dc536ee5dcfa397f8be3c794d1047a8eed253a27c30456a SHA512 c9d0355d925c756aea4b156129476b46c2f94ae66785cd03560b6a53c765d57c19307917ed7036f1c299803035920a72c78bce21789000e6734effd33cb357f3 DIST vector-0.12.3.1-rev1.cabal 7946 BLAKE2B f1545c06c3a2ce405c9bc498e471b640fa415acd3413fbb3514fd0ea9422f4c7d51ee9ff8b6041da842c45a156132f6eebf89ea11b843835fd360b7c1dafa8f3 SHA512 292df3231e4f34bc038efa769928813808e562553188547420a83a5d068e5d591a169957ef50da42da66b5ba9eea12408b3e739f0f9edb76f06977d6b75a4843 +DIST vector-0.12.3.1-rev4.cabal 8218 BLAKE2B df9e13b1d98377d6506225e3da5a1834c51d3e5244945a6d02a9267b077a5b1d276410130d7c2860b8d49b23f4d6d63dfbd168b497d9ad439240aed19dd8213f SHA512 86088ff4f20b2cc214a703b7ea665baf6d1e9b218f931c6880d6d1291f0dd8e2804863a251a8bf11e82d2f0026d55dcba06f937f8c8909dc8988bc60874374aa DIST vector-0.12.3.1.tar.gz 151420 BLAKE2B 1d3bb37f1c2b7f3c74e8a934d855b0f1742df03f8526a8b7632d1f940abeeef5a03e476340a96840c9486aeafc404463bff078eb28db9176bc8989b554e87ac4 SHA512 bf117d53c7844c010dc1cee8b778851bd714155fd34e671ae2eb7bd324427de972389eb9f3f315832f20e7bbbecc93ec0f6296ab10e4935957d2a4e14c6cfd98 -EBUILD vector-0.12.3.1.ebuild 1861 BLAKE2B 86199af76e3676db4df27538642875f20f56515ea17f11d1fb6a5f367738e07a92df5445c40594e95bbebc72bc392fcf438bf6d693537a3722e668f4e4160706 SHA512 783f2447f34e6208db8a4c6dc5af59117b56a287632204c35e4d98c50dd194f3384c4d4bf1c5dd84ca38d77d65a53ce77674de6abd60563baa65c45c90eb4ead -MISC metadata.xml 2432 BLAKE2B 68ccab0b08c3cd848b1e68df59d703e82da74bdb819471f8c867edffd33dd3832340b7bfbe255892ca0e81a810c8c6232154f8262172d71bb54e20341f48bcd1 SHA512 a28490c454bd52bdf1e2c1ce972eab4bf89bcef23f8f4b7e943ffe6be452bc65a51469a8645bb9505ff531af8bad9132afa2475ce067491296b535830cd78fdd +EBUILD vector-0.12.3.1-r1.ebuild 1212 BLAKE2B dd5bdd5fcd5e235eaedb39b8bf2a888d1eab559005af32dcbe8c63ff7a3132936783c701aaa788b84a5ad26c4d3221011aff82aef3789aa62793294d2febe7e6 SHA512 ee376b94b42b51c3e28e01e83d5511cd5ea127cdbc7d51822b7f4858705662856a8a4d2644e23055da122f68edcdbed1e400e455861c2b9bf53bd465024fa2ed +EBUILD vector-0.12.3.1.ebuild 1649 BLAKE2B a8ca0a15683e558d6bc718ae09a0579b616f8cf51d5c9e87821792e3a7625dc6d7ff23a94741db29d65dc2d975822b707c1f5f0d3e2f5763abcc223948f0cef9 SHA512 1f4352b396e5982c38186799828fcb4ae14f717af4e58378f4ea06b585103fb429741cadfd20de31bd4f7d556983b1f4064636a8c8e799fe089d32af106b6587 +MISC metadata.xml 698 BLAKE2B 45f1c24540f2b75537930533243084f7c5fe21c0712e965bf2709c71dc89b22fa5dff17d03b368484d6bc7163a1fe626b5544753ceffc729e27277c0a67547b9 SHA512 9626da7feafe181ef190cfa9e83412ebf8588bb503203f064be13c60362a7ef6ea1a315e388986f314ec1c921ab7c1f8c5d25dd8c80c81d980dc01316c4d19c6 diff --git a/dev-haskell/vector/files/vector-0.12.3.1-disable-doctests.patch b/dev-haskell/vector/files/vector-0.12.3.1-disable-doctests.patch new file mode 100644 index 000000000000..1a04dd89c7f0 --- /dev/null +++ b/dev-haskell/vector/files/vector-0.12.3.1-disable-doctests.patch @@ -0,0 +1,27 @@ +From eb479f24b766425dd522ba01e0c298fc814c788d Mon Sep 17 00:00:00 2001 +From: hololeap +Date: Sat, 4 Mar 2023 14:46:07 -0700 +Subject: [PATCH] Disable doctests + +Doctests are not working on ghc-9.2 + +Signed-off-by: hololeap +--- + vector.cabal | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/vector.cabal b/vector.cabal +index cea122a..c738a35 100644 +--- a/vector.cabal ++++ b/vector.cabal +@@ -274,6 +274,7 @@ test-suite vector-tests-O2 + Ghc-Options: -Wno-redundant-constraints + + test-suite vector-doctest ++ buildable: False + type: exitcode-stdio-1.0 + main-is: doctests.hs + hs-source-dirs: tests +-- +2.39.2 + diff --git a/dev-haskell/vector/files/vector-0.12.3.1-fix-testdata-float.patch b/dev-haskell/vector/files/vector-0.12.3.1-fix-testdata-float.patch new file mode 100644 index 000000000000..8a8db580f225 --- /dev/null +++ b/dev-haskell/vector/files/vector-0.12.3.1-fix-testdata-float.patch @@ -0,0 +1,42 @@ +From df8dd8e8e84005aa6b187b03cd502f3c6e18cf3c Mon Sep 17 00:00:00 2001 +From: Bodigrim +Date: Sun, 4 Jun 2023 17:55:28 +0100 +Bug: https://github.com/haskell/vector/pull/461 +Signed-off-by: hololeap +Subject: [PATCH] Fix instance TestData Float/Double + +--- + vector/tests/Utilities.hs | 18 ++++++++++++++++-- + 1 file changed, 16 insertions(+), 2 deletions(-) + +diff --git a/vector/tests/Utilities.hs b/vector/tests/Utilities.hs +index 24799554..ae19d425 100644 +--- a/tests/Utilities.hs ++++ b/tests/Utilities.hs +@@ -121,10 +121,24 @@ instance TestData ty where { \ + id_TestData(()) + id_TestData(Bool) + id_TestData(Int) +-id_TestData(Float) +-id_TestData(Double) + id_TestData(Ordering) + ++instance TestData Float where ++ type Model Float = Float ++ model = id ++ unmodel = id ++ ++ type EqTest Float = Property ++ equal x y = property (x == y || (isNaN x && isNaN y)) ++ ++instance TestData Double where ++ type Model Double = Double ++ model = id ++ unmodel = id ++ ++ type EqTest Double = Property ++ equal x y = property (x == y || (isNaN x && isNaN y)) ++ + bimapEither :: (a -> b) -> (c -> d) -> Either a c -> Either b d + bimapEither f _ (Left a) = Left (f a) + bimapEither _ g (Right c) = Right (g c) diff --git a/dev-haskell/vector/metadata.xml b/dev-haskell/vector/metadata.xml index f17879fb0804..d7ad3155bea8 100644 --- a/dev-haskell/vector/metadata.xml +++ b/dev-haskell/vector/metadata.xml @@ -5,71 +5,15 @@ haskell@gentoo.org Gentoo Haskell - - An efficient implementation of Int-indexed arrays (both mutable - and immutable), with a powerful loop optimisation framework . - - It is structured as follows: - - ["Data.Vector"] Boxed vectors of arbitrary types. - - ["Data.Vector.Unboxed"] Unboxed vectors with an adaptive - representation based on data type families. - - ["Data.Vector.Storable"] Unboxed vectors of 'Storable' types. - - ["Data.Vector.Primitive"] Unboxed vectors of primitive types as - defined by the @primitive@ package. "Data.Vector.Unboxed" is more - flexible at no performance cost. - - ["Data.Vector.Generic"] Generic interface to the vector types. - - Each module has a @Safe@ version with is marked as @Trustworthy@ - (see <http://hackage.haskell.org/trac/ghc/wiki/SafeHaskell>). - - There is also a (draft) tutorial on common uses of vector. - - * <http://haskell.org/haskellwiki/Numeric_Haskell:_A_Vector_Tutorial> - - Please use the project trac to submit bug reports and feature - requests. - - * <http://trac.haskell.org/vector> - - Changes in version 0.9 - - * 'MonadPlus' instance for boxed vectors - - * Export more @construct@ and @constructN@ from @Safe@ modules - - * Require @primitive-0.4.0.1@ - - Changes in version 0.8 - - * New functions: @constructN@, @constructrN@ - - * Support for GHC 7.2 array copying primitives - - * New fixity for @(!)@ - - * Safe Haskell support (contributed by David Terei) - - * 'Functor', 'Monad', 'Applicative', 'Alternative', 'Foldable' and - 'Traversable' instances for boxed vectors - (/WARNING: they tend to be slow and are only provided for completeness/) - - * 'Show' instances for immutable vectors follow containers conventions - - * 'Read' instances for all immutable vector types - - * Performance improvements - Enable bounds checking - Enable internal consistency checks at the cost of a significant performance penalty - Enable bounds checking in unsafe operations at the cost of a significant performance penalty + Enable internal consistency checks at the cost of a +significant performance penalty + Enable bounds checking in unsafe operations at the cost of a +significant performance penalty + vector haskell/vector diff --git a/dev-haskell/vector/vector-0.12.3.1-r1.ebuild b/dev-haskell/vector/vector-0.12.3.1-r1.ebuild new file mode 100644 index 000000000000..23f7fd1c6530 --- /dev/null +++ b/dev-haskell/vector/vector-0.12.3.1-r1.ebuild @@ -0,0 +1,50 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +# ebuild generated by hackport 0.8.1.0.9999 +#hackport: flags: -wall + +CABAL_HACKAGE_REVISION=4 + +CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite" +inherit haskell-cabal + +DESCRIPTION="Efficient Arrays" +HOMEPAGE="https://github.com/haskell/vector" + +LICENSE="BSD" +SLOT="0/${PV}" +KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86" +IUSE="+boundschecks internalchecks unsafechecks" + +PATCHES=( + "${FILESDIR}/${PN}-0.12.3.1-disable-doctests.patch" + "${FILESDIR}/${PN}-0.12.3.1-fix-testdata-float.patch" +) + +RDEPEND=" + >=dev-haskell/primitive-0.6.4.0:=[profile?] =dev-lang/ghc-8.8.1:= +" +DEPEND="${RDEPEND} + >=dev-haskell/cabal-3.0.0.0 + test? ( + >=dev-haskell/base-orphans-0.6 + dev-haskell/hunit + >=dev-haskell/quickcheck-2.9 =0.15 && <0.19' 'doctest >=0.15' -} +CABAL_CHDEPS=( + 'doctest >=0.15 && <0.19' 'doctest >=0.15' +) src_configure() { haskell-cabal_src_configure \ -- cgit v1.2.3