gentoo resync : 28.11.2020

5 files changed, 3 insertions, 29 deletions

diff --git a/dev-haskell/Manifest.gz b/dev-haskell/Manifest.gz
index af131aab3f37..2eacf8f2948c 100644
--- a/dev-haskell/Manifest.gz
+++ b/dev-haskell/Manifest.gz
diff --git a/dev-haskell/conduit/Manifest b/dev-haskell/conduit/Manifest
index 2147044e912e..34e0e010e864 100644
--- a/dev-haskell/conduit/Manifest
+++ b/dev-haskell/conduit/Manifest
@@ -1,3 +1,3 @@
-DIST conduit-1.3.2.tar.gz 87752 BLAKE2B e07ef9dc2d3ae189892ee32ff1a8ff877a93c023309b79ff5af62f971d2a6356c3ebe4bd27122ed4dc510dd5e8222afdccf13d772701f69274cab0c0c1a69bf6 SHA512 d6dcc33156923a1601e9c0c7ae61d1df9dc4ec71c39f4ec0935b13bff502eb66bcdda30901c3c864e44ade9fcc437d3ab2c1af167bac0d89f7f70567d0911f57
-EBUILD conduit-1.3.2.ebuild 1081 BLAKE2B 26ad35fe77f000b4d841de6c5fb517da6276aef60f02428e7b1d228686152b9cc37626f32f8e8a7765762f82ec1a57ae64407e3d9c364dc48bfb0f7df5c3b51e SHA512 4da9d9f8d1da96dfacbad703513cb7eae5845b61e26306cd9c318d68cede4f923e3391490968b2b5a4ee4a29e05667f59c00a17a7bfdb5884f6e415d01fbc91d
+DIST conduit-1.3.4.tar.gz 88861 BLAKE2B 79821013c6177ed2d555c6ad0c42a694f927c069b11c637c881d3cbcdf99c6ed8238bb8fd2d846fe1e89199dd7a35a4d75ddbb7e4c44ac2edb5314e9062229e7 SHA512 a70f41f45b9014fcd4155167114e0c42b98f33ffe5111ecfe12f3d7f579fcfe82b76e27c16670538f71883bb10af159a2e56eee322e0a1f1cf79bbf862db7611
+EBUILD conduit-1.3.4.ebuild 1081 BLAKE2B 374f1c8ad26d0fbcc6154ba69d675eb81ef0db9fefc12f18084b832d5c9fe54f702cf11d921bad760071d99de3b07e36c7d109870e5b2424c4d89827a6733c08 SHA512 2a9e83a3073da445b893feae3bb1b86a4ecb81ec16a060e2d4df490805c4320f0ac24cca8f05071b697ec73cf9f14944701c2df19e1d2f2a1e261d42abfddcaa
 MISC metadata.xml 674 BLAKE2B 0629cd5d362e45b0330da15c0bd7279a84cba9e6f753d9703cb6d6bf17df2dcb92553e55162d0e1f8bfeea81bd46d24619d1bbe54e7c53db88ee76c3fdebc483 SHA512 386602e42ffa583dc367ce3ca7293362709f1e264b028fb53ac34af7d89a255aab98989fb1924727594845e57a3e4fb0eea20faaf856fdd2cc4946cfde9baf4e
diff --git a/dev-haskell/conduit/conduit-1.3.2.ebuild b/dev-haskell/conduit/conduit-1.3.4.ebuild
index 416c047448c8..be3bc3632468 100644
--- a/dev-haskell/conduit/conduit-1.3.2.ebuild
+++ b/dev-haskell/conduit/conduit-1.3.4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-# ebuild generated by hackport 0.6.4.9999
+# ebuild generated by hackport 0.6.6.9999
 
 CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
 inherit haskell-cabal
diff --git a/dev-haskell/xhtml/Manifest b/dev-haskell/xhtml/Manifest
index 1d51f9104246..72a47ae1a49e 100644
--- a/dev-haskell/xhtml/Manifest
+++ b/dev-haskell/xhtml/Manifest
@@ -1,5 +1,3 @@
-DIST xhtml-3000.2.1.tar.gz 14555 BLAKE2B e6617914fbcf4ea56b7ffbf7790305fe6c89a27f2a24a50e54cf8a13d57c5bfe66731c47bf41c3163698ae6ce98a8566199c952bca9df22ead5e1a8d9d9a2cdd SHA512 a3e901f6173e3885717ee5e451f8ea8d2ee61cbb159335eb69b0a7e097dbad350b1919aedd7f9daf530147fea7982921fc324df41112e69ed362d143fe327342
 DIST xhtml-3000.2.2.1.tar.gz 14647 BLAKE2B e1e0bf0e0f9927fd8299e67925b45caa2f265302ec940c6ec50ee464bb2fecf94d9bd14d4ee5909d7ae1564a71d1891241ecd99598a2a9757aff45b8caee8714 SHA512 0843042fb40e11ad0f47100fbead8a6eadf2d9d1d8d530195cd5100d9a2a9b81a8cf5118bcce40239e5f4fc3875ac7809791b32d19055c6fdf0b4d0cc72b207d
-EBUILD xhtml-3000.2.1-r1.ebuild 787 BLAKE2B 8a19ee7cb5fad968f20a1770ddd24d83ace746b90b37af32e4431c95a7be9c1e48b04816ab0b8d8442a000e937ee1972e081de7da9ec7b7df3bfb3090b5d974f SHA512 66dd8c595dca9f40e9f28907bf1bcca49033e23b4fd192915605714e165c187c0921db78957310e4466e9e73e4350148ccbbdb7bee9a0e905e6552538e93df56
 EBUILD xhtml-3000.2.2.1.ebuild 695 BLAKE2B 5687e7a9bab589c8bd56515af32145016852c8a312a51f6d01045730653f28d333e43c8a8bf9401d8e5a2885cb4dfcf4fca79465744b069e5bfa901e7aaefd10 SHA512 fbbac568878f53acafbbe20e00f036bc6017919f789a29b773d699a7ac001cf7aa0cb020431656e1ba62dc243ee6df24ac56800d4eb90abc27b50176f146d1ab
 MISC metadata.xml 305 BLAKE2B e7048400b3dc0c789dbb2c34c23f18373deee9b55f53ae669b3d55f1aed654e486fc258fffe9f733fa688600069420adc0496627ced8d08084e7774e5dbe5b70 SHA512 0270a7ac1593d87c819597c6adf0c5658415e1338423c2c1cf254c8d2b9edb879b7776114600ae034b4b667ea42b53b1c372e8fc09c944a017303bbe04ea3453
diff --git a/dev-haskell/xhtml/xhtml-3000.2.1-r1.ebuild b/dev-haskell/xhtml/xhtml-3000.2.1-r1.ebuild
deleted file mode 100644
index 182e71d969f9..000000000000
--- a/dev-haskell/xhtml/xhtml-3000.2.1-r1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.3.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="An XHTML combinator library"
-HOMEPAGE="https://github.com/haskell/xhtml"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-6.10.4:="
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6"
-
-CABAL_CORE_LIB_GHC_PV="7.8.3 7.8.3.20141119 7.8.4 7.10.0.20141222 7.10.0.20150123 PM:7.10.1_rc3 PM:7.10.1 PM:7.10.2_rc2 PM:7.10.2 PM:7.10.2-r1 PM:7.10.3_rc1 PM:7.10.3 PM:8.0.1_rc1 PM:8.0.1_rc2 PM:8.0.1_rc3 PM:8.0.1_rc4 PM:8.0.1 PM:8.0.2_rc1 PM:8.0.2_rc2 PM:8.0.2"