diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2022-08-21 08:40:51 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2022-08-21 08:40:51 +0100 |
| commit | 4dec1dfeca8e16b25934ff861c9eab7d1a8758a1 (patch) | |
| tree | 6baa6667b5a6f8803404d9c87646bbaccbff3d41 /dev-haskell/parser-combinators | |
| parent | 766dae6306eab8ca7e982499e2cab68eb5ecb105 (diff) | |
gentoo auto-resync : 21:08:2022 - 08:40:51
Diffstat (limited to 'dev-haskell/parser-combinators')
| -rw-r--r-- | dev-haskell/parser-combinators/Manifest | 2 | ||||
| -rw-r--r-- | dev-haskell/parser-combinators/parser-combinators-1.3.0.ebuild | 27 |
2 files changed, 15 insertions, 14 deletions
diff --git a/dev-haskell/parser-combinators/Manifest b/dev-haskell/parser-combinators/Manifest index 68426a8ea7c1..f54e4a84632d 100644 --- a/dev-haskell/parser-combinators/Manifest +++ b/dev-haskell/parser-combinators/Manifest @@ -1,4 +1,4 @@ DIST parser-combinators-1.3.0.tar.gz 11699 BLAKE2B 0a24e95c52627a3219cc8e89ed49ebc12e759a487e7daf333f3ab788837576aef88d295f585aecd0831866319ee0445369cc3cd26255d6ef85d602f44d7767fa SHA512 f7a4581d229b788e841d844003e058a6c63827c5cadeb6fe8f1b94e2a920b11d3b08a8a7a412fa95e1b75bca24f6957f88162f8d1af5bb174ca7f91ef47c0b71 DIST parser-combinators-tests-1.3.0.tar.gz 6860 BLAKE2B ececd5d8a47501a90e68ba77da679aed2c00da225c234f8afeebd43bf4cb821c988cd5612e8411e70179b39f0fcf8c15fcd93accd81e42ce1b8999d0cd8c7bdf SHA512 ac863afcbe81ea83c20cbab3229c5321860d1d45b4b04031db1a8cc493239096aef80d24148fe3cd5a18dfc811d806855386736be94e32cecabab3ae656d5389 -EBUILD parser-combinators-1.3.0.ebuild 1681 BLAKE2B 17242e0cffb303f26ba44daec6666eaae676c2023e2b129b2500744a3fb17ba29177f2b8966da50f189a9e33e209e8b3a83f30bdd709e0c2dbf75e8dacfb4a84 SHA512 3cde3247d462d4f95765d097ca90eb4168105403b6c2c223c69b56c268c01aee78387177c405fbde43f213fc2a6b32167257620419cd5a4e5a253501633ef783 +EBUILD parser-combinators-1.3.0.ebuild 1798 BLAKE2B 0bb06c68249a0c45a1c18baa18f1ee337408aa3830217db2a061eb1c4e21c2166e89a0035a1831774a35237846503b205611c3eeb7b50e760c1a0885d1e5e4fe SHA512 c06dfeaca924550ddd4b5b238f88749d2cf202a4a0ec037b2369abad8ab7a56c80b2c1d23b233cbba0f8c2163cc5a88203408fd47a7fecb7733dc028489170a4 MISC metadata.xml 250 BLAKE2B 3adf9597d5114c480b4cc9fb5c3e231d8475b795cd6dce77986e13583ab6e59b43857cf2328570490abef0062a8b8a6b73d231867f9b62124855515cdc044d6d SHA512 5ef2c1d34a3438b39a38c041d45bb06bd0f1ae8a3f8b971bd5aaf36dee560f380e9abefab0c2a4cd7b518e151f5c6a0d0c7cd53caee9a384818f1bdc7deeadc4 diff --git a/dev-haskell/parser-combinators/parser-combinators-1.3.0.ebuild b/dev-haskell/parser-combinators/parser-combinators-1.3.0.ebuild index fc3e4a9d5cb2..7c57fcc85c7d 100644 --- a/dev-haskell/parser-combinators/parser-combinators-1.3.0.ebuild +++ b/dev-haskell/parser-combinators/parser-combinators-1.3.0.ebuild @@ -9,18 +9,16 @@ EAPI=8 CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite" inherit haskell-cabal -TESTS_PN="${PN}-tests" -TESTS_P="${TESTS_PN}-${PV}" +TESTS_PN="${CABAL_PN}-tests" +TESTS_P="${TESTS_PN}-${CABAL_PV}" DESCRIPTION="Lightweight package providing commonly useful parser combinators" HOMEPAGE="https://github.com/mrkkrp/parser-combinators" -SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz - https://hackage.haskell.org/package/${TESTS_P}/${TESTS_P}.tar.gz" +SRC_URI+=" https://hackage.haskell.org/package/${TESTS_P}/${TESTS_P}.tar.gz" LICENSE="BSD" SLOT="0/${PV}" KEYWORDS="~amd64 ~ppc64 ~x86" -RESTRICT="test" # tests only work if not already installed RDEPEND=">=dev-lang/ghc-8.6.3:= " @@ -41,18 +39,21 @@ src_configure() { src_test() { if use test; then - ./setup register --inplace --gen-pkg-config || die - ghc-pkg init pkgdb || die - ghc-pkg -f pkgdb register "${P}.conf" + local -a configure_flags=( "--flag=-dev" ) - old_S="${S}" + # Runs the block if the main package is not installed currently + if ! ghc-pkg describe "${CABAL_PN}" &>/dev/null; then + ./setup register --inplace --gen-pkg-config || die + ghc-pkg init pkgdb || die + ghc-pkg -f pkgdb register "${CABAL_P}.conf" || die + configure_flags+=( "--package-db=${S}/pkgdb" ) + fi + + local old_S="${S}" export S="${WORKDIR}/${TESTS_P}" pushd "${S}" > /dev/null || die - haskell-cabal_src_configure \ - --package-db="${old_S}/pkgdb" \ - --flag=-dev - + haskell-cabal_src_configure "${configure_flags[@]}" haskell-cabal_src_compile haskell-cabal_src_test |