gentoo resync : 25.08.2020

8 files changed, 9 insertions, 258 deletions

diff --git a/dev-haskell/dav/Manifest b/dev-haskell/dav/Manifest
index fa6442eb2602..620a618f34e5 100644
--- a/dev-haskell/dav/Manifest
+++ b/dev-haskell/dav/Manifest
@@ -1,13 +1,3 @@
-DIST DAV-0.4.1.tar.gz 18631 BLAKE2B 503b2746100668e9fa230029b34c8659bdaf504a3b966a6abaddc909ace2686d876c53808d038aeff4061d128643bc10e782b6295f9e0c5a52c90146784b1980 SHA512 280aef7ab401df1a8b724a6ba610257085fa1829b38860dfc676c4764a95ea3a9e53d6c18007a66bad0caff931891138c9512361d2d21107582a44e534cc98ff
-DIST DAV-0.5.1.tar.gz 18657 BLAKE2B 0638bd6f1b860163f0261035d638f78af557d9998917fdea152e8d38c0e9e6c45f8031154081d9ab4ff70cd6dfab313153b3c1c8a8fb2481b3ad73517fb4176b SHA512 b72d757c2dc94d328b144fd3b9d2601d3adf3795bff6b49b436684306abc0f147aaedf1e782303bfdfe1803d6821cf19215caa5faaf5184822f6887a008f91ff
-DIST DAV-0.6.2.tar.gz 19039 BLAKE2B d00443cdf7e4305ea0b424f292e44b2cbefe5b388b70ede36a29fc28d97bad9ac25df2995772d2190357e6ff6c4bb1c07391f14be1c91db5e8db93b96a09a747 SHA512 2342bd0d1bca3e0fcbe459ad1dda74265e728d2524781989165895ae49b610c5ce96576968555b5d9d049157553684539fc4cbfcf4527dd231bef13855d47ad3
-DIST DAV-1.0.7.tar.gz 19768 BLAKE2B 923f1c20db5325527798bfc6c0b02f02aa051e3e7969e90c43bdf6bbc804918e88c0c5784295060afccf29d095e67a73d76a8a3cd3c610af5172caec7c81ca52 SHA512 3f4cdd5c708793a3c9542cb89845cc8de6a456ba55bc564bf7227ca2c3243807e3e85d6995581ad7662c994d65a0a9cde6f3c0d0a7fbe8ac7c8a07e338b039a8
-DIST DAV-1.3.1.tar.gz 20003 BLAKE2B ae4227b845761092a7435dc2c5a82640c3abf547587bc3b0a0ed3af2a2dd3b96498f45ab299abf7e85711b55ef233efc3be0e4e311f9204aa2196048281eb953 SHA512 d9f502e52c6d6de774b6b25426f1231c02e1a522ea2b991266ddb56778fd34c3a2dcafc81fdf55332895df4b9ca717e3df30cdf39b707589224b646f1895a621
-DIST DAV-1.3.3.tar.gz 20524 BLAKE2B 23eeaddac4e9bbc5e969caa978f2b806c025fa8cda7337c81956950644d564d20e37a6ee468baf07ac2ffcffcbc7be8f7165360548753ecede6b876f1d6d012c SHA512 bbc9a4d685e25ac763c05dd8dc72d7db39196dbbb0cd898b66f644abc8333cd82950439fd446770c5aae737fd863afe881129ce551dadf9d0f75ef52df738fae
-EBUILD dav-0.4.1.ebuild 1187 BLAKE2B 7c9303727be015279330bbb7e1aec42b4a00a6ea3fec78c209f4329908dfd774d48084f3b95d1912d68396b9cf1e53250557b78644ab934d65a91e703a94f45b SHA512 9c932745b5c0ff97c4740cf6693ab66279e4ecc4a32f6c40e29f762628235dae4151ed89b2410a29c3e2c1630daf316ddc59355e8336a877e53c668b2ad72adf
-EBUILD dav-0.5.1.ebuild 1216 BLAKE2B 1bd2ff41970c28ae5f3914504c5061852867bc1d3581ff3182de091ff0c02f524be594bfb098ac6a2cbe07bd05f1d400a31b8057b204a6a9417703b6d60e1535 SHA512 c1616b1a379117ee26dd23e65fbc783e5a1a69c186649811f29c4dbe01d2a44be1fec21cef980cf7a904332ad866cdef6576f028ae0fd0d147ff96bc04fba3a9
-EBUILD dav-0.6.2.ebuild 1340 BLAKE2B 1cd86d146e9cfd301a3a101d8b7d954ec80abf0f1c308d9f053db7772264785b0e7647318932ea13829cc90d636101d754fe7b3b4672a1ccd31e5c08775fe8e3 SHA512 575e91245fc592a7c7a66ed789a11dbfaf1c4349f1a5e6d579db44df70deaa9fc133901e618e70ba517f64919e4911234d32561533b6d71c7ecb7f554022cde3
-EBUILD dav-1.0.7.ebuild 1550 BLAKE2B 658f4b33ee7925ec873a1c13ad47b9ff814b8a8764480d9ba8e4b17b279fd66df316dd1b93d244313d82e9a03e5d2b5fc46686b3aef0c7b7054fbc8ce2dbeb00 SHA512 2c11cc77aeca791519dece66fc10f0c198b2000d4206ba8064605c117ee6c77a4049a07a2e370f149062826e0fe10a13b0dc1f3a3d756b8e68c31f12c2515881
-EBUILD dav-1.3.1.ebuild 1618 BLAKE2B 070c28bfcf97fbbf55fa9f9a15076a095e52e1f67140df8f850f9b58d8f4559f0cbd88478a42932731361c508d79843d5d5e82a6d5a1512ade891c938562a5a0 SHA512 92724303f76f84c5998539ecf4a9d5761ac06ccf620b7c6fd2e4c5be4c87aca8d3136ab5be54463a52f9f209361df496ec66c60ffabd16d05a91005ed2d831b1
-EBUILD dav-1.3.3.ebuild 1574 BLAKE2B cd5f655e788ba3c0d96ecde7b96f350bf91a146cca659dcf25aa0573a3a070e425dc6fcaec4aaeeb838c96c397278e30b40617d644fa34b6f67a26ffdd4ab3f3 SHA512 d2da0a23c267e52562b617d6e28563e3a00cf54dea5112660db86d715f2062c709b53b02f90b53ef40c1f7c07b2b6ca09624e4dd0b88c0b30c40b16d3fcfad7a
-MISC metadata.xml 650 BLAKE2B c387958eada84c6abeb2c338a51d77a6070c9abfe4a30a9b32e0385b0cdbe2019505f8762390ec0d39961ded95f859f8238c7e04d61d4b85c61551fd0d4b948d SHA512 0d4eb14205b9b25fd1821ad4c43f905b5cad5ff376491fe0e9b1e6758dbbb5930cead0552dd9ba0af0a9d35a9d60c015874427e9ee51665913831d217bbfe957
+DIST DAV-1.3.4.tar.gz 19884 BLAKE2B 84993b24cb4db897c76c964e8600bb3f882523792545e8d22468a7e435d53a2a2f05716595d73df3ec3f05f3e30a9d56c31bb446fc28e00126b5a853486c9206 SHA512 95bb567488bed2fef3813597ea9c080781bbc25117995901ff7264c0f04bf4db1bad6c9c94c4d1fbea968245041752b2b720d4c42b4c23191eda5e3dc0c292b6
+EBUILD dav-1.3.4.ebuild 1407 BLAKE2B a33507ec5994d7bdfeff11072fc14f8cd07b250d446de4f557f316779bc3e0bec79f5ade0bbc7d029ce7f6981d6f8fe2519830ddd0ac9404a866f94b1d8782d1 SHA512 63932672f1e5d77bdb5bdc3ea5ae705b2b2d151f1467c638b2c37bf3f0945af58fb3f6309c9a53e4793998cc37778fb55a9662c025e1827bcf4b4045b2203cfb
+MISC metadata.xml 555 BLAKE2B de3664fa86739e49eef772e97a133b9da7abbfeb9b105290b7ee3874bc6be8ae8007e28261afa0b48f1c3ba7e63591f41b22770c7f9cbc979a82577cfa881eef SHA512 b7038424e956aab3e8122c97ea27bf8860cf9ff9784efe87f53a7c9a6dce4470669a6e2b52e3e44d5cab6bab476c12494b5a1d9f09c504809813fa4b8f5c558d
diff --git a/dev-haskell/dav/dav-0.4.1.ebuild b/dev-haskell/dav/dav-0.4.1.ebuild
deleted file mode 100644
index 333bdbb7c291..000000000000
--- a/dev-haskell/dav/dav-0.4.1.ebuild
+++ /dev/null
@@ -1,41 +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="bin lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-MY_PN="DAV"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="RFC 4918 WebDAV support"
-HOMEPAGE="http://floss.scru.org/hDAV"
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/case-insensitive-0.4:=[profile?]
-		>=dev-haskell/http-conduit-1.9.0:=[profile?]
-		>=dev-haskell/http-types-0.7:=[profile?]
-		>=dev-haskell/lens-3.0:=[profile?]
-		>=dev-haskell/lifted-base-0.1:=[profile?]
-		>=dev-haskell/mtl-2.1:=[profile?]
-		>=dev-haskell/network-2.3:=[profile?]
-		dev-haskell/optparse-applicative:=[profile?]
-		>=dev-haskell/resourcet-0.3:=[profile?]
-		>=dev-haskell/transformers-0.3:=[profile?]
-		>=dev-haskell/xml-conduit-1.0:=[profile?]
-		<=dev-haskell/xml-conduit-1.2:=[profile?]
-		>=dev-haskell/xml-hamlet-0.4:=[profile?]
-		<=dev-haskell/xml-hamlet-0.5:=[profile?]
-		>=dev-lang/ghc-7.4.1:="
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.8"
-
-S="${WORKDIR}/${MY_P}"
diff --git a/dev-haskell/dav/dav-0.5.1.ebuild b/dev-haskell/dav/dav-0.5.1.ebuild
deleted file mode 100644
index 491ff6061a00..000000000000
--- a/dev-haskell/dav/dav-0.5.1.ebuild
+++ /dev/null
@@ -1,42 +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.5.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-MY_PN="DAV"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="RFC 4918 WebDAV support"
-HOMEPAGE="http://floss.scru.org/hDAV"
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/case-insensitive-0.4:=[profile?]
-	>=dev-haskell/http-client-0.2:=[profile?]
-	>=dev-haskell/http-client-tls-0.2:=[profile?]
-	>=dev-haskell/http-types-0.7:=[profile?]
-	>=dev-haskell/lens-3.0:=[profile?]
-	>=dev-haskell/lifted-base-0.1:=[profile?]
-	>=dev-haskell/mtl-2.1:=[profile?]
-	>=dev-haskell/network-2.3:=[profile?]
-	dev-haskell/optparse-applicative:=[profile?]
-	>=dev-haskell/resourcet-0.3:=[profile?]
-	>=dev-haskell/transformers-0.3:=[profile?]
-	>=dev-haskell/xml-conduit-1.0:=[profile?] <=dev-haskell/xml-conduit-1.2:=[profile?]
-	>=dev-haskell/xml-hamlet-0.4:=[profile?] <=dev-haskell/xml-hamlet-0.5:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-"
-
-S="${WORKDIR}/${MY_P}"
diff --git a/dev-haskell/dav/dav-0.6.2.ebuild b/dev-haskell/dav/dav-0.6.2.ebuild
deleted file mode 100644
index d647c38710c2..000000000000
--- a/dev-haskell/dav/dav-0.6.2.ebuild
+++ /dev/null
@@ -1,45 +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.4.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-MY_PN="DAV"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="RFC 4918 WebDAV support"
-HOMEPAGE="http://floss.scru.org/hDAV"
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/case-insensitive-0.4:=[profile?]
-	>=dev-haskell/either-4.1:=[profile?]
-	dev-haskell/errors:=[profile?]
-	>=dev-haskell/http-client-0.2:=[profile?]
-	>=dev-haskell/http-client-tls-0.2:=[profile?]
-	>=dev-haskell/http-types-0.7:=[profile?]
-	>=dev-haskell/lens-3.0:=[profile?]
-	>=dev-haskell/lifted-base-0.1:=[profile?]
-	>=dev-haskell/monad-control-0.3.2:=[profile?]
-	>=dev-haskell/mtl-2.1:=[profile?]
-	>=dev-haskell/network-2.3:=[profile?]
-	>=dev-haskell/optparse-applicative-0.5.0:=[profile?]
-	>=dev-haskell/transformers-0.3:=[profile?]
-	dev-haskell/transformers-base:=[profile?]
-	>=dev-haskell/xml-conduit-1.0:=[profile?] <dev-haskell/xml-conduit-1.3:=[profile?]
-	>=dev-haskell/xml-hamlet-0.4:=[profile?] <=dev-haskell/xml-hamlet-0.5:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-"
-
-S="${WORKDIR}/${MY_P}"
diff --git a/dev-haskell/dav/dav-1.0.7.ebuild b/dev-haskell/dav/dav-1.0.7.ebuild
deleted file mode 100644
index 4d7f151c2314..000000000000
--- a/dev-haskell/dav/dav-1.0.7.ebuild
+++ /dev/null
@@ -1,52 +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.4.5.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-MY_PN="DAV"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="RFC 4918 WebDAV support"
-HOMEPAGE="http://floss.scru.org/hDAV"
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+network-uri"
-
-RDEPEND=">=dev-haskell/case-insensitive-0.4:=[profile?]
-	dev-haskell/data-default:=[profile?]
-	>=dev-haskell/either-4.3:=[profile?]
-	dev-haskell/exceptions:=[profile?]
-	>=dev-haskell/http-client-0.2:=[profile?]
-	>=dev-haskell/http-client-tls-0.2:=[profile?]
-	>=dev-haskell/http-types-0.7:=[profile?]
-	>=dev-haskell/lens-3.0:=[profile?]
-	>=dev-haskell/mtl-2.1:=[profile?]
-	>=dev-haskell/optparse-applicative-0.10.0:=[profile?]
-	>=dev-haskell/transformers-0.3:=[profile?]
-	dev-haskell/transformers-base:=[profile?]
-	dev-haskell/utf8-string:=[profile?]
-	>=dev-haskell/xml-conduit-1.0:=[profile?]
-	>=dev-haskell/xml-hamlet-0.4:=[profile?] <dev-haskell/xml-hamlet-0.5:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	network-uri? ( >=dev-haskell/network-2.6:=[profile?]
-			>=dev-haskell/network-uri-2.6:=[profile?] )
-	!network-uri? ( >=dev-haskell/network-2.3:=[profile?] <dev-haskell/network-2.6:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-"
-
-S="${WORKDIR}/${MY_P}"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag network-uri network-uri)
-}
diff --git a/dev-haskell/dav/dav-1.3.1.ebuild b/dev-haskell/dav/dav-1.3.1.ebuild
deleted file mode 100644
index 6ed19403d7f4..000000000000
--- a/dev-haskell/dav/dav-1.3.1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-#hackport: flags: -mtl-compat
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-MY_PN="DAV"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="RFC 4918 WebDAV support"
-HOMEPAGE="http://floss.scru.org/hDAV"
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+network-uri"
-
-RDEPEND=">=dev-haskell/case-insensitive-0.4:=[profile?]
-	dev-haskell/data-default:=[profile?]
-	>=dev-haskell/exceptions-0.7:=[profile?]
-	dev-haskell/haskeline:=[profile?]
-	>=dev-haskell/http-client-0.4:=[profile?]
-	>=dev-haskell/http-client-tls-0.2:=[profile?]
-	>=dev-haskell/http-types-0.7:=[profile?]
-	>=dev-haskell/lens-3.0:=[profile?]
-	>=dev-haskell/mtl-2.2.1:=[profile?]
-	>=dev-haskell/optparse-applicative-0.10.0:=[profile?]
-	dev-haskell/transformers-base:=[profile?]
-	>=dev-haskell/transformers-compat-0.3:=[profile?]
-	dev-haskell/utf8-string:=[profile?]
-	>=dev-haskell/xml-conduit-1.0:=[profile?]
-	>=dev-haskell/xml-hamlet-0.4:=[profile?] <dev-haskell/xml-hamlet-0.5:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-	network-uri? ( >=dev-haskell/network-2.6:=[profile?]
-			>=dev-haskell/network-uri-2.6:=[profile?] )
-	!network-uri? ( >=dev-haskell/network-2.3:=[profile?] <dev-haskell/network-2.6:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-"
-
-S="${WORKDIR}/${MY_P}"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=-mtl-compat \
-		$(cabal_flag network-uri network-uri)
-}
diff --git a/dev-haskell/dav/dav-1.3.3.ebuild b/dev-haskell/dav/dav-1.3.4.ebuild
index 4bb444abb2b3..9faf65b3f594 100644
--- a/dev-haskell/dav/dav-1.3.3.ebuild
+++ b/dev-haskell/dav/dav-1.3.4.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=7
 
-# ebuild generated by hackport 0.6.9999
+# ebuild generated by hackport 0.6.3
 #hackport: flags: -mtl-compat
 
 CABAL_FEATURES="lib profile haddock hoogle hscolour"
@@ -19,7 +19,7 @@ SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
 LICENSE="GPL-3"
 SLOT="0/${PV}"
 KEYWORDS="~amd64 ~x86"
-IUSE="+network-uri"
+IUSE=""
 
 RDEPEND=">=dev-haskell/case-insensitive-0.4:=[profile?]
 	dev-haskell/data-default:=[profile?]
@@ -30,6 +30,8 @@ RDEPEND=">=dev-haskell/case-insensitive-0.4:=[profile?]
 	>=dev-haskell/http-types-0.7:=[profile?]
 	>=dev-haskell/lens-3.0:=[profile?]
 	>=dev-haskell/mtl-2.2.1:=[profile?]
+	>=dev-haskell/network-2.6.10:=[profile?]
+	>=dev-haskell/network-uri-2.6:=[profile?]
 	>=dev-haskell/optparse-applicative-0.10.0:=[profile?]
 	dev-haskell/transformers-base:=[profile?]
 	>=dev-haskell/transformers-compat-0.3:=[profile?]
@@ -37,9 +39,6 @@ RDEPEND=">=dev-haskell/case-insensitive-0.4:=[profile?]
 	>=dev-haskell/xml-conduit-1.0:=[profile?]
 	>=dev-haskell/xml-hamlet-0.4:=[profile?]
 	>=dev-lang/ghc-7.8.2:=
-	network-uri? ( >=dev-haskell/network-2.6:=[profile?]
-			>=dev-haskell/network-uri-2.6:=[profile?] )
-	!network-uri? ( >=dev-haskell/network-2.3:=[profile?] <dev-haskell/network-2.6:=[profile?] )
 "
 DEPEND="${RDEPEND}
 	>=dev-haskell/cabal-1.18.1.3
@@ -49,6 +48,5 @@ S="${WORKDIR}/${MY_P}"
 
 src_configure() {
 	haskell-cabal_src_configure \
-		--flag=-mtl-compat \
-		$(cabal_flag network-uri network-uri)
+		--flag=-mtl-compat
 }
diff --git a/dev-haskell/dav/metadata.xml b/dev-haskell/dav/metadata.xml
index 8dcb4ff8ac22..5c3e82b05960 100644
--- a/dev-haskell/dav/metadata.xml
+++ b/dev-haskell/dav/metadata.xml
@@ -13,7 +13,4 @@
 		In addition, there is an executable, hdav, which can be used for
 		command-line operation.
 	</longdescription>
-	<use>
-		<flag name="network-uri">Get Network.URI from the network-uri package.</flag>
-	</use>
 </pkgmetadata>