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

3 files changed, 37 insertions, 25 deletions

diff --git a/dev-haskell/pointed/Manifest b/dev-haskell/pointed/Manifest
index 438b7cf5b2da..8989023c8e90 100644
--- a/dev-haskell/pointed/Manifest
+++ b/dev-haskell/pointed/Manifest
@@ -1,3 +1,4 @@
-DIST pointed-5.0.2.tar.gz 7236 BLAKE2B 573a771f30b170cd1c394faa3ae5115b648c0c140bfb3253c0ecd790109c2a860ec1c2374ea2e55e76bbf2362c737f7725fee8dafc255e20d8bfc8f6411d297a SHA512 dc1c60108cf13f089c66511c6cc6cc695de3614fcaa93be54f9b71eb2ed07d4b3b8d9a550e9ba4d73322445eda36679d7abc554ec807755a2e13722cc68627e0
-EBUILD pointed-5.0.2.ebuild 2045 BLAKE2B ea4f8711a2dd1c43cf9b9885182e46a308f461b27a5231af9d3f8a5b76c0ce67805d2c2e970e70e90cc8495eeaedd8eb9050ec9fb596063fc55ca51f9a2b6c25 SHA512 2c930591f3d739be5903ce8c116b5bcba422d1095d39be6df1b0850b1e9e1f705ea4e78d4cb805b53bf1ca6117d65804fcc4498b391e9b2dda494dae3173bc49
-MISC metadata.xml 817 BLAKE2B 66724e4e1b15f63010db5089499fa3c7b406bfb44582e53e6d516ec8dc23d5b09fa76fdf16b3bea8aae9959ba827ec9974d0cfea540ac5b0d9ae1db2f95e6547 SHA512 b2011445bb4a3f4f8315031e5a5bd6478eeffc2e255d7af99734d9019e8f5f29b386304ea1f1b9634f125546d2fcf64a5cf9dab2e518279cf1236e889849a527
+DIST pointed-5.0.3.cabal 3343 BLAKE2B 9920fe549ab82e1903b998853400ac5e7f316f18fe725838df5c0d0bf17616e5e2bd19647aef8efaec6f3c7a225458eee3dd45c2822679c602ab5312cd5f3c72 SHA512 91d7218999ad94b132e3af1a8f844856ee403d6a08805d707ebc59c8466229aca2dffa7c18f06746cd221e55eed5382be8c0b9a8df0f6d9cb79bf8719f65828d
+DIST pointed-5.0.3.tar.gz 5128 BLAKE2B 83389eeb4a9de7ef707aab35eea847b75970ccc9b223963b4e0cc8fc3a6806cc9e97383a672b757b2c97f8e2cc66595b300870c4b99b55fb4ad8eeff7b9ad58e SHA512 e68375506d08002c5f0a76c24a40bdc7b28fea0e447f213c441bc22571846c3685a4833f19e224406f975236fd0bbaacecf6ea0ec1ec056254863f2b65aecbaa
+EBUILD pointed-5.0.3.ebuild 2424 BLAKE2B d850e99ed8409e83646b37d55d8ee5347436b83cc4ba019a4f4e1d455afbc26ef536efb5b5b97fca0ee352b658d626a6424d12ad8d14a11d95a53641b3154b06 SHA512 527b0581c93551b50349f144c804a51a4f2ec104226077b3009ce067a739cff9d8c82b64e90f48474d6a732f756d23984b8eef3286d90693e925bbc47c3eaa5b
+MISC metadata.xml 1149 BLAKE2B 352659d889259ca1499ba68794ceaf8a7a6e46d29716317785d079389deaaaa6023e25efb775665c832b0b7f31909ae9cc75156794444a20a5e774b2051cad0a SHA512 d71e91bc268e9c80bb444decb53d48444d22df14836091ebeaa3171bc5cfd59d2f5eb8d4301ee98164e08adabb3d4a372d37d16ee033487097fd11b1cb7e25c8
diff --git a/dev-haskell/pointed/metadata.xml b/dev-haskell/pointed/metadata.xml
index 7bf780270265..b9c5626a0df2 100644
--- a/dev-haskell/pointed/metadata.xml
+++ b/dev-haskell/pointed/metadata.xml
@@ -6,17 +6,13 @@
 		<name>Gentoo Haskell</name>
 	</maintainer>
 	<use>
-		<flag name="comonad">optional instances</flag>
-		<flag name="containers">optional instances</flag>
-		<flag name="kan-extensions">optional instances</flag>
-		<flag name="semigroupoids">optional instances</flag>
-		<flag name="semigroups">optional instances</flag>
-		<flag name="stm">optional instances</flag>
-		<flag name="tagged">optional instances</flag>
-		<flag name="transformers">optional instances</flag>
-		<flag name="unordered-containers">optional instances</flag>
+		<flag name="comonad">You can disable the use of the `comonad` package using `-f-transformers`.</flag>
+		<flag name="kan-extensions">You can disable the use of the `kan-extensions` package using `-f-kan-extensions`.</flag>
+		<flag name="semigroupoids">You can disable the use of the `semigroupoids` package using `-f-semigroupoids`.</flag>
+		<flag name="semigroups">You can disable the use of the `semigroups` package using `-f-semigroups`.</flag>
+		<flag name="stm">You can disable the use of the `stm` package using `-f-stm`.</flag>
+		<flag name="tagged">You can disable the use of the `tagged` package using `-f-tagged`.</flag>
+		<flag name="transformers">You can disable the use of the `transformers` package using `-f-transformers`.</flag>
+		<flag name="unordered-containers">You can disable the use of the `unordered-containers` package using `-f-unordered-containers`.</flag>
 	</use>
-	<upstream>
-		<remote-id type="github">ekmett/pointed</remote-id>
-	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/pointed/pointed-5.0.2.ebuild b/dev-haskell/pointed/pointed-5.0.3.ebuild
index 116cf93a1b1d..486b00d68242 100644
--- a/dev-haskell/pointed/pointed-5.0.2.ebuild
+++ b/dev-haskell/pointed/pointed-5.0.3.ebuild
@@ -1,24 +1,27 @@
-# Copyright 1999-2021 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.7.9999
+# ebuild generated by hackport 0.7.1.1.9999
+#hackport: flags: +containers
 
 CABAL_FEATURES="lib profile haddock hoogle hscolour"
 inherit haskell-cabal
 
 DESCRIPTION="Pointed and copointed data"
 HOMEPAGE="https://github.com/ekmett/pointed/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+HACKAGE_REV="1"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz
+	https://hackage.haskell.org/package/${P}/revision/${HACKAGE_REV}.cabal -> ${PF}.cabal"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+comonad +containers +kan-extensions +semigroupoids +semigroups +stm +tagged +transformers +unordered-containers"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+IUSE="+comonad +kan-extensions +semigroupoids +semigroups +stm +tagged +transformers +unordered-containers"
 
 RDEPEND=">=dev-haskell/data-default-class-0.0.1:=[profile?] <dev-haskell/data-default-class-0.2:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
+	>=dev-lang/ghc-8.4.3:=
 	comonad? ( >=dev-haskell/comonad-5:=[profile?] <dev-haskell/comonad-6:=[profile?] )
 	kan-extensions? ( >=dev-haskell/kan-extensions-5:=[profile?] <dev-haskell/kan-extensions-6:=[profile?] )
 	semigroupoids? ( >=dev-haskell/semigroupoids-4:=[profile?] <dev-haskell/semigroupoids-6:=[profile?] )
@@ -26,17 +29,17 @@ RDEPEND=">=dev-haskell/data-default-class-0.0.1:=[profile?] <dev-haskell/data-de
 	stm? ( >=dev-haskell/stm-2.1.2.1:=[profile?] <dev-haskell/stm-2.6:=[profile?] )
 	tagged? ( >=dev-haskell/tagged-0.5:=[profile?] <dev-haskell/tagged-1:=[profile?] )
 	transformers? ( >=dev-haskell/transformers-compat-0.3:=[profile?] <dev-haskell/transformers-compat-1:=[profile?] )
-	unordered-containers? ( >=dev-haskell/hashable-1.1:=[profile?] <dev-haskell/hashable-1.4:=[profile?]
+	unordered-containers? ( >=dev-haskell/hashable-1.1:=[profile?] <dev-haskell/hashable-1.5:=[profile?]
 				>=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] )
 "
 DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
+	>=dev-haskell/cabal-2.2.0.1
 "
 
 src_configure() {
 	haskell-cabal_src_configure \
 		$(cabal_flag comonad comonad) \
-		$(cabal_flag containers containers) \
+		--flag=containers \
 		$(cabal_flag kan-extensions kan-extensions) \
 		$(cabal_flag semigroupoids semigroupoids) \
 		$(cabal_flag semigroups semigroups) \
@@ -45,3 +48,15 @@ src_configure() {
 		$(cabal_flag transformers transformers) \
 		$(cabal_flag unordered-containers unordered-containers)
 }
+BDEPEND="app-text/dos2unix"
+
+src_prepare() {
+	# pull revised cabal from upstream
+	cp "${DISTDIR}/${PF}.cabal" "${S}/${PN}.cabal" || die
+
+	# Convert to unix line endings
+	dos2unix "${S}/${PN}.cabal" || die
+
+	# Apply patches *after* pulling the revised cabal
+	default
+}