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

4 files changed, 69 insertions, 2 deletions

diff --git a/dev-haskell/regex-tdfa/Manifest b/dev-haskell/regex-tdfa/Manifest
index d8da574fd36d..1011908f139c 100644
--- a/dev-haskell/regex-tdfa/Manifest
+++ b/dev-haskell/regex-tdfa/Manifest
@@ -1,4 +1,7 @@
 AUX regex-tdfa-1.3.2-disable-doctests.patch 617 BLAKE2B 5e2e7dc8ccc6bbf92a46315a736209ce170912971f6df80581f9f6ca2587388fef864d2200d14de21092b784582fd08cb77d2aa118ca3872cd72d67ce31f74ee SHA512 210ee3c910e9f80d904e13c4cefc01d4bef9558bb2c2f8b8273f174022db8bb89b24068f56b84c8d1e3cf0c44476b441f381bd811264123c9fedb22fafedc0d5
+AUX regex-tdfa-1.3.2.2-disable-doctests.patch 947 BLAKE2B 85b88b82a235618d43ab431d536f769d369d2ad602fcd20e049abae874d9f5a569b976ab4de3fccea1b21230c8aaee138d1d52cb73aeed85f3309cb469572c13 SHA512 e16333975955c45a272b843d62ba688a52eacab4e309b3a20215e979a73f9eb7735fb7d8444d60bb5240459942c719018316554eb2c4a528c8fcb188c988910b
+DIST regex-tdfa-1.3.2.2.tar.gz 83016 BLAKE2B 77f6698a5c42eece0eb9f2166017a6a9334f917ba2134e963d06a443088e6d594765e846083052d91fc7944b8fea776c5e188afcbad2b25ce57939255f5cc3b4 SHA512 be5d93b0e989a3232f9d0e37f002085d500d334ec554ade30177b22dd0d873321aa2a4f8b3cacb4156d002659f67b6d6f50d5f8c8b2da513a43be49572dc9c6c
 DIST regex-tdfa-1.3.2.tar.gz 82839 BLAKE2B e381bc951dfad53b0cd2c83f6c77e3a71fe6b1fd64988f75544e631f49a9d108f39e27bc5bb42fbccc4887321c7655d609c0c13cc58f7be3b93e8131059f4320 SHA512 88bbf8f4d7ac15fb85c899bdeb8f8556c7a284075bf2b600051f529f0e2109dcda6ba74fc95969b824cfb03f00a9eb47e9c375c70b1b9e17096c95acbe517168
+EBUILD regex-tdfa-1.3.2.2.ebuild 1053 BLAKE2B 7e3da1aca7a3f3b343ce6b6499038dbe06ecdcd24e565b4c9e3f25637c3048c846c26d4285430224a457e70b7adbf6ff2c94fd319873e8792dc366cc4ec6b743 SHA512 ab92d81c8875875ea58bd80c6a645279ca12981be1ba23d8887cb9407acf0e3a38b5bf034be14d7b59d7d63a43ad50dce2a1049e7df9e9ca62a90589148fd068
 EBUILD regex-tdfa-1.3.2.ebuild 906 BLAKE2B a3230e23bf6abaab58d7d06bbd1e4a4515f98207a346bb2bc1aaccb3f9155dee4bb1611e57990ba33260e799f36d418535ca9254f7d7e4bf25128e50020da62a SHA512 93b20a301bbfb1fd37bd831e2a905c0b94dd2f556c3050312105d4e217d10a9e1b41998afa91f0f96308362e5a5222c20cf42a8b782a3c409e2ee9271fb38d46
-MISC metadata.xml 340 BLAKE2B 319aacb72c42132e7ada85d202654dc33109e26c5d5d8c7d429daa3f7f428b779fbd4ba37a328086f51ca6abd7f5371a381ad142a8d16f1101ddbe9b31d1a181 SHA512 d9a7851eef96bea2959de80eecbda08d625c8fa9989beb2cfb4f2e845d2756f309be4a23f2eca4c205e78fa5a78de2087dc816390c27fb6081b8ce0bfbd3ea8c
+MISC metadata.xml 388 BLAKE2B 3c4c06267e1e62d6afae2745d1433bd0ec6e877b5dbc157ecfb09c30dfb604501c834cab8223e4d3a2e9ca91b1d7ccc11b084abbbe97a4695e33656e36823e1a SHA512 70144ec58484d82390e8af18e7dd9e4f7d44c523b4d478a290e0d94e340cc90bfdcdbb6b7db11d97abf521aa4b0552a35f1e52529d4a526223b1e4a49f5faa4a
diff --git a/dev-haskell/regex-tdfa/files/regex-tdfa-1.3.2.2-disable-doctests.patch b/dev-haskell/regex-tdfa/files/regex-tdfa-1.3.2.2-disable-doctests.patch
new file mode 100644
index 000000000000..769ff7f34191
--- /dev/null
+++ b/dev-haskell/regex-tdfa/files/regex-tdfa-1.3.2.2-disable-doctests.patch
@@ -0,0 +1,24 @@
+From: hololeap <hololeap@protonmail.com>
+Signed-off-by: hololeap <hololeap@protonmail.com>
+
+doctests don't seem to work with Setup.hs
+
+The hackage tarball doesn't include cabal.project which seems to be necessary
+for doctest-parallel to work. Even when this file is copied to $S, Setup.hs
+doesn't seem to recognize it.
+
+The necessary flag is not recognized by `./setup configure`:
+    --write-ghc-environment-files=always
+See: <https://cabal.readthedocs.io/en/3.4/cabal-project.html#cfg-field-write-ghc-environment-files>
+
+diff -urN regex-tdfa-1.3.2/regex-tdfa.cabal regex-tdfa-1.3.2-r1/regex-tdfa.cabal
+--- regex-tdfa-1.3.2/regex-tdfa.cabal	2022-08-14 00:42:54.578227087 -0600
++++ regex-tdfa-1.3.2-r1/regex-tdfa.cabal	2022-08-14 00:43:17.428227098 -0600
+@@ -175,6 +175,7 @@
+     ghc-options:        -O2
+ 
+ test-suite doctest
++  buildable:      False
+   type:           exitcode-stdio-1.0
+   hs-source-dirs: test
+   main-is:        DocTestMain.hs
diff --git a/dev-haskell/regex-tdfa/metadata.xml b/dev-haskell/regex-tdfa/metadata.xml
index 6883f6fe98a6..1192b9e7aef1 100644
--- a/dev-haskell/regex-tdfa/metadata.xml
+++ b/dev-haskell/regex-tdfa/metadata.xml
@@ -6,6 +6,7 @@
 		<name>Gentoo Haskell</name>
 	</maintainer>
 	<upstream>
-		<remote-id type="github">ChrisKuklewicz/regex-tdfa</remote-id>
+		<remote-id type="hackage">regex-tdfa</remote-id>
+		<remote-id type="github">haskell-hvr/regex-tdfa</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/regex-tdfa/regex-tdfa-1.3.2.2.ebuild b/dev-haskell/regex-tdfa/regex-tdfa-1.3.2.2.ebuild
new file mode 100644
index 000000000000..a47592f6b41f
--- /dev/null
+++ b/dev-haskell/regex-tdfa/regex-tdfa-1.3.2.2.ebuild
@@ -0,0 +1,39 @@
+# 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: +base4,-devel,+force-o2,-doctest
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Pure Haskell Tagged DFA Backend for \"Text.Regex\" (regex-base)"
+HOMEPAGE="https://wiki.haskell.org/Regular_expressions"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+PATCHES=(
+	"${FILESDIR}/${P}-disable-doctests.patch"
+)
+
+RDEPEND=">=dev-haskell/parsec-3.1:=[profile?] <dev-haskell/parsec-3.2:=[profile?]
+	>=dev-haskell/regex-base-0.94:=[profile?] <dev-haskell/regex-base-0.95:=[profile?]
+	>=dev-haskell/text-1.2.3:=[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/utf8-string-1.0.1 <dev-haskell/utf8-string-1.1
+	)
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		--flag=base4 \
+		--flag=-devel \
+		--flag=force-o2
+}