8 files changed, 44 insertions, 169 deletions
diff --git a/dev-haskell/transformers-compat/Manifest b/dev-haskell/transformers-compat/Manifest
index 6d23ac621250..60185e23f03c 100644
--- a/dev-haskell/transformers-compat/Manifest
+++ b/dev-haskell/transformers-compat/Manifest
@@ -1,5 +1,2 @@
-DIST transformers-compat-0.1.1.1.tar.gz 5221 BLAKE2B b8c050fb67bfe43529619bc14b6e035fb44626e276c36ba89d56a95fc4af91f887dd2612e21f668e9d36e4c8e231caa7144fb2555a7be2a35f79f554d61fc3fc SHA512 326873df4a316948d64ddbee351f0bf2855b5f2bac1913eed3ca490305363771fc031ff6cad1e6de5849ab375ace9364ffb18e56cb8a57f0406508377f521a54
-DIST transformers-compat-0.3.3.4.tar.gz 11143 BLAKE2B 3fd082d92945620acbe1cf043c73b9d22322581df782473a40b507260bd8c5eaaa6b475f9659863a2b922d4edff388d336946ff423cc9a99e934ec0a5a03d2ad SHA512 1f50ddeaec4ea2e17ec348194a6efcfab35c4b9d49f9eba9e70a0c1ebfdfd39387461c133fb99e6cdad234b7facae74fa73c99f604807d7f3ad7c31d0188d462
-DIST transformers-compat-0.4.0.4.tar.gz 12048 BLAKE2B a72513e0a5b482067ee912e467c29166bdebef75bf70cee9661b6f8e3a649cbdca57cd159483f4187e520425b46a8dd600e7f5b409705f67e851d9d11ec91c24 SHA512 5850fa8ed63684b3dc37897c22d1d32d7412374dcd892e42db7ed975d493fdc8e216630735813ed00203f83dcd17722484a6ec182ccffb6fc8794b4b82b6c951
-DIST transformers-compat-0.5.1.4.tar.gz 18574 BLAKE2B e08bbb9b6104a9e46b17478b156d4e5b9198ab9e93ecc1e0faec4402a8b403b19ee517bb81a1f4c0d8633ff6a74ec59470d6a27a3c3df947ee25ce11312a84a0 SHA512 7e4ff75cdae7afbf640b3ddbfc0a260be8bb3b06cdb1be803bfd7cdb333d289919164923ab4fcde4b270883548cce115643f908410ed394aec67efa389d5aeb2
-DIST transformers-compat-0.6.5.tar.gz 40421 BLAKE2B c3d4b55bef310f717cdf2069a4d8b58cc38ea037bbd982f21c11ddbfd3175689f681fed615f30f7026e826e90a0ee6bee51e7448ad2468a084ed00ad6311a643 SHA512 86ce6e81baf4e71cc4ac854066543a8777628ae67182e8059e582754608b279a053f7f98a539ec5cc07e1771d8173a6de6ebe5df4eee2b4c41278734774c3958
+DIST transformers-compat-0.6.6.tar.gz 41347 BLAKE2B e0d49ac7fdb035e6255f8124cf7a2e734bc9d36bcadded33e79e237603a5f9d1e4609fd50b673fc1f3353e20816a7c94a784bb0aa0feb3243c70151f8023d5b7 SHA512 1f34e40e17e7c19c889e58101f5ed6a019b5bb08be4c798a1f233158b27b6a2cd05b9260d2cf7065cd2bdfb4df4cbbda463abee69c4ba00b6f445392659e920d
+DIST transformers-compat-0.7.2.tar.gz 46485 BLAKE2B a0a26a91219e098f04fff32f2dfb5e860c4e62fc6d5111c9baaf7203ee19a19809a1b812721fcd110edf680be7665112a8e5e11e798f40e1912418f6a52c0b29 SHA512 9bcc4b5aebbc6ec0b05ac8499ec79102e766ae8c2c919343f7d20ebb451fedb3a00647dc0baff5e998dd0b67f1ffbe725a14e0abf299a6b2656c219f8330856e
diff --git a/dev-haskell/transformers-compat/metadata.xml b/dev-haskell/transformers-compat/metadata.xml
index 207a9e0eb759..c0d56bdf262d 100644
--- a/dev-haskell/transformers-compat/metadata.xml
+++ b/dev-haskell/transformers-compat/metadata.xml
@@ -1,26 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		This package includes backported versions of types that were added
-		to transformers in transformers 0.3 for users who need strict
-		transformers 0.2 compatibility to run on old versions of the
-		platform, but also need those types.
-		
-		Those users should be able to just depend on @transformers &gt;= 0.2@
-		and @transformers-compat@.
-		
-		Note: missing methods are not supplied
-		but this at least permits the types to be used.
-	</longdescription>
-	<use>
-		<flag name="three">Use transformers-0.3</flag>
-	</use>
 	<upstream>
+		<remote-id type="hackage">transformers-compat</remote-id>
 		<remote-id type="github">ekmett/transformers-compat</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/transformers-compat/transformers-compat-0.1.1.1.ebuild b/dev-haskell/transformers-compat/transformers-compat-0.1.1.1.ebuild
deleted file mode 100644
index 7218f3aa679a..000000000000
--- a/dev-haskell/transformers-compat/transformers-compat-0.1.1.1.ebuild
+++ /dev/null
@@ -1,24 +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="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="A small compatibility shim for dev-haskell/transformers"
-HOMEPAGE="https://github.com/ekmett/transformers-compat/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.0.1:=
-		=dev-haskell/transformers-0.3*:=[profile?]
-		"
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.8"
diff --git a/dev-haskell/transformers-compat/transformers-compat-0.3.3.4.ebuild b/dev-haskell/transformers-compat/transformers-compat-0.3.3.4.ebuild
deleted file mode 100644
index ee56569038bf..000000000000
--- a/dev-haskell/transformers-compat/transformers-compat-0.3.3.4.ebuild
+++ /dev/null
@@ -1,33 +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
-#hackport: flags: -two
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="A small compatibility shim for dev-haskell/transformers"
-HOMEPAGE="https://github.com/ekmett/transformers-compat/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="three"
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-	three? ( >=dev-haskell/transformers-0.3:=[profile?] <dev-haskell/transformers-0.4:=[profile?] )
-	!three? ( >=dev-haskell/transformers-0.4.1:=[profile?] <dev-haskell/transformers-0.5:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag three three) \
-		--flag=-two
-}
diff --git a/dev-haskell/transformers-compat/transformers-compat-0.4.0.4.ebuild b/dev-haskell/transformers-compat/transformers-compat-0.4.0.4.ebuild
deleted file mode 100644
index d2befc431ccb..000000000000
--- a/dev-haskell/transformers-compat/transformers-compat-0.4.0.4.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.4.9999
-#hackport: flags: -two,+mtl
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="A small compatibility shim for dev-haskell/transformers"
-HOMEPAGE="https://github.com/ekmett/transformers-compat/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-	>=dev-haskell/mtl-2.1:=[profile?]
-	>=dev-haskell/transformers-0.3:=[profile?] <dev-haskell/transformers-0.5:=[profile?]
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-"
-
-src_configure() {
-	local tf_arg=()
-
-	has_version '=dev-haskell/transformers-0.3*' && \
-		tf_arg+=(--flag=three)
-
-	has_version '=dev-haskell/transformers-0.4*' && \
-		tf_arg+=(--flag=-three)
-
-	haskell-cabal_src_configure \
-		--flag=mtl \
-		--flag=-two \
-		${tf_arg[@]}
-}
diff --git a/dev-haskell/transformers-compat/transformers-compat-0.5.1.4.ebuild b/dev-haskell/transformers-compat/transformers-compat-0.5.1.4.ebuild
deleted file mode 100644
index 94ceada31a79..000000000000
--- a/dev-haskell/transformers-compat/transformers-compat-0.5.1.4.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.4.7.9999
-#hackport: flags: -two,+mtl
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="A small compatibility shim for dev-haskell/transformers"
-HOMEPAGE="https://github.com/ekmett/transformers-compat/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-	>=dev-haskell/mtl-2.1:=[profile?]
-	>=dev-haskell/transformers-0.3:=[profile?]
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-"
-
-src_configure() {
-	local tf_arg=()
-
-	if has_version '=dev-haskell/transformers-0.3*'; then
-		tf_arg+=(--flag=three)
-	else
-		tf_arg+=(--flag=-three)
-	fi
-
-	haskell-cabal_src_configure \
-		--flag=mtl \
-		--flag=-two \
-		${tf_arg[@]}
-}
diff --git a/dev-haskell/transformers-compat/transformers-compat-0.6.5.ebuild b/dev-haskell/transformers-compat/transformers-compat-0.6.6.ebuild
index 5ac53b6cbadc..00d7d6e66cbe 100644
--- a/dev-haskell/transformers-compat/transformers-compat-0.6.5.ebuild
+++ b/dev-haskell/transformers-compat/transformers-compat-0.6.6.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-# ebuild generated by hackport 0.6.1.9999
-#hackport: flags: -two,+mtl,-generic-deriving"
+# ebuild generated by hackport 0.6.6.9999
+#hackport: flags: -two,+mtl,-generic-deriving
 
 CABAL_FEATURES="lib profile haddock hoogle hscolour"
 # break circular dependencies:
@@ -12,13 +12,13 @@ CABAL_FEATURES="lib profile haddock hoogle hscolour"
 CABAL_FEATURES+=" nocabaldep"
 inherit haskell-cabal
 
-DESCRIPTION="A small compatibility shim for dev-haskell/transformers"
+DESCRIPTION="A small compatibility shim for the transformers library"
 HOMEPAGE="https://github.com/ekmett/transformers-compat/"
 SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND=">=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-4.10:=[profile?]
@@ -26,7 +26,8 @@ RDEPEND=">=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-4.10:=[profile?]
 	>=dev-haskell/transformers-0.3:=[profile?]
 	>=dev-lang/ghc-7.8.2:=
 "
-DEPEND="${RDEPEND}"
+DEPEND="${RDEPEND}
+"
 
 src_configure() {
 	local tf3_arg=()
@@ -58,6 +59,7 @@ src_configure() {
 	fi
 
 	haskell-cabal_src_configure \
+		--flag=-generic-deriving \
 		--flag=mtl \
 		--flag=-two \
 		${tf3_arg[@]} \
diff --git a/dev-haskell/transformers-compat/transformers-compat-0.7.2.ebuild b/dev-haskell/transformers-compat/transformers-compat-0.7.2.ebuild
new file mode 100644
index 000000000000..36e1b3237168
--- /dev/null
+++ b/dev-haskell/transformers-compat/transformers-compat-0.7.2.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.3.0
+#hackport: flags: -two,+mtl,-generic-deriving
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="A small compatibility shim for the transformers library"
+HOMEPAGE="https://github.com/ekmett/transformers-compat/"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux"
+
+RDEPEND="
+	>=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.2.0.1
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		--flag=-generic-deriving \
+		--flag=mtl \
+		--flag=-two
+}