gentoo resync : 16.09.2020

4 files changed, 15 insertions, 54 deletions

diff --git a/dev-haskell/chaselev-deque/Manifest b/dev-haskell/chaselev-deque/Manifest
index ed70b5a5fef0..e5be1fd5a9e0 100644
--- a/dev-haskell/chaselev-deque/Manifest
+++ b/dev-haskell/chaselev-deque/Manifest
@@ -1,5 +1,3 @@
-DIST chaselev-deque-0.4.tar.gz 10323 BLAKE2B b8e47560586b9fbde66be5499e1bb42d44e15c5c2992ef4f6f14653dfc6e51021377d2becace5a7b4079cd50d527c85965f5bb38872433130c65486ddfa79d27 SHA512 40145d86c4664d192eac0c264f6371b8f894b5aa0ab8d3179d6fe3b6d336f8062ebbfb83a39836069d7eb90baf2a5d7d3d75aba73adf67547a29824793084cc7
 DIST chaselev-deque-0.5.0.5.tar.gz 12451 BLAKE2B 79ee460eb84286bbbe0dcd58431d5ab0b7aef1d0d186c2c919b566c6b169ab4069917a61e8bb800af3857c7e3cca09c6f698c6f9a6b5d8efdbdd5902a7042310 SHA512 1561208ec92d7765b126684677cab02ee71bd1f7d2cdc6f2acac065972c241d085a538e14f51c87555f464aadbac2795c64f9063075acdf29217fb2d70a47dfd
-EBUILD chaselev-deque-0.4.ebuild 1126 BLAKE2B c2d61b69a3f445c1feecacaf94c4a378de26edcf354c1896effdc564907f6076d59533aae836a68747fc3045d8e814243ed531d4340e4afe0c6acd023bda9de7 SHA512 4ab028eaa12bc02e6fdf212e28012f78b47b41f943b2153deb3331645ffb6375a01ead433b6f191a66e59af66d7ee308bd7ac5064c2d98161c67efc54099ad66
-EBUILD chaselev-deque-0.5.0.5.ebuild 1017 BLAKE2B 1f87aac877054598bbd081a3bd2baec5e5a81cc02bfecc1ce8091aa9012bb57bb5d597a4f11a9c5d01f8c53a902abb2f8d81a8d4f8df25ac8c7dc6ffe124a02a SHA512 3b2ba7801c7e8acfd45f70477cd67b1e133b5b5a5b6497b5543cfd6bbd41dfca612c352aabd06b62af20df53ebc118026fee6bc59de8cea246a4f82f7f04901f
-MISC metadata.xml 450 BLAKE2B 687396764385a78c84169677319e33815e449cbc38b61489058e8aebdb43b708759e91b2449ca5cd9ff7ae0d710c5623c65b4c57e9d04e7755818f3586226713 SHA512 3fdab91a32cc60d1b79d309e4285d17494057fc11e470c6683eefe412cf9ed8a720d659c2b841f493f9c7259842c044856c8264714b5590d2bef270003b3c71d
+EBUILD chaselev-deque-0.5.0.5.ebuild 984 BLAKE2B 8202a3aaf229d49d99da2a648481d75446ac09803c100c55877b03b1bad20954d94b85a7f70bf4166763eeb57bb6e9424050377341db7ba9b2121e182168f7ba SHA512 b327c20c82ad3096dd4e2feb52b51d04af2ffd07ff751e589eedd9721de3ac89815fae031aed980b0661b9266f6fa46dc910171b608688ce4ae77df274d5fe0d
+MISC metadata.xml 656 BLAKE2B 6862d66069d8504053ab67a52dcb55eb8cdf454d760398bf075897ce817bb472619f9f8848ee5437c24dd5fda82493c978cb8b4de6f9a92c47bbe8ea65ef72ca SHA512 411fda514336cc74791b5b6b50eaad670a2bc46bff0ebd966dd57fbf7905ce3b34c12d659b6d5acc0a09b4d0a556a846dffb4da5cc08a3946421a39d1f702302
diff --git a/dev-haskell/chaselev-deque/chaselev-deque-0.4.ebuild b/dev-haskell/chaselev-deque/chaselev-deque-0.4.ebuild
deleted file mode 100644
index 579684ffc118..000000000000
--- a/dev-haskell/chaselev-deque/chaselev-deque-0.4.ebuild
+++ /dev/null
@@ -1,40 +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.3.4.9999
-
-CABAL_FEATURES="lib profile test-suite" # haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Chase & Lev work-stealing lock-free double-ended queues (deques)"
-HOMEPAGE="https://github.com/rrnewton/haskell-lockfree-queue/wiki"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug"
-
-RESTRICT=test # missing files
-
-RDEPEND=">=dev-haskell/abstract-deque-0.2.2:=[profile?] <dev-haskell/abstract-deque-0.3:=[profile?]
-	>=dev-haskell/atomic-primops-0.4:=[profile?] <dev-haskell/atomic-primops-0.5:=[profile?]
-	dev-haskell/bits-atomic:=[profile?]
-	dev-haskell/transformers:=[profile?]
-	dev-haskell/vector:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( dev-haskell/hunit
-		dev-haskell/test-framework
-		dev-haskell/test-framework-hunit )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag debug debug) \
-		--disable-tests
-}
diff --git a/dev-haskell/chaselev-deque/chaselev-deque-0.5.0.5.ebuild b/dev-haskell/chaselev-deque/chaselev-deque-0.5.0.5.ebuild
index 19f6bb3bb585..6d2416322a90 100644
--- a/dev-haskell/chaselev-deque/chaselev-deque-0.5.0.5.ebuild
+++ b/dev-haskell/chaselev-deque/chaselev-deque-0.5.0.5.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-# ebuild generated by hackport 0.4.4.9999
+# ebuild generated by hackport 0.6.6.9999
 
 CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
 inherit haskell-cabal
@@ -19,12 +19,11 @@ IUSE="debug"
 
 RDEPEND=">=dev-haskell/abstract-deque-0.3:=[profile?] <dev-haskell/abstract-deque-0.4:=[profile?]
 	>=dev-haskell/atomic-primops-0.5.0.2:=[profile?]
-	dev-haskell/transformers:=[profile?]
 	dev-haskell/vector:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
+	>=dev-lang/ghc-7.8.2:=
 "
 DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
+	>=dev-haskell/cabal-1.18.1.3
 	test? ( >=dev-haskell/abstract-deque-tests-0.3
 		dev-haskell/hunit
 		dev-haskell/test-framework
diff --git a/dev-haskell/chaselev-deque/metadata.xml b/dev-haskell/chaselev-deque/metadata.xml
index 9f0030f4e5fd..b2433ea1f52f 100644
--- a/dev-haskell/chaselev-deque/metadata.xml
+++ b/dev-haskell/chaselev-deque/metadata.xml
@@ -5,10 +5,14 @@
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
+	<use>
+		<flag name="debug">Enable the extra internal checks.</flag>
+	</use>
 	<longdescription>
-		Chase &amp; Lev work-stealing lock-free double-ended queues (deques).
+		A queue that is push/pop on one end and pop-only on the other.  These are commonly
+		used for work-stealing.
+		This implementation derives directly from the pseudocode in the 2005 SPAA paper:
+		
+		http://citeseerx.ist.psu.edu/viewdoc/download?doi=10.1.1.170.1097&amp;rep=rep1&amp;type=pdf
 	</longdescription>
-	<upstream>
-		<remote-id type="github">rrnewton/haskell-lockfree</remote-id>
-	</upstream>
 </pkgmetadata>