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

5 files changed, 97 insertions, 10 deletions

diff --git a/dev-haskell/temporary/Manifest b/dev-haskell/temporary/Manifest
index 94f6824ac616..0d199aa5af6b 100644
--- a/dev-haskell/temporary/Manifest
+++ b/dev-haskell/temporary/Manifest
@@ -1,3 +1,5 @@
+AUX temporary-1.3-smp-flag.patch 1334 BLAKE2B abe978de31dcdafa826eb7d7706d8c268ced45e5f15a5c22e1a743839c927590c8dc3ca6b8066edca417d7414e13270111947b594c6627efb83b431ed067ae17 SHA512 04d845360f3e57bcbe437278a1f7daf8f686f006dba724977a0a352bf24c8476839da12544db68bd6a48756f3f702d93c0d159fe057098be1cdf0728157f854d
 DIST temporary-1.3.tar.gz 5686 BLAKE2B 7769c471a8fe3f2a73291b53633c9d4ec785bff9dfa93874f46bdac50b7e16a5fea918848645132593d2d0c0aeda2479777e04b1adf8fa501306bace89fdfdcd SHA512 e3078caf54da95c4efa9e9c936b35a98b62296ecce2242cd4e103605a9d29e8a9d6c7027dbf50d02b6a893bea558ea5b07dbb1df7c59bf26d86db76ccf112f25
-EBUILD temporary-1.3.ebuild 769 BLAKE2B d1e75b9caea7e4d8dee7d7df555e9ee7aae7f81bd9821cf9e329f2aff044696b992d4d857dd5fd83c2ef2e984d9837cc3d26bf0318d567501a2516a261c25e8a SHA512 3ac56561575b49d2489bdd45d6ac7a1de90e9431f6142a98536dab6e0917d2270efb1c3e49025e83aeb4897b87ae1fa4f304522dcba5d42ed783b8cc6c4829a4
-MISC metadata.xml 761 BLAKE2B 7c7ee76e9b93493c648a71eebfde77e8ae629f868ee971279a77cedc5172150d2de7310dd30a90fe4bbe1e2021d38043bfa7ce5123905a4f57dfa083c550bb78 SHA512 bf4cce9e2c0f0921309ad35510b53914d8982ca1fc4f7e0f169e8aeba6e4f52c91c1e938c3e4ee2f48db0bd4c859002eb7c27a98bd821e624f576ef9bbe38fb1
+EBUILD temporary-1.3-r1.ebuild 855 BLAKE2B 88d7947e175ea01bc5f898f5d33c62ecf31be9a2f7acbe71d3bc86093b3933b0e4e7da69b336cb7e0789fde45ec773e76b1c5e535e5b12f72abb607baa557736 SHA512 de6a6f24d3afba0151a7fa33494265c15fb1a91b4c00fb5d08b782010949250b7036767de77b913f3885e8ccd1399826edf86c53f5d88ddfa725471814b50c9c
+EBUILD temporary-1.3.ebuild 769 BLAKE2B f7da5f57394eab905c1fabbffbffd742e1a7b69d60217b003b3fb831928f6976799d81adf603f95bbf42c595a1536b49ae3f326aebff099dcd47a49982922a08 SHA512 e551656fec076bd63a5bcfb79df5eb86104a4df2bf72398a83e99d55820c4ffd05d8d79985aeb99576c25e47dac25b537c1dc09cda6b1867463730508fea1791
+MISC metadata.xml 384 BLAKE2B 8f4bc3a10619a84d73deb4cd59f6367161f82dd77ef3d1758f268109436c0369f3e17455acef2c516ce3a992b6635c991c338746013159f7d82ab10fb8db6c81 SHA512 9cc019ecfb05220ea80d43fd5961f8581d88b05d7accc0b4765dba80127ce7171ad3163d980281355ba5684ec01d2c389db02eb69956ce877fc6b3280641f36e
diff --git a/dev-haskell/temporary/files/temporary-1.3-smp-flag.patch b/dev-haskell/temporary/files/temporary-1.3-smp-flag.patch
new file mode 100644
index 000000000000..22832a87777a
--- /dev/null
+++ b/dev-haskell/temporary/files/temporary-1.3-smp-flag.patch
@@ -0,0 +1,46 @@
+From 7f448b41589fccd3ac883c6fb3865f8dbedcb14d Mon Sep 17 00:00:00 2001
+From: hololeap <hololeap@users.noreply.github.com>
+Date: Sun, 30 Oct 2022 12:45:29 -0600
+Bug: https://github.com/UnkindPartition/temporary/pull/15
+Subject: [PATCH] Add smp flag
+
+This flag will toggle the use of some `ghc-options` in the  test suite.
+It is set to `default: True`.
+
+This is needed for tests to run on some GHC builds which do not support
+a threaded runtime.
+
+Reported-by: matoro <https://github.com/matoro>
+Signed-off-by: hololeap <hololeap@users.noreply.github.com>
+---
+ temporary.cabal | 10 +++++++++-
+ 1 file changed, 9 insertions(+), 1 deletion(-)
+
+diff --git a/temporary.cabal b/temporary.cabal
+index 67163d1..ca54604 100644
+--- a/temporary.cabal
++++ b/temporary.cabal
+@@ -15,6 +15,11 @@ source-repository head
+   type:     git
+   location: git://github.com/feuerbach/temporary.git
+ 
++flag smp
++  description: Use flags that depend on GHC supporting a multicore runtime (tests only)
++  manual: True
++  default: True
++
+ Library
+     default-language:
+       Haskell2010
+@@ -37,7 +42,10 @@ test-suite test
+     tests
+   main-is:
+     test.hs
+-  ghc-options: -threaded -with-rtsopts=-N2
++  if flag(smp)
++    ghc-options: -threaded -with-rtsopts=-N2
++  else
++    ghc-options: -threaded
+   build-depends:
+       base >= 4.3 && < 5
+     , directory
diff --git a/dev-haskell/temporary/metadata.xml b/dev-haskell/temporary/metadata.xml
index f0239d9fd1c2..5a2f1de5b5d4 100644
--- a/dev-haskell/temporary/metadata.xml
+++ b/dev-haskell/temporary/metadata.xml
@@ -5,13 +5,8 @@
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		The functions for creating temporary files and directories in the base library are quite limited. The unixutils
-		package contains some good ones, but they aren't portable to Windows.
-		This library just repackages the Cabal implementations of its own temporary file and folder functions so that
-		you can use them without linking against Cabal or depending on it being installed.
-	</longdescription>
 	<upstream>
-		<remote-id type="github">batterseapower/temporary</remote-id>
+		<remote-id type="hackage">temporary</remote-id>
+		<remote-id type="github">feuerbach/temporary</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/temporary/temporary-1.3-r1.ebuild b/dev-haskell/temporary/temporary-1.3-r1.ebuild
new file mode 100644
index 000000000000..604644669b27
--- /dev/null
+++ b/dev-haskell/temporary/temporary-1.3-r1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.3.0
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit ghc-package haskell-cabal
+
+DESCRIPTION="Portable temporary file and directory support"
+HOMEPAGE="https://github.com/feuerbach/temporary"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.3-smp-flag.patch"
+)
+
+RDEPEND="
+	>=dev-haskell/random-1.1:=[profile?]
+	>=dev-lang/ghc-8.10.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-3.2.0.0
+	test? (
+		dev-haskell/base-compat
+		dev-haskell/tasty
+		dev-haskell/tasty-hunit
+	)
+"
+
+src_configure() {
+	if ghc-supports-smp; then
+		local smp_flag=smp
+	else
+		local smp_flag=-smp
+	fi
+
+	haskell-cabal_src_configure \
+		--flag="${smp_flag}"
+}
diff --git a/dev-haskell/temporary/temporary-1.3.ebuild b/dev-haskell/temporary/temporary-1.3.ebuild
index 1bd336437008..3bbb3ee7db6b 100644
--- a/dev-haskell/temporary/temporary-1.3.ebuild
+++ b/dev-haskell/temporary/temporary-1.3.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 # ebuild generated by hackport 0.6.9999