Skip to content

Commit d31b93e

Browse files
hololeaphololeap
committed
tests: Improve ebuild formatting
- Use an asterisk at the end of the version when possible - Add newline to DEPEND - Avoid backslashes by passing an array to src_configure - Drop trailing .0 components Thanks-to: Sam James <[email protected]> Signed-off-by: hololeap <[email protected]>
1 parent e015ae7 commit d31b93e

File tree

4 files changed

+54
-46
lines changed

4 files changed

+54
-46
lines changed

‎tests/data/golden/hakyll-4.16.1.0.ebuild‎

Lines changed: 26 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -21,36 +21,36 @@ RDEPEND="
2121
>=dev-haskell/blaze-markup-0.5.1:=[profile?] <dev-haskell/blaze-markup-0.9
2222
>=dev-haskell/data-default-0.4:=[profile?] <dev-haskell/data-default-0.8
2323
>=dev-haskell/file-embed-0.0.10.1:=[profile?] <dev-haskell/file-embed-0.0.16
24-
>=dev-haskell/hashable-1.0:=[profile?] <dev-haskell/hashable-2
24+
>=dev-haskell/hashable-1*:=[profile?]
2525
>=dev-haskell/lrucache-1.1.1:=[profile?] <dev-haskell/lrucache-1.3
26-
>=dev-haskell/network-uri-2.6:=[profile?] <dev-haskell/network-uri-2.7
26+
>=dev-haskell/network-uri-2.6*:=[profile?]
2727
>=dev-haskell/optparse-applicative-0.12:=[profile?] <dev-haskell/optparse-applicative-0.19
28-
>=dev-haskell/parsec-3.0:=[profile?] <dev-haskell/parsec-3.2
29-
>=dev-haskell/random-1.0:=[profile?] <dev-haskell/random-1.3
28+
>=dev-haskell/parsec-3:=[profile?] <dev-haskell/parsec-3.2
29+
>=dev-haskell/random-1:=[profile?] <dev-haskell/random-1.3
3030
>=dev-haskell/regex-tdfa-1.1:=[profile?] <dev-haskell/regex-tdfa-1.4
3131
>=dev-haskell/resourcet-1.1:=[profile?] <dev-haskell/resourcet-1.4
3232
>=dev-haskell/scientific-0.3.4:=[profile?] <dev-haskell/scientific-0.4
3333
>=dev-haskell/tagsoup-0.13.1:=[profile?] <dev-haskell/tagsoup-0.15
34-
>=dev-haskell/time-locale-compat-0.1:=[profile?] <dev-haskell/time-locale-compat-0.2
35-
>=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3
34+
>=dev-haskell/time-locale-compat-0.1*:=[profile?]
35+
>=dev-haskell/unordered-containers-0.2*:=[profile?]
3636
>=dev-haskell/vector-0.11:=[profile?] <dev-haskell/vector-0.14
37-
>=dev-haskell/wai-app-static-3.1:=[profile?] <dev-haskell/wai-app-static-3.2
37+
>=dev-haskell/wai-app-static-3.1*:=[profile?]
3838
>=dev-haskell/yaml-0.8.11:=[profile?] <dev-haskell/yaml-0.12
3939
>=dev-lang/ghc-8.10.6:=
4040
|| (
41-
( >=dev-haskell/aeson-1.0 <dev-haskell/aeson-1.6 )
42-
( >=dev-haskell/aeson-2.0 <dev-haskell/aeson-2.3 )
41+
( >=dev-haskell/aeson-1 <dev-haskell/aeson-1.6 )
42+
( >=dev-haskell/aeson-2 <dev-haskell/aeson-2.3 )
4343
)
4444
dev-haskell/aeson:=[profile?]
4545
|| (
4646
( >=dev-haskell/text-0.11 <dev-haskell/text-1.3 )
47-
( >=dev-haskell/text-2.0 <dev-haskell/text-2.1 )
47+
( >=dev-haskell/text-2.0* )
4848
)
4949
dev-haskell/text:=[profile?]
5050
buildwebsite? (
5151
|| (
5252
( >=app-text/pandoc-2.11 <app-text/pandoc-2.20 )
53-
( >=app-text/pandoc-3.0 <app-text/pandoc-3.2 )
53+
( >=app-text/pandoc-3 <app-text/pandoc-3.2 )
5454
)
5555
app-text/pandoc:=[profile?]
5656
)
@@ -60,7 +60,7 @@ RDEPEND="
6060
previewserver? (
6161
>=dev-haskell/fsnotify-0.2:=[profile?] <dev-haskell/fsnotify-0.5
6262
>=dev-haskell/http-types-0.9:=[profile?] <dev-haskell/http-types-0.13
63-
>=dev-haskell/wai-3.2:=[profile?] <dev-haskell/wai-3.3
63+
>=dev-haskell/wai-3.2*:=[profile?]
6464
>=dev-haskell/warp-3.2:=[profile?] <dev-haskell/warp-3.4
6565
)
6666
!previewserver? (
@@ -74,27 +74,32 @@ RDEPEND="
7474
usepandoc? (
7575
|| (
7676
( >=app-text/pandoc-2.11 <app-text/pandoc-2.20 )
77-
( >=app-text/pandoc-3.0 <app-text/pandoc-3.2 )
77+
( >=app-text/pandoc-3 <app-text/pandoc-3.2 )
7878
)
7979
app-text/pandoc:=[profile?]
8080
)
8181
"
82-
DEPEND="${RDEPEND}
83-
>=dev-haskell/cabal-3.2.1.0
82+
DEPEND="
83+
${RDEPEND}
84+
>=dev-haskell/cabal-3.2.1
8485
test? (
8586
>=dev-haskell/quickcheck-2.8 <dev-haskell/quickcheck-2.15
8687
>=dev-haskell/tasty-0.11 <dev-haskell/tasty-1.5
87-
>=dev-haskell/tasty-golden-2.3 <dev-haskell/tasty-golden-2.4
88+
>=dev-haskell/tasty-golden-2.3*
8889
>=dev-haskell/tasty-hunit-0.9 <dev-haskell/tasty-hunit-0.11
8990
>=dev-haskell/tasty-quickcheck-0.8 <dev-haskell/tasty-quickcheck-0.11
9091
)
9192
"
9293

9394
src_configure() {
94-
haskell-cabal_src_configure \
95-
$(cabal_flag buildwebsite buildwebsite) \
96-
$(cabal_flag checkexternal checkexternal) \
97-
$(cabal_flag previewserver previewserver) \
98-
$(cabal_flag usepandoc usepandoc) \
95+
local config_opts=(
96+
$(cabal_flag buildwebsite buildwebsite)
97+
$(cabal_flag buildwebsite buildwebsite)
98+
$(cabal_flag checkexternal checkexternal)
99+
$(cabal_flag previewserver previewserver)
100+
$(cabal_flag usepandoc usepandoc)
99101
$(cabal_flag watchserver watchserver)
102+
)
103+
104+
haskell-cabal_src_configure "${config_opts[@]}"
100105
}

‎tests/data/golden/microstache-1.0.2.3.ebuild‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,17 +24,18 @@ RDEPEND="
2424
>=dev-lang/ghc-8.8.1:=
2525
|| (
2626
( >=dev-haskell/aeson-0.11 <dev-haskell/aeson-1.6 )
27-
( >=dev-haskell/aeson-2.0.0.0 <dev-haskell/aeson-2.2 )
27+
( >=dev-haskell/aeson-2 <dev-haskell/aeson-2.2 )
2828
)
2929
dev-haskell/aeson:=[profile?]
3030
|| (
31-
( >=dev-haskell/text-1.2.3.0 <dev-haskell/text-1.3 )
32-
( >=dev-haskell/text-2.0 <dev-haskell/text-2.1 )
31+
( >=dev-haskell/text-1.2.3 <dev-haskell/text-1.3 )
32+
( >=dev-haskell/text-2.0* )
3333
)
3434
dev-haskell/text:=[profile?]
3535
"
36-
DEPEND="${RDEPEND}
37-
>=dev-haskell/cabal-3.0.0.0
36+
DEPEND="
37+
${RDEPEND}
38+
>=dev-haskell/cabal-3
3839
test? (
3940
>=dev-haskell/base-orphans-0.8.7 <dev-haskell/base-orphans-0.9
4041
>=dev-haskell/tasty-1.4.0.1 <dev-haskell/tasty-1.5

‎tests/data/golden/time-compat-1.9.6.1.ebuild‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,21 +19,22 @@ KEYWORDS="~amd64"
1919

2020
RDEPEND="
2121
>=dev-haskell/base-orphans-0.8.4:=[profile?] <dev-haskell/base-orphans-0.10
22-
>=dev-haskell/hashable-1.3.2.0:=[profile?] <dev-haskell/hashable-1.5
22+
>=dev-haskell/hashable-1.3.2:=[profile?] <dev-haskell/hashable-1.5
2323
>=dev-lang/ghc-8.8.1:=
2424
"
25-
DEPEND="${RDEPEND}
26-
>=dev-haskell/cabal-3.0.0.0
25+
DEPEND="
26+
${RDEPEND}
27+
>=dev-haskell/cabal-3
2728
test? (
2829
>=dev-haskell/base-compat-0.10.5 <dev-haskell/base-compat-0.14
2930
>=dev-haskell/quickcheck-2.13 <dev-haskell/quickcheck-2.15
3031
>=dev-haskell/tagged-0.8.6 <dev-haskell/tagged-0.9
3132
>=dev-haskell/tasty-1.2.1 <dev-haskell/tasty-1.5
32-
>=dev-haskell/tasty-hunit-0.10 <dev-haskell/tasty-hunit-0.11
33-
>=dev-haskell/tasty-quickcheck-0.10 <dev-haskell/tasty-quickcheck-0.11
33+
>=dev-haskell/tasty-hunit-0.10*
34+
>=dev-haskell/tasty-quickcheck-0.10*
3435
|| (
3536
( >=dev-haskell/hunit-1.3.1 <dev-haskell/hunit-1.3.2 )
36-
( >=dev-haskell/hunit-1.6.0.0 <dev-haskell/hunit-1.7 )
37+
( >=dev-haskell/hunit-1.6 <dev-haskell/hunit-1.7 )
3738
)
3839
)
3940
"

‎tests/data/golden/tree-diff-0.2.2.ebuild‎

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -19,46 +19,47 @@ RDEPEND="
1919
>=dev-haskell/ansi-terminal-0.10:=[profile?] <dev-haskell/ansi-terminal-0.12
2020
>=dev-haskell/ansi-wl-pprint-0.6.8.2:=[profile?] <dev-haskell/ansi-wl-pprint-0.7
2121
>=dev-haskell/base-compat-0.10.5:=[profile?] <dev-haskell/base-compat-0.13
22-
>=dev-haskell/bytestring-builder-0.10.8.2.0:=[profile?] <dev-haskell/bytestring-builder-0.11
23-
>=dev-haskell/parsec-3.1.13.0:=[profile?] <dev-haskell/parsec-3.2
22+
>=dev-haskell/bytestring-builder-0.10.8.2:=[profile?] <dev-haskell/bytestring-builder-0.11
23+
>=dev-haskell/parsec-3.1.13:=[profile?] <dev-haskell/parsec-3.2
2424
>=dev-haskell/parsers-0.12.10:=[profile?] <dev-haskell/parsers-0.13
25-
>=dev-haskell/primitive-0.7.1.0:=[profile?] <dev-haskell/primitive-0.8
25+
>=dev-haskell/primitive-0.7.1:=[profile?] <dev-haskell/primitive-0.8
2626
>=dev-haskell/quickcheck-2.14.2:2=[profile?] <dev-haskell/quickcheck-2.15
2727
>=dev-haskell/scientific-0.3.6.2:=[profile?] <dev-haskell/scientific-0.4
2828
>=dev-haskell/semialign-1.2.0.1:=[profile?] <dev-haskell/semialign-1.3
2929
>=dev-haskell/strict-0.4.0.1:=[profile?] <dev-haskell/strict-0.5
3030
>=dev-haskell/tagged-0.8.6:=[profile?] <dev-haskell/tagged-0.9
3131
>=dev-haskell/these-1.1.1.1:=[profile?] <dev-haskell/these-1.2
32-
>=dev-haskell/unordered-containers-0.2.8.0:=[profile?] <dev-haskell/unordered-containers-0.3
32+
>=dev-haskell/unordered-containers-0.2.8:=[profile?] <dev-haskell/unordered-containers-0.3
3333
>=dev-haskell/uuid-types-1.0.3:=[profile?] <dev-haskell/uuid-types-1.1
34-
>=dev-haskell/vector-0.12.0.0:=[profile?] <dev-haskell/vector-0.14
34+
>=dev-haskell/vector-0.12:=[profile?] <dev-haskell/vector-0.14
3535
>=dev-lang/ghc-8.10.6:=
3636
|| (
37-
( >=dev-haskell/aeson-1.4.6.0 <dev-haskell/aeson-1.5 )
38-
( >=dev-haskell/aeson-1.5.6.0 <dev-haskell/aeson-1.6 )
39-
( >=dev-haskell/aeson-2.0.0.0 <dev-haskell/aeson-2.2 )
37+
( >=dev-haskell/aeson-1.4.6 <dev-haskell/aeson-1.5 )
38+
( >=dev-haskell/aeson-1.5.6 <dev-haskell/aeson-1.6 )
39+
( >=dev-haskell/aeson-2 <dev-haskell/aeson-2.2 )
4040
)
4141
dev-haskell/aeson:=[profile?]
4242
|| (
43-
( >=dev-haskell/hashable-1.2.7.0 <dev-haskell/hashable-1.4 )
43+
( >=dev-haskell/hashable-1.2.7 <dev-haskell/hashable-1.4 )
4444
( >=dev-haskell/hashable-1.4.0.1 <dev-haskell/hashable-1.5 )
4545
)
4646
dev-haskell/hashable:=[profile?]
4747
|| (
48-
( >=dev-haskell/text-1.2.3.0 <dev-haskell/text-1.3 )
49-
( >=dev-haskell/text-2.0 <dev-haskell/text-2.1 )
48+
( >=dev-haskell/text-1.2.3 <dev-haskell/text-1.3 )
49+
( >=dev-haskell/text-2.0* )
5050
)
5151
dev-haskell/text:=[profile?]
5252
"
53-
DEPEND="${RDEPEND}
54-
>=dev-haskell/cabal-3.2.1.0
53+
DEPEND="
54+
${RDEPEND}
55+
>=dev-haskell/cabal-3.2.1
5556
test? (
5657
dev-haskell/base-compat
5758
>=dev-haskell/tasty-golden-2.3.1.1 <dev-haskell/tasty-golden-2.4
5859
>=dev-haskell/tasty-quickcheck-0.10.1 <dev-haskell/tasty-quickcheck-0.11
5960
>=dev-haskell/trifecta-2 <dev-haskell/trifecta-2.2
6061
|| (
61-
( >=dev-haskell/tasty-1.2 <dev-haskell/tasty-1.3 )
62+
( >=dev-haskell/tasty-1.2* )
6263
( >=dev-haskell/tasty-1.3.1 <dev-haskell/tasty-1.4 )
6364
( >=dev-haskell/tasty-1.4.2 <dev-haskell/tasty-1.5 )
6465
)

0 commit comments

Comments
 (0)