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

4 files changed, 73 insertions, 16 deletions

diff --git a/dev-haskell/yaml/Manifest b/dev-haskell/yaml/Manifest
index 7af2a53cf756..22c23b27113e 100644
--- a/dev-haskell/yaml/Manifest
+++ b/dev-haskell/yaml/Manifest
@@ -1,3 +1,5 @@
+DIST yaml-0.11.11.2.tar.gz 31926 BLAKE2B 3c8fb1973a8d8e03fa626122862c124fd6cf8b0f5ffbcc2c6d9566fcca84fb1428857c916b5f072de13dc9198fbfec8bf2c8b3b69836eb351c24fe42cb496420 SHA512 419b5fb86d96d2e7adda5b0091d9d32eb2a5c964d32ca9d72e83feb14aef738e5029f43d1760a91ae83c47aebd8d2211e255dfdf28e95c64be3fbb2380cfaf60
 DIST yaml-0.11.8.0.tar.gz 31674 BLAKE2B a4c508eecb4e5b931e6832ceee0bd694fc6879cc6c3482a48e44c1b865207e3525c52cd51a9e2ec74a9ef98e1537f8d559151da80c0ef07351ace1665e5b5f09 SHA512 f47ae0a158bfd323e06ff31db348f916077882f4198b160c7f3f88e89ae0e62a9f17ff5ba29c15a1d74a52d040245613eced5267c38f9658d0a19007efb402f7
-EBUILD yaml-0.11.8.0.ebuild 1688 BLAKE2B 82a53affc7b6e0c933300b85bf0b1b073f75001b9e448ef5c7b8946136256ea00e62665a51db80c349b3adc56627b6387ec3586d7b89b17283598a78b4cea602 SHA512 b9a690bfc53fea32a41debcfd3580826feb6af464e27e7fd26a6655f86f795a5cc1b6cd95bc4bfc72dd53425f919511759d3ae14309226a6149897cf63630d01
-MISC metadata.xml 807 BLAKE2B 75d34a7e6b7c7b265990b2df5e2b1c9b1f061e49902451171356314c39fa09950a1308ea68cf95fca409776282a6377bbc707c493224e88adcfca56fe4472f5d SHA512 9242395c3a196123d1b9b8e4a8adf7d01cfbd1b70d1a93c1bb5203cc1d46eb48b751aab88d2875ad5729e578cd8218d5ffad1a3fc6f4b2c4c3f2905693c6b797
+EBUILD yaml-0.11.11.2.ebuild 1870 BLAKE2B eeb2454819614c47180fe0e7ac554fad57b15a6b00b0a58d6ee8b436d85d794437e30c5470cc8aea5d5aa1b7432e99504562632977ab11661de83fb9a1320084 SHA512 b92280b9d50cffb6be01187625523df0ad1333ea5ada4d5a73676bf6eb8585498ea6ac47f4b9305e5545c49459e56de5df7826e1820323a8b1fbb20fa8fc8b23
+EBUILD yaml-0.11.8.0.ebuild 1638 BLAKE2B 4e8d80d94875112700c6e876587cb97f640be8abca4ef568c0ea4660f07184fbbc8ed7d348b74f2ba83a70e315ddf5ae8f1bca0f0ae53bf20d88db0225b35644 SHA512 fea4fa26507af029fb4521021c7df137e1cec02c2347822b191ad6daef62fd617abcc52555e2fcb89c2a5ef74fb04dbfb109decd6e0ef9212990394336bf863a
+MISC metadata.xml 469 BLAKE2B 1092dfc383a28bc1dbca675aa69aeb2287ba2da0c2054484f8197dc8035621e7c75d764a8d8e929ecb5bddeff7a5928cbca32601894a276a48fc9374f32ebb4a SHA512 c7149130085f0177f79c14d52c6c4a19a022a8abd5808e2ce90448f442c47a5fbbde1cf1dd08c62ee77feb32a8b9a083ce89e4a838c5e6f42f369918a27876e4
diff --git a/dev-haskell/yaml/metadata.xml b/dev-haskell/yaml/metadata.xml
index 3d126b223c2e..71b8b45b1435 100644
--- a/dev-haskell/yaml/metadata.xml
+++ b/dev-haskell/yaml/metadata.xml
@@ -5,18 +5,11 @@
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		Provides support for parsing and emitting Yaml documents.
-
-		This package includes the full libyaml C library version 0.1.12 by Kirill
-		Simonov (&lt;http://pyyaml.org/wiki/LibYAML&gt;) in the package so you
-		don't need to worry about any non-Haskell dependencies.
-	</longdescription>
 	<use>
-		<flag name="examples">Install the haskell-yaml-examples executable</flag>
 		<flag name="executable">Install the yaml2json and json2yaml executables</flag>
 	</use>
 	<upstream>
+		<remote-id type="hackage">yaml</remote-id>
 		<remote-id type="github">snoyberg/yaml</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/yaml/yaml-0.11.11.2.ebuild b/dev-haskell/yaml/yaml-0.11.11.2.ebuild
new file mode 100644
index 000000000000..9eb42d269c67
--- /dev/null
+++ b/dev-haskell/yaml/yaml-0.11.11.2.ebuild
@@ -0,0 +1,65 @@
+# 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_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Support for parsing and rendering YAML documents"
+HOMEPAGE="https://github.com/snoyberg/yaml#readme"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="examples executable"
+
+CABAL_CHDEPS=(
+	'executable examples' 'executable haskell-yaml-examples'
+)
+
+RDEPEND=">=dev-haskell/aeson-0.11:=[profile?]
+	>=dev-haskell/attoparsec-0.11.3.0:=[profile?]
+	>=dev-haskell/conduit-1.2.8:=[profile?] <dev-haskell/conduit-1.4:=[profile?]
+	>=dev-haskell/libyaml-0.1:=[profile?] <dev-haskell/libyaml-0.2:=[profile?]
+	>=dev-haskell/resourcet-0.3:=[profile?] <dev-haskell/resourcet-1.4:=[profile?]
+	>=dev-haskell/scientific-0.3:=[profile?]
+	dev-haskell/text:=[profile?]
+	dev-haskell/unordered-containers:=[profile?]
+	dev-haskell/vector:=[profile?]
+	>=dev-lang/ghc-8.8.1:=
+	examples? ( dev-haskell/raw-strings-qq:=[profile?] )
+	executable? ( dev-haskell/optparse-applicative:=[profile?] )
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-3.0.0.0
+	test? ( dev-haskell/base-compat
+		>=dev-haskell/hspec-1.3
+		dev-haskell/hunit
+		dev-haskell/mockery
+		dev-haskell/temporary
+		!examples? ( dev-haskell/raw-strings-qq ) )
+"
+
+src_configure() {
+	local examples_flag="no-examples"
+	use examples && examples_flag="-no-examples"
+
+	local exe_flag="no-exe"
+	use executable && exe_flag="-no-exe"
+
+	haskell-cabal_src_configure \
+		--flag="${examples_flag}" \
+		--flag="${exe_flag}"
+}
+
+pkg_postinst() {
+	if use examples; then
+		elog "The executable installed with this package (normally named 'examples')"
+		elog "has been renamed to 'haskell-yaml-examples' to help prevent name collisions."
+	fi
+
+	haskell-cabal_pkg_postinst
+}
diff --git a/dev-haskell/yaml/yaml-0.11.8.0.ebuild b/dev-haskell/yaml/yaml-0.11.8.0.ebuild
index 017f755f0637..a3f0fb87e619 100644
--- a/dev-haskell/yaml/yaml-0.11.8.0.ebuild
+++ b/dev-haskell/yaml/yaml-0.11.8.0.ebuild
@@ -39,12 +39,9 @@ DEPEND="${RDEPEND}
 		!examples? ( dev-haskell/raw-strings-qq ) )
 "
 
-src_prepare() {
-	default
-
-	cabal_chdeps \
-		'executable examples' 'executable haskell-yaml-examples'
-}
+CABAL_CHBINS=(
+	'examples' 'haskell-yaml-examples'
+)
 
 src_configure() {
 	local examples_flag="no-examples"