gentoo auto-resync : 21:08:2022 - 08:40:51

3 files changed, 43 insertions, 15 deletions

diff --git a/dev-haskell/doctest-parallel/Manifest b/dev-haskell/doctest-parallel/Manifest
index 2f321527a83f..1f6c5977eca7 100644
--- a/dev-haskell/doctest-parallel/Manifest
+++ b/dev-haskell/doctest-parallel/Manifest
@@ -1,3 +1,4 @@
-DIST doctest-parallel-0.2.3.tar.gz 45698 BLAKE2B 1650965be43357d86d497c4545c4673b21add0de3bccb52146519dd109bf34532973ca58285486f8311b4bd0e8b0acc443610a9f4d16d4326fa5a74926c3d6c6 SHA512 7a39b379a4be0bab4e6d360c572d81d4bfd7197d4e2a068ec2b00924ab8866406165eb9aef62a0612619c524f16302fe398edccfbcd117a97891d48fd00b5786
-EBUILD doctest-parallel-0.2.3.ebuild 1300 BLAKE2B 68ab672c2346074830f41bdd384946d53cc64404d4ebcfa38f5e6dd1a5fda287505487393e0bf5866ad7c1df1726dc1fbc41c4ecbfa7f8547ccdac5327081aa7 SHA512 ec3cc3c76aa60ef6f3e07ab6bc821bfc03f2ee29ad41a2b4168a4e5976ab36f0ac0a1aa356ab782178c5feafda52d072dbe1e3d952c8ee4c46a68e48390e7d46
+AUX doctest-parallel-0.2.4-disable-internal-test-lib.patch 917 BLAKE2B 6817c91e82e9d44180fe2f0d263545af08cc2056c886de34c7798cfeae411c6323625d718d8aa7ff8a3ae7fa520aed748557ec9cba64a45b2740545a8fe00d3e SHA512 ca4b5b1f810514a3343315fd11357514a1a6a692452c436f698f644b3ce1eaf296080b5461b6659b043200637dda79fa431ea479350c6744a9c22af58bca9e1c
+DIST doctest-parallel-0.2.4.tar.gz 46038 BLAKE2B c5ce7b48c8cf268dc31ef2060bcd3f1322e41b5ca8ca43ea889ccc2fae3eedbdbcdae57477f4e74f4eb815c5f4997295d30ac9ba62f95ebf6a86643e9c88b096 SHA512 9ccc407e317f09cb7bd104b7d1727f33449bae26f6782bc4a9b3c636b9adc53d4fa37d252bf8d1cc608a1a2bd9c27c105f5f5ad2ed36742d4ac50ef783c3ea7f
+EBUILD doctest-parallel-0.2.4.ebuild 1264 BLAKE2B 92f0ffe50b5f4f3a84fbcac36149aebcc7e23e9f885e3854e6537f56120e38d69022e964aeae72419b694ef061a5c50ef1522063d4c4d139ba6cd9c18a42a249 SHA512 8c6dc40d5988849b74449a86069e9e73561fc5e03b4eb1ed967027168371d6df3bf4e1c0f30196bdfbc16c7afddbc06451a80e4e841752bb88c62af91859ef9d
 MISC metadata.xml 250 BLAKE2B 3adf9597d5114c480b4cc9fb5c3e231d8475b795cd6dce77986e13583ab6e59b43857cf2328570490abef0062a8b8a6b73d231867f9b62124855515cdc044d6d SHA512 5ef2c1d34a3438b39a38c041d45bb06bd0f1ae8a3f8b971bd5aaf36dee560f380e9abefab0c2a4cd7b518e151f5c6a0d0c7cd53caee9a384818f1bdc7deeadc4
diff --git a/dev-haskell/doctest-parallel/doctest-parallel-0.2.3.ebuild b/dev-haskell/doctest-parallel/doctest-parallel-0.2.4.ebuild
index 6aa28f4165c8..677e98996e3f 100644
--- a/dev-haskell/doctest-parallel/doctest-parallel-0.2.3.ebuild
+++ b/dev-haskell/doctest-parallel/doctest-parallel-0.2.4.ebuild
@@ -3,20 +3,24 @@
 
 EAPI=8
 
-# ebuild generated by hackport 0.7.1.1
+# ebuild generated by hackport 0.7.2.1.9999
 
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+CABAL_FEATURES="lib profile haddock hoogle hscolour" # test-suite
 inherit haskell-cabal
 
 DESCRIPTION="Test interactive Haskell examples"
 HOMEPAGE="https://github.com/martijnbastiaan/doctest-parallel#readme"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
 KEYWORDS="~amd64 ~ppc64 ~x86"
+
 RESTRICT="test" # Known failure, issue #22 on upstream github
 
+PATCHES=(
+	"${FILESDIR}/${PN}-0.2.4-disable-internal-test-lib.patch"
+)
+
 RDEPEND=">=dev-haskell/base-compat-0.7.0:=[profile?]
 	>=dev-haskell/cabal-3.4:=[profile?]
 	>=dev-haskell/code-page-0.1:=[profile?]
@@ -26,18 +30,17 @@ RDEPEND=">=dev-haskell/base-compat-0.7.0:=[profile?]
 	>=dev-haskell/random-1.2:=[profile?]
 	>=dev-haskell/syb-0.3:=[profile?]
 	dev-haskell/unordered-containers:=[profile?]
-	>=dev-lang/ghc-8.2:=[profile?] <dev-lang/ghc-9.3:=[profile?]
 	>=dev-lang/ghc-8.10.1:=
 "
 DEPEND="${RDEPEND}
 	>=dev-haskell/cabal-3.2.0.0
-	test? ( >=dev-haskell/hspec-2.3.0
-		>=dev-haskell/hspec-core-2.3.0
-		dev-haskell/hspec-discover
-		dev-haskell/hunit
-		dev-haskell/mockery
-		>=dev-haskell/quickcheck-2.13.1
-		dev-haskell/setenv
-		>=dev-haskell/silently-1.2.4
-		>=dev-haskell/stringbuilder-0.4 )
 "
+#	test? ( >=dev-haskell/hspec-2.3.0
+#		>=dev-haskell/hspec-core-2.3.0
+#		dev-haskell/hspec-discover
+#		dev-haskell/hunit
+#		dev-haskell/mockery
+#		>=dev-haskell/quickcheck-2.13.1
+#		dev-haskell/setenv
+#		>=dev-haskell/silently-1.2.4
+#		>=dev-haskell/stringbuilder-0.4 )
diff --git a/dev-haskell/doctest-parallel/files/doctest-parallel-0.2.4-disable-internal-test-lib.patch b/dev-haskell/doctest-parallel/files/doctest-parallel-0.2.4-disable-internal-test-lib.patch
new file mode 100644
index 000000000000..642f9762c737
--- /dev/null
+++ b/dev-haskell/doctest-parallel/files/doctest-parallel-0.2.4-disable-internal-test-lib.patch
@@ -0,0 +1,24 @@
+From: hololeap <hololeap@protonmail.com>
+Signed-off-by: hololeap <hololeap@protonmail.com>
+
+This internal library is only needed for tests (currently disabled) and it
+causes an error when building docs:
+
+Running Haddock on library 'spectests-modules' for doctest-parallel-0.2.4
+setup: internal error when calculating transitive package dependencies
+Debug info: []
+
+Very similar to:
+https://github.com/commercialhaskell/stack/issues/5284
+
+diff -urN doctest-parallel-0.2.4/doctest-parallel.cabal doctest-parallel-0.2.4-r1/doctest-parallel.cabal
+--- doctest-parallel-0.2.4/doctest-parallel.cabal	2022-08-11 23:35:31.648141338 -0600
++++ doctest-parallel-0.2.4-r1/doctest-parallel.cabal	2022-08-11 23:44:18.178141594 -0600
+@@ -119,6 +119,7 @@
+ 
+ 
+ library spectests-modules
++  buildable: False
+   default-language: Haskell2010
+   build-depends: base, doctest-parallel, template-haskell
+   -- Too many warnings. TODO: fix.