8 files changed, 46 insertions, 142 deletions
diff --git a/dev-haskell/pandoc-types/Manifest b/dev-haskell/pandoc-types/Manifest
index eed78ef3a0e9..6dcbaa2575ee 100644
--- a/dev-haskell/pandoc-types/Manifest
+++ b/dev-haskell/pandoc-types/Manifest
@@ -1,5 +1,2 @@
-DIST pandoc-types-1.12.3.tar.gz 18633 BLAKE2B 53776ac60c3e658ae6bf348d065d449045b5b0474b16550270c7087c766f1726fed80135ae92cab087a76dee8994a6ff3f68cc7085145f1e065a7cddf3b2759f SHA512 8da2d37baa962c4a414a60ac274736897499b3ba26bd54e2e6dd10616f204c3e143e4e66c97fa209781d73bde35fab7a466a8eaa06edaa13eaa178aa77c285af
-DIST pandoc-types-1.12.4.5.tar.gz 13341 BLAKE2B e0c9d079a8b5ee1eef07d8da87f621a1b005a984ae9b52b81241530bc5e7ef632fd9efe52aa7ab6f55978b28a15ef049769bdaeb5a94cc3b09b5cba8f34f757d SHA512 7f4c1156b074e61cd6fb5f37f5555700f5c21a24eb4226770fb8c83be3dc6075fef0b7b183c06561cc42c194fea0ac7356572e05097165e87e162b161f9c8993
-DIST pandoc-types-1.12.4.7.tar.gz 13208 BLAKE2B 6d823bc596cb779e67d6ba3af0323de2747ff0280e82fb4c319a8ebb5dbe5211015708c5241146a6a8210f9f1907c1d92aa5aac90397d3de3c249d5cf32968fd SHA512 cabb59d4f6bfec3c00d4cac4f2bda60e11ce96394b61d79650544b3249b5ef81758da0d8d08cb3de68ed252845ae1b6f2c4d663e80b4cdc076916c278ac4fc4b
-DIST pandoc-types-1.17.0.4.tar.gz 21540 BLAKE2B ba11e3a9c8fc98597cfaf0812ca35d6346f2c43aa7f67adf3f098b2410d12aed6b60b28003eec16e4cd82c6a355ec03b78d590bfa672d579ca8adc5ad1c63fb5 SHA512 3b3aaa2d6b62be8b3876ead411a0d48277666ab3dd718e5aad5ecca01cb9d66a4d7973bdc250e4fd2d061917d0836f63e6412534fa854c2c886dc798e34c60fc
-DIST pandoc-types-1.20.tar.gz 29505 BLAKE2B f455cc8462b20e86403cba1de836545100402db34b23f8be0d8907fa9d5596fe515f522c513f0cef3c67e7f8d3bb5bd3409f7bf5f1216f9b9f234c44552650fd SHA512 36c658093237246a344dc65bf9e214b250ea1a0aecf9931d80299f44ee152553c4326948bfae8e0f3e5aaabe93bc7a9aca0c79383e48b0f9d2696383df2b40ee
+DIST pandoc-types-1.22.2.tar.gz 35887 BLAKE2B 7a884551a1c1ed94308a1b2529806aee42b9e04a7de94d6a0ded0ad106a6653b9c290b8781ff4197ff86bd132645ef96b5984987206b67173e057258a9fd4c43 SHA512 c4e78de0d6f2df67a716f7e549d629b9ead7f2569674cd84cd73a430c7ee97d1ebe30e0a95e84b5f45dab2a5cee6c6d5cc30f6c47f11859c938c75f63406878b
+DIST pandoc-types-1.23.1.tar.gz 36480 BLAKE2B 7c25cc294d0180c4c8a694b0471e76049ff9236a0c9dcf1fac37e6dbe47f7166948c8468b9232c6900a2fc231fd3210edd32b7c504e58b5ed749ce66cfbc3454 SHA512 c09dd9966da80e7121d2033d175832fef190f17044f3fa340c554b4f3ec1a288ffe3b0bb1c1fb0bbd477de0633adfdf111cda39d2e09d8e6d5019f6c28be3fb4
diff --git a/dev-haskell/pandoc-types/metadata.xml b/dev-haskell/pandoc-types/metadata.xml
index 39e4e9303f27..05ac3948269e 100644
--- a/dev-haskell/pandoc-types/metadata.xml
+++ b/dev-haskell/pandoc-types/metadata.xml
@@ -1,18 +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 contains definitions for the <pkg>app-text/pandoc</pkg> data
-		structure, which is used by pandoc to represent
-		structured documents.  These definitions used to live
-		in the pandoc package, but starting with pandoc 1.7, they
-		have been split off, so that other packages can use them
-		without drawing in all of pandoc's dependencies, and
-		pandoc itself can depend on packages (like <pkg>dev-haskell/citeproc-hs</pkg>)
-		that use them.
-	</longdescription>
+	<upstream>
+		<remote-id type="hackage">pandoc-types</remote-id>
+		<remote-id type="github">jgm/pandoc-types</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/pandoc-types/pandoc-types-1.12.3.ebuild b/dev-haskell/pandoc-types/pandoc-types-1.12.3.ebuild
deleted file mode 100644
index a042d0f51bb6..000000000000
--- a/dev-haskell/pandoc-types/pandoc-types-1.12.3.ebuild
+++ /dev/null
@@ -1,26 +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.3.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Types for representing a structured document"
-HOMEPAGE="https://johnmacfarlane.net/pandoc"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/aeson-0.6.2:=[profile?] <dev-haskell/aeson-0.7:=[profile?]
-	>=dev-haskell/syb-0.1:=[profile?] <dev-haskell/syb-0.5:=[profile?]
-	>=dev-lang/ghc-6.12.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8.0.2
-"
diff --git a/dev-haskell/pandoc-types/pandoc-types-1.12.4.5.ebuild b/dev-haskell/pandoc-types/pandoc-types-1.12.4.5.ebuild
deleted file mode 100644
index 0bd0a14f78e8..000000000000
--- a/dev-haskell/pandoc-types/pandoc-types-1.12.4.5.ebuild
+++ /dev/null
@@ -1,27 +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.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Types for representing a structured document"
-HOMEPAGE="https://johnmacfarlane.net/pandoc"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/aeson-0.6.2:=[profile?] <dev-haskell/aeson-0.10:=[profile?]
-	>=dev-haskell/deepseq-generics-0.1:=[profile?] <dev-haskell/deepseq-generics-0.2:=[profile?]
-	>=dev-haskell/syb-0.1:=[profile?] <dev-haskell/syb-0.6:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
diff --git a/dev-haskell/pandoc-types/pandoc-types-1.12.4.7.ebuild b/dev-haskell/pandoc-types/pandoc-types-1.12.4.7.ebuild
deleted file mode 100644
index a13b3e07c2ef..000000000000
--- a/dev-haskell/pandoc-types/pandoc-types-1.12.4.7.ebuild
+++ /dev/null
@@ -1,27 +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.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Types for representing a structured document"
-HOMEPAGE="https://johnmacfarlane.net/pandoc"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/aeson-0.6.2:=[profile?] <dev-haskell/aeson-0.11:=[profile?]
-	>=dev-haskell/deepseq-generics-0.1:=[profile?] <dev-haskell/deepseq-generics-0.2:=[profile?]
-	>=dev-haskell/syb-0.1:=[profile?] <dev-haskell/syb-0.7:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
diff --git a/dev-haskell/pandoc-types/pandoc-types-1.17.0.4.ebuild b/dev-haskell/pandoc-types/pandoc-types-1.17.0.4.ebuild
deleted file mode 100644
index c6839b395ca1..000000000000
--- a/dev-haskell/pandoc-types/pandoc-types-1.17.0.4.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.1
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Types for representing a structured document"
-HOMEPAGE="https://johnmacfarlane.net/pandoc"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/aeson-0.6.2:=[profile?] <dev-haskell/aeson-1.1:=[profile?]
-	>=dev-haskell/deepseq-generics-0.1:=[profile?]
-	>=dev-haskell/quickcheck-2:2=[profile?]
-	>=dev-haskell/syb-0.1:=[profile?] <dev-haskell/syb-0.7:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/hunit-1.2 <dev-haskell/hunit-1.6
-		>=dev-haskell/quickcheck-2.4 <dev-haskell/quickcheck-2.10
-		~dev-haskell/string-qq-0.0.2
-		>=dev-haskell/test-framework-0.3 <dev-haskell/test-framework-0.9
-		>=dev-haskell/test-framework-hunit-0.2 <dev-haskell/test-framework-hunit-0.4
-		>=dev-haskell/test-framework-quickcheck2-0.2.9 <dev-haskell/test-framework-quickcheck2-0.4 )
-"
diff --git a/dev-haskell/pandoc-types/pandoc-types-1.20.ebuild b/dev-haskell/pandoc-types/pandoc-types-1.22.2.ebuild
index 0afc02176b72..0966156abcb5 100644
--- a/dev-haskell/pandoc-types/pandoc-types-1.20.ebuild
+++ b/dev-haskell/pandoc-types/pandoc-types-1.22.2.ebuild
@@ -1,9 +1,9 @@
-# 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.9999
+# ebuild generated by hackport 0.7.1.1.9999
 
 CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
 inherit haskell-cabal
@@ -14,20 +14,17 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
 
-RDEPEND=">=dev-haskell/aeson-0.6.2:=[profile?] <dev-haskell/aeson-1.5:=[profile?]
-	>=dev-haskell/quickcheck-2.4:2=[profile?] <dev-haskell/quickcheck-2.14:2=[profile?]
-	>=dev-haskell/semigroups-0.18:=[profile?] <dev-haskell/semigroups-0.19:=[profile?]
+RDEPEND=">=dev-haskell/aeson-0.6.2:=[profile?] <dev-haskell/aeson-2.1:=[profile?]
+	>=dev-haskell/quickcheck-2.10:=[profile?] <dev-haskell/quickcheck-2.15:=[profile?]
 	>=dev-haskell/syb-0.1:=[profile?] <dev-haskell/syb-0.8:=[profile?]
-	dev-haskell/text:=[profile?]
-	>=dev-lang/ghc-7.10.1:=
+	>=dev-lang/ghc-8.4.3:=
 "
 DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.22.2.0
+	>=dev-haskell/cabal-2.2.0.1
 	test? ( >=dev-haskell/hunit-1.2 <dev-haskell/hunit-1.7
-		>=dev-haskell/string-qq-0.0.2
+		>=dev-haskell/string-qq-0.0.2 <dev-haskell/string-qq-0.1
 		>=dev-haskell/test-framework-0.3 <dev-haskell/test-framework-0.9
 		>=dev-haskell/test-framework-hunit-0.2 <dev-haskell/test-framework-hunit-0.4
 		>=dev-haskell/test-framework-quickcheck2-0.2.9 <dev-haskell/test-framework-quickcheck2-0.4 )
diff --git a/dev-haskell/pandoc-types/pandoc-types-1.23.1.ebuild b/dev-haskell/pandoc-types/pandoc-types-1.23.1.ebuild
new file mode 100644
index 000000000000..e02997758c0e
--- /dev/null
+++ b/dev-haskell/pandoc-types/pandoc-types-1.23.1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.4.0.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Types for representing a structured document"
+HOMEPAGE="https://pandoc.org/"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-haskell/aeson-0.6.2:=[profile?] <dev-haskell/aeson-2.3:=[profile?]
+	>=dev-haskell/quickcheck-2.10:=[profile?] <dev-haskell/quickcheck-2.15:=[profile?]
+	>=dev-haskell/syb-0.1:=[profile?] <dev-haskell/syb-0.8:=[profile?]
+	dev-haskell/text:=[profile?]
+	>=dev-lang/ghc-8.8.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-3.0.0.0
+	test? ( >=dev-haskell/hunit-1.2 <dev-haskell/hunit-1.7
+		>=dev-haskell/test-framework-0.3 <dev-haskell/test-framework-0.9
+		>=dev-haskell/test-framework-hunit-0.2 <dev-haskell/test-framework-hunit-0.4
+		>=dev-haskell/test-framework-quickcheck2-0.2.9 <dev-haskell/test-framework-quickcheck2-0.4 )
+"