gentoo resync : 16.09.2020

4 files changed, 1 insertions, 72 deletions

diff --git a/dev-haskell/network-conduit/Manifest b/dev-haskell/network-conduit/Manifest
index c09652a1b7b2..7092d7cafeb4 100644
--- a/dev-haskell/network-conduit/Manifest
+++ b/dev-haskell/network-conduit/Manifest
@@ -1,7 +1,3 @@
-DIST network-conduit-1.0.0.tar.gz 5853 BLAKE2B 9c6a1692d8839dd81ba5b9ae6d6728c310ea5888753089a35bfdb8b53d98925a7925da4ed5f75ae64de23b0962df83e9f941588e3f1a5b2ca09bcfd04dd74d4b SHA512 9f16e529da022d2a4049fe9d41f8df0eb1fb34b4ad80f755944074b4016688169f3efd78a4ad2c052c1951ddccb728552077d88b533ed8fde1425c469a27f7c4
-DIST network-conduit-1.0.2.2.tar.gz 7072 BLAKE2B edbef7b63493b5317dd9a043273e310c47529933b82f8ea9876ac3ac0044d6f8e6d9a39c893b52b2c7ff88de4ce705dd55e039e1ae49a17420dee1386f464d96 SHA512 3dcc755ccb0ddb9c543fccec54c32ab52749602c7c9367ee70b569a1f6aa2924ae0b7207b946d6e3d55e562758e65e694c13aa464498f5927c84239f09b1c8b7
 DIST network-conduit-1.1.0.tar.gz 1357 BLAKE2B 7952df2ab1a141a6d9b5460bc128ea1b45df0ea178a1d75e8e746d66d5d11c9cee278e56bb99dc4aed62af94312b1c3e6eb9f89be4ba94c198d96091b90100a5 SHA512 1bda46190bc9759e9d85f61f4555dca4444c307305b8a7ebfc3e88519ae8119e313eaf4095541c487b8431ad342320d83ff4dd1ebf271cf10c11414c652b34d1
-EBUILD network-conduit-1.0.0-r1.ebuild 807 BLAKE2B 0af4e33e35f27816534261ef4af893f6189eda13ee33961cdcfac44753bb2c694b2875b36015cf2954d8381ed5df5505b8f44fc1ae34eaec324d70ba5919d009 SHA512 1d900d24a58b28dd3cc4fd299f66fbd33928ae560ea76a656991f9b60f9200afdfa47b5de299567b4b275ed8f22ba6c0dba4ebc1500e3659abafcb4f5ddb6d85
-EBUILD network-conduit-1.0.2.2.ebuild 1001 BLAKE2B f11eab44506c552850fdf416f3343defbee28dc491e790b58d8e4d7d310a741dfe3e1267c39f4cef3e98c2c65a5b068a383b2cc0190339c01cee3cce9e736103 SHA512 1614da03dea0080896c313e1e06279c044e06cac9c5191374e80ea7b8446d3f739cf83556c209230cbd663213f0d1ebbce6765a8a19bd331e70a6fc7bd024dc9
 EBUILD network-conduit-1.1.0.ebuild 600 BLAKE2B 7edd8e7814e9e7fc3418f50ddc5beb7da1a38ab8a86c2aaf0db642c2269595c1274bbb2ee796d667ae978fc90617610379de5f61e37718ca49b4966998d59cfd SHA512 e613bf25ec0a74d84b3e3f397d2fe7afddc5bbefc0dee48cbc915920fc31632d8f8f29aa305c183040c6252092e4a4148b2b68a7eca66c7d89b728ee98b32800
-MISC metadata.xml 406 BLAKE2B fdb568f1abe1792e097d4fcf5138bc86f980956429cd421054aa11e96ba57acd6b1a240295d741472d35dfa86076f43c5908b5e393f57ab184ec312f2a902481 SHA512 a7f050ad57487449aa6bbdfbb98d70a3942748613a1e6d1cda26b6baedafb8f57df481c9afb5d3d99260f502b386505f38d95bef6c83596f52b478a4e986c467
+MISC metadata.xml 330 BLAKE2B d56163baf6c38494b371fd7f1fcd301119899051db4735a607f802ec25550dcdac277005a9785b323311bd0e4282630ea8de2abff756b5fc1067ef4d07d6de51 SHA512 48095eabcee345441e214e87e05b66a2323a48ccf2f596601105375f3f36d30dfe5c193e717858ff4f4719e49bdb9e5c3bf85c52cd87cb039e35c2208db3417e
diff --git a/dev-haskell/network-conduit/metadata.xml b/dev-haskell/network-conduit/metadata.xml
index 8451d83ac011..b22e8f68da82 100644
--- a/dev-haskell/network-conduit/metadata.xml
+++ b/dev-haskell/network-conduit/metadata.xml
@@ -5,9 +5,6 @@
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		Stream socket data using conduits.
-	</longdescription>
 	<upstream>
 		<remote-id type="github">snoyberg/conduit</remote-id>
 	</upstream>
diff --git a/dev-haskell/network-conduit/network-conduit-1.0.0-r1.ebuild b/dev-haskell/network-conduit/network-conduit-1.0.0-r1.ebuild
deleted file mode 100644
index dfbc31ae7f13..000000000000
--- a/dev-haskell/network-conduit/network-conduit-1.0.0-r1.ebuild
+++ /dev/null
@@ -1,29 +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.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Stream socket data using conduits"
-HOMEPAGE="https://github.com/snoyberg/conduit"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="=dev-haskell/conduit-1.0*:=[profile?]
-		>=dev-haskell/lifted-base-0.1:=[profile?]
-		=dev-haskell/monad-control-0.3*:=[profile?]
-		>=dev-haskell/transformers-0.2.2:=[profile?]
-		<dev-haskell/transformers-0.4:=[profile?]
-		>=dev-lang/ghc-6.10.4:=
-		>=dev-haskell/network-2.3:=[profile?]
-		"
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.8"
diff --git a/dev-haskell/network-conduit/network-conduit-1.0.2.2.ebuild b/dev-haskell/network-conduit/network-conduit-1.0.2.2.ebuild
deleted file mode 100644
index 0936a177d177..000000000000
--- a/dev-haskell/network-conduit/network-conduit-1.0.2.2.ebuild
+++ /dev/null
@@ -1,35 +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.6.9999
-#hackport: flags: -network-bytestring
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Stream socket data using conduits"
-HOMEPAGE="https://github.com/snoyberg/conduit"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/conduit-1.0:=[profile?] <dev-haskell/conduit-1.1:=[profile?]
-	>=dev-haskell/lifted-base-0.1:=[profile?]
-	>=dev-haskell/monad-control-0.3:=[profile?] <dev-haskell/monad-control-0.4:=[profile?]
-	>=dev-haskell/network-2.3:=[profile?]
-	>=dev-haskell/transformers-0.2.2:=[profile?] <dev-haskell/transformers-0.4:=[profile?]
-	>=dev-lang/ghc-7.0.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10.0.0
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=-network-bytestring
-}