summaryrefslogtreecommitdiff
path: root/dev-haskell/yaml
diff options
context:
space:
mode:
authorV3n3RiX <venerix@koprulu.sector>2022-07-23 14:50:53 +0100
committerV3n3RiX <venerix@koprulu.sector>2022-07-23 14:50:53 +0100
commit674b648c65d37f018cecade7f66ab3162ed94a8e (patch)
treead4083997dcc3bf2cb623233a0326090748441bd /dev-haskell/yaml
parent34efeba333bb7b35b450c57f2045c933b84bd252 (diff)
gentoo auto-resync : 23:07:2022 - 14:50:52
Diffstat (limited to 'dev-haskell/yaml')
-rw-r--r--dev-haskell/yaml/Manifest6
-rw-r--r--dev-haskell/yaml/metadata.xml6
-rw-r--r--dev-haskell/yaml/yaml-0.11.8.0.ebuild (renamed from dev-haskell/yaml/yaml-0.11.5.0.ebuild)34
3 files changed, 29 insertions, 17 deletions
diff --git a/dev-haskell/yaml/Manifest b/dev-haskell/yaml/Manifest
index 2e4d048be6d9..1f7179635392 100644
--- a/dev-haskell/yaml/Manifest
+++ b/dev-haskell/yaml/Manifest
@@ -1,3 +1,3 @@
-DIST yaml-0.11.5.0.tar.gz 30049 BLAKE2B 96e7d8b39ac392ac927a61991a2c645dd564e36a7676984193e447ad591bddedb9029136aa6f71c65a0665a05516f907a0151b85d7e7f22169d7d5ddc98e6c5d SHA512 a4209cdbe75413191aed5a72f13a0cc4af04906a3e8ce629711689624f334b31681dcfc2fc89fdae20a874c5e6831e9663a30188d34d8067491ff8958912930b
-EBUILD yaml-0.11.5.0.ebuild 1447 BLAKE2B bb4c5153892b6c9c1a8c88dcbc2ce8858065ee6d517049f2c14023b44e19688db86105b317862257da198c63becece04d42990220fbf4d138f3842c8dfd03f95 SHA512 df881eb513c30fa19dfef6451666ad02eb03a05b5560169c381993d6be27807a92b8ef3e5d1a5bc1f7524b31569e650ca6d92380a60fffc37c03a7f16dfc56c0
-MISC metadata.xml 779 BLAKE2B 37084534c009b52c9fe81c01805cc962e9c70df4a30e899ff64ec26e37ee516c73d9229d38ca7730ad531480e0b8a0adce1f933a1d61a35b6995e89a7d11a04f SHA512 065bff5d71ad7bd06352e8ee1a1422c6479370c5216b97921570c56389b1e192b960f1492c99b181e7054d31a3016a551af9f02d9f10a8694b5c7adf6f157f9f
+DIST yaml-0.11.8.0.tar.gz 31674 BLAKE2B a4c508eecb4e5b931e6832ceee0bd694fc6879cc6c3482a48e44c1b865207e3525c52cd51a9e2ec74a9ef98e1537f8d559151da80c0ef07351ace1665e5b5f09 SHA512 f47ae0a158bfd323e06ff31db348f916077882f4198b160c7f3f88e89ae0e62a9f17ff5ba29c15a1d74a52d040245613eced5267c38f9658d0a19007efb402f7
+EBUILD yaml-0.11.8.0.ebuild 1675 BLAKE2B 934c0b1a4ccb626c5a89d18a64e6167869c2a74f4d6daf6c69aef1943796424d86d2e5c3a7accda6bab58aa4a293e763701dfa914b72000affa4d782b68c4e29 SHA512 5ac93d35ce22a279698e993960475574d33e5d44f433209274719f680115a673f54f96095b2122a1571db510f0d3e1fba72aceb0cec2d442694d83fabc5e0b75
+MISC metadata.xml 807 BLAKE2B 75d34a7e6b7c7b265990b2df5e2b1c9b1f061e49902451171356314c39fa09950a1308ea68cf95fca409776282a6377bbc707c493224e88adcfca56fe4472f5d SHA512 9242395c3a196123d1b9b8e4a8adf7d01cfbd1b70d1a93c1bb5203cc1d46eb48b751aab88d2875ad5729e578cd8218d5ffad1a3fc6f4b2c4c3f2905693c6b797
diff --git a/dev-haskell/yaml/metadata.xml b/dev-haskell/yaml/metadata.xml
index 2eae49bd2eae..3d126b223c2e 100644
--- a/dev-haskell/yaml/metadata.xml
+++ b/dev-haskell/yaml/metadata.xml
@@ -7,14 +7,14 @@
</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="no-examples">don't build the examples</flag>
- <flag name="no-exe">don't install the yaml2json executable</flag>
+ <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="github">snoyberg/yaml</remote-id>
diff --git a/dev-haskell/yaml/yaml-0.11.5.0.ebuild b/dev-haskell/yaml/yaml-0.11.8.0.ebuild
index ec7829b83f61..a1a113a969b2 100644
--- a/dev-haskell/yaml/yaml-0.11.5.0.ebuild
+++ b/dev-haskell/yaml/yaml-0.11.8.0.ebuild
@@ -1,9 +1,9 @@
# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
-# ebuild generated by hackport 0.6.6.9999
+# ebuild generated by hackport 0.7.1.1.9999
CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
inherit haskell-cabal
@@ -15,33 +15,45 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
KEYWORDS="~amd64 ~ppc64 ~x86"
-IUSE="+no-examples +no-exe"
+IUSE="examples executable"
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/mtl:=[profile?]
>=dev-haskell/resourcet-0.3:=[profile?] <dev-haskell/resourcet-1.3:=[profile?]
>=dev-haskell/scientific-0.3:=[profile?]
- dev-haskell/text:=[profile?]
dev-haskell/unordered-containers:=[profile?]
dev-haskell/vector:=[profile?]
- >=dev-lang/ghc-8.0.2:=
- !no-examples? ( dev-haskell/raw-strings-qq:=[profile?] )
+ >=dev-lang/ghc-8.4.3:=
+ examples? ( dev-haskell/raw-strings-qq:=[profile?] )
+ executable? ( dev-haskell/optparse-applicative:=[profile?] )
"
DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.24.2.0
+ >=dev-haskell/cabal-2.2.0.1
test? ( dev-haskell/base-compat
>=dev-haskell/hspec-1.3
dev-haskell/hunit
dev-haskell/mockery
dev-haskell/temporary
- no-examples? ( dev-haskell/raw-strings-qq ) )
+ !examples? ( dev-haskell/raw-strings-qq ) )
"
+src_prepare() {
+ default
+
+ cabal_chdeps \
+ 'executable examples' 'executable haskell-yaml-examples'
+}
+
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 \
- $(cabal_flag no-examples no-examples) \
- $(cabal_flag no-exe no-exe)
+ --flag="${examples_flag}" \
+ --flag="${exe_flag}"
}