gentoo resync : 31.05.2021

3 files changed, 12 insertions, 66 deletions

diff --git a/dev-haskell/hexpat/Manifest b/dev-haskell/hexpat/Manifest
index 77eb4d558231..11c476af8d66 100644
--- a/dev-haskell/hexpat/Manifest
+++ b/dev-haskell/hexpat/Manifest
@@ -1,3 +1,3 @@
 DIST hexpat-0.20.13.tar.gz 143733 BLAKE2B 73cb82a98454f7dda6425d1366e3746741e73290dc6eb2d10510caa3a3d749a074f1592766a03a45bd820d6f44d6cbd9215eddb35bc4005b2bf273501a889695 SHA512 900abcb599bd66856c822b791222a814cc6293d655f45c4295e991ba74f750a80fd1c3993a0dfd943de6a83e90a5905711a7ce9c599471b043b10f661ca5a598
-EBUILD hexpat-0.20.13.ebuild 953 BLAKE2B 19bd8d909031a5c880a8898ca2c6518866026313e285945097e117585125d2f72b7bb2e4ae611e2de7150dfe15a0848b31cf5df100231bc4ed71582897ac83e4 SHA512 e398e336a014311307598abf3521de5ae484615a14eea44eeea1382c740b6e1692405a2c2c48a0535e2cf220f3168fe8f3e7d18dc242eb4c4ce1de1ba6935d23
-MISC metadata.xml 3554 BLAKE2B 91aa31aff7ae52fba9b6efcfed3b199968fb12881b286462e57ac5b475870628c58ae72599dd8bedc25ff3afbae530f94f1cfeafcc5fe85373c081117ce33fc0 SHA512 e6e1d12e17761cac548f4ae19bd12b69cc66eb1d6e66bf1ec9c98a880a8f9ea2622ad283e03f064ab6b7942a6d71e667c0bc107d7b9c1dd9e899fe914ba636bb
+EBUILD hexpat-0.20.13.ebuild 879 BLAKE2B e6c3da3ca1e90670721cde7f62abed3583214e50a5e855c3ba963b548340d05c388d531ab42bc8e8f6b6179fa115c748a6565a80bed1e3e9f9e9d7f4f63e44c4 SHA512 9a486bb9d9c710027e9726ba437a92c65af334a65bdc3540c9e89927642d4726e0f387d737dc44b086382cc4da322163163c8f342de6f11fa296e6d4debfec2c
+MISC metadata.xml 249 BLAKE2B 84b809c265ff2a09d1f06c66d4797652ff4c64205d94323e07333ae0fbddcfb8c58d0176a8cc52bd37e9353371d987b9b473b9747cb082e1c2871ed80fcfa144 SHA512 ce055b41ff1c10209e88579fe21ce16550be7e9b21f87724564f06430aa6f478974f186a10c8ff7e92398f534c09109aeed57eae1c6d2b56b5c99ebfb64a0015
diff --git a/dev-haskell/hexpat/hexpat-0.20.13.ebuild b/dev-haskell/hexpat/hexpat-0.20.13.ebuild
index 01a2c7198d8b..6bdd54151798 100644
--- a/dev-haskell/hexpat/hexpat-0.20.13.ebuild
+++ b/dev-haskell/hexpat/hexpat-0.20.13.ebuild
@@ -1,34 +1,33 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-# ebuild generated by hackport 0.5.3.9999
-#hackport: flags: bundle:bundled-expat
+# ebuild generated by hackport 0.6.7.9999
+#hackport: flags: -bundle
 
 CABAL_FEATURES="lib profile haddock hoogle hscolour"
 inherit haskell-cabal
 
 DESCRIPTION="XML parser/formatter based on expat"
-HOMEPAGE="http://haskell.org/haskellwiki/Hexpat/"
+HOMEPAGE="https://haskell.org/haskellwiki/Hexpat/"
 SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
 KEYWORDS="~amd64 ~x86"
-IUSE="bundled-expat"
 
 RDEPEND=">=dev-haskell/list-0.4.2:=[profile?] <dev-haskell/list-0.7:=[profile?]
 	>=dev-haskell/text-0.5.0.0:=[profile?] <dev-haskell/text-1.3.0.0:=[profile?]
 	>=dev-haskell/utf8-string-0.3:=[profile?] <dev-haskell/utf8-string-1.1:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
-	!bundled-expat? ( dev-libs/expat )
+	>=dev-lang/ghc-8.4.3:=
+	dev-libs/expat
 "
 DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
+	>=dev-haskell/cabal-2.2.0.1
 "
 
 src_configure() {
 	haskell-cabal_src_configure \
-		$(cabal_flag bundled-expat bundle)
+		--flag=-bundle
 }
diff --git a/dev-haskell/hexpat/metadata.xml b/dev-haskell/hexpat/metadata.xml
index b858ead0d5ef..b7878815d80d 100644
--- a/dev-haskell/hexpat/metadata.xml
+++ b/dev-haskell/hexpat/metadata.xml
@@ -3,59 +3,6 @@
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
 	</maintainer>
-	<use>
-		<flag name="bundled-expat"> Use bundled expat instead of <pkg>dev-libs/expat</pkg></flag>
-	</use>
-	<longdescription>
-		This package provides a general purpose Haskell XML library using Expat to
-		do its parsing (&lt;http://expat.sourceforge.net/&gt; - a fast stream-oriented XML
-		parser written in C).  It is extensible to any string type, with @String@,
-		@ByteString@ and @Text@ provided out of the box.
-		
-		Basic usage: Parsing a tree (/Tree/), formatting a tree (/Format/).
-		Other features: Helpers for processing XML trees (/Proc/), trees annotated with
-		XML source location (/Annotated/), extended XML trees with comments,
-		processing instructions, etc (/Extended/), XML cursors (/Cursor/),
-		SAX-style parse (/SAX/), and access to the low-level interface in case speed
-		is paramount (/Internal.IO/).
-		
-		The design goals are speed, speed, speed, interface simplicity and modularity.
-		
-		For introduction and examples, see the /Text.XML.Expat.Tree/ module. For benchmarks,
-		&lt;http://haskell.org/haskellwiki/Hexpat/&gt;
-		
-		If you want to do interactive I\/O, an obvious option is to use lazy parsing
-		with one of the lazy I\/O functions such as hGetContents.  However, this can be
-		problematic in some applications because it doesn't handle I\/O errors properly
-		and can give no guarantee of timely resource cleanup.  In these cases, chunked
-		I\/O is a better approach: Take a look at the /hexpat-enumerator/ package.
-		
-		/IO/ is filed under /Internal/ because it's low-level and most users won't want
-		it.  The other /Internal/ modules are re-exported by /Annotated/, /Tree/ and /Extended/,
-		so you won't need to import them directly.
-		
-		Credits to Iavor Diatchki and the @xml@ (XML.Light) package for /Proc/ and /Cursor/.
-		Thanks to the many contributors.
-		
-		BOUND VS. UNBOUND THREADS: GHC (at least versions 6.12.X) will spawn threads
-		if you call a safe FFI callback from an unbound thread.  This can get out of
-		control in a busy application.  To avoid this, from version 0.19.1 we now delegate
-		processing to a single worker thread if the calling thread is not bound.
-		This essentially means that hexpat currently won't exploit multicores very well.
-		It also means that hexpat may be more efficient on threads spawned with forkOS
-		(to give you a bound thread) rather than forkIO.
-		
-		ChangeLog: 0.15 changes intended to fix a (rare) \"error: a C finalizer called back into Haskell.\"
-		that seemed only to happen only on ghc6.12.X; 0.15.1 Fix broken Annotated parse;
-		0.16 switch from mtl to transformers; 0.17 fix mapNodeContainer &amp; rename some things.;
-		0.18 rename defaultEncoding to overrideEncoding. 0.18.3 formatG and indent were demanding list
-		items more than once (inefficient in chunked processing); 0.19 add Extended.hs;
-		0.19.1 fix a memory leak introduced in 0.19, delegate parsing to bound thread
-		if unbound (see note above); 0.19.2 include expat source code so \'cabal install\' just works
-		on Linux, Mac and Windows (thanks Jacob Stanley); 0.19.3 fix misconfiguration of expat
-		which broke entity parsing; 0.19.4 bump version constraint for text; 0.19.5 bump text
-		to &lt; 0.12 and fix text-0.10.0.1 breakage; 0.19.6 dependency breakage with List;
-		0.19.7 ghc-7.2.1 compatibility; 0.19.8 fix space leak on lazy parse under ghc-7.2.1
-	</longdescription>
 </pkgmetadata>