From 40aaaa64e86ba6710bbeb31c4615a6ce80e75e11 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 28 Apr 2021 20:21:43 +0100 Subject: gentoo resync : 28.04.2021 --- dev-haskell/hlint/Manifest | 7 ++- dev-haskell/hlint/files/60hlint-gentoo.el | 7 --- dev-haskell/hlint/hlint-2.1.17-r1.ebuild | 82 ------------------------------- dev-haskell/hlint/hlint-3.2.7.ebuild | 59 ++++++++++++++++++++++ dev-haskell/hlint/metadata.xml | 7 ++- 5 files changed, 65 insertions(+), 97 deletions(-) delete mode 100644 dev-haskell/hlint/files/60hlint-gentoo.el delete mode 100644 dev-haskell/hlint/hlint-2.1.17-r1.ebuild create mode 100644 dev-haskell/hlint/hlint-3.2.7.ebuild (limited to 'dev-haskell/hlint') diff --git a/dev-haskell/hlint/Manifest b/dev-haskell/hlint/Manifest index 43ab0ccf8058..420b436987ec 100644 --- a/dev-haskell/hlint/Manifest +++ b/dev-haskell/hlint/Manifest @@ -1,4 +1,3 @@ -AUX 60hlint-gentoo.el 231 BLAKE2B 2fef831bc7a3056d59e67dcfbb6cd5ca86a4ad4d46c8728ba528b0bd8b5c9e10fb765282de3f856ee59146e1f1043d7b5cb47c8352e60a72f2a86119654283c6 SHA512 1e83147144fb72a9e98fd405116baa2ff10532bdfb954fd86486f1abc3a6df7db54f90875dfe325f827546c03cc6c1d9980003fa839857f8c6b4410cfe8cccd4 -DIST hlint-2.1.17.tar.gz 119243 BLAKE2B 09d70dffdaec25e8f574fb4dd1f6012828cc8032e38b9275a676b836bff0a86e331ac4e7780618001931622e985ad4a9bd799267b06dee059f3f1b28b33bdf16 SHA512 b0a78fa970bcf2b74d969e1825dee1c7382fb5cebc47f3c752f3b3d5915905943dff21e36f8c0158e3bd10696c4785a2c86a2e1abfcf72b610ab2b564f3be5f3 -EBUILD hlint-2.1.17-r1.ebuild 1948 BLAKE2B c599034a9b4139ff21d8d493efb4ceae6b072eda74077c6c3e19129dc0fb63506db1c6d438b3117e866e5239a7688344c643941bd271a8296c9dc65b02185a80 SHA512 cda3327dc8192d7b00ff35d0a380ab5c923f1c04f2a9fde8c8adee988d9cdb16570a2053de29b52688febad57acfd8227bbf0dc28d15483e0f49455a55b182db -MISC metadata.xml 413 BLAKE2B fcda272b6d32522677922b85aaf4d0f61c670f81d89cec222efdec84de44116cfb4bd383e1d5b07568e4c949087c03bebae3f7771cf1f711823b487d847718a4 SHA512 859f47847efd9bfd4cc5c406df9efa406dff07c051fde2e101acc62588a920f3ccd1c2b06b9c324c10399d28327dd928265d80ce46cb3556d87d860ef0119840 +DIST hlint-3.2.7.tar.gz 159088 BLAKE2B 5fde93d35093aff4c56dd2b39f2f2318872b6d85cfa1d8ee21aaa7c970ecbd013eb5cac3b9d8742139fe3fa1e5c251364ea479facbc54338adcec5717e31dfaa SHA512 5db66f671d18279d5f4da8b158c9947e95804eff97b2efe1b53a2e3f0f5e23d7560c8085a253031e57d20bb77da0c266f2143b3b03899bfaa1a311d3ace2985b +EBUILD hlint-3.2.7.ebuild 1890 BLAKE2B eb788ada53085c4e8eabc1a7edbad838387c1df8a0d3db055d610ace52dba7226793ede4d8afb41e02ec5fa06f2a043fc589ba69ad2cd0ef79c0e204fd27082d SHA512 45895cd4005cf68c13a81da27012d845e0e9dccabc76aadae74ba404bbf12636240af46b61bbb52115d8006481d9c4deb89456d87434853e77024c71897f7e69 +MISC metadata.xml 465 BLAKE2B a0a970ee7a7d014a51f22944aabcb2254e1b4448d7fbf20881b0222d82102d99c2ac5230999492334d3ba051f082364aa40cc05af796f5d984ff393f11277d9e SHA512 b02ceb7e170dd64f84db21b5a72656c08a3729e64f932e26adc3451d096f9ddb38753cf8a423920fc9fa039c97a365e51cccc3f8d52752fc12da09263344df72 diff --git a/dev-haskell/hlint/files/60hlint-gentoo.el b/dev-haskell/hlint/files/60hlint-gentoo.el deleted file mode 100644 index 990d5a89b5fb..000000000000 --- a/dev-haskell/hlint/files/60hlint-gentoo.el +++ /dev/null @@ -1,7 +0,0 @@ - -;; hlint emacs integration site initialisation -(add-to-list 'load-path "@SITELISP@") -(require 'hs-lint) -(defun hlint-haskell-mode-hook () - (local-set-key "\C-cl" 'hs-lint)) -(add-hook 'haskell-mode-hook 'hlint-haskell-mode-hook) diff --git a/dev-haskell/hlint/hlint-2.1.17-r1.ebuild b/dev-haskell/hlint/hlint-2.1.17-r1.ebuild deleted file mode 100644 index e725b17cfa22..000000000000 --- a/dev-haskell/hlint/hlint-2.1.17-r1.ebuild +++ /dev/null @@ -1,82 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -# ebuild generated by hackport 0.6.4.9999 - -CABAL_FEATURES="lib profile haddock hoogle hscolour" -inherit haskell-cabal elisp-common - -DESCRIPTION="Source code suggestions" -HOMEPAGE="https://github.com/ndmitchell/hlint#readme" -SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz" - -LICENSE="BSD" -SLOT="0/${PV}" -KEYWORDS="~amd64 ~x86" -IUSE="emacs +gpl" - -RDEPEND=">=dev-haskell/aeson-1.1.2.0:=[profile?] - >=dev-haskell/ansi-terminal-0.6.2:=[profile?] - >=dev-haskell/cmdargs-0.10:=[profile?] - >=dev-haskell/cpphs-1.20.1:=[profile?] - >=dev-haskell/data-default-0.3:=[profile?] - >=dev-haskell/extra-1.6.6:=[profile?] - dev-haskell/haskell-src-exts:1.21=[profile?] - >=dev-haskell/haskell-src-exts-util-0.2.5:=[profile?] - >=dev-haskell/refact-0.3:=[profile?] - >=dev-haskell/semigroups-0.18:=[profile?] - dev-haskell/text:=[profile?] - >=dev-haskell/uniplate-1.5:=[profile?] - dev-haskell/unordered-containers:=[profile?] - dev-haskell/vector:=[profile?] - >=dev-haskell/yaml-0.5.0:=[profile?] - >=dev-lang/ghc-7.10.1:= - gpl? ( >=dev-haskell/hscolour-1.21:=[profile?] ) -" -DEPEND="${RDEPEND} - >=dev-haskell/cabal-1.22.2.0 -" - -SITEFILE="60${PN}-gentoo.el" - -src_configure() { - local threaded_flag="" - if $(ghc-supports-threaded-runtime); then - threaded_flag="--flags=threaded" - else - threaded_flag="--flags=-threaded" - fi - - haskell-cabal_src_configure \ - $(cabal_flag gpl gpl) \ - $threaded_flag -} - -src_compile() { - cabal_src_compile - - use emacs && elisp-compile data/hs-lint.el -} - -src_install() { - cabal_src_install - - if use emacs; then - elisp-install ${PN} data/*.el data/*.elc || die "elisp-install failed." - elisp-site-file-install "${FILESDIR}/${SITEFILE}" - fi - - doman data/hlint.1 -} - -pkg_postinst() { - haskell-cabal_pkg_postinst - use emacs && elisp-site-regen -} - -pkg_postrm() { - haskell-cabal_pkg_postrm - use emacs && elisp-site-regen -} diff --git a/dev-haskell/hlint/hlint-3.2.7.ebuild b/dev-haskell/hlint/hlint-3.2.7.ebuild new file mode 100644 index 000000000000..a66d70328900 --- /dev/null +++ b/dev-haskell/hlint/hlint-3.2.7.ebuild @@ -0,0 +1,59 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +# ebuild generated by hackport 0.6.7.9999 +#hackport: flags: -ghc-lib + +CABAL_FEATURES="lib profile haddock hoogle hscolour" +inherit haskell-cabal + +DESCRIPTION="Source code suggestions" +HOMEPAGE="https://github.com/ndmitchell/hlint#readme" +SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz" + +LICENSE="BSD" +SLOT="0/${PV}" +KEYWORDS="~amd64 ~x86" +IUSE="+gpl hsyaml +threaded test" +RESTRICT="!test? ( test )" + +RDEPEND=">=dev-haskell/aeson-1.1.2.0:=[profile?] + >=dev-haskell/ansi-terminal-0.8.1:=[profile?] + >=dev-haskell/cmdargs-0.10:=[profile?] + >=dev-haskell/cpphs-1.20.1:=[profile?] + >=dev-haskell/data-default-0.3:=[profile?] + >=dev-haskell/extra-1.7.3:=[profile?] + dev-haskell/file-embed:=[profile?] + >=dev-haskell/filepattern-0.1.1:=[profile?] + >=dev-haskell/ghc-lib-parser-8.10:=[profile?] =dev-haskell/ghc-lib-parser-ex-8.10.0.17:=[profile?] =dev-haskell/refact-0.3:=[profile?] + dev-haskell/text:=[profile?] + >=dev-haskell/uniplate-1.5:=[profile?] + dev-haskell/unordered-containers:=[profile?] + dev-haskell/utf8-string:=[profile?] + dev-haskell/vector:=[profile?] + >=dev-lang/ghc-8.4.3:= + gpl? ( >=dev-haskell/hscolour-1.21:=[profile?] ) + hsyaml? ( >=dev-haskell/hsyaml-0.2:=[profile?] + >=dev-haskell/hsyaml-aeson-0.2:=[profile?] ) + !hsyaml? ( >=dev-haskell/yaml-0.5.0:=[profile?] ) +" +DEPEND="${RDEPEND} + >=dev-haskell/cabal-2.2.0.1 +" + +src_configure() { + haskell-cabal_src_configure \ + --flag=-ghc-lib \ + $(cabal_flag gpl gpl) \ + $(cabal_flag hsyaml hsyaml) \ + $(cabal_flag threaded threaded) +} + +src_test() { + export LD_LIBRARY_PATH="${S}/dist/build${LD_LIBRARY_PATH+:}:${LD_LIBRARY_PATH}" + "${S}"/dist/build/hlint/hlint --datadir="${S}"/data --test || die +} diff --git a/dev-haskell/hlint/metadata.xml b/dev-haskell/hlint/metadata.xml index bea62cfa5834..a33e9d0bc4b3 100644 --- a/dev-haskell/hlint/metadata.xml +++ b/dev-haskell/hlint/metadata.xml @@ -6,9 +6,8 @@ Gentoo Haskell - Use GPL libraries, specifically hscolour. + Use GPL libraries, specifically hscolour + Use HsYAML instead of yaml + Build with support for multithreaded execution - - ndmitchell/hlint - -- cgit v1.2.3