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

4 files changed, 70 insertions, 11 deletions

diff --git a/dev-haskell/ghc-paths/Manifest b/dev-haskell/ghc-paths/Manifest
index 4bb38e6ae0d4..e028000ee0ad 100644
--- a/dev-haskell/ghc-paths/Manifest
+++ b/dev-haskell/ghc-paths/Manifest
@@ -1,3 +1,5 @@
+DIST ghc-paths-0.1.0.12-rev5.cabal 699 BLAKE2B c23c4c781ff3d47a8a01f067803fb1b71e34b954018990bf03ac81c42e6ca6bc434569c66b2d4cdb13b4f651fe3969a3b3323915a30bfd3d682c4522659044ba SHA512 c68d9f16c28bbac47d6831c5f385e4e21ce2b8188e7b04eb0531ca088b79c2f1169a36650fb5588f73a5e4d78307a0fbbb17af241b8bdc46b9c7dcde39b8d096
 DIST ghc-paths-0.1.0.12.tar.gz 2565 BLAKE2B 3e4783a854510a4ae6d6a9d5f4d0fefa7fbc03088aa298d8731c7bdf961ab47553b0e46c1b8d2f61193b669c43fc74e8eb6f948abba4419b0110772d56397c1d SHA512 1c66caf459f5783bde38a47ce1292bf5c47fef21e3f69d7f6c052b4eb39f446ed5decd38f0e4143a90d55ba44ebc0891b4497050cc652cbf3fcad636d45690e9
-EBUILD ghc-paths-0.1.0.12-r1.ebuild 1591 BLAKE2B 1f8f18e331674101895e1618ef62fad1668b674532c4854445827d3d27da8826d7b898353bb954e5bd7f6e1bfd26a765378c38b095fc70a060ce23846bb1065d SHA512 89b70329c2cb0cc4519018550006771bffa374687ae05b1d2889e33fce9a00cbac3f7270cc6f1fe91672586b37d5eaf3da2daea11ef065336702471f4b45f490
-MISC metadata.xml 218 BLAKE2B a4171bcdd2464513ecc42102fe4b99a29e63146928db17e679dbc71bf248912ee585be783f633541e6031335029bf7c4a8edc3636c9a626a30a57547bc315440 SHA512 f65587e3686d21a5546379b88cc6a58ab53bd6fa512bc63cab7e02f5162bb876fb91f843a86fee5f1a7813abde579b61a38d6f8a9e363473eeb5e6c90691c681
+EBUILD ghc-paths-0.1.0.12-r1.ebuild 1608 BLAKE2B 645b8f5d41a92664d69bed0dd8e997a7c611beedd8876f7e07cbfcfbea89b99d0ed99926486c860dbd4d9126c07904ea4b36d674da438749a71589f0507a3255 SHA512 f084f24c9b250fb525682967719348b9f730c1dbd6d8c542f43dbaa837136512748134ff2b7d1e1b97bfe5b8c2e7e07b532c2c5edd1f8af187544a242baf8def
+EBUILD ghc-paths-0.1.0.12-r3.ebuild 1406 BLAKE2B 2ea710a7b81dd2d3fc7671dd79c2f3a13006b1db77fcb789190515f008fa985e0d2ad14c1074d1b541be5a18027b5cfbf2160fd0f6d3d421aa694d441ce16a48 SHA512 620a7693fece1fe28c79cad8d986a1133873e55421c54afbfe6fd567fdca1d7b9fab5156f5aafd5358ef58f43a17941cfe7d525cdd9386e0a6b4bedf6ec142bf
+MISC metadata.xml 383 BLAKE2B aa0f17aa7e4a2cc370b9c3b8155cfcbe834e068e75d189ef134e635f27979a986e201c5d504b736ffdc221815c91210891f9f2270b96b957d30feeee81fceb9d SHA512 01a3e2105172b7627ae539e4ff51bd5e0489589c8d31c9bb0f753cbbb9810a7bd5bc2e976d7e48e6ed3b2670ec28e2991ddd9125afba837e6e95bec0ceda73d7
diff --git a/dev-haskell/ghc-paths/ghc-paths-0.1.0.12-r1.ebuild b/dev-haskell/ghc-paths/ghc-paths-0.1.0.12-r1.ebuild
index 6a8cad7ee4d5..c1b92212a47b 100644
--- a/dev-haskell/ghc-paths/ghc-paths-0.1.0.12-r1.ebuild
+++ b/dev-haskell/ghc-paths/ghc-paths-0.1.0.12-r1.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.2.9999
 
@@ -24,16 +24,17 @@ DEPEND="${RDEPEND}
 	>=dev-haskell/cabal-1.6 <dev-haskell/cabal-3.7
 "
 
+# https://github.com/simonmar/ghc-paths/pull/26
+CABAL_CHDEPS=(
+	'Cabal >= 1.6 && <3.1' 'Cabal >= 1.6 && <3.7'
+)
+
 src_prepare() {
-	default
+	haskell-cabal_src_prepare
 	# ghc-patch it has awfully unportable (across cabal versions) ghc detection code
 	# but in gentoo we install it to fixed patch, so remove Setup.hs detection code
 	cabal-mksetup
 
-	# https://github.com/simonmar/ghc-paths/pull/26
-	cabal_chdeps \
-		'Cabal >= 1.6 && <3.1' 'Cabal >= 1.6 && <3.7'
-
 	# and use gentoo's hardcoded one:
 	# a few things we need to replace, and example values
 	# GHC_PATHS_LIBDIR /usr/lib64/ghc-6.12.0.20091010
diff --git a/dev-haskell/ghc-paths/ghc-paths-0.1.0.12-r3.ebuild b/dev-haskell/ghc-paths/ghc-paths-0.1.0.12-r3.ebuild
new file mode 100644
index 000000000000..c2d544493b0d
--- /dev/null
+++ b/dev-haskell/ghc-paths/ghc-paths-0.1.0.12-r3.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.2.1.9999
+
+CABAL_HACKAGE_REVISION=5
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit ghc-package haskell-cabal
+
+DESCRIPTION="Knowledge of GHC's installation directories"
+HOMEPAGE="https://hackage.haskell.org/package/ghc-paths"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND=">=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.2.0.1 <dev-haskell/cabal-3.11
+"
+
+src_prepare() {
+	haskell-cabal_src_prepare
+
+	# ghc-patch it has awfully unportable (across cabal versions) ghc detection code
+	# but in gentoo we install it to fixed patch, so remove Setup.hs detection code
+	cabal-mksetup
+
+	# and use gentoo's hardcoded one:
+	# a few things we need to replace, and example values
+	# GHC_PATHS_LIBDIR /usr/lib64/ghc-6.12.0.20091010
+	# GHC_PATHS_DOCDIR /usr/share/doc/ghc-6.12.0.20091010/html
+	# GHC_PATHS_GHC_PKG /usr/bin/ghc-pkg
+	# GHC_PATHS_GHC /usr/bin/ghc (be careful: GHC_PATHS_GHC is a substring of GHC_PATHS_GHC_PKG)
+
+	cat >"${S}/GHC/Paths.hs" <<-EOF
+	module GHC.Paths ( ghc, ghc_pkg, libdir, docdir ) where
+
+	libdir, docdir, ghc, ghc_pkg :: FilePath
+
+	libdir  = "$(ghc-libdir)"
+	docdir  = "/usr/share/doc/ghc-$(ghc-version)/html"
+
+	ghc     = "$(ghc-getghc)"
+	ghc_pkg = "$(ghc-getghcpkg)"
+	EOF
+}
diff --git a/dev-haskell/ghc-paths/metadata.xml b/dev-haskell/ghc-paths/metadata.xml
index c7bb0e775ab0..f6c086c0de21 100644
--- a/dev-haskell/ghc-paths/metadata.xml
+++ b/dev-haskell/ghc-paths/metadata.xml
@@ -1,7 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-  <email>haskell@gentoo.org</email>
-</maintainer>
+	<maintainer type="project">
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="hackage">ghc-paths</remote-id>
+		<remote-id type="github">simonmar/ghc-paths</remote-id>
+	</upstream>
 </pkgmetadata>