1 |
commit: 3be65bd024ba4873caf192d056c8017870806f0d |
2 |
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Sep 30 06:54:39 2019 +0000 |
4 |
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Sep 30 06:54:56 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3be65bd0 |
7 |
|
8 |
dev-haskell/citeproc-hs: convert IUSE underscore to dash |
9 |
|
10 |
Reported-by: Michał Górny |
11 |
Closes: https://bugs.gentoo.org/695052 |
12 |
Package-Manager: Portage-2.3.76, Repoman-2.3.17 |
13 |
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org> |
14 |
|
15 |
.../citeproc-hs/citeproc-hs-0.3.10-r1.ebuild | 14 +++--- |
16 |
dev-haskell/citeproc-hs/citeproc-hs-0.3.10.ebuild | 51 ---------------------- |
17 |
dev-haskell/citeproc-hs/metadata.xml | 6 +-- |
18 |
3 files changed, 10 insertions(+), 61 deletions(-) |
19 |
|
20 |
diff --git a/dev-haskell/citeproc-hs/citeproc-hs-0.3.10-r1.ebuild b/dev-haskell/citeproc-hs/citeproc-hs-0.3.10-r1.ebuild |
21 |
index 1c7f1a2bf92..113ca2b6418 100644 |
22 |
--- a/dev-haskell/citeproc-hs/citeproc-hs-0.3.10-r1.ebuild |
23 |
+++ b/dev-haskell/citeproc-hs/citeproc-hs-0.3.10-r1.ebuild |
24 |
@@ -1,4 +1,4 @@ |
25 |
-# Copyright 1999-2015 Gentoo Foundation |
26 |
+# Copyright 1999-2019 Gentoo Authors |
27 |
# Distributed under the terms of the GNU General Public License v2 |
28 |
|
29 |
EAPI=5 |
30 |
@@ -15,7 +15,7 @@ SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz" |
31 |
LICENSE="BSD" |
32 |
SLOT="0/${PV}" |
33 |
KEYWORDS="~amd64 ~x86" |
34 |
-IUSE="+bibutils embed_data_files +hexpat +network +small_base unicode_collation" |
35 |
+IUSE="+bibutils embed-data-files +hexpat +network +small-base unicode-collation" |
36 |
|
37 |
RDEPEND="dev-haskell/json:=[profile?] |
38 |
dev-haskell/mtl:=[profile?] |
39 |
@@ -25,13 +25,13 @@ RDEPEND="dev-haskell/json:=[profile?] |
40 |
dev-haskell/utf8-string:=[profile?] |
41 |
>=dev-lang/ghc-7.4.1:= |
42 |
bibutils? ( >=dev-haskell/hs-bibutils-0.3:=[profile?] ) |
43 |
- embed_data_files? ( dev-haskell/file-embed:=[profile?] ) |
44 |
+ embed-data-files? ( dev-haskell/file-embed:=[profile?] ) |
45 |
hexpat? ( >=dev-haskell/hexpat-0.20.2:=[profile?] ) |
46 |
!hexpat? ( dev-haskell/xml:=[profile?] ) |
47 |
network? ( >=dev-haskell/http-4000.0.9:=[profile?] |
48 |
>=dev-haskell/network-2.6:=[profile?] |
49 |
>=dev-haskell/network-uri-2.6:=[profile?] ) |
50 |
- unicode_collation? ( dev-haskell/text:=[profile?] |
51 |
+ unicode-collation? ( dev-haskell/text:=[profile?] |
52 |
dev-haskell/text-icu:=[profile?] ) |
53 |
" |
54 |
DEPEND="${RDEPEND} |
55 |
@@ -46,9 +46,9 @@ src_prepare() { |
56 |
src_configure() { |
57 |
haskell-cabal_src_configure \ |
58 |
$(cabal_flag bibutils bibutils) \ |
59 |
- $(cabal_flag embed_data_files embed_data_files) \ |
60 |
+ $(cabal_flag embed-data-files embed_data_files) \ |
61 |
$(cabal_flag hexpat hexpat) \ |
62 |
$(cabal_flag network network) \ |
63 |
- $(cabal_flag small_base small_base) \ |
64 |
- $(cabal_flag unicode_collation unicode_collation) |
65 |
+ $(cabal_flag small-base small_base) \ |
66 |
+ $(cabal_flag unicode-collation unicode_collation) |
67 |
} |
68 |
|
69 |
diff --git a/dev-haskell/citeproc-hs/citeproc-hs-0.3.10.ebuild b/dev-haskell/citeproc-hs/citeproc-hs-0.3.10.ebuild |
70 |
deleted file mode 100644 |
71 |
index 5765a67367b..00000000000 |
72 |
--- a/dev-haskell/citeproc-hs/citeproc-hs-0.3.10.ebuild |
73 |
+++ /dev/null |
74 |
@@ -1,51 +0,0 @@ |
75 |
-# Copyright 1999-2015 Gentoo Foundation |
76 |
-# Distributed under the terms of the GNU General Public License v2 |
77 |
- |
78 |
-EAPI=5 |
79 |
- |
80 |
-# ebuild generated by hackport 0.4.3 |
81 |
- |
82 |
-CABAL_FEATURES="lib profile haddock hoogle hscolour" |
83 |
-inherit base haskell-cabal |
84 |
- |
85 |
-DESCRIPTION="A Citation Style Language implementation in Haskell" |
86 |
-HOMEPAGE="http://istitutocolli.org/repos/citeproc-hs/" |
87 |
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz" |
88 |
- |
89 |
-LICENSE="BSD" |
90 |
-SLOT="0/${PV}" |
91 |
-KEYWORDS="~amd64 ~x86" |
92 |
-IUSE="+bibutils embed_data_files +hexpat +network +small_base unicode_collation" |
93 |
- |
94 |
-RDEPEND="dev-haskell/json:=[profile?] |
95 |
- dev-haskell/mtl:=[profile?] |
96 |
- >=dev-haskell/pandoc-types-1.8:=[profile?] <dev-haskell/pandoc-types-1.13:=[profile?] |
97 |
- dev-haskell/parsec:=[profile?] |
98 |
- dev-haskell/syb:=[profile?] |
99 |
- dev-haskell/utf8-string:=[profile?] |
100 |
- >=dev-lang/ghc-7.4.1:= |
101 |
- bibutils? ( >=dev-haskell/hs-bibutils-0.3:=[profile?] ) |
102 |
- embed_data_files? ( dev-haskell/file-embed:=[profile?] ) |
103 |
- hexpat? ( >=dev-haskell/hexpat-0.20.2:=[profile?] ) |
104 |
- !hexpat? ( dev-haskell/xml:=[profile?] ) |
105 |
- network? ( >=dev-haskell/http-4000.0.9:=[profile?] |
106 |
- >=dev-haskell/network-2.6:=[profile?] |
107 |
- >=dev-haskell/network-uri-2.6:=[profile?] ) |
108 |
- unicode_collation? ( dev-haskell/text:=[profile?] |
109 |
- dev-haskell/text-icu:=[profile?] ) |
110 |
-" |
111 |
-DEPEND="${RDEPEND} |
112 |
- >=dev-haskell/cabal-1.6 |
113 |
-" |
114 |
- |
115 |
-PATCHES=("${FILESDIR}/${P}-ghc-7.10.patch") |
116 |
- |
117 |
-src_configure() { |
118 |
- haskell-cabal_src_configure \ |
119 |
- $(cabal_flag bibutils bibutils) \ |
120 |
- $(cabal_flag embed_data_files embed_data_files) \ |
121 |
- $(cabal_flag hexpat hexpat) \ |
122 |
- $(cabal_flag network network) \ |
123 |
- $(cabal_flag small_base small_base) \ |
124 |
- $(cabal_flag unicode_collation unicode_collation) |
125 |
-} |
126 |
|
127 |
diff --git a/dev-haskell/citeproc-hs/metadata.xml b/dev-haskell/citeproc-hs/metadata.xml |
128 |
index a27651833e7..9c951e54db5 100644 |
129 |
--- a/dev-haskell/citeproc-hs/metadata.xml |
130 |
+++ b/dev-haskell/citeproc-hs/metadata.xml |
131 |
@@ -7,11 +7,11 @@ |
132 |
</maintainer> |
133 |
<use> |
134 |
<flag name="bibutils">use Chris Putnam's <pkg>app-text/bibutils</pkg></flag> |
135 |
- <flag name="embed_data_files">Embed locale files into the library (needed for windows packaging)</flag> |
136 |
+ <flag name="embed-data-files">Embed locale files into the library (needed for windows packaging)</flag> |
137 |
<flag name="network">use <pkg>dev-haskell/network</pkg> and <pkg>dev-haskell/http</pkg> to retrieve CSL file from URIs</flag> |
138 |
<flag name="hexpat">use <pkg>dev-haskell/hexpat</pkg> instead of <pkg>dev-haskell/xml</pkg> for XML parsing</flag> |
139 |
- <flag name="small_base">Choose the new smaller, split-up base package.</flag> |
140 |
- <flag name="unicode_collation">Use Haskell bindings to the <pkg>dev-libs/icu</pkg></flag> |
141 |
+ <flag name="small-base">Choose the new smaller, split-up base package.</flag> |
142 |
+ <flag name="unicode-collation">Use Haskell bindings to the <pkg>dev-libs/icu</pkg></flag> |
143 |
</use> |
144 |
<longdescription> |
145 |
citeproc-hs is a library for rendering |