gentoo auto-resync : 30:07:2022 - 09:09:33

3 files changed, 30 insertions, 85 deletions

diff --git a/dev-haskell/io-streams/Manifest b/dev-haskell/io-streams/Manifest
index 4e2eac96838e..78050f62179c 100644
--- a/dev-haskell/io-streams/Manifest
+++ b/dev-haskell/io-streams/Manifest
@@ -1,3 +1,4 @@
-DIST io-streams-1.5.2.0.tar.gz 63812 BLAKE2B a555bc0bc365e4e2c28570da34e6c2891ff56a7460ec8a857285a22ea3a4a2b8975139c3024fd90ffec51386646d9ed632754971abef04fd2c358cba5e0a19c6 SHA512 2cb6c9cded0077f1501b0fba576b79e5ebf21ccc2711a91552ec46ef6d5e943e0c1255cdfda381aa8e4d7691b1e450956bedd2fbd4414b13ef7926b0cc3dc4c3
-EBUILD io-streams-1.5.2.0.ebuild 1863 BLAKE2B 7239468f7bb1b4523aadea960743b25ed33bc764e1ec16d167281a7ead27a30553b600bce45d179940dd1f4d4cc47fe2bbbfa73be1bef0ad7a81702a6ee2cef5 SHA512 1e7037f2b0c55ffd1529e89a53bee05b3716511dc7b513e761c8f53ef11b9f50a9c1fc680e23e3b282cf073d8cff80bb38f2715d2533a282a11d985107c5c387
-MISC metadata.xml 2650 BLAKE2B c67f812693ab5b41ed42dd9f02e3cc60e3374a0a071bff6ec19bb8746a43da48c59029d38ca80d59d23f58a96de118fef40594ca1bc91e05e5c66adc09c17622 SHA512 8210a9391b6c3d025f02050d8c2a3815ea0ceefbe5afa18908508ca87975c116a19ca53d1f7c134f675da458e3b801acf665a0237b5fd19bde4e987e8a183b53
+DIST io-streams-1.5.2.1-rev2.cabal 9916 BLAKE2B ac72adc1e84dc2016db65266141113d26e981d2c057574f02ac4ada94c62f4923265e528f3cd4917142ec32de2880f8607776964628c589355fb3639a222448e SHA512 3b2519b655095bdd6a5c2d1180dbaa2ff750f52a9ee02d893d6b82951e3ca2b6a61b81d694cb1539a0dd4080f223a038d3e92df1b660fa9c4a5626fa62460541
+DIST io-streams-1.5.2.1.tar.gz 64050 BLAKE2B 6533d2cff65e3f7af54b6a652e13a2e75ef4a2b38dad6dec3bd3d299f479e7f6293bb63b27dd1066561d6a1eed9a65fe47910d2f8eec83baffdff532deb53433 SHA512 c86f55714469198bab5a670e8b061e75f3f9ad6576ed1523df543365caac492ba3b54fb6356a898c27fa6394e96874bb636e5b9100cf70e0de0d7f73e91ba9c9
+EBUILD io-streams-1.5.2.1.ebuild 2107 BLAKE2B 8f0623e6d1c3aa5f48ecfb1ee0f4b2a93053eb3e5206d88f8d270adda2718e06870264a0e0c5be89cd10a1c2885970041036f8838af979f47933aabb6309db67 SHA512 e82656183091e14b2349cfed64baba604ac5470780baaba316885d793b784dde86a2c734b1a9065aba49179465e7109a7e339ef607b2357e1d1a366cb20d3b9b
+MISC metadata.xml 367 BLAKE2B 7941719997b039a64f880ce01d6a68af50af62e185633a78992961b1ee691a1387cf612dd1ba8083d4fcd3097f4d16a6732103cbd6f3acdc9f76c05ac405d657 SHA512 b9056efbbd8d992bfd04e21e1572bb942e03124f35b305eddbc76338381ff0bd8d594cad739b13ffc397dbc4c5bada776f28d25040651fa818e26692333cb226
diff --git a/dev-haskell/io-streams/io-streams-1.5.2.0.ebuild b/dev-haskell/io-streams/io-streams-1.5.2.1.ebuild
index 0d44d531e46d..f7a2f97e1d31 100644
--- a/dev-haskell/io-streams/io-streams-1.5.2.0.ebuild
+++ b/dev-haskell/io-streams/io-streams-1.5.2.1.ebuild
@@ -1,44 +1,57 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-# ebuild generated by hackport 0.6.6.9999
+# ebuild generated by hackport 0.7.1.1.9999
 #hackport: flags: +nointeractivetests
 
 CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+CABAL_HACKAGE_REVISION="2"
 inherit haskell-cabal
 
+CABAL_FILE="${S}/${PN}.cabal"
+CABAL_DISTFILE="${P}-rev${CABAL_HACKAGE_REVISION}.cabal"
+
 DESCRIPTION="Simple, composable, and easy-to-use stream I/O"
 HOMEPAGE="https://hackage.haskell.org/package/io-streams"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz
+	https://hackage.haskell.org/package/${P}/revision/${CABAL_HACKAGE_REVISION}.cabal
+		-> ${CABAL_DISTFILE}"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 IUSE="+network +zlib"
 
-RESTRICT=test # requires network access
-
-RDEPEND=">=dev-haskell/attoparsec-0.10:=[profile?] <dev-haskell/attoparsec-0.14:=[profile?]
-	>=dev-haskell/bytestring-builder-0.10:=[profile?] <dev-haskell/bytestring-builder-0.11:=[profile?]
+RDEPEND=">=dev-haskell/attoparsec-0.10:=[profile?] <dev-haskell/attoparsec-0.15:=[profile?]
 	>=dev-haskell/primitive-0.2:=[profile?] <dev-haskell/primitive-0.8:=[profile?]
-	>=dev-haskell/text-0.10:=[profile?] <dev-haskell/text-1.3:=[profile?]
 	>=dev-haskell/vector-0.7:=[profile?] <dev-haskell/vector-0.13:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
+	>=dev-lang/ghc-8.4.3:=
 	network? ( >=dev-haskell/network-2.3:=[profile?] <dev-haskell/network-3.2:=[profile?] )
 	zlib? ( >=dev-haskell/zlib-bindings-0.1:=[profile?] <dev-haskell/zlib-bindings-0.2:=[profile?] )
 "
 DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
+	>=dev-haskell/cabal-2.2.0.1
 	test? ( >=dev-haskell/hunit-1.2 <dev-haskell/hunit-2
-		>=dev-haskell/mtl-2 <dev-haskell/mtl-3
 		>=dev-haskell/quickcheck-2.3.0.2 <dev-haskell/quickcheck-3
 		>=dev-haskell/test-framework-0.6 <dev-haskell/test-framework-0.9
 		>=dev-haskell/test-framework-hunit-0.2.7 <dev-haskell/test-framework-hunit-0.4
 		>=dev-haskell/test-framework-quickcheck2-0.2.12.1 <dev-haskell/test-framework-quickcheck2-0.4
 		zlib? ( >=dev-haskell/zlib-0.5 <dev-haskell/zlib-0.7 ) )
 "
+BDEPEND="app-text/dos2unix"
+
+src_prepare() {
+	# pull revised cabal from upstream
+	cp "${DISTDIR}/${CABAL_DISTFILE}" "${CABAL_FILE}" || die
+
+	# Convert to unix line endings
+	dos2unix "${CABAL_FILE}" || die
+
+	# Apply patches *after* pulling the revised cabal
+	default
+}
 
 src_configure() {
 	haskell-cabal_src_configure \
diff --git a/dev-haskell/io-streams/metadata.xml b/dev-haskell/io-streams/metadata.xml
index 310f0593f2cf..7696ff9ecf64 100644
--- a/dev-haskell/io-streams/metadata.xml
+++ b/dev-haskell/io-streams/metadata.xml
@@ -9,73 +9,4 @@
 		<flag name="network">Include network support</flag>
 		<flag name="zlib">Include zlib support</flag>
 	</use>
-	<longdescription>
-		/Overview/
-		
-		The io-streams library contains simple and easy-to-use primitives for I/O
-		using streams. Most users will want to import the top-level convenience
-		module "System.IO.Streams", which re-exports most of the library:
-		
-		@
-		import           System.IO.Streams (InputStream, OutputStream)
-		import qualified System.IO.Streams as Streams
-		@
-		
-		For first-time users, @io-streams@ comes with an included tutorial, which can
-		be found in the "System.IO.Streams.Tutorial" module.
-		
-		/Features/
-		
-		The @io-streams@ user API has two basic types: @InputStream a@ and
-		@OutputStream a@, and three fundamental I/O primitives:
-		
-		@
-		\-\- read an item from an input stream
-		Streams.read :: InputStream a -&gt; IO (Maybe a)
-		
-		\-\- push an item back to an input stream
-		Streams.unRead :: a -&gt; InputStream a -&gt; IO ()
-		
-		\-\- write to an output stream
-		Streams.write :: Maybe a -&gt; OutputStream a -&gt; IO ()
-		@
-		
-		Streams can be transformed by composition and hooked together with provided combinators:
-		
-		@
-		ghci&gt; Streams.fromList [1,2,3::Int] &gt;&gt;= Streams.map (*10) &gt;&gt;= Streams.toList
-		[10,20,30]
-		@
-		
-		Stream composition leaves the original stream accessible:
-		
-		@
-		ghci&gt; input \&lt;- Streams.fromByteString \"long string\"
-		ghci&gt; wrapped \&lt;- Streams.takeBytes 4 input
-		ghci&gt; Streams.read wrapped
-		Just \"long\"
-		ghci&gt; Streams.read wrapped
-		Nothing
-		ghci&gt; Streams.read input
-		Just \" string\"
-		@
-		
-		Simple types and operations in the IO monad mean straightforward and simple
-		exception handling and resource cleanup using Haskell standard library
-		facilities like 'Control.Exception.bracket'.
-		
-		@io-streams@ comes with:
-		
-		* functions to use files, handles, concurrent channels, sockets, lists,
-		vectors, and more as streams.
-		
-		* a variety of combinators for wrapping and transforming streams, including
-		compression and decompression using zlib, controlling precisely how many
-		bytes are read from or written to a stream, buffering output using
-		bytestring builders, folds, maps, filters, zips, etc.
-		
-		* support for parsing from streams using @attoparsec@.
-		
-		* support for spawning processes and communicating with them using streams.
-	</longdescription>
 </pkgmetadata>