gentoo auto-resync : 23:10:2023 - 08:35:49

4 files changed, 55 insertions, 65 deletions

diff --git a/dev-haskell/haddock-library/Manifest b/dev-haskell/haddock-library/Manifest
index 30c6a2291a9f..09c03e59325d 100644
--- a/dev-haskell/haddock-library/Manifest
+++ b/dev-haskell/haddock-library/Manifest
@@ -1,4 +1,4 @@
 DIST haddock-library-1.10.0-rev3.cabal 4178 BLAKE2B 72b7e3424ed6e7974c9549f77d924bbccf6caba55bc91ef2ce13fa0c48a1eee4dd4f3a74286b64cb3b77f60427736fc4674de10b2390bfb28145cba18ec67e2d SHA512 7b9d61d23725920f4a303be38800a5679e317b8633307b028bd8168ddce5a0cc0e42d149b3b595f5e2b6afd062e87a8df877c73cea9182d21fd0292696d1e860
 DIST haddock-library-1.10.0.tar.gz 32427 BLAKE2B 7c1b26edca2a40a43622c376cd8c064c6dd333d85db37e38a26b91ff1d61004f96e1ed330c54987b5891157f560f46a56e88a730a82b2561f430014fc7aed4f0 SHA512 dac536a2b8e2764de1a1b1a16fc328e15455656c2992fb3b3bccdeae2bb6ac81fe94e164aa2a70cff7cea3b97347b8510aadb5fa1c0564bb2429947f0aace0d1
-EBUILD haddock-library-1.10.0.ebuild 1779 BLAKE2B 54b8c1cccff545bb6b04a57b6c157449f31c1a824b3d2437928a90a81934e31594397ad3a9778e02c0fac1c4df92658ab6c62a364e395c76bf5deb1403d98a3c SHA512 7f157b2b7f606c6af2368f767f5b6c8010467f924b10635b32bfebb81d015df379a1468933c8e416a809b1fa1ef3db9126875b4d1c26390715da5f0118131d66
-MISC metadata.xml 606 BLAKE2B ff62a779b7be6ec4864021c5dc2ed6f2bf3bf506b14495206a077ce7164e11354e276254aea52c642f054c9cfa958cec11e647e32667701e8273dc49e5b7b681 SHA512 e24a9352e19d07f152b14c5a499e1563b308ae95d76fd34bd9b07175391dfe2927747786ca7e0f67ad05484a13c42e25f255f9ef5df7b17cfd65d4bc38e61b76
+EBUILD haddock-library-1.10.0-r2.ebuild 1486 BLAKE2B 023342e714f2b084ab78420391a2a716bbb02f2dbb63a3e192743c37af2d6f74b9dd7ca2a2c812b4cd34c1b31f8d9f30d7b030e53205629ed746f247cfd2aa8c SHA512 40f9ace6e737941940d2d5bb6e5ac2cb9716d0ed4bac7271e8cffbd0c0207a619aa6149064371a192a615e5f9453b385b50f61a69e320d186ba9aa40a30deeef
+MISC metadata.xml 386 BLAKE2B fa00526239f0be33dfe405995b7c1e10a66739b764c520ce6a835caebd04af1d3fdb47811edf0e357b6a5040b9aa9a40bbbffd4cec21d6f4ebd946babd9d988f SHA512 0d91b09bc30523c2c7f29087bc37c17c3428da4abdda41c177201e3f624b197902e7b858ae76de27a2a5a29710d6821facf1e450f604919bdab79af60a59b12a
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>