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

5 files changed, 68 insertions, 11 deletions

diff --git a/dev-haskell/hourglass/Manifest b/dev-haskell/hourglass/Manifest
index bac26917a910..97fd70c808b3 100644
--- a/dev-haskell/hourglass/Manifest
+++ b/dev-haskell/hourglass/Manifest
@@ -1,3 +1,5 @@
+AUX hourglass-0.2.12-time-1_10-fix.patch 1142 BLAKE2B 4481a378309e8effb1be519366510ffb7856b36ea1b123541819344da9da4f51102599779c58449acc11420b07e63c56925c3631fab14a6fd3a5ff9f36878439 SHA512 f44b597bec1a22a527317139282d86a5ceafaa62c77ab0d40638a6ad8d4a95bd650e983a7710490cd03bf17c3804d0e20be5cf2bab499e1173887fea4f454e78
 DIST hourglass-0.2.12.tar.gz 25797 BLAKE2B c833a2cfd1686f43a9ed101570a962255d813e6f169ce23d8dabd59f405c4ea091d8d9d08b118fe191cece215457bc034c419ebb6bc1d45fc684e43ea113d921 SHA512 c748d7f875ca0b1ea9034dba1a5cfa3fc4e51613ce24c90b54856fdc385d9ccc5eda3559f1674abf3ea966cc7851891dfee86bad897062a97a79db8408574bdc
-EBUILD hourglass-0.2.12.ebuild 702 BLAKE2B b479f1e3fcf9e61913d5df99456665a1c0a3fccd2a6df6794d44193963c81a2c79384b4f75caf25514ce0bdd82e04ca660d70c8c9ffa767ca8ace3e1f70f9981 SHA512 12c8ba2f8d9c7e78734ca3e86d182d316493a763806d0aac0f9b1cc979101dfbedb03efefb3246a222ab74ae20864d205a6c96dab35a1e446a7fe6bc5d122002
-MISC metadata.xml 661 BLAKE2B 24bc733f1e3264a02eef835a76c6114e4f4c3f2b32b544b028a1b74408f15cb50a6be46622be9b559fcef9212056884879a1c85d06f10c8dd6ea835e42fed3ef SHA512 af9ad67f31de2fa31bd75d5373319c4096fdb1f113fb2a90dc8374b19420e043f7cebed2faf0ecb6ac4d60d9e14c73ae11f96e09fbaf354da2b466d5e1f2bd0d
+EBUILD hourglass-0.2.12-r1.ebuild 685 BLAKE2B e79a573992e8b764683359dbac673efdc3f0f2eafafe3e16553defe5ef8e14f46d6cc01f8af35ab8e6626f49c1a33315c7cf8ca44d8d53dbf4983007bd29f57b SHA512 2468430ad4c3f096d0421996262b1d2ae5f262bd2b53a33b9d418c77ff5e3f6dcbb1cc2910d9204fdf8787d5da34b67695397d837c07c5e09ffe7b09233648ef
+EBUILD hourglass-0.2.12.ebuild 702 BLAKE2B 385d80309be45ef17e7df6a4c9273e77ad5e740a8c91c63e9f07c55f43bd80f0a5ddd104297c06f0ed1118496d436d9a9624aa03032e9d5710a0545557a9a983 SHA512 6bfe12f71382b0aee6d681d8db1cd4bfc35aeee8ec3f2bab505ecc103b999df42c1bd3760797c9c55991a8199821414c9f79e5cbe5c6bbe006068cfc32add183
+MISC metadata.xml 387 BLAKE2B eb6a49abcc9255fc37c19aadd93018625a5222e07231a276b3f81dea24250390860d0a84c79513c29e687a72fe0c2d8621c1946f66453c96ff8755293eb26ef3 SHA512 744f3fb40871bc376f7682d34decc5f004c9b43f42da2e27eaf6c76de0dd30266ebb96984df4338ba62ca5db67e2d4379ffad8de6a40cf98b6630ffd593fc9de
diff --git a/dev-haskell/hourglass/files/hourglass-0.2.12-time-1_10-fix.patch b/dev-haskell/hourglass/files/hourglass-0.2.12-time-1_10-fix.patch
new file mode 100644
index 000000000000..f9a62ed78904
--- /dev/null
+++ b/dev-haskell/hourglass/files/hourglass-0.2.12-time-1_10-fix.patch
@@ -0,0 +1,30 @@
+From 803fc360e3aa7a772ee7fd5bd7a81c8a21f99c38 Mon Sep 17 00:00:00 2001
+From: hololeap <hololeap@users.noreply.github.com>
+Date: Mon, 27 Feb 2023 13:44:09 -0700
+Subject: [PATCH] Fix tests for >=time-1.10
+
+Signed-off-by: hololeap <hololeap@users.noreply.github.com>
+---
+ tests/Tests.hs | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/tests/Tests.hs b/tests/Tests.hs
+index d400032..309eb84 100644
+--- a/tests/Tests.hs
++++ b/tests/Tests.hs
+@@ -210,7 +210,12 @@ tests knowns = testGroup "hourglass"
+         [ testProperty "iso8601 date" $ \(e :: Elapsed) ->
+             let fmt = calTimeFormatTimeISO8601 (elapsedToPosixTime e)
+                 ed1  = localTimeParseE ISO8601_Date fmt
++#if MIN_VERSION_time(0,10,0)
++                md2  = T.parseTimeM False T.defaultTimeLocale fmt "%F"
++#else
+                 md2  = T.parseTime T.defaultTimeLocale fmt "%F"
++#endif
++
+              in case (ed1,md2) of
+                     (Left err, Nothing)       -> error ("both cannot parse: " ++ show fmt ++ " hourglass-err=" ++ show err)
+                     (Left err, Just _)        -> error ("error parsing string: " ++ show err)
+-- 
+2.39.2
+
diff --git a/dev-haskell/hourglass/hourglass-0.2.12-r1.ebuild b/dev-haskell/hourglass/hourglass-0.2.12-r1.ebuild
new file mode 100644
index 000000000000..c75f291fc8b9
--- /dev/null
+++ b/dev-haskell/hourglass/hourglass-0.2.12-r1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.1.0.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="simple performant time related library"
+HOMEPAGE="https://github.com/vincenthz/hs-hourglass"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.2.12-time-1_10-fix.patch"
+)
+
+RDEPEND=">=dev-lang/ghc-8.8.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-3.0.0.0
+	test? (
+		dev-haskell/old-locale
+		dev-haskell/tasty
+		dev-haskell/tasty-hunit
+		dev-haskell/tasty-quickcheck
+	)
+"
diff --git a/dev-haskell/hourglass/hourglass-0.2.12.ebuild b/dev-haskell/hourglass/hourglass-0.2.12.ebuild
index 3ae0cf441ef3..52cc3dc9e0ac 100644
--- a/dev-haskell/hourglass/hourglass-0.2.12.ebuild
+++ b/dev-haskell/hourglass/hourglass-0.2.12.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
 
diff --git a/dev-haskell/hourglass/metadata.xml b/dev-haskell/hourglass/metadata.xml
index fe5e8c16ea92..0a81fcfb89e9 100644
--- a/dev-haskell/hourglass/metadata.xml
+++ b/dev-haskell/hourglass/metadata.xml
@@ -5,15 +5,8 @@
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		Simple time library focusing on simple but powerful and performant API
-		
-		The backbone of the library are the Timeable and Time type classes.
-		
-		Each Timeable instances can be converted to type that has a Time instances,
-		and thus are different representations of current time.
-	</longdescription>
 	<upstream>
+		<remote-id type="hackage">hourglass</remote-id>
 		<remote-id type="github">vincenthz/hs-hourglass</remote-id>
 	</upstream>
 </pkgmetadata>