gentoo resync : 25.08.2020

7 files changed, 39 insertions, 172 deletions

diff --git a/dev-haskell/scientific/Manifest b/dev-haskell/scientific/Manifest
index 0e828e369f75..eb0da1bf1aca 100644
--- a/dev-haskell/scientific/Manifest
+++ b/dev-haskell/scientific/Manifest
@@ -1,9 +1,3 @@
-DIST scientific-0.3.3.8.tar.gz 18543 BLAKE2B ae3a16163d830fe20f7e2705b9e99aa9156743287aa45e635a282f5369b9132f2b8de11596353a5c374b0e11e5a2219ab40de842f1a273f956032fd1908ce514 SHA512 ef77aa3490cbbc92ab71c1db7015ead24100a6230444b895c49bc4840a80dad04f4f8ff0c1bff27490f5c35b53a1f0c294177912492d1259e204bd4d874ea477
-DIST scientific-0.3.4.4.tar.gz 21646 BLAKE2B 9ca2e989cea77dc70a1ce26de4571b0ccdd1ec68c7ab84f00bbb32d7a121963feae9cdd4acb7d51e417a698222143fd4a34d838af21e6f86551fb5f9e097e05f SHA512 18c36036ffe15ef4203d391864c91d505a4a55c7da1b71556cbd6ebb7f83e71e0695789f8beaa4741ae4e21ae54bc1f795a26cd4e3208d08625d639519945217
-DIST scientific-0.3.4.6.tar.gz 21932 BLAKE2B 5d78b981d5627b172af677a35a9bde73bd96053f06cf5e7945957400d3b2b6455bdd6d5039dbf21df16a8bf5f68889a54d9ef71eaf977e0908e21e7792575744 SHA512 c4d3f3c166c45395aa420ff598671128faae130cf85f22b651e338dbbdbe9215ef3b75c58f6b495978a4dd36a49fa45de9a68c7b870151296dc09095e3c79e09
-DIST scientific-0.3.4.9.tar.gz 21932 BLAKE2B 5f0f900b5b51d8b4720bf73d4f2ec4911df7156c9bb5013995eec5f9ee0817be61ad8caf4cc41d07f4b022467de1c6e6943eb630e93cb1b1d9760b6b2b0b58ee SHA512 10b317f6d6aa39883891d4fafaad3a8bdcc8390705f981144f3fe040191ffc7364e0505fde07ab7a3fa9d0b03f97adf42be48fcea2d13ef521fb1031590c0db3
-EBUILD scientific-0.3.3.8.ebuild 1311 BLAKE2B 8dbc0e2bb80b57b5fc64a50f8ab8dc3e974c9ff40237a3b5d1f7faf7ba37626184f800fff701d0aeffe18d363fa8555e8023182487700e3e331e3dc5004d09ef SHA512 0b9218d391828505bb4cafeda2b8cce466942931e1557e11bed8eabac12c529a4aeca7829d53358e31bad197b51958b109f4a5057384ccce6d1ed4e7dd27e523
-EBUILD scientific-0.3.4.4.ebuild 1462 BLAKE2B 87f91572f9a97f0b5abe4928ce5908b5a2c4e16544ee2161e1482071d1b53fcbb94f28d951ca6a247b8b003664390f01ff533bfb146057411b58ebdb4fedc856 SHA512 40b73de4817c99dd59b47f46b1efa938b154b71a5250cb72943f98728898037ad5ae3784d6722747f751e463f64d14b026a3f0da184ca8b7cc852fa08b2db94b
-EBUILD scientific-0.3.4.6.ebuild 1462 BLAKE2B d6b96237f8ee33c081e6e29f8ced684b11af9a45e7aef1a134aaf6a9526d145f857c9e000f655b5450c6a657288e27c6430f4bfe6ba93ec7da396c3d7cc6ad5d SHA512 0ea071927c7cfc4920c23a76dec9c4fa5ca9e779b3f29c56ab55ee6cbfa996aa7071c2450db56e0027282edc49e42b8b24d44765a53c70b551776f6621e392c7
-EBUILD scientific-0.3.4.9.ebuild 1433 BLAKE2B 0094267797c399fc3d40ac034d2f8f9e0fdc81779274b80a6ea214a135af28ca37d69758d34e7e7c804c40cdeba4fbccb1e271c82dd6c10cce3e9bf23deec553 SHA512 529748a4a3ec24061b1f504b7a4bd91bcb354bad1104ccd44cb588ff7a27937168506f47e5428356999ea71610c2e358a66ef8f748545c73e68a113e14e39dd5
-MISC metadata.xml 1019 BLAKE2B 199c5a43e898b24760454aa88076485f8615506c4feda7df63dec16a907f1f9a645039ce7c4a5c4bd85f642cc1aca577edfc3b714c8632eae99d0f827fbaf8e5 SHA512 954d114b29202a451e82be2dea78c68db8b23c52d46a2dbc59b7cbef7d500d91edc0e23dce702f36569caa7ed3c85ee52bc3cc314d18e9249218635390252963
+DIST scientific-0.3.6.2.tar.gz 23510 BLAKE2B 096cd305cdbc4856f48e81de5387b229c4f23fdbfc641243ffa56a74422ec7b224fb2979f22cbdcf747d56c6073ce74ff6ca773093570a8d0a774e2b33d26697 SHA512 47a74524c8fb25d381adf868d823a6b6772f3f69b0b3cf9f9de015a03bc941857ef3fca1b4f8cbf23e998164e71a914e167221e753c6f32dc8644047d1ef57ee
+EBUILD scientific-0.3.6.2.ebuild 1003 BLAKE2B 74568fe34148084cb21513d016e5bdcd4deda8208109486d67312c43fd78f4bbaf22a96176bb4f1020b61291306514567499db7b2672158f267e6d9da0c1a936 SHA512 f746132e49f8cf3553b3347df977a61ae2706c34c98b76da533692aefa64b1765bb2c1ce0cec06b56ecb7e013a2873f8633efabd8510d9706b2f9ed4a521242d
+MISC metadata.xml 865 BLAKE2B 52a07c5a35f30ad750004fbbe63818dfa5fdef4964bb3dccf62a55f1c67fed8e860f558f02e2bce6b148f03da31db9650421bfb8d82985376e5c02b3c48799e3 SHA512 2ceead4c34d1554693d2ccb1c65c35e2d06f20fbc04053973ef58466b5cb7fc48f36accd358e7bdd14fca01cb7a958d6a1fb82d4aff4cf57cad4360e23167cfb
diff --git a/dev-haskell/scientific/metadata.xml b/dev-haskell/scientific/metadata.xml
index af4a88b17cb6..bc68c8a356b5 100644
--- a/dev-haskell/scientific/metadata.xml
+++ b/dev-haskell/scientific/metadata.xml
@@ -19,12 +19,6 @@
 		scientific notation they can be efficiently
 		parsed to a @Scientific@ number.
 	</longdescription>
-	<use>
-		<flag name="bytestring-builder">
-			Provide the Data.ByteString.Builder.Scientific
-			module (requires bytestring &gt;= 0.10).
-		</flag>
-	</use>
 	<upstream>
 		<remote-id type="github">basvandijk/scientific</remote-id>
 	</upstream>
diff --git a/dev-haskell/scientific/scientific-0.3.3.8.ebuild b/dev-haskell/scientific/scientific-0.3.3.8.ebuild
deleted file mode 100644
index d7b467896092..000000000000
--- a/dev-haskell/scientific/scientific-0.3.3.8.ebuild
+++ /dev/null
@@ -1,39 +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="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Numbers represented using scientific notation"
-HOMEPAGE="https://github.com/basvandijk/scientific"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+bytestring-builder"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=dev-haskell/hashable-1.1.2:=[profile?] <dev-haskell/hashable-1.3:=[profile?]
-	>=dev-haskell/text-0.8:=[profile?] <dev-haskell/text-1.3:=[profile?]
-	>=dev-lang/ghc-7.6.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.16.0
-	test? ( >=dev-haskell/quickcheck-2.5 <dev-haskell/quickcheck-2.9
-		>=dev-haskell/smallcheck-1.0 <dev-haskell/smallcheck-1.2
-		>=dev-haskell/tasty-0.5 <dev-haskell/tasty-0.11
-		>=dev-haskell/tasty-ant-xml-1.0 <dev-haskell/tasty-ant-xml-1.1
-		>=dev-haskell/tasty-hunit-0.8 <dev-haskell/tasty-hunit-0.10
-		>=dev-haskell/tasty-quickcheck-0.8 <dev-haskell/tasty-quickcheck-0.9
-		>=dev-haskell/tasty-smallcheck-0.2 <dev-haskell/tasty-smallcheck-0.9 )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag bytestring-builder bytestring-builder)
-}
diff --git a/dev-haskell/scientific/scientific-0.3.4.4.ebuild b/dev-haskell/scientific/scientific-0.3.4.4.ebuild
deleted file mode 100644
index 63d0143a8536..000000000000
--- a/dev-haskell/scientific/scientific-0.3.4.4.ebuild
+++ /dev/null
@@ -1,41 +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.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Numbers represented using scientific notation"
-HOMEPAGE="https://github.com/basvandijk/scientific"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+bytestring-builder"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=dev-haskell/binary-0.4.1:=[profile?] <dev-haskell/binary-0.8:=[profile?]
-	>=dev-haskell/hashable-1.1.2:=[profile?] <dev-haskell/hashable-1.3:=[profile?]
-	>=dev-haskell/text-0.8:=[profile?] <dev-haskell/text-1.3:=[profile?]
-	>=dev-haskell/vector-0.5:=[profile?] <dev-haskell/vector-0.12:=[profile?]
-	>=dev-lang/ghc-7.6.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.16.0
-	test? ( >=dev-haskell/quickcheck-2.5 <dev-haskell/quickcheck-2.9
-		>=dev-haskell/smallcheck-1.0 <dev-haskell/smallcheck-1.2
-		>=dev-haskell/tasty-0.5 <dev-haskell/tasty-0.12
-		>=dev-haskell/tasty-ant-xml-1.0 <dev-haskell/tasty-ant-xml-1.1
-		>=dev-haskell/tasty-hunit-0.8 <dev-haskell/tasty-hunit-0.10
-		>=dev-haskell/tasty-quickcheck-0.8 <dev-haskell/tasty-quickcheck-0.9
-		>=dev-haskell/tasty-smallcheck-0.2 <dev-haskell/tasty-smallcheck-0.9 )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag bytestring-builder bytestring-builder)
-}
diff --git a/dev-haskell/scientific/scientific-0.3.4.6.ebuild b/dev-haskell/scientific/scientific-0.3.4.6.ebuild
deleted file mode 100644
index e812a36edaf3..000000000000
--- a/dev-haskell/scientific/scientific-0.3.4.6.ebuild
+++ /dev/null
@@ -1,41 +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.7.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Numbers represented using scientific notation"
-HOMEPAGE="https://github.com/basvandijk/scientific"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+bytestring-builder"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=dev-haskell/binary-0.4.1:=[profile?] <dev-haskell/binary-0.9:=[profile?]
-	>=dev-haskell/hashable-1.1.2:=[profile?] <dev-haskell/hashable-1.3:=[profile?]
-	>=dev-haskell/text-0.8:=[profile?] <dev-haskell/text-1.3:=[profile?]
-	>=dev-haskell/vector-0.5:=[profile?] <dev-haskell/vector-0.12:=[profile?]
-	>=dev-lang/ghc-7.6.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.16.0
-	test? ( >=dev-haskell/quickcheck-2.5 <dev-haskell/quickcheck-2.9
-		>=dev-haskell/smallcheck-1.0 <dev-haskell/smallcheck-1.2
-		>=dev-haskell/tasty-0.5 <dev-haskell/tasty-0.12
-		>=dev-haskell/tasty-ant-xml-1.0 <dev-haskell/tasty-ant-xml-1.1
-		>=dev-haskell/tasty-hunit-0.8 <dev-haskell/tasty-hunit-0.10
-		>=dev-haskell/tasty-quickcheck-0.8 <dev-haskell/tasty-quickcheck-0.9
-		>=dev-haskell/tasty-smallcheck-0.2 <dev-haskell/tasty-smallcheck-0.9 )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag bytestring-builder bytestring-builder)
-}
diff --git a/dev-haskell/scientific/scientific-0.3.4.9.ebuild b/dev-haskell/scientific/scientific-0.3.4.9.ebuild
deleted file mode 100644
index ae9daf6295fb..000000000000
--- a/dev-haskell/scientific/scientific-0.3.4.9.ebuild
+++ /dev/null
@@ -1,36 +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.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Numbers represented using scientific notation"
-HOMEPAGE="https://github.com/basvandijk/scientific"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND=">=dev-haskell/binary-0.4.1:=[profile?] <dev-haskell/binary-0.9:=[profile?]
-	>=dev-haskell/bytestring-builder-0.10.4:=[profile?] <dev-haskell/bytestring-builder-0.11:=[profile?]
-	>=dev-haskell/hashable-1.1.2:=[profile?] <dev-haskell/hashable-1.3:=[profile?]
-	>=dev-haskell/text-0.8:=[profile?] <dev-haskell/text-1.3:=[profile?]
-	>=dev-haskell/vector-0.5:=[profile?] <dev-haskell/vector-0.12:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
-	test? ( >=dev-haskell/quickcheck-2.5 <dev-haskell/quickcheck-2.10
-		>=dev-haskell/smallcheck-1.0 <dev-haskell/smallcheck-1.2
-		>=dev-haskell/tasty-0.5 <dev-haskell/tasty-0.12
-		>=dev-haskell/tasty-ant-xml-1.0 <dev-haskell/tasty-ant-xml-1.1
-		>=dev-haskell/tasty-hunit-0.8 <dev-haskell/tasty-hunit-0.10
-		>=dev-haskell/tasty-quickcheck-0.8 <dev-haskell/tasty-quickcheck-0.9
-		>=dev-haskell/tasty-smallcheck-0.2 <dev-haskell/tasty-smallcheck-0.9 )
-"
diff --git a/dev-haskell/scientific/scientific-0.3.6.2.ebuild b/dev-haskell/scientific/scientific-0.3.6.2.ebuild
new file mode 100644
index 000000000000..a65f4fad1a1a
--- /dev/null
+++ b/dev-haskell/scientific/scientific-0.3.6.2.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.5.6.9999
+#hackport: flags: -integer-simple
+CABAL_FEATURES="lib profile haddock hoogle hscolour" # disable test-suite: circular depends
+inherit haskell-cabal
+
+DESCRIPTION="Numbers represented using scientific notation"
+HOMEPAGE="https://github.com/basvandijk/scientific"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RESTRICT=test # circular depends
+
+RDEPEND=">=dev-haskell/bytestring-builder-0.10.4:=[profile?] <dev-haskell/bytestring-builder-0.11:=[profile?]
+	>=dev-haskell/hashable-1.1.2:=[profile?]
+	>=dev-haskell/integer-logarithms-1:=[profile?]
+	>=dev-haskell/primitive-0.1:=[profile?]
+	>=dev-haskell/text-0.8:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.10
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		--flags=-integer-simple
+}