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

4 files changed, 48 insertions, 52 deletions

diff --git a/dev-haskell/time-compat/Manifest b/dev-haskell/time-compat/Manifest
index 577ae051459d..c76ca96351cf 100644
--- a/dev-haskell/time-compat/Manifest
+++ b/dev-haskell/time-compat/Manifest
@@ -1,5 +1,5 @@
 AUX fix-resolution-test.patch 2175 BLAKE2B da5752e05d420996c7ec6b570b3a4bbc2eddbb0b96c2abe44f5aeb278c74690b067bbb9c2b71cf71be5449266a000418b653891b434cf72bea12cb1c7aba10cc SHA512 58050f6fb1e05e2b83829cecbf9cf43e20affd32c9973c6151065f070a1a4cdd3df59c4cfc8ff3f4e5bbbb33c13851abfe07ad4a44b69407cf2340a3638ddb7a
-DIST time-compat-1.9.6.1.cabal 5033 BLAKE2B bd54030fd2ea681d4b50eebbf05db7a8080c0023aaa845d285e4b9c15c86d9b578446c690d5053c00da27a28ee77be5ee4a728a9d120f98271f57128b4fada2a SHA512 9643dcfd5e6397b00b16547fc5eff687363d5921b44293d2e80e665392ee853315da84cfb3aa91ee8f225bee1966b281af80a5a549bdfa10b42444f27b097890
+DIST time-compat-1.9.6.1-rev5.cabal 5062 BLAKE2B be9fb65c60bc62b7b92ec552ef691121084b67d05f329f32a6cd9af8f57663e8be7b31510e5a5080db38d711a06a91a9de705fbd8e3ad6697b6451f95ddedb7b SHA512 6ab42c2ad2d53b4bb9e713886508691cfc0f13535524e2cf0311110b8bf991474b6efd030ec74dfda056d154cdbb409cc7caea087645e91d50a96e2a5c07a979
 DIST time-compat-1.9.6.1.tar.gz 59964 BLAKE2B 0a19a9692100d47f14643613539061104fead78056d37ff3aededf3d15ef00e23aa6875b77b56a92138818511b7681197ff55fb8adb6a0d6075c7e02bf0fe397 SHA512 ca0b19aa5e7948fd7d9fbd8ff5e1b0f93a2d8d410d515e7078b40370e7d9fc363c111d53551d57a0320efb0894bcc2210afa8fc04da9f003ded626f53b7e58ea
-EBUILD time-compat-1.9.6.1.ebuild 1677 BLAKE2B 7a319dfac42463501e9e9e3b86301ac7560324e49b06f6c39ae50ce8f85ec7c38f38f4ea66baa05ec8b748f090dcb7f31eb5a77a569becc42d9357d4bb1cc5c0 SHA512 53cc089b2a782093674a63c30e32a4dfad7253645e2a78a4a93816a1a6c67c24e02a61d97c389c2d1a48f88422192c2fa762f33d965681b68a7fa5a1fbbb838f
-MISC metadata.xml 250 BLAKE2B 3adf9597d5114c480b4cc9fb5c3e231d8475b795cd6dce77986e13583ab6e59b43857cf2328570490abef0062a8b8a6b73d231867f9b62124855515cdc044d6d SHA512 5ef2c1d34a3438b39a38c041d45bb06bd0f1ae8a3f8b971bd5aaf36dee560f380e9abefab0c2a4cd7b518e151f5c6a0d0c7cd53caee9a384818f1bdc7deeadc4
+EBUILD time-compat-1.9.6.1-r1.ebuild 1258 BLAKE2B cc24304b5c476adcc75881b7dd81e7d184536624904aaded36dfe5c4fc96967ebfff08ed205866965249bc6a5be56d304e8e2d868eba94fd2f22df1ae0a1dc2d SHA512 2b72f5af619083eec8931f9213ac6a78b20528f0c1fac53306496fb6f3e76c6fda63f8c17826b55f684f2348a5bead49828382872154c46e8919a2b3fdcac2e3
+MISC metadata.xml 389 BLAKE2B db66760e25f6818ca264b35310d82617709aa9c286eea11b9830814b6a4fa76401f272ef3a90ae3d22671736ce09305f1f801195054d0c838a4d69d1fbd50c87 SHA512 fc8b4143fc5d50c8d0f7a3339d0c49ad74eb5bb506ec43483efc6415c97552a4d4c18567e7b1e311fc3964b91e4f58d154c839b26b1c947388951287cf315b5f
diff --git a/dev-haskell/time-compat/metadata.xml b/dev-haskell/time-compat/metadata.xml
index 937381521944..9eefe1548660 100644
--- a/dev-haskell/time-compat/metadata.xml
+++ b/dev-haskell/time-compat/metadata.xml
@@ -5,4 +5,8 @@
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="hackage">time-compat</remote-id>
+		<remote-id type="github">haskellari/time-compat</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/time-compat/time-compat-1.9.6.1-r1.ebuild b/dev-haskell/time-compat/time-compat-1.9.6.1-r1.ebuild
new file mode 100644
index 000000000000..927540bc987f
--- /dev/null
+++ b/dev-haskell/time-compat/time-compat-1.9.6.1-r1.ebuild
@@ -0,0 +1,41 @@
+# 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.1.9999
+
+CABAL_HACKAGE_REVISION=5
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Compatibility package for time"
+HOMEPAGE="https://github.com/haskellari/time-compat"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+PATCHES=( "${FILESDIR}/fix-resolution-test.patch" )
+
+RDEPEND="
+	>=dev-haskell/base-orphans-0.8.4:=[profile?] <dev-haskell/base-orphans-0.10:=[profile?]
+	>=dev-haskell/hashable-1.3.2.0:=[profile?] <dev-haskell/hashable-1.5:=[profile?]
+	>=dev-lang/ghc-8.8.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-3.0.0.0
+	test? (
+		>=dev-haskell/base-compat-0.10.5 <dev-haskell/base-compat-0.14
+		>=dev-haskell/quickcheck-2.13 <dev-haskell/quickcheck-2.15
+		>=dev-haskell/tagged-0.8.6 <dev-haskell/tagged-0.9
+		>=dev-haskell/tasty-1.2.1 <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/hunit-1.3.1 <dev-haskell/hunit-1.3.2 )
+			( >=dev-haskell/hunit-1.6.0.0 <dev-haskell/hunit-1.7 )
+		)
+	)
+"
diff --git a/dev-haskell/time-compat/time-compat-1.9.6.1.ebuild b/dev-haskell/time-compat/time-compat-1.9.6.1.ebuild
deleted file mode 100644
index a40b9786b63b..000000000000
--- a/dev-haskell/time-compat/time-compat-1.9.6.1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# ebuild generated by hackport 0.7.1.1.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-CABAL_HACKAGE_REVISION="3"
-inherit haskell-cabal
-
-DESCRIPTION="Compatibility package for time"
-HOMEPAGE="https://github.com/haskellari/time-compat"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz
-	https://hackage.haskell.org/package/${P}/revision/${CABAL_HACKAGE_REVISION}.cabal -> ${PF}.cabal"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
-
-RDEPEND=">=dev-haskell/base-orphans-0.8.4:=[profile?] <dev-haskell/base-orphans-0.9:=[profile?]
-	>=dev-haskell/hashable-1.3.2.0:=[profile?] <dev-haskell/hashable-1.5:=[profile?]
-	>=dev-lang/ghc-8.4.3:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-2.2.0.1
-	test? ( >=dev-haskell/base-compat-0.10.5 <dev-haskell/base-compat-0.13
-		>=dev-haskell/quickcheck-2.13 <dev-haskell/quickcheck-2.15
-		>=dev-haskell/tagged-0.8.6 <dev-haskell/tagged-0.9
-		>=dev-haskell/tasty-1.2.1 <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/hunit-1.3.1 <dev-haskell/hunit-1.3.2 )
-			( >=dev-haskell/hunit-1.6.0.0 <dev-haskell/hunit-1.7 ) ) )
-"
-BDEPEND="app-text/dos2unix"
-
-PATCHES=( "${FILESDIR}/fix-resolution-test.patch" )
-
-src_prepare() {
-	# pull revised cabal from upstream
-	cp "${DISTDIR}/${PF}.cabal" "${S}/${PN}.cabal" || die
-
-	# Convert to unix line endings
-	dos2unix "${S}/${PN}.cabal" || die
-
-	# Apply patches *after* pulling the revised cabal
-	default
-}