6 files changed, 25 insertions, 100 deletions
diff --git a/dev-haskell/nanospec/Manifest b/dev-haskell/nanospec/Manifest
index d3d3ea0f6b04..70d337550864 100644
--- a/dev-haskell/nanospec/Manifest
+++ b/dev-haskell/nanospec/Manifest
@@ -1,4 +1 @@
-DIST nanospec-0.1.0.tar.gz 3408 BLAKE2B 1aee0ad0d544439ff7baf1b58bee79f3348d13f4bb21042fa2818a79a4d719f7c66b6ade0902d18967f6822d2165a8da815b5bfc10dd946139afe3213aac47c5 SHA512 6e38bcee0d9a5f2e6b42566bb3e4aec57a61115dd649cb441721cb79193caac5aaf59aeef54a30dccb7e939e6512632221ec9e03b86142e5cb7671ef3433d4e9
-DIST nanospec-0.2.0.tar.gz 3451 BLAKE2B 428d01a9fccd73aef9e7cc268c96127e39b81cba30778a4979b5a9eebbf9d4e3e49f29e3b9fd42331cc2dd3f1e6b7eef0fa4def617335ca679dd25fdfd8156df SHA512 318458a205bc0bb48d83f9291cb8f047d6ca20b03174ae6a4a00d9f1b921a058641f80870e12f8eda3f238bd1b98dca96cb324161ea14cf2f0f3da1314edade4
-DIST nanospec-0.2.1.tar.gz 3478 BLAKE2B 1bee45c06ca7fce951c5652708843c3a91eb579e59a82e50403d8549f421eb48519c9e263596c381df6247983e5f9fb4dc07d1fd90299cb56644bfb24ccf78cd SHA512 ee5b5080fefc5a213b59c8d146054f59b73dbfc8ed909ea308ec2646cd3e071a7de6115563a13fb683434725e3756fa71acbfcec77e85e3dfaa9400c7e249769
 DIST nanospec-0.2.2.tar.gz 3698 BLAKE2B 38351f999a2e71b598734b75aff06486f44166ed8df80956d2486d99687cda6f4b4b0f12f44db17f6b0c43ddfdf5bd13b788967e18caccafddfe27f27af27f86 SHA512 6161b5cc1797a3fdcd07cad14deaa3edd6faa87309b5e8a31834d7c1dda23737fe4f2e763b13da7f5ef6f6ee3a9414f88b9ae01e5403320ba23d76404324a3b0
diff --git a/dev-haskell/nanospec/metadata.xml b/dev-haskell/nanospec/metadata.xml
index f22e2abd4a74..8f1b8ce8ed3a 100644
--- a/dev-haskell/nanospec/metadata.xml
+++ b/dev-haskell/nanospec/metadata.xml
@@ -1,12 +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>
-		A lightweight implementation of a subset of Hspec's API with
-		minimal dependencies.
-	</longdescription>
+	<upstream>
+		<remote-id type="hackage">nanospec</remote-id>
+		<remote-id type="github">hspec/nanospec</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/nanospec/nanospec-0.1.0.ebuild b/dev-haskell/nanospec/nanospec-0.1.0.ebuild
deleted file mode 100644
index 5801b527e191..000000000000
--- a/dev-haskell/nanospec/nanospec-0.1.0.ebuild
+++ /dev/null
@@ -1,25 +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.2.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="A lightweight implementation of a subset of Hspec's API"
-HOMEPAGE="https://hackage.haskell.org/package/nanospec"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-6.10.4:="
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.8
-		test? ( >=dev-haskell/hspec-1.3
-			dev-haskell/silently
-		)"
diff --git a/dev-haskell/nanospec/nanospec-0.2.0.ebuild b/dev-haskell/nanospec/nanospec-0.2.0.ebuild
deleted file mode 100644
index f97a4227bfcf..000000000000
--- a/dev-haskell/nanospec/nanospec-0.2.0.ebuild
+++ /dev/null
@@ -1,28 +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.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="A lightweight implementation of a subset of Hspec's API"
-HOMEPAGE="https://hackage.haskell.org/package/nanospec"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RESTRICT=test # circular depend: nanospec[test]->silently[test]->nanospec
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/hspec-1.3
-		>=dev-haskell/silently-1.2.4 )
-"
diff --git a/dev-haskell/nanospec/nanospec-0.2.1.ebuild b/dev-haskell/nanospec/nanospec-0.2.1.ebuild
deleted file mode 100644
index ec10eeb6f834..000000000000
--- a/dev-haskell/nanospec/nanospec-0.2.1.ebuild
+++ /dev/null
@@ -1,28 +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 test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="A lightweight implementation of a subset of Hspec's API"
-HOMEPAGE="https://hackage.haskell.org/package/nanospec"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RESTRICT=test # cyclic depend
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/hspec-1.3
-		>=dev-haskell/silently-1.2.4 )
-"
diff --git a/dev-haskell/nanospec/nanospec-0.2.2.ebuild b/dev-haskell/nanospec/nanospec-0.2.2.ebuild
index da4c12d5cc29..c14d160d5dfb 100644
--- a/dev-haskell/nanospec/nanospec-0.2.2.ebuild
+++ b/dev-haskell/nanospec/nanospec-0.2.2.ebuild
@@ -1,26 +1,35 @@
-# 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.5.9999
+# ebuild generated by hackport 0.8.0.0.9999
 
-CABAL_FEATURES="lib profile haddock hoogle hscolour" # drop test-suite: cyclic depend
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
 inherit haskell-cabal
 
 DESCRIPTION="A lightweight implementation of a subset of Hspec's API"
 HOMEPAGE="https://github.com/hspec/nanospec#readme"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
 
-RESTRICT=test # cyclic depend: silently[test]->nanospec
-
-RDEPEND=">=dev-lang/ghc-7.4.1:=
+RDEPEND="
+	>=dev-lang/ghc-8.4.3:=
 "
 DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.10
+	>=dev-haskell/cabal-2.2.0.1
+	test? (
+		>=dev-haskell/hspec-1.3
+		>=dev-haskell/silently-1.2.4
+	)
 "
+
+pkg_pretend() {
+	if use test; then
+		ewarn "The \"test\" USE flag for this package creates cycles within the"
+		ewarn "dependency graph. This may give you problems during 'haskell-updater' runs."
+		ewarn "It is recommended to leave it disabled unless explicitly testing the package."
+	fi
+}