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

4 files changed, 117 insertions, 1 deletions

diff --git a/dev-haskell/hackage-security/Manifest b/dev-haskell/hackage-security/Manifest
index 3a9a7bdc6877..e97bedd2759e 100644
--- a/dev-haskell/hackage-security/Manifest
+++ b/dev-haskell/hackage-security/Manifest
@@ -1,3 +1,7 @@
+AUX hackage-security-0.6.2.3-change-cabal-syntax-dep.patch 1087 BLAKE2B cd220cec75476ba0a83af0c27f02db279fe050044c88d0804c18a311533040757a998a78a809daed1f699fa2a56b671b7246cf973e653bdab7623f1b43a8c4d0 SHA512 e0713c260d8ab9aa6f80cf59c8d0f97088b465f3116ecca88e5d5be7af15acc653abe62d08d9c02075ee079244a5322d181d8cde80e64a727fba2bba4f699e2f
 DIST hackage-security-0.6.1.0.tar.gz 86243 BLAKE2B f28651d9c0506e4e1b9085e1efd6647ad3dd0dea4fcec2823f3072504831e7d01be34f6a14619cc352ef236214a1fd7073449f00c82c8f7ef5e95cdca1ad3133 SHA512 0a303e8c594a5fef52bf95f3ff75379aeec44fdaebc6ba78da8bf7911798040b43c3c289f0c4d7bcd2c1903d82c29d5ffa012360660c3548c0f3fb4b719a9327
+DIST hackage-security-0.6.2.3-rev3.cabal 12712 BLAKE2B 329c7ad4039411932fc8cdb6f5f31274de8adb11ab68a6688a03bd9d20043ee7df66e9c063aba33aaf7435470190d3e775f7d121011c5ef4b8dd8dfe2837eeb2 SHA512 cf4545d393745efd29da0882b093299d7a6cf8072c3219d71a3d5d1f754bf8b435e135df686447dd785f18ab190287ca57f2a749bb3b1d59199d6d00225684f5
+DIST hackage-security-0.6.2.3.tar.gz 86611 BLAKE2B 4cc851be655c6b4dc9435f129bcd1bda4b31dc16e0a97181c6e68a91c374d662937d5b629934087b6eb13db4c3b49217e3ed924f98024f2b868dca4eced13750 SHA512 d2bd80a940a2bacdbe6c6f5086ae846eb27548f0013952e0fe95dfbdea7bc4f17631f86f295d62b02a491f3903d8a5ab316bad2d8227fd240f459cbe966b1b84
 EBUILD hackage-security-0.6.1.0.ebuild 2344 BLAKE2B 4cc35d7fc8d8c02be219b4e3763f4617f564e5e5ead56cf9620cd8cddddff23396ca4ad2a9dba729614de31c8e42115be1d1819e6ce4eef082c0b080f43a5da0 SHA512 10b7ba0eaddd9e57b41cc39d70aa87dd46e70d87a30fd94d54ccb4205e465cee49be93c7b83a1a35b11c696acb5fd31bdf8d4767b73ef437d1d1902d4bcd234f
-MISC metadata.xml 358 BLAKE2B 12d49d372b9d972b090959fa4386cd071450c6c038d3cbe5adc0b2ff5de41de6fc422cc0063382c84dc1a2e188e3eae64e2ce84504587aff452e4fc11d895b2f SHA512 ad8b0b471b64cc9dec807c71d5c2cebea90558a51794c36cff68b30c65e9f8d3f5f965c660a989e1c0a98636c2670926629913ab5b8916524609ceed4a47db91
+EBUILD hackage-security-0.6.2.3-r2.ebuild 2482 BLAKE2B 4c2413ecbb3ed736c65759595a73f8689a96d2aca166428fffddc64d4ac9b239b15b5286ba670836409adf0f9a305c596162f6a3dc3e47671d0fd98e70dcac76 SHA512 ca5b5b578f14cfa1616d012a65cf73ffd80ba1923d34d536cb6e572d3f9aa50cf75687ab78e7a56cca9a8792ae51d7bbd6e39b63b933cafc7e736a9d5446d3b3
+MISC metadata.xml 504 BLAKE2B 447f4327da491d9638461df2f034b1a89b02f262a8da4d71014baae845ef8f4d3c8a81c693deb9b0032d8c75b18a3effa1db0298f3f92904b74bc013afe9ab04 SHA512 46e3dbd68e4cd09907d01492506412288363b463bcc2c36de6b6872be616c06a9d0aa9caeb992edb4b8af8c58e80bac211d0ef948977bf7c0dbc5c263021aca0
diff --git a/dev-haskell/hackage-security/files/hackage-security-0.6.2.3-change-cabal-syntax-dep.patch b/dev-haskell/hackage-security/files/hackage-security-0.6.2.3-change-cabal-syntax-dep.patch
new file mode 100644
index 000000000000..dc26881ebdbe
--- /dev/null
+++ b/dev-haskell/hackage-security/files/hackage-security-0.6.2.3-change-cabal-syntax-dep.patch
@@ -0,0 +1,33 @@
+From b228347d62b7c69f16d1983d4c8c70f6601c7351 Mon Sep 17 00:00:00 2001
+From: hololeap <hololeap@users.noreply.github.com>
+Date: Sun, 2 Jul 2023 14:33:27 -0600
+Subject: [PATCH] Change dependency on Cabal-syntax
+
+Do not add Cabal-syntax to build-depends when the Cabal-syntax flag is
+off.
+
+This will ensure that Cabal-syntax is ignored/omitted when the flag is
+off which will prevent version conflicts with >=Cabal-syntax-3.8
+
+Signed-off-by: hololeap <hololeap@users.noreply.github.com>
+---
+ hackage-security.cabal | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/hackage-security.cabal b/hackage-security.cabal
+index 58afd57..f0463f4 100644
+--- a/hackage-security.cabal
++++ b/hackage-security.cabal
+@@ -170,8 +170,7 @@ library
+   else
+     build-depends: Cabal        >= 1.14    && < 1.26
+                              || >= 2.0     && < 2.6
+-                             || >= 3.0     && < 3.7,
+-                   Cabal-syntax <  3.7
++                             || >= 3.0     && < 3.7
+ 
+   hs-source-dirs:      src
+   default-language:    Haskell2010
+-- 
+2.39.3
+
diff --git a/dev-haskell/hackage-security/hackage-security-0.6.2.3-r2.ebuild b/dev-haskell/hackage-security/hackage-security-0.6.2.3-r2.ebuild
new file mode 100644
index 000000000000..a1f898fad5cb
--- /dev/null
+++ b/dev-haskell/hackage-security/hackage-security-0.6.2.3-r2.ebuild
@@ -0,0 +1,75 @@
+# 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
+#hackport: flags: -mtl21,+use-network-uri,-Cabal-syntax
+
+CABAL_HACKAGE_REVISION=3
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour" # test-suite
+inherit haskell-cabal
+RESTRICT="test" # Requires Cabal-3.8 or newer
+
+DESCRIPTION="Hackage security library"
+HOMEPAGE="https://github.com/haskell/hackage-security"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="+lukko"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.6.2.3-change-cabal-syntax-dep.patch"
+)
+
+CABAL_CHDEPS=(
+	'|| >= 3.0     && < 3.7' '|| >= 3.0'
+)
+
+RDEPEND="
+	>=dev-haskell/base16-bytestring-0.1.1:=[profile?] <dev-haskell/base16-bytestring-1.1:=[profile?]
+	>=dev-haskell/base64-bytestring-1.0:=[profile?] <dev-haskell/base64-bytestring-1.3:=[profile?]
+	>=dev-haskell/cryptohash-sha256-0.11:=[profile?] <dev-haskell/cryptohash-sha256-0.12:=[profile?]
+	>=dev-haskell/ed25519-0.0:=[profile?] <dev-haskell/ed25519-0.1:=[profile?]
+	>=dev-haskell/network-uri-2.6:=[profile?] <dev-haskell/network-uri-2.7:=[profile?]
+	>=dev-haskell/parsec-3.1:=[profile?] <dev-haskell/parsec-3.2:=[profile?]
+	>=dev-haskell/tar-0.5:=[profile?] <dev-haskell/tar-0.6:=[profile?]
+	>=dev-haskell/zlib-0.5:=[profile?] <dev-haskell/zlib-0.7:=[profile?]
+	>=dev-lang/ghc-8.8.1:=
+	|| (
+		( >=dev-haskell/network-2.6 <dev-haskell/network-2.9 )
+		( >=dev-haskell/network-3.0 <dev-haskell/network-3.2 )
+	)
+	dev-haskell/network:=[profile?]
+	lukko? (
+		>=dev-haskell/lukko-0.1:=[profile?] <dev-haskell/lukko-0.2:=[profile?]
+	)
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-3.0.0.0
+"
+#	test? (
+#		>=dev-haskell/cabal-3.7 <dev-haskell/cabal-3.12
+#		>=dev-haskell/quickcheck-2.11 <dev-haskell/quickcheck-2.15
+#		>=dev-haskell/tasty-1.2 <dev-haskell/tasty-1.5
+#		>=dev-haskell/tasty-hunit-0.10 <dev-haskell/tasty-hunit-0.11
+#		>=dev-haskell/tasty-quickcheck-0.10 <dev-haskell/tasty-quickcheck-0.11
+#		>=dev-haskell/temporary-1.2 <dev-haskell/temporary-1.4
+#		dev-haskell/text
+#		>=dev-haskell/unordered-containers-0.2.8.0 <dev-haskell/unordered-containers-0.3
+#		>=dev-haskell/vector-0.12 <dev-haskell/vector-0.14
+#		|| (
+#			( >=dev-haskell/aeson-1.4 <dev-haskell/aeson-1.6 )
+#			( >=dev-haskell/aeson-2.0 <dev-haskell/aeson-2.2 )
+#		)
+#	)
+
+src_configure() {
+	haskell-cabal_src_configure \
+		--flag=-Cabal-syntax \
+		$(cabal_flag lukko lukko) \
+		--flag=-mtl21 \
+		--flag=use-network-uri
+}
diff --git a/dev-haskell/hackage-security/metadata.xml b/dev-haskell/hackage-security/metadata.xml
index 67d5d614a4f2..63d1cf7e461f 100644
--- a/dev-haskell/hackage-security/metadata.xml
+++ b/dev-haskell/hackage-security/metadata.xml
@@ -8,4 +8,8 @@
 	<use>
 		<flag name="lukko">Use @lukko@ for file-locking, otherwise use @GHC.IO.Handle.Lock@</flag>
 	</use>
+	<upstream>
+		<remote-id type="hackage">hackage-security</remote-id>
+		<remote-id type="github">haskell/hackage-security</remote-id>
+	</upstream>
 </pkgmetadata>