gentoo resync : 30.09.2018

7 files changed, 9 insertions, 19 deletions

diff --git a/dev-haskell/Manifest.gz b/dev-haskell/Manifest.gz
index 951518644bba..5563e59538de 100644
--- a/dev-haskell/Manifest.gz
+++ b/dev-haskell/Manifest.gz
diff --git a/dev-haskell/binary/Manifest b/dev-haskell/binary/Manifest
index 70ae55961b2c..4999d33f6129 100644
--- a/dev-haskell/binary/Manifest
+++ b/dev-haskell/binary/Manifest
@@ -8,6 +8,6 @@ EBUILD binary-0.5.1.1.ebuild 712 BLAKE2B 9e149f4df6af8b85a7c7754c79458d4bdad8935
 EBUILD binary-0.7.1.0.ebuild 1158 BLAKE2B 235574cdee69c11282c290aa5616a160d18d3acca1a646b8801e41060af4929d93ffadbbe371afe5df49e1ab6e69074c9d5fbf4b2146e8bcb4c3e7235b2fc936 SHA512 9b793ebf0836fac1d9ef902ca85c3de774872a5a1bf527f0874028aa6c7f2746733cfdd7cd26c9cba5c9c83d829b497b54d6bbb4d9d59f84e5813e5a74e135e8
 EBUILD binary-0.7.2.3.ebuild 900 BLAKE2B b16c179b2a1e05b2fca7291b2d422d7ded9c82fe8eaca363ae8f39ef546ce49994f9b54e6afeb9ed7a5113699d96c9e490bc498b0fb9c45c990934b3593c3a31 SHA512 c8c30f254713ded8c23378fe14812539094b02a6e578484120d77ae6b319482dd9ad223b365b5131e2646f3413f10f6cd1915b67470eee3b817fc1d977b77273
 EBUILD binary-0.7.5.0.ebuild 868 BLAKE2B 6b2d4d843a85cb572f3c72c40bb8f320f482bda6ee63ec4f9d579c610dd14b1f406bc80e2db8fdcdca5ac97f3457de02a1d04cbc32379b6515b87f569351d1e4 SHA512 9c4584bf2107a77ff9f78b3c8174752ce6817f83a1cf96741775b19e989575c5dcfd406da933004f0555c49aa112812feb7391c25db83bdc827a0ba72e0c2f58
-EBUILD binary-0.7.6.1.ebuild 914 BLAKE2B da002c4b90a0911d0760d66c1fcba675a47467da4e539561a2f9dc6bea12642de39c0a750840863856a660cb0cc2840e73fd28e71935d15f423d9b8886d563ee SHA512 a3e23f292683b483b414ee2724cae1aa71ba70feb7ecd92d01c1bb77dcb79ae33aac692b561956b34c9f12626e930d80b8394a925ac16c5e14e5691490ac3ad9
+EBUILD binary-0.7.6.1.ebuild 768 BLAKE2B fcf1c09b426bdbfcdc0969a4c6656fc4cd15d1fe39549f82d62876ce1a3ab999c5b9e0a3cbdb48b1ede925663a18e55cc796d401fa781678595dd6c05affd528 SHA512 a9e66f07186906c0ad8e54eba814760a14493ef5ec44d985f2265863476316bf6f64bbed589cbf8593aa9413ab0105ccf75776fd07d5519209c556c7102b0f4e
 EBUILD binary-0.8.3.0.ebuild 952 BLAKE2B 7caa191a5be1951aee9b6b564ee561a6be1ad3e4934da05e8981241aa2cae5da039b274b74b31badff77a915396970e219a9634f58b03dbc9da13b1ca7a0f122 SHA512 2f59a5423469b94bad20549963d5ff381403cdfb6b1fe7e694727ec2a51330a6ab8c7bfd10aed2670ac7276cb88d7405a371b3b712565cd7da0e2a805d700ff0
 MISC metadata.xml 677 BLAKE2B c28648a0dd6140c8763a604e7976bfc20b9b8174dabb66a63d64df2947ac5ad3d5ceffeb6c60143a88c1328f2b822505e5938161654246c3e33ca0cce4a8e811 SHA512 0b2e3503d82f796a6c3bef7dcaf307de19b3f7d0081690971e0b5f9c9b49451260e87d25e0bd2e311f1249ed111568bb62b246b6a1510b16138c6788aaccb563
diff --git a/dev-haskell/binary/binary-0.7.6.1.ebuild b/dev-haskell/binary/binary-0.7.6.1.ebuild
index c35913aef133..124d0ca1b734 100644
--- a/dev-haskell/binary/binary-0.7.6.1.ebuild
+++ b/dev-haskell/binary/binary-0.7.6.1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 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"
+CABAL_FEATURES="lib profile haddock hoogle hscolour" # Avoid test-suite circular depend
 inherit haskell-cabal
 
 DESCRIPTION="Binary serialisation for Haskell values using lazy ByteStrings"
@@ -23,11 +23,6 @@ RDEPEND=">=dev-lang/ghc-7.4.1:=
 "
 DEPEND="${RDEPEND}
 	>=dev-haskell/cabal-1.8
-	test? ( dev-haskell/hunit
-		>=dev-haskell/quickcheck-2.8
-		>=dev-haskell/random-1.0.1.0
-		dev-haskell/test-framework
-		>=dev-haskell/test-framework-quickcheck2-0.3 )
 "
 
 CABAL_CORE_LIB_GHC_PV="PM:7.10.3_rc1 PM:7.10.3"
diff --git a/dev-haskell/nanospec/Manifest b/dev-haskell/nanospec/Manifest
index 976ee2969676..ce98afd74a3a 100644
--- a/dev-haskell/nanospec/Manifest
+++ b/dev-haskell/nanospec/Manifest
@@ -3,5 +3,5 @@ DIST nanospec-0.2.0.tar.gz 3451 BLAKE2B 428d01a9fccd73aef9e7cc268c96127e39b81cba
 DIST nanospec-0.2.1.tar.gz 3478 BLAKE2B 1bee45c06ca7fce951c5652708843c3a91eb579e59a82e50403d8549f421eb48519c9e263596c381df6247983e5f9fb4dc07d1fd90299cb56644bfb24ccf78cd SHA512 ee5b5080fefc5a213b59c8d146054f59b73dbfc8ed909ea308ec2646cd3e071a7de6115563a13fb683434725e3756fa71acbfcec77e85e3dfaa9400c7e249769
 EBUILD nanospec-0.1.0.ebuild 641 BLAKE2B e650e7b7ad4d7889a45c575e3fbbc6481ac1334efbd6ec67c9958edc8d238b02905459646e33bd06194d5eb75d16600679fdad96ca125e53733051d15a7ba4e7 SHA512 7fe4fffaaf8cf720f86054605744a44ee6081b31f34ae982a854b81d1849b1805143f5a90852f5b27da951d74a526550353c21c6142706659a08c8afaf2de4fe
 EBUILD nanospec-0.2.0.ebuild 718 BLAKE2B fdb5cc441ff4fb1266f06c3478f537ed75ee120a5f00d1675790f16f16de0755af713664f4ec8694dac978baea61488ffa440e55f1c4e450918c18e65e8b8be6 SHA512 48995255dea9e7139b66f03eb6a3c4b50d268daf09fb00e1fa17920c3e5aa1d92378759679bfa1c0a79512eccd199cafe469e58e43e65e0f10d3b1de81bed13b
-EBUILD nanospec-0.2.1.ebuild 678 BLAKE2B 7fba64d90c9dde250bd776ff19529f7e9dbb5a70dd0cf8bff626db7e6f092931e427789cae51a45f43c1b412da31572dbf904fd7b8f9ff714ed66eb5ca8fa001 SHA512 6ed6f663b6337a9656ec2e68ce658ce125c5df46bb05218a974b4f42eb2b9ba0b5eb86347a2f57036fdace583ec935228edf43100df3ca36d799b55f9c9f6775
+EBUILD nanospec-0.2.1.ebuild 676 BLAKE2B c035acebd48271311fe7f37d6300fbdeff88d927dd24d00d72c290f183892d67ebd2249c8f7d7daf705b04a4a1f9f317715678c2a8bda65647b87394fbc1d99a SHA512 ab55c9263965567ce734d6877c336f3ddbaff66061d3278912371036e767e06c7fe77f94d522aae223df485be91003974523ac7dc24e0e1d4876c9013703da8e
 MISC metadata.xml 375 BLAKE2B d4fec83f694238cc866e7c263166bcfcb6d1e988528d32c1276348273a6af67c25b8a9a92b7ef408e408fc6b7e874dc0fa552e3cfb8e1bed0ff9c1bc21216cbe SHA512 70735952a27c99222b87bc5662f69c32f3f96595e7db04c4726d192256d98b4169367669359b9e5aa3b0c84b5495583a36c334de65de93b84b38df6a5a3a89fe
diff --git a/dev-haskell/nanospec/nanospec-0.2.1.ebuild b/dev-haskell/nanospec/nanospec-0.2.1.ebuild
index bafe71391e72..e95f2f64eb47 100644
--- a/dev-haskell/nanospec/nanospec-0.2.1.ebuild
+++ b/dev-haskell/nanospec/nanospec-0.2.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -14,7 +14,7 @@ SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RESTRICT=test # cyclic depend
diff --git a/dev-haskell/vector/Manifest b/dev-haskell/vector/Manifest
index 033f0d127c9e..693e675e2d4e 100644
--- a/dev-haskell/vector/Manifest
+++ b/dev-haskell/vector/Manifest
@@ -2,5 +2,5 @@ AUX vector-0.11.0.0-primitive-0.6.2.0.patch 753 BLAKE2B 1117ef087b476dc7a35bdf42
 DIST vector-0.10.12.3.tar.gz 103617 BLAKE2B cd4a4fda8a3da5b431c316d04b23eb82947f08cc930059beb3182c9c68d646c6a767168ae2fd82d06a782991b055421a0558dbf41a1e92f06d265c043cdb2048 SHA512 2b2c98f1fbaaf4f5e7243e18a08e373e85acb06dddf73a48d34b966bfd736efc72880babec9c47859bd8d6d6928a28ac9acd9134eb0ef61b2f88fa31bf18811b
 DIST vector-0.11.0.0.tar.gz 115558 BLAKE2B e2475a37593b92f896c48ff85f6e506fb5011d89173bb0fe12492ed8c6f9620f426c9db88cbc274b37aade52bf6ca3cbdc7cf03b013371b37f2d1b42c348a117 SHA512 4f31e45d08a08c09e5ce73cca4da70e954bf3921d05130b9458c7f2ba267602e0aafc96496595000fd7b82f80aa9147c880917dc64086dab7bf5b2cd426539e0
 EBUILD vector-0.10.12.3.ebuild 1592 BLAKE2B 418bc7d6570795fc008f735ae306cd6173255c19da9602030142f75fc803d75c1e36c4a075080593476bce55d223a89b31fc829800fbbde2807c537034267871 SHA512 6257d68861966ec6768d435239179b8cc9d35cea0023085392c87b6a0be620bc7577d74911ece596d1d2b0f19e6974cad8c08b7155056bef472a3deeffd614c3
-EBUILD vector-0.11.0.0.ebuild 1401 BLAKE2B c963221760f2ef6ecd59bd57307d1cfdd92b4d460262730894aa00b8226ed5c8c918ce656d987cf5469724fdff2b6c4e176d428c0d49778343ed2a273aa6bef7 SHA512 e23c6b4371a9f9c662192fae3e832c783c92fa40a64131cb6391946398df256bc308cfdccd88b55847bf23260c4052387ae7ba50fb794c9fa2fa6cc6f241e3a8
+EBUILD vector-0.11.0.0.ebuild 1248 BLAKE2B bc8c72cd5116a805ed27ead007a53f1a37808cea93d528941916b8de9cf0eab45987e32f798ac7d4c6b7ff00b001a1dd64d861c44f46e23c896014b4a3e61080 SHA512 87dff2bdf0520d733b037bf383631c88e779da8b44be32345bd40a5bc849f66f129da055b028226d2ca9d58f507060d1b9e58bd73ea9637edd0939c96247bd60
 MISC metadata.xml 2431 BLAKE2B ab4b371c0626e51fa792aa18b7a7622921ea12a7b76d8855441865f46372a3dfa11fd0d0acdafb11983b614b6733325a28711d149660d3e0d874fe24754cf7c4 SHA512 58c6d75396f364fa29acf4287a1411448c2a77f5589be30fc83bdde998773f15c5d5a4fd7e6e95b5454c33ad49aa367a6b557c445612f85f99924520825002ba
diff --git a/dev-haskell/vector/vector-0.11.0.0.ebuild b/dev-haskell/vector/vector-0.11.0.0.ebuild
index f27cf913c98b..efdc86104afb 100644
--- a/dev-haskell/vector/vector-0.11.0.0.ebuild
+++ b/dev-haskell/vector/vector-0.11.0.0.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 # ebuild generated by hackport 0.4.6.9999
 
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+CABAL_FEATURES="lib profile haddock hoogle hscolour" # Broken test-suite: #666812
 inherit haskell-cabal
 
 DESCRIPTION="Efficient Arrays"
@@ -24,11 +24,6 @@ RDEPEND=">=dev-haskell/primitive-0.5.0.1:=[profile?] <dev-haskell/primitive-0.7:
 "
 DEPEND="${RDEPEND}
 	>=dev-haskell/cabal-1.10
-	test? ( >=dev-haskell/quickcheck-2.7
-		dev-haskell/random
-		dev-haskell/test-framework
-		dev-haskell/test-framework-quickcheck2
-		>=dev-haskell/transformers-0.2.0.0 )
 "
 
 PATCHES=("${FILESDIR}"/${P}-primitive-0.6.2.0.patch)