gentoo resync : 25.08.2020

7 files changed, 20 insertions, 231 deletions

diff --git a/dev-haskell/yaml/Manifest b/dev-haskell/yaml/Manifest
index 649c3ef6a52e..93e99f670688 100644
--- a/dev-haskell/yaml/Manifest
+++ b/dev-haskell/yaml/Manifest
@@ -1,11 +1,3 @@
-DIST yaml-0.8.10.1.tar.gz 73448 BLAKE2B 1b4e8b50d8e4913dd772253a8a7481802afe3dbc91538da9ce06437a09d155d2711540a87d4592a9953f6f316915da20caaf85a49f3f1369b2d98a5d8d9004ca SHA512 59b26eaca99379ff84cda6b8972ec2ff1e777536a754b9bda248d350a0797ef6c24d9cb86590062f4e6c12a5453224619a656c306a0292fdd1fe46e459a286e7
-DIST yaml-0.8.15.2.tar.gz 75540 BLAKE2B fc7b03cdb582221c0d8611bee0f38189a4e55cc78a10c12906e09e1b4820de00298096d43289cd7d01ad23cd5fb9a221d9d976f90b0ec966f15975a97779312e SHA512 214a8203ca13350268b285d7049110ce91c03d6c8b0bc59187048b9efed15374c97a4b91e464e86f719d3190c0bc534f9ca4b7436fc33a4748d0fa84bb747bb4
-DIST yaml-0.8.17.1.tar.gz 78775 BLAKE2B 66ddd1bf1ccb1f7b1314cd5b56987cc6e29da23ccadbde0d62baa6a9f143167e619f83bdb2734b8d561be030ebffed62ae610c417c52a40375b395ba38fd9ee7 SHA512 7119651e209942d41a9f5a542d365b5fea77c56d9dab012e3bf77234e6c6d23e2cff65c9b6c16ca185ff33338fd75c6b3f7dacaf1ff56f96c5773fcea70687f3
-DIST yaml-0.8.20.tar.gz 80264 BLAKE2B dc1252c331e707b96f04a15026eb50862b457a0d1137c5a72f1e9269db3a1f2aac0425784c442417b04e1d08b21d52e10ba115f1170595229177f96c3545b779 SHA512 bed0bcc6758606663aa1ba315590b7f4e26043bd5fbf462219e4164c7d41144d093763f85015db2ad83fdeb51b464715d49c0ec882e43cba6b141d40d7a2226e
-DIST yaml-0.8.21.2.tar.gz 81350 BLAKE2B e2c1474625d1283eae811805127babf37e89f00a38fa889cf855a53defec7837b5c80a3e4f6cadb48855056430487cb21d380c8c4af5d54ba5e61b57820c0463 SHA512 94c612a6b54ea0844c092b2304f786dd974b7d36c365bc56a3d6f4705197a9aba85bd1c429d356bb6bb8ec1bf81ded38a859ed16a5846bfd86add6e598c7a4fa
-EBUILD yaml-0.8.10.1.ebuild 1434 BLAKE2B e4225c530b1b3f8730554aabca72101df8ea404bce871bcc6d581bd099410fb78070e98914ec0065446670e8d7d923e8d0a37fcef18a74da49bda58d27587e41 SHA512 3cec3184e5298fcdefd1751a0628ba87b8b67e4d4dc02174bae4c0a3d695c18bd95e6b383f5085110c0c9f9ade2c923cfe879781346b19a1e4db9d4b40b1fcea
-EBUILD yaml-0.8.15.2.ebuild 1440 BLAKE2B 11e62810552ebf35cc2e30b1f485a3f34d258b35f8a431cc0c4736f29d9212bc4a8c56ed89961191e94779e98dab2c7db73768f9bb69b6803c9858051b697258 SHA512 0f830bed38bdc44ca3a221dfc74a41798d766d92ed6ccbeb98c91d7d9d022ab5515097ef95fc39c88999f61c57bbe391ab07e27653ecd37f08dd2ae82547212a
-EBUILD yaml-0.8.17.1.ebuild 1589 BLAKE2B 322689b92b52133e7b5ffd4fe9c38504fce9970c77b4f4cdd5b0ddd7327e33fb0faadb326b05ef6727730f175feff249fb68e1e81189120712b99b2b2e46dc61 SHA512 3e53071e952195092d781f10e03975284deb95f997cc4b5410d38e19880adb7f02ec131e64bb1c3eecc53b28bbe7a63fcb31eb4ddbd46163b7edbcf0026420ca
-EBUILD yaml-0.8.20.ebuild 1568 BLAKE2B 610e11307522d30258dfbf243e96f770b9360cb5f8e390d7c222626d2463f605a08a6148792989aae794cb7d50c0a656bdc47c47e40159161db80cd4c7b9010a SHA512 a03da43ae7466f166c3c7080b01763bfdaa46a629d5e3d18eb7a29349ad18b1861c64b3a5c7917d0abdcc85ed770852dc2e16817c7f727bc463518a97d2739bd
-EBUILD yaml-0.8.21.2.ebuild 1570 BLAKE2B 78ecef51aa5c3a22c63f52dc3b5aa81b3dbe64c0fb3421d898272769cdfaa0056d4536bf19e567154511d4346f1b2f100fc913a005c814e9cdd47cff53d32f21 SHA512 064c2d47e5e2febb56da859189d91b642cdb1f8c2801cbe4fef5ef862121d20323f2f00d5775621302d17eada24807b88e2c3f39e25787e89b4f2b5d309a144a
-MISC metadata.xml 964 BLAKE2B 379ad007b936b137d0353aaa89d3fe970d5bb96b69f11b1acfc2e5dfce75d7dc638efb6c358559cc694fef1b8695684f0e0ff4bb6200f0ecc1eb5fa8092bed0c SHA512 b24a56b9b405154c146d4a02424d443969e3b3df1fab7950486e64772f78d7fb6223e94763f867830135acca03ed1dc8f7e5d093fb76a50ca6ebca05bf890ef4
+DIST yaml-0.11.5.0.tar.gz 30049 BLAKE2B 96e7d8b39ac392ac927a61991a2c645dd564e36a7676984193e447ad591bddedb9029136aa6f71c65a0665a05516f907a0151b85d7e7f22169d7d5ddc98e6c5d SHA512 a4209cdbe75413191aed5a72f13a0cc4af04906a3e8ce629711689624f334b31681dcfc2fc89fdae20a874c5e6831e9663a30188d34d8067491ff8958912930b
+EBUILD yaml-0.11.5.0.ebuild 1440 BLAKE2B 9403d772abc0471bb56ae0819e548299b89acfcc4f3c22bc384078a30749a3ed3c35fac0252af912c6d3f74f89829e61a4035a14be30b6d88a10ed75a4abef70 SHA512 3870009ac1bef69c9a741bda59e942737cc16ee4f7a7f34f60c78aba9926b2dfb41cdc540cb7f0c6465a28ea985f39b0de17f0f2525e1aa05975f0d2e38f10c2
+MISC metadata.xml 778 BLAKE2B 2923ea55f5dcf6448cee3c91d7331f5cd20375865f5fcf9f6fbc0537519f430bab4ca1e9846a3d44d4a67f3579301a7ebdb325bf1435cef89f03fa8372619370 SHA512 0265e53652c618f4aeab4b7ef79f0ca2d082e15395c6d4374a67d03714db6d8a2a4c4f60c199249f1ae4f75b35669bc5093a20941d9ead7292e673dc217ec8aa
diff --git a/dev-haskell/yaml/metadata.xml b/dev-haskell/yaml/metadata.xml
index 2ea8f62867a3..2a2e0f16895c 100644
--- a/dev-haskell/yaml/metadata.xml
+++ b/dev-haskell/yaml/metadata.xml
@@ -15,8 +15,6 @@
 	<use>
 		<flag name="no-examples">don't build the examples</flag>
 		<flag name="no-exe">don't install the yaml2json executable</flag>
-		<flag name="no-unicode">Don't enable unicode output. Instead, unicode characters will be escaped.</flag>
-		<flag name="system-libyaml">Use system libyaml instead on generic one</flag>
 	</use>
 	<upstream>
 		<remote-id type="github">snoyberg/yaml</remote-id>
diff --git a/dev-haskell/yaml/yaml-0.8.20.ebuild b/dev-haskell/yaml/yaml-0.11.5.0.ebuild
index 3bdfe6f0dfbc..675db69e8dac 100644
--- a/dev-haskell/yaml/yaml-0.8.20.ebuild
+++ b/dev-haskell/yaml/yaml-0.11.5.0.ebuild
@@ -1,51 +1,47 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-# ebuild generated by hackport 0.5.9999
+# ebuild generated by hackport 0.6.6.9999
 
 CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
 inherit haskell-cabal
 
 DESCRIPTION="Support for parsing and rendering YAML documents"
-HOMEPAGE="https://github.com/snoyberg/yaml/"
+HOMEPAGE="https://github.com/snoyberg/yaml#readme"
 SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
 KEYWORDS="~amd64 ~x86"
-IUSE="+no-examples no-exe no-unicode system-libyaml"
+IUSE="+no-examples +no-exe"
 
-RDEPEND=">=dev-haskell/aeson-0.7:=[profile?]
+RDEPEND=">=dev-haskell/aeson-0.11:=[profile?]
 	>=dev-haskell/attoparsec-0.11.3.0:=[profile?]
-	>=dev-haskell/conduit-1.1.0:=[profile?] <dev-haskell/conduit-1.3:=[profile?]
-	dev-haskell/enclosed-exceptions:=[profile?]
-	>=dev-haskell/resourcet-0.3:=[profile?] <dev-haskell/resourcet-1.2:=[profile?]
-	dev-haskell/scientific:=[profile?]
-	dev-haskell/semigroups:=[profile?]
+	>=dev-haskell/conduit-1.2.8:=[profile?] <dev-haskell/conduit-1.4:=[profile?]
+	>=dev-haskell/libyaml-0.1:=[profile?] <dev-haskell/libyaml-0.2:=[profile?]
+	dev-haskell/mtl:=[profile?]
+	>=dev-haskell/resourcet-0.3:=[profile?] <dev-haskell/resourcet-1.3:=[profile?]
+	>=dev-haskell/scientific-0.3:=[profile?]
 	dev-haskell/text:=[profile?]
 	dev-haskell/unordered-containers:=[profile?]
 	dev-haskell/vector:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
+	>=dev-lang/ghc-8.0.2:=
 	!no-examples? ( dev-haskell/raw-strings-qq:=[profile?] )
-	system-libyaml? ( dev-libs/libyaml )
 "
 DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-	test? ( dev-haskell/aeson-qq
-		dev-haskell/base-compat
+	>=dev-haskell/cabal-1.24.2.0
+	test? ( dev-haskell/base-compat
 		>=dev-haskell/hspec-1.3
 		dev-haskell/hunit
 		dev-haskell/mockery
-		dev-haskell/temporary )
-	system-libyaml? ( virtual/pkgconfig )
+		dev-haskell/temporary
+		no-examples? ( dev-haskell/raw-strings-qq ) )
 "
 
 src_configure() {
 	haskell-cabal_src_configure \
 		$(cabal_flag no-examples no-examples) \
-		$(cabal_flag no-exe no-exe) \
-		$(cabal_flag no-unicode no-unicode) \
-		$(cabal_flag system-libyaml system-libyaml)
+		$(cabal_flag no-exe no-exe)
 }
diff --git a/dev-haskell/yaml/yaml-0.8.10.1.ebuild b/dev-haskell/yaml/yaml-0.8.10.1.ebuild
deleted file mode 100644
index 7cad1b4d1359..000000000000
--- a/dev-haskell/yaml/yaml-0.8.10.1.ebuild
+++ /dev/null
@@ -1,47 +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.4.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Support for parsing and rendering YAML documents"
-HOMEPAGE="https://github.com/snoyberg/yaml/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="no-exe unicode system-libyaml"
-
-RDEPEND=">=dev-haskell/aeson-0.5:=[profile?]
-	dev-haskell/attoparsec:=[profile?]
-	>=dev-haskell/conduit-1.1.0:=[profile?] <dev-haskell/conduit-1.3:=[profile?]
-	dev-haskell/enclosed-exceptions:=[profile?]
-	>=dev-haskell/resourcet-0.3:=[profile?] <dev-haskell/resourcet-1.2:=[profile?]
-	dev-haskell/scientific:=[profile?]
-	dev-haskell/text:=[profile?]
-	>=dev-haskell/transformers-0.1:=[profile?]
-	dev-haskell/unordered-containers:=[profile?]
-	dev-haskell/vector:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	system-libyaml? ( dev-libs/libyaml )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( dev-haskell/aeson-qq
-		>=dev-haskell/hspec-1.3
-		dev-haskell/hspec-expectations
-		dev-haskell/hunit )
-	system-libyaml? ( virtual/pkgconfig )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag no-exe no-exe) \
-		$(usex unicode "--flags=-no-unicode" "--flags=no-unicode") \
-		$(cabal_flag system-libyaml system-libyaml)
-}
diff --git a/dev-haskell/yaml/yaml-0.8.15.2.ebuild b/dev-haskell/yaml/yaml-0.8.15.2.ebuild
deleted file mode 100644
index f99d3be78eac..000000000000
--- a/dev-haskell/yaml/yaml-0.8.15.2.ebuild
+++ /dev/null
@@ -1,48 +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.6.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Support for parsing and rendering YAML documents"
-HOMEPAGE="https://github.com/snoyberg/yaml/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="no-exe no-unicode system-libyaml"
-
-RDEPEND=">=dev-haskell/aeson-0.7:=[profile?]
-	>=dev-haskell/attoparsec-0.11.3.0:=[profile?]
-	>=dev-haskell/conduit-1.1.0:=[profile?] <dev-haskell/conduit-1.3:=[profile?]
-	dev-haskell/enclosed-exceptions:=[profile?]
-	>=dev-haskell/resourcet-0.3:=[profile?] <dev-haskell/resourcet-1.2:=[profile?]
-	dev-haskell/scientific:=[profile?]
-	dev-haskell/text:=[profile?]
-	>=dev-haskell/transformers-0.1:=[profile?]
-	dev-haskell/unordered-containers:=[profile?]
-	dev-haskell/vector:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	system-libyaml? ( dev-libs/libyaml )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( dev-haskell/aeson-qq
-		dev-haskell/base-compat
-		>=dev-haskell/hspec-1.3
-		dev-haskell/hunit
-		dev-haskell/mockery )
-	system-libyaml? ( virtual/pkgconfig )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag no-exe no-exe) \
-		$(cabal_flag no-unicode no-unicode) \
-		$(cabal_flag system-libyaml system-libyaml)
-}
diff --git a/dev-haskell/yaml/yaml-0.8.17.1.ebuild b/dev-haskell/yaml/yaml-0.8.17.1.ebuild
deleted file mode 100644
index 5ebc14438470..000000000000
--- a/dev-haskell/yaml/yaml-0.8.17.1.ebuild
+++ /dev/null
@@ -1,51 +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.4.7.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Support for parsing and rendering YAML documents"
-HOMEPAGE="https://github.com/snoyberg/yaml/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+no-examples no-exe no-unicode system-libyaml"
-
-RDEPEND=">=dev-haskell/aeson-0.7:=[profile?]
-	>=dev-haskell/attoparsec-0.11.3.0:=[profile?]
-	>=dev-haskell/conduit-1.1.0:=[profile?] <dev-haskell/conduit-1.3:=[profile?]
-	dev-haskell/enclosed-exceptions:=[profile?]
-	>=dev-haskell/resourcet-0.3:=[profile?] <dev-haskell/resourcet-1.2:=[profile?]
-	dev-haskell/scientific:=[profile?]
-	dev-haskell/semigroups:=[profile?]
-	dev-haskell/text:=[profile?]
-	>=dev-haskell/transformers-0.1:=[profile?]
-	dev-haskell/unordered-containers:=[profile?]
-	dev-haskell/vector:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	!no-examples? ( dev-haskell/raw-strings-qq:=[profile?] )
-	system-libyaml? ( dev-libs/libyaml )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( dev-haskell/aeson-qq
-		dev-haskell/base-compat
-		>=dev-haskell/hspec-1.3
-		dev-haskell/hunit
-		dev-haskell/mockery )
-	system-libyaml? ( virtual/pkgconfig )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag no-examples no-examples) \
-		$(cabal_flag no-exe no-exe) \
-		$(cabal_flag no-unicode no-unicode) \
-		$(cabal_flag system-libyaml system-libyaml)
-}
diff --git a/dev-haskell/yaml/yaml-0.8.21.2.ebuild b/dev-haskell/yaml/yaml-0.8.21.2.ebuild
deleted file mode 100644
index 83876298f741..000000000000
--- a/dev-haskell/yaml/yaml-0.8.21.2.ebuild
+++ /dev/null
@@ -1,51 +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.1.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Support for parsing and rendering YAML documents"
-HOMEPAGE="https://github.com/snoyberg/yaml/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+no-examples no-exe no-unicode system-libyaml"
-
-RDEPEND=">=dev-haskell/aeson-0.7:=[profile?]
-	>=dev-haskell/attoparsec-0.11.3.0:=[profile?]
-	>=dev-haskell/conduit-1.1.0:=[profile?] <dev-haskell/conduit-1.3:=[profile?]
-	dev-haskell/enclosed-exceptions:=[profile?]
-	>=dev-haskell/resourcet-0.3:=[profile?] <dev-haskell/resourcet-1.2:=[profile?]
-	dev-haskell/scientific:=[profile?]
-	dev-haskell/semigroups:=[profile?]
-	dev-haskell/text:=[profile?]
-	dev-haskell/unordered-containers:=[profile?]
-	dev-haskell/vector:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-	!no-examples? ( dev-haskell/raw-strings-qq:=[profile?] )
-	system-libyaml? ( dev-libs/libyaml )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
-	test? ( dev-haskell/aeson-qq
-		dev-haskell/base-compat
-		>=dev-haskell/hspec-1.3
-		dev-haskell/hunit
-		dev-haskell/mockery
-		dev-haskell/temporary )
-	system-libyaml? ( virtual/pkgconfig )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag no-examples no-examples) \
-		$(cabal_flag no-exe no-exe) \
-		$(cabal_flag no-unicode no-unicode) \
-		$(cabal_flag system-libyaml system-libyaml)
-}