dev-haskell/haddock-library: Clean up ebuild

Signed-off-by: hololeap <hololeap@protonmail.com>
Signed-off-by: Sam James <sam@gentoo.org>

3 files changed, 53 insertions, 63 deletions

diff --git a/dev-haskell/haddock-library/haddock-library-1.10.0-r2.ebuild b/dev-haskell/haddock-library/haddock-library-1.10.0-r2.ebuild
new file mode 100644
index 000000000000..ca8fdfae207d
--- /dev/null
+++ b/dev-haskell/haddock-library/haddock-library-1.10.0-r2.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.2.0.9999
+
+CABAL_HACKAGE_REVISION=3
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Library exposing some functionality of Haddock"
+HOMEPAGE="https://www.haskell.org/haddock/"
+
+LICENSE="BSD-2"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux"
+
+CABAL_CHDEPS=(
+	'hspec                          >= 2.4.4    && < 2.8' 'hspec >=2.4.4'
+	'hspec-discover:hspec-discover  >= 2.4.4    && < 2.8' 'hspec-discover:hspec-discover >=2.4.4'
+	'optparse-applicative  ^>= 0.15' 'optparse-applicative >=0.15'
+	'tree-diff             ^>= 0.1' 'tree-diff >=0.1'
+	'base-compat  ^>= 0.9.3 || ^>= 0.11.0' 'base-compat >=0.11.0'
+	'base-compat           ^>= 0.9.3 || ^>= 0.11.0' 'base-compat >=0.11.0'
+)
+
+RDEPEND="
+	>=dev-haskell/parsec-3.1.13.0:=[profile?] <dev-haskell/parsec-3.2:=[profile?]
+	>=dev-haskell/text-1.2.3.0:=[profile?] <dev-haskell/text-2.1:=[profile?]
+	>=dev-lang/ghc-8.8.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-3.0.0.0
+	test? (
+		>=dev-haskell/base-compat-0.11.0
+		>=dev-haskell/hspec-2.4.4
+		>=dev-haskell/optparse-applicative-0.15
+		>=dev-haskell/tree-diff-0.1
+		|| (
+			( >=dev-haskell/quickcheck-2.11 <dev-haskell/quickcheck-2.12 )
+			( >=dev-haskell/quickcheck-2.13.2 <dev-haskell/quickcheck-2.15 )
+		)
+	)
+"
+BDEPEND="test? (
+	>=dev-haskell/hspec-discover-2.4.4
+)"
diff --git a/dev-haskell/haddock-library/haddock-library-1.10.0.ebuild b/dev-haskell/haddock-library/haddock-library-1.10.0.ebuild
deleted file mode 100644
index 8c99c641c993..000000000000
--- a/dev-haskell/haddock-library/haddock-library-1.10.0.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# ebuild generated by hackport 0.7.1.1.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-CABAL_HACKAGE_REVISION="3"
-inherit haskell-cabal
-
-CABAL_FILE="${S}/${PN}.cabal"
-CABAL_DISTFILE="${P}-rev${CABAL_HACKAGE_REVISION}.cabal"
-
-DESCRIPTION="Library exposing some functionality of Haddock"
-HOMEPAGE="https://www.haskell.org/haddock/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz
-	https://hackage.haskell.org/package/${P}/revision/${CABAL_HACKAGE_REVISION}.cabal
-		-> ${CABAL_DISTFILE}"
-
-LICENSE="BSD-2"
-SLOT="0/${PV}"
-KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND=">=dev-lang/ghc-8.4.3:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-2.2.0.1
-	test? ( >=dev-haskell/hspec-2.4.4
-		>=dev-haskell/hspec-discover-2.4.4
-		>=dev-haskell/optparse-applicative-0.15
-		>=dev-haskell/tree-diff-0.1
-		>=dev-haskell/base-compat-0.11.0
-		>=dev-haskell/quickcheck-2.13.2 <dev-haskell/quickcheck-2.15 )
-"
-BDEPEND="app-text/dos2unix"
-
-src_prepare() {
-	# pull revised cabal from upstream
-	cp "${DISTDIR}/${CABAL_DISTFILE}" "${CABAL_FILE}" || die
-
-	# Convert to unix line endings
-	dos2unix "${CABAL_FILE}" || die
-
-	# Apply patches *after* pulling the revised cabal
-	default
-
-	cabal_chdeps \
-		'hspec                          >= 2.4.4    && < 2.8' 'hspec >=2.4.4' \
-		'hspec-discover:hspec-discover  >= 2.4.4    && < 2.8' 'hspec-discover:hspec-discover >=2.4.4' \
-		'optparse-applicative  ^>= 0.15' 'optparse-applicative >=0.15' \
-		'tree-diff             ^>= 0.1' 'tree-diff >=0.1' \
-		'base-compat  ^>= 0.9.3 || ^>= 0.11.0' 'base-compat >=0.11.0' \
-		'base-compat           ^>= 0.9.3 || ^>= 0.11.0' 'base-compat >=0.11.0'
-}
diff --git a/dev-haskell/haddock-library/metadata.xml b/dev-haskell/haddock-library/metadata.xml
index b4a6fd6bd93c..9272627d4f5e 100644
--- a/dev-haskell/haddock-library/metadata.xml
+++ b/dev-haskell/haddock-library/metadata.xml
@@ -5,12 +5,8 @@
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		Haddock is a documentation-generation tool for Haskell
-		libraries. These modules expose some functionality of it
-		without pulling in the GHC dependency and it is not the same
-		as Haddock itself. Please note that the
-		API is likely to change so specify upper bounds in your
-		project if you can't release often.
-	</longdescription>
+	<upstream>
+		<remote-id type="hackage">haddock-library</remote-id>
+		<remote-id type="github">haskell/haddock</remote-id>
+	</upstream>
 </pkgmetadata>