7 files changed, 45 insertions, 122 deletions
diff --git a/dev-haskell/cmdargs/Manifest b/dev-haskell/cmdargs/Manifest
index b02eb38dfe21..20c948578523 100644
--- a/dev-haskell/cmdargs/Manifest
+++ b/dev-haskell/cmdargs/Manifest
@@ -1,4 +1,2 @@
-DIST cmdargs-0.10.13.tar.gz 64008 BLAKE2B 64108321d1acc028c8fe74deb8674005c25117599c8d960edc8d2717dd63ce0b71f73de26306e247cdcba2d83d03049e8e81cbe6e7c0597cd93dae8d03bf9997 SHA512 d4d0b93ca19b9ecdcea472b38b836c254a5e8a5ffe488c95d98f16395579483993fe0f7266d80771b85f1ed4683e34a6a3b493fe8e23595c1ba4db68a8daa0df
-DIST cmdargs-0.10.14.tar.gz 64056 BLAKE2B f31e52471a3f27e93fdcab68a8fb559e595f3799a8c166d882f343962af99dc453cb9d25923e0fc93c9433cd0f7974ddd72a6e3bb693401c8a9e34844d42573e SHA512 82a53fcecd42c9f1307e3e5bb1a8d490d53dda7243afe92fbda75d00dc6b638f6477591f4ebe98f1d576a623a8f5c111c8ff4d738466467f5579caa80ec6af15
 DIST cmdargs-0.10.20.tar.gz 64550 BLAKE2B 08511df092c2a7010af94bc8d9b54b29c0e76c33be06a9521eccc85092b57a45ae9f9d22b0f8e81266073c81185b66266d1f2321c327ae730c6ccebea7f6d6cf SHA512 b9e270aa5dabd84eaaa47b95a450ef5b5f43cd19646f2a407579f855857d396e5ab9ca0038e1e876849a596ecb8cdc9964c45970825a0a95021d69b23699da79
-DIST cmdargs-0.10.7.tar.gz 61526 BLAKE2B ba9e6d639218576f0c576c93c4932fb9f7a5e15273df388798e582e6b3e3751e8e1d8e03c814114ff614f49fea5c9680a1b7b46ab9d8e1fcd934db8760ed6967 SHA512 b9091e4f708db1e7c8bac367c4faad5c311a3194aefbf2776316b4ecc559314f01ceb0102df007819996b00200c5300e5b56e1035d45561e924bbfc3b38b656a
+DIST cmdargs-0.10.22.tar.gz 65154 BLAKE2B a6f05c4a186dc4dbb9de3c754f9100138d3954b1537b1ecb81e2fec2c6bd293dd381a2a666dae0bcbbc631e9ab95d8a65d85d68d3e2c80bb2d6ad87baf9906b1 SHA512 571d9584769fdb5bb77a57607c2f432b365604a2ca2e9b5c044c319499004f7fcb12f2f6e61091a245f1bf6a5d321d38ade1a54d5bc86831136fa85b9b898faa
diff --git a/dev-haskell/cmdargs/cmdargs-0.10.13.ebuild b/dev-haskell/cmdargs/cmdargs-0.10.13.ebuild
deleted file mode 100644
index 391c694ed9a5..000000000000
--- a/dev-haskell/cmdargs/cmdargs-0.10.13.ebuild
+++ /dev/null
@@ -1,31 +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.5.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Command line argument processing"
-HOMEPAGE="http://community.haskell.org/~ndm/cmdargs/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+quotation testprog"
-
-RDEPEND=">=dev-haskell/transformers-0.2:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag quotation quotation) \
-		$(cabal_flag testprog testprog)
-}
diff --git a/dev-haskell/cmdargs/cmdargs-0.10.14.ebuild b/dev-haskell/cmdargs/cmdargs-0.10.14.ebuild
deleted file mode 100644
index 59be217865c0..000000000000
--- a/dev-haskell/cmdargs/cmdargs-0.10.14.ebuild
+++ /dev/null
@@ -1,31 +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.6.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Command line argument processing"
-HOMEPAGE="https://github.com/ndmitchell/cmdargs#readme"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+quotation testprog"
-
-RDEPEND=">=dev-haskell/transformers-0.2:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag quotation quotation) \
-		$(cabal_flag testprog testprog)
-}
diff --git a/dev-haskell/cmdargs/cmdargs-0.10.20.ebuild b/dev-haskell/cmdargs/cmdargs-0.10.20.ebuild
index 15cd81e1e236..082cc75e06aa 100644
--- a/dev-haskell/cmdargs/cmdargs-0.10.20.ebuild
+++ b/dev-haskell/cmdargs/cmdargs-0.10.20.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 # ebuild generated by hackport 0.5.6
 
@@ -14,7 +14,7 @@ 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"
 IUSE="+quotation testprog"
 
 RDEPEND=">=dev-haskell/semigroups-0.18:=[profile?]
diff --git a/dev-haskell/cmdargs/cmdargs-0.10.22.ebuild b/dev-haskell/cmdargs/cmdargs-0.10.22.ebuild
new file mode 100644
index 000000000000..2ce0041ab470
--- /dev/null
+++ b/dev-haskell/cmdargs/cmdargs-0.10.22.ebuild
@@ -0,0 +1,36 @@
+# 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
+#hackport: flags: testprog:examples
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Command line argument processing"
+HOMEPAGE="https://github.com/ndmitchell/cmdargs#readme"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="examples +quotation"
+REQUIRED_USE="examples? ( quotation )"
+
+CABAL_CHDEPS=(
+	'executable cmdargs' 'executable cmdargs-demo'
+)
+
+RDEPEND="
+	>=dev-lang/ghc-8.8.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-3.0.0.0
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag quotation quotation) \
+		$(cabal_flag examples testprog)
+}
diff --git a/dev-haskell/cmdargs/cmdargs-0.10.7.ebuild b/dev-haskell/cmdargs/cmdargs-0.10.7.ebuild
deleted file mode 100644
index e6397b9d5d3f..000000000000
--- a/dev-haskell/cmdargs/cmdargs-0.10.7.ebuild
+++ /dev/null
@@ -1,31 +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.5.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Command line argument processing"
-HOMEPAGE="http://community.haskell.org/~ndm/cmdargs/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+quotation testprog"
-
-RDEPEND=">=dev-haskell/transformers-0.2:=[profile?]
-	>=dev-lang/ghc-6.10.4:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.6.0.3
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag quotation quotation) \
-		$(cabal_flag testprog testprog)
-}
diff --git a/dev-haskell/cmdargs/metadata.xml b/dev-haskell/cmdargs/metadata.xml
index d07cc4fd7c80..4a2ade06e3ba 100644
--- a/dev-haskell/cmdargs/metadata.xml
+++ b/dev-haskell/cmdargs/metadata.xml
@@ -1,35 +1,17 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<?xml version="1.0" encoding="UTF-8"?>
+<!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 library provides an easy way to define command line parsers. Most users
-		will want to use the "System.Console.CmdArgs.Implicit" module, whose
-		documentation contains an example.
-		
-		* "System.Console.CmdArgs.Explicit" provides a way to write command line
-		parsers for both single mode programs (most programs) and multiple
-		mode programs (e.g. darcs or cabal). Parsers are defined by constructing
-		a data structure.
-		
-		* "System.Console.CmdArgs.Implicit" provides a way to concisely define
-		command line parsers, up to three times shorter than getopt. These parsers
-		are translated into the Explicit data type.
-		
-		* "System.Console.CmdArgs.GetOpt" provides a wrapper allowing compatiblity
-		with existing getopt parsers, mapping to the Explicit data type.
-		
-		For a general reference on what command line flags are commonly used,
-		see &lt;http://www.faqs.org/docs/artu/ch10s05.html&gt;.
-	</longdescription>
 	<use>
+		<flag name="examples">Build the cmdargs-demo program</flag>
 		<flag name="testprog">Build the test program</flag>
-		<flag name="quotation">Build quote module</flag>
+		<flag name="quotation">Build the Quote module</flag>
 	</use>
 	<upstream>
+		<remote-id type="hackage">cmdargs</remote-id>
 		<remote-id type="github">ndmitchell/cmdargs</remote-id>
 	</upstream>
 </pkgmetadata>