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

7 files changed, 59 insertions, 34 deletions

diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 8089db00f051..fccd65f2f759 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/shellcheck/Manifest b/dev-util/shellcheck/Manifest
index 4e8304c68255..1f274d2c9e76 100644
--- a/dev-util/shellcheck/Manifest
+++ b/dev-util/shellcheck/Manifest
@@ -1,4 +1,4 @@
 DIST shellcheck-0.9.0-rev1.cabal 4094 BLAKE2B 2b81ca0f3953944f9f482763721b0f7d0c364780795470c19ec7dc4f5007d94a83ffdc5486b6a89661ddb041668a72790877e46ff41e852591330106b20cb6a4 SHA512 16d2732eb726cc56875a62bc3974aef20538a0ae1cf29c46ee25aab0d1d43c162c8c2c4280cabacb3304e971e8b8d407a14a1d91c4e81b80db1aa9e5c739ac70
 DIST shellcheck-0.9.0.tar.gz 231011 BLAKE2B bc03a243c33faf433e64c34cf86983c80bcac9eae4c15a5ba00b9dd893cc988a78e0fdda1a72a81134f0d489346b52c2d805ee7ff1550f63e901c61f6b02efe7 SHA512 724da8de58eb9c4512779de0ec5f2f8f9015145c1eab3605574e609355980cd2fb87338d41e8ae95a0fd0742eed463b1c515a68d255308caa77ca06d57e12fcb
-EBUILD shellcheck-0.9.0.ebuild 925 BLAKE2B 861c7793e3ad9b38bfe699ec174450c99261c3eada0763995d46eaeba2ff268aa5a501afae993827900593808938c515d37956e23e1a71fba72977edbfa32dee SHA512 340e74a9acf9ad908d9137ff9a05d57bfb795e76d26afc9d43816b20ec2081975f416506451c2ee193886c5da5394a9651d5206a87e910998faac6922cc0e52f
-MISC metadata.xml 250 BLAKE2B 3adf9597d5114c480b4cc9fb5c3e231d8475b795cd6dce77986e13583ab6e59b43857cf2328570490abef0062a8b8a6b73d231867f9b62124855515cdc044d6d SHA512 5ef2c1d34a3438b39a38c041d45bb06bd0f1ae8a3f8b971bd5aaf36dee560f380e9abefab0c2a4cd7b518e151f5c6a0d0c7cd53caee9a384818f1bdc7deeadc4
+EBUILD shellcheck-0.9.0-r2.ebuild 1556 BLAKE2B 3403827a371be52c2e9bbd96ae2a00b2df039c88494d0dca073b521833e8b8beac9e842c41506de1a83cd7140a5e635753975521ad1c9083e35a910246ac61f5 SHA512 c81f051145b2c3d79973c64a0b235e763699bba2e3a16c5dcb9cc0b2067c06ac7f910c626a722564f862288d27ec97144896281e8fecff70a9556d358c73c3b9
+MISC metadata.xml 385 BLAKE2B 3a1182b7df96d89a0bb291fd36477f7e29ddfa3ed1f8e713d81e0a724114f68ab5a5596f78afeb3e146f29d330545929a2fc0930aa31cac456e2634ad4df62b4 SHA512 e16ddc568cbb835db80ca8f7a78dae9deacaaafe6b5d6e8e5e96a256617db1d5a9f18deb35c917692a5c93d7a30821b84d84d44548aaa0a5b03880b13ce5bb3f
diff --git a/dev-util/shellcheck/metadata.xml b/dev-util/shellcheck/metadata.xml
index 937381521944..792eb9603797 100644
--- a/dev-util/shellcheck/metadata.xml
+++ b/dev-util/shellcheck/metadata.xml
@@ -5,4 +5,8 @@
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="hackage">ShellCheck</remote-id>
+		<remote-id type="github">koalaman/shellcheck</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-util/shellcheck/shellcheck-0.9.0-r2.ebuild b/dev-util/shellcheck/shellcheck-0.9.0-r2.ebuild
new file mode 100644
index 000000000000..c6c9cfada7db
--- /dev/null
+++ b/dev-util/shellcheck/shellcheck-0.9.0-r2.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.8.4.0.9999
+
+CABAL_HACKAGE_REVISION=1
+CABAL_PN="ShellCheck"
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Shell script analysis tool"
+HOMEPAGE="https://www.shellcheck.net/"
+
+LICENSE="GPL-3"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+# hololeap (2023-09-10)
+# 1 test fails
+# === prop_checkOverwrittenExitCode8 from src/ShellCheck/Analytics.hs:4927 ===
+# *** Failed! Exception: '(Array.!): undefined array element' (after 1 test):
+RESTRICT="test"
+
+CABAL_CHDEPS=(
+
+# hololeap (2023-09-02)
+# This is from the upstream git repo
+# See: <https://github.com/koalaman/shellcheck/pull/2749#issuecomment-1703896093>
+	'fgl                  >= 5.7.0 && < 5.8.1.0'
+		'fgl (>= 5.7.0 && < 5.8.1.0) || (>= 5.8.1.1 && < 5.9)'
+)
+
+RDEPEND="
+	>=dev-haskell/aeson-1.4.0:=[profile?] <dev-haskell/aeson-2.2:=[profile?]
+	>=dev-haskell/diff-0.4.0:=[profile?] <dev-haskell/diff-0.5:=[profile?]
+	>=dev-haskell/parsec-3.1.14:=[profile?] <dev-haskell/parsec-3.2:=[profile?]
+	>=dev-haskell/quickcheck-2.14.2:2=[profile?] <dev-haskell/quickcheck-2.15:2=[profile?]
+	>=dev-haskell/regex-tdfa-1.2.0:=[profile?] <dev-haskell/regex-tdfa-1.4:=[profile?]
+	>=dev-lang/ghc-8.10.6:=
+	|| (
+		( >=dev-haskell/fgl-5.7.0 <dev-haskell/fgl-5.8.1.0 )
+		( >=dev-haskell/fgl-5.8.1.1 <dev-haskell/fgl-5.9 )
+	)
+	dev-haskell/fgl:=[profile?]
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-3.2.1.0
+"
diff --git a/dev-util/shellcheck/shellcheck-0.9.0.ebuild b/dev-util/shellcheck/shellcheck-0.9.0.ebuild
deleted file mode 100644
index 5346582375d4..000000000000
--- a/dev-util/shellcheck/shellcheck-0.9.0.ebuild
+++ /dev/null
@@ -1,30 +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.8.0.0.9999
-
-CABAL_HACKAGE_REVISION=1
-CABAL_PN="ShellCheck"
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Shell script analysis tool"
-HOMEPAGE="https://www.shellcheck.net/"
-
-LICENSE="GPL-3"
-SLOT="0/${PV}"
-KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
-
-RDEPEND=">=dev-haskell/aeson-1.4.0:=[profile?] <dev-haskell/aeson-2.2:=[profile?]
-	>=dev-haskell/diff-0.4.0:=[profile?] <dev-haskell/diff-0.5:=[profile?]
-	>=dev-haskell/fgl-5.7.0:=[profile?] <dev-haskell/fgl-5.8.1.0:=[profile?]
-	>=dev-haskell/quickcheck-2.14.2:2=[profile?] <dev-haskell/quickcheck-2.15:2=[profile?]
-	>=dev-haskell/regex-tdfa-1.2.0:=[profile?] <dev-haskell/regex-tdfa-1.4:=[profile?]
-	>=dev-lang/ghc-8.8.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-3.0.0.0
-"
diff --git a/dev-util/shelltestrunner/Manifest b/dev-util/shelltestrunner/Manifest
index 20a33b99180f..70feedbfa573 100644
--- a/dev-util/shelltestrunner/Manifest
+++ b/dev-util/shelltestrunner/Manifest
@@ -1,3 +1,3 @@
 DIST shelltestrunner-1.9.tar.gz 39538 BLAKE2B 45dc5acbfd35d65a818938382e62eacc7aa3798e8f0ab9cdd4d4a358f470de9854bedbd2335bae6b4195ea05b2305de84e0b13c86206ac0e53039726fbc59354 SHA512 bdb5476e30189f0997f3a9505d954a828475a5d95e1220dc9ed342e96100f4dfa0cfadc1afd9a5758223cf1a659d1f77d7d0a0533c32bd80b325c9a7ad48178d
-EBUILD shelltestrunner-1.9.ebuild 1441 BLAKE2B a2c88f8cc2f0f848c40b1e73806dabe67921fd6607c44543bea353df8ddaa1eba615be6119c66e55c4e9809c4a495647e2adde7470ea73f57b358ced6bd485a8 SHA512 0a4d1e237b45b0e5517a3c9e9271341353d50a70222afdad16bbe635b52e32c0423d85d449b325258e2cd35be95e11ab6e42e37a1eafc5f14e9fc02c1d6d69a5
+EBUILD shelltestrunner-1.9.ebuild 1441 BLAKE2B 51c961ca38ec5eb01b60eb2f6466c7dc328c2211a58fa9ae3f3f40ba703e482224e0db7852391180d5e81fcf94973149e9fa7bb464f7530100c9b160c570c76d SHA512 97f8751f54288fea6f45dae46d2ecf863b9948a9ede469a29ffd59df3cfa7a59fea2968e0ce38a3f73e667463451a486c9267f625b2b2380e30dcd6592a86309
 MISC metadata.xml 636 BLAKE2B 5b6582234f95bbdcd237d07b32648d3800ea8162f6879fc71924ec74f6fdffa6ba0737cc00534407f08fb2064104b8c242428ee7a7b42b1db69a2859f3f7655a SHA512 4a6ce0971a5f80f0836f5b1d11343165e38517aec895aea56ff29dee844fc83b1e5f7a69cb2eb878a03750a25e61285939fdee0c332f7023367cc19f38e1de4c
diff --git a/dev-util/shelltestrunner/shelltestrunner-1.9.ebuild b/dev-util/shelltestrunner/shelltestrunner-1.9.ebuild
index d663fbfaf753..9ad55469b1f2 100644
--- a/dev-util/shelltestrunner/shelltestrunner-1.9.ebuild
+++ b/dev-util/shelltestrunner/shelltestrunner-1.9.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 CABAL_FEATURES=""
 inherit haskell-cabal