gentoo resync : 16.09.2020

6 files changed, 1 insertions, 178 deletions

diff --git a/dev-haskell/http2/Manifest b/dev-haskell/http2/Manifest
index caf9212e7a0e..1a4d4b42f29c 100644
--- a/dev-haskell/http2/Manifest
+++ b/dev-haskell/http2/Manifest
@@ -1,9 +1,3 @@
-AUX http2-1.6.0-even-less-deps.patch 527 BLAKE2B 0a86191247c3b88b6fb188dfb9a963a24c3ddecc2d4eb55fb6e097ed95a023fe7f211c152748f92ea14fff53d467dbd3ddc64520a9663f36f4e514ce30c854fb SHA512 665ff2ac35b518525d15f4f2f15d717e93cfb08fc723f6a909c481d94dfae80cf45f7cf4f828ea49b39802d8ef5559488f30027236109af0fb493107cac65273
-AUX http2-1.6.0-less-deps.patch 1584 BLAKE2B c4411d643e1dd44cd82373750d998b42f6ccb268b0864b4cd3be7be2e9b2262490f80fc3ba204cb7dc9e9aba4a0630102337b6e3090aba88e1ad68e516c29fb9 SHA512 6e626f5412e6e49462d3676e44f410e280e0f0c1b4458d9e400ad6c193620a4b939fd0e80517c503e16c68610c42429fd89761ea7ac88f8c124a7bdc62c61371
-DIST http2-1.3.1.tar.gz 39493 BLAKE2B a1a94de5d35510d02c9c43638c9193631c04277e1c53bc6d7ae2cfe93176eda72a700f61606220fcdf349d375c4e888380552193ff8a40b9ec3ca64de04123d1 SHA512 7d47cb35ce55743ecdc19ea52a1e230c8c3d608348f658ed7b3eb4f86a93ad4aa16eb23e4294dc1752bd99da8027e61a0b575ee9b89fe182d6582f6b5b402cee
-DIST http2-1.6.2.tar.gz 5138047 BLAKE2B 7febaa42b0c50cd89bfc5e9acba558bea9d7e0e8c791c5ea6e6de17ed938e431b3ba4a94375dcc5858881920b83a92491a5181a13d23420d586b13fd24222535 SHA512 c9df89cb073b57bc379857aedfba82097b805f8c9452b5a2b9cfff2ff096f185f9b8aa2dfaa5b0be7909a214a67d8ba8fb93ddc8a19f8afb43f9f5d5bf67f0da
 DIST http2-2.0.3.tar.gz 5211934 BLAKE2B cc1fad663650eaa1514e5f94737966ac86a92c2cc15f47db06c057a78873ca7d745aa77280cf451e11a9c2e328cad2a89d965bb7502d6b2e0b9b808b88570a8d SHA512 ff5f02c355f9f5c459d94993f05636955f81b91cbdbd4e8c262b56e1fa3846f92aff946f8ec6851ab57ffbb73afb42999cb3597eb250a9e15a8d6788da860b20
-EBUILD http2-1.3.1.ebuild 1143 BLAKE2B bdd69ebda0fccabde040829fa88297df81ab10be665c37021dfa1965da7c69b2b63d78435b0a6ba90560ca2b2555132c68d8a20c87804808ef45597fead6103c SHA512 1d42242266e51ee570c7f2d3de8a3a135b84864f1072aecdf46b93d8ddfc5083dd566e89a5af714ccccdea63071c8283ae66dcc0ac84685f77503c7a4a7b2871
-EBUILD http2-1.6.2.ebuild 1232 BLAKE2B 456750cbc877a0529a28ee69ea8055d68ffc060fe9d61eb46e6043ebe23ae0954b5ce7cbecdeeae1d6bf6d9d733a5b7604c7da9678851da21fdc77be2fd4cd1c SHA512 13f37e85217945f99c942b93a8cd61368a05e5339169219d1755352df1f36bd2bb74c38957eb3641588936ba3b951f9fbc709aef9c680d65df59b032c91ce1a9
 EBUILD http2-2.0.3.ebuild 1163 BLAKE2B ccad55c77abb3de14a78e23f88cf6051241efe0720d18b013f8a7d81b656c59b23a8bb28c63385a42393983933d6f164b499004b52d90fece71510482f8ae626 SHA512 be4bdc104d50a2fe724c765cd59d1758d1b0d0146798bf356ac655a1b7b86027c94a1e97dbd366ba40a8197c67c1aa8183bdaf995f2e8c0687670de95a064f26
-MISC metadata.xml 392 BLAKE2B 30170fe16036b33d7e8d83fe7bb3bc04ec51d2fe0598f34dfb8b8bc21727496c191e0178bb267018320eeaa9beedabd4463342f35ba9b98b682a1af9d3ec15d2 SHA512 5515590e5ff7b56f8ebd033611ce8d3164cf6c267ae26eb5b177ff47edee607d04208e123f982140b1b40438fc3b0b12f0fbe33788e4da448e316944ccf9a1ed
+MISC metadata.xml 249 BLAKE2B 84b809c265ff2a09d1f06c66d4797652ff4c64205d94323e07333ae0fbddcfb8c58d0176a8cc52bd37e9353371d987b9b473b9747cb082e1c2871ed80fcfa144 SHA512 ce055b41ff1c10209e88579fe21ce16550be7e9b21f87724564f06430aa6f478974f186a10c8ff7e92398f534c09109aeed57eae1c6d2b56b5c99ebfb64a0015
diff --git a/dev-haskell/http2/files/http2-1.6.0-even-less-deps.patch b/dev-haskell/http2/files/http2-1.6.0-even-less-deps.patch
deleted file mode 100644
index 07be024ee5e1..000000000000
--- a/dev-haskell/http2/files/http2-1.6.0-even-less-deps.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff --git a/http2.cabal b/http2.cabal
-index fe57a48..b28ad06 100644
---- a/http2.cabal
-+++ b/http2.cabal
-@@ -204,6 +204,3 @@ Executable hpack-debug
-     Buildable:          True
--  else
--    Buildable:          False
--  Main-Is:              hpack-debug.hs
--  Build-Depends:        base >= 4 && < 5
-+    Build-Depends:      base >= 4 && < 5
-                       , aeson
-@@ -219,2 +216,5 @@ Executable hpack-debug
-                       , word8
-+  else
-+    Buildable:          False
-+  Main-Is:              hpack-debug.hs
- 
diff --git a/dev-haskell/http2/files/http2-1.6.0-less-deps.patch b/dev-haskell/http2/files/http2-1.6.0-less-deps.patch
deleted file mode 100644
index 1ee62446d328..000000000000
--- a/dev-haskell/http2/files/http2-1.6.0-less-deps.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-diff --git a/http2.cabal b/http2.cabal
-index 7986d1c..fe57a48 100644
---- a/http2.cabal
-+++ b/http2.cabal
-@@ -180,7 +180,3 @@ Executable hpack-encode
-     Buildable:          True
--  else
--    Buildable:          False
--  Main-Is:              hpack-encode.hs
--  Other-Modules:        HPACKEncode
--  Build-Depends:        base >= 4 && < 5
-+    Build-Depends:      base >= 4 && < 5
-                       , aeson
-@@ -197,2 +193,6 @@ Executable hpack-encode
-                       , word8
-+  else
-+    Buildable:          False
-+  Main-Is:              hpack-encode.hs
-+  Other-Modules:        HPACKEncode
- 
-@@ -226,6 +226,3 @@ Executable hpack-stat
-     Buildable:          True
--  else
--    Buildable:          False
--  Main-Is:              hpack-stat.hs
--  Build-Depends:        base >= 4 && < 5
-+    Build-Depends:      base >= 4 && < 5
-                       , aeson
-@@ -243,2 +240,5 @@ Executable hpack-stat
-                       , word8
-+  else
-+    Buildable:          False
-+  Main-Is:              hpack-stat.hs
- 
-@@ -250,8 +250,3 @@ Executable frame-encode
-     Buildable:          True
--  else
--    Buildable:          False
--  Main-Is:              frame-encode.hs
--  Other-Modules:        Case
--                        JSON
--  Build-Depends:        base >= 4 && < 5
-+    Build-Depends:      base >= 4 && < 5
-                       , aeson
-@@ -263,2 +258,7 @@ Executable frame-encode
-                       , unordered-containers
-+  else
-+    Buildable:          False
-+  Main-Is:              frame-encode.hs
-+  Other-Modules:        Case
-+                        JSON
- 
diff --git a/dev-haskell/http2/http2-1.3.1.ebuild b/dev-haskell/http2/http2-1.3.1.ebuild
deleted file mode 100644
index c263ac981cc9..000000000000
--- a/dev-haskell/http2/http2-1.3.1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-#hackport: flags: -devel
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="HTTP/2.0 library including frames and HPACK"
-HOMEPAGE="https://hackage.haskell.org/package/http2"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RESTRICT=test # missing files
-
-RDEPEND="dev-haskell/aeson:=[profile?]
-	dev-haskell/aeson-pretty:=[profile?]
-	dev-haskell/bytestring-builder:=[profile?]
-	dev-haskell/hex:=[profile?]
-	dev-haskell/psqueues:=[profile?]
-	dev-haskell/stm:=[profile?]
-	dev-haskell/text:=[profile?]
-	dev-haskell/unordered-containers:=[profile?]
-	dev-haskell/vector:=[profile?]
-	dev-haskell/word8:=[profile?]
-	>=dev-lang/ghc-7.6.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.16.0
-	test? ( >=dev-haskell/doctest-0.9.3
-		dev-haskell/glob
-		>=dev-haskell/hspec-1.3
-		dev-haskell/mwc-random )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=-devel
-}
diff --git a/dev-haskell/http2/http2-1.6.2.ebuild b/dev-haskell/http2/http2-1.6.2.ebuild
deleted file mode 100644
index dad40a704875..000000000000
--- a/dev-haskell/http2/http2-1.6.2.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.4.7.9999
-#hackport: flags: -devel
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="HTTP/2.0 library including frames and HPACK"
-HOMEPAGE="https://hackage.haskell.org/package/http2"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/bytestring-builder:=[profile?]
-	dev-haskell/case-insensitive:=[profile?]
-	dev-haskell/psqueues:=[profile?]
-	dev-haskell/stm:=[profile?]
-	>=dev-lang/ghc-7.6.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.16.0
-	test? ( dev-haskell/aeson
-		dev-haskell/aeson-pretty
-		>=dev-haskell/doctest-0.9.3
-		dev-haskell/glob
-		dev-haskell/hex
-		>=dev-haskell/hspec-1.3
-		dev-haskell/text
-		dev-haskell/unordered-containers
-		dev-haskell/vector
-		dev-haskell/word8 )
-"
-
-src_prepare() {
-	# workaround Cabal bug at picking unused deps
-	eapply "${FILESDIR}"/${PN}-1.6.0-less-deps.patch
-	eapply "${FILESDIR}"/${PN}-1.6.0-even-less-deps.patch
-	eapply_user
-}
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=-devel
-}
diff --git a/dev-haskell/http2/metadata.xml b/dev-haskell/http2/metadata.xml
index 8d45638c29bf..b7878815d80d 100644
--- a/dev-haskell/http2/metadata.xml
+++ b/dev-haskell/http2/metadata.xml
@@ -5,8 +5,4 @@
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		HTTP/2.0 library including frames and HPACK.
-		Currently HTTP/2 16 framing and HPACK 10 is supported.
-	</longdescription>
 </pkgmetadata>