Gentoo Archives: gentoo-commits

From: Mikle Kolyada <zlogene@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-text/enchant/
Date: Mon, 30 Apr 2018 21:16:02
Message-Id: 1525122954.e2899af3524419071689fcb31d61b5a418cbeca6.zlogene@gentoo
1 commit: e2899af3524419071689fcb31d61b5a418cbeca6
2 Author: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
3 AuthorDate: Mon Apr 30 21:15:20 2018 +0000
4 Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
5 CommitDate: Mon Apr 30 21:15:54 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e2899af3
7
8 app-text/enchant: [QA] drop removed dependency
9
10 Package-Manager: Portage-2.3.24, Repoman-2.3.6
11
12 app-text/enchant/enchant-1.6.1.ebuild | 16 ++++++----------
13 app-text/enchant/enchant-2.1.0.ebuild | 17 +++++++----------
14 app-text/enchant/enchant-2.1.1.ebuild | 17 +++++++----------
15 app-text/enchant/enchant-2.1.2.ebuild | 15 ++++++---------
16 app-text/enchant/metadata.xml | 1 -
17 5 files changed, 26 insertions(+), 40 deletions(-)
18
19 diff --git a/app-text/enchant/enchant-1.6.1.ebuild b/app-text/enchant/enchant-1.6.1.ebuild
20 index 243c1947ec6..8a0c7ad3ef3 100644
21 --- a/app-text/enchant/enchant-1.6.1.ebuild
22 +++ b/app-text/enchant/enchant-1.6.1.ebuild
23 @@ -1,4 +1,4 @@
24 -# Copyright 1999-2017 Gentoo Foundation
25 +# Copyright 1999-2018 Gentoo Foundation
26 # Distributed under the terms of the GNU General Public License v2
27
28 EAPI=6
29 @@ -13,19 +13,16 @@ LICENSE="LGPL-2.1"
30 SLOT="0"
31 KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
32
33 -IUSE="aspell +hunspell static-libs test zemberek"
34 -REQUIRED_USE="|| ( hunspell aspell zemberek )"
35 +IUSE="aspell +hunspell static-libs test"
36 +REQUIRED_USE="|| ( hunspell aspell )"
37
38 # FIXME: depends on unittest++ but through pkgconfig which is a Debian hack, bug #629742
39 COMMON_DEPENDS="
40 >=dev-libs/glib-2.6:2
41 aspell? ( app-text/aspell )
42 - hunspell? ( >=app-text/hunspell-1.2.1:0= )
43 - zemberek? ( dev-libs/dbus-glib )
44 -"
45 -RDEPEND="${COMMON_DEPENDS}
46 - zemberek? ( app-text/zemberek-server )
47 -"
48 + hunspell? ( >=app-text/hunspell-1.2.1:0= )"
49 +RDEPEND="${COMMON_DEPENDS}"
50 +
51 DEPEND="${COMMON_DEPENDS}
52 virtual/pkgconfig
53 "
54 @@ -47,7 +44,6 @@ src_configure() {
55 $(use_enable aspell) \
56 $(use_enable hunspell myspell) \
57 $(use_enable static-libs static) \
58 - $(use_enable zemberek) \
59 --disable-hspell \
60 --disable-ispell \
61 --disable-uspell \
62
63 diff --git a/app-text/enchant/enchant-2.1.0.ebuild b/app-text/enchant/enchant-2.1.0.ebuild
64 index e3768516143..03527fb9495 100644
65 --- a/app-text/enchant/enchant-2.1.0.ebuild
66 +++ b/app-text/enchant/enchant-2.1.0.ebuild
67 @@ -1,4 +1,4 @@
68 -# Copyright 1999-2017 Gentoo Foundation
69 +# Copyright 1999-2018 Gentoo Foundation
70 # Distributed under the terms of the GNU General Public License v2
71
72 EAPI=6
73 @@ -11,19 +11,17 @@ LICENSE="LGPL-2.1"
74 SLOT="0"
75 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
76
77 -IUSE="aspell +hunspell static-libs test zemberek"
78 -REQUIRED_USE="|| ( hunspell aspell zemberek )"
79 +IUSE="aspell +hunspell static-libs test"
80 +REQUIRED_USE="|| ( hunspell aspell )"
81
82 # FIXME: depends on unittest++ but through pkgconfig which is a Debian hack, bug #629742
83 COMMON_DEPENDS="
84 >=dev-libs/glib-2.6:2
85 aspell? ( app-text/aspell )
86 - hunspell? ( >=app-text/hunspell-1.2.1:0= )
87 - zemberek? ( dev-libs/dbus-glib )
88 -"
89 -RDEPEND="${COMMON_DEPENDS}
90 - zemberek? ( app-text/zemberek-server )
91 -"
92 + hunspell? ( >=app-text/hunspell-1.2.1:0= )"
93 +
94 +RDEPEND="${COMMON_DEPENDS}"
95 +
96 DEPEND="${COMMON_DEPENDS}
97 virtual/pkgconfig
98 "
99 @@ -42,7 +40,6 @@ src_configure() {
100 $(use_with aspell) \
101 $(use_with hunspell) \
102 $(use_enable static-libs static) \
103 - $(use_with zemberek) \
104 --without-hspell \
105 --without-voikko \
106 --with-hunspell-dir="${EPREFIX}"/usr/share/hunspell/
107
108 diff --git a/app-text/enchant/enchant-2.1.1.ebuild b/app-text/enchant/enchant-2.1.1.ebuild
109 index 4e9c52c25da..0780c2cc403 100644
110 --- a/app-text/enchant/enchant-2.1.1.ebuild
111 +++ b/app-text/enchant/enchant-2.1.1.ebuild
112 @@ -1,4 +1,4 @@
113 -# Copyright 1999-2017 Gentoo Foundation
114 +# Copyright 1999-2018 Gentoo Foundation
115 # Distributed under the terms of the GNU General Public License v2
116
117 EAPI=6
118 @@ -11,19 +11,17 @@ LICENSE="LGPL-2.1"
119 SLOT="0/2"
120 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
121
122 -IUSE="aspell +hunspell static-libs test zemberek"
123 -REQUIRED_USE="|| ( hunspell aspell zemberek )"
124 +IUSE="aspell +hunspell static-libs test"
125 +REQUIRED_USE="|| ( hunspell aspell )"
126
127 # FIXME: depends on unittest++ but through pkgconfig which is a Debian hack, bug #629742
128 COMMON_DEPENDS="
129 >=dev-libs/glib-2.6:2
130 aspell? ( app-text/aspell )
131 - hunspell? ( >=app-text/hunspell-1.2.1:0= )
132 - zemberek? ( dev-libs/dbus-glib )
133 -"
134 -RDEPEND="${COMMON_DEPENDS}
135 - zemberek? ( app-text/zemberek-server )
136 -"
137 + hunspell? ( >=app-text/hunspell-1.2.1:0= )"
138 +
139 +RDEPEND="${COMMON_DEPENDS}"
140 +
141 DEPEND="${COMMON_DEPENDS}
142 virtual/pkgconfig
143 "
144 @@ -36,7 +34,6 @@ src_configure() {
145 $(use_with aspell) \
146 $(use_with hunspell) \
147 $(use_enable static-libs static) \
148 - $(use_with zemberek) \
149 --without-hspell \
150 --without-voikko \
151 --with-hunspell-dir="${EPREFIX}"/usr/share/hunspell/
152
153 diff --git a/app-text/enchant/enchant-2.1.2.ebuild b/app-text/enchant/enchant-2.1.2.ebuild
154 index 5f53e3589f5..0780c2cc403 100644
155 --- a/app-text/enchant/enchant-2.1.2.ebuild
156 +++ b/app-text/enchant/enchant-2.1.2.ebuild
157 @@ -11,19 +11,17 @@ LICENSE="LGPL-2.1"
158 SLOT="0/2"
159 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
160
161 -IUSE="aspell +hunspell static-libs test zemberek"
162 -REQUIRED_USE="|| ( hunspell aspell zemberek )"
163 +IUSE="aspell +hunspell static-libs test"
164 +REQUIRED_USE="|| ( hunspell aspell )"
165
166 # FIXME: depends on unittest++ but through pkgconfig which is a Debian hack, bug #629742
167 COMMON_DEPENDS="
168 >=dev-libs/glib-2.6:2
169 aspell? ( app-text/aspell )
170 - hunspell? ( >=app-text/hunspell-1.2.1:0= )
171 - zemberek? ( dev-libs/dbus-glib )
172 -"
173 -RDEPEND="${COMMON_DEPENDS}
174 - zemberek? ( app-text/zemberek-server )
175 -"
176 + hunspell? ( >=app-text/hunspell-1.2.1:0= )"
177 +
178 +RDEPEND="${COMMON_DEPENDS}"
179 +
180 DEPEND="${COMMON_DEPENDS}
181 virtual/pkgconfig
182 "
183 @@ -36,7 +34,6 @@ src_configure() {
184 $(use_with aspell) \
185 $(use_with hunspell) \
186 $(use_enable static-libs static) \
187 - $(use_with zemberek) \
188 --without-hspell \
189 --without-voikko \
190 --with-hunspell-dir="${EPREFIX}"/usr/share/hunspell/
191
192 diff --git a/app-text/enchant/metadata.xml b/app-text/enchant/metadata.xml
193 index 8a391bed92f..2b8b7cffbc1 100644
194 --- a/app-text/enchant/metadata.xml
195 +++ b/app-text/enchant/metadata.xml
196 @@ -8,6 +8,5 @@
197 <use>
198 <flag name="aspell">Adds support for <pkg>app-text/aspell</pkg> spell checker</flag>
199 <flag name="hunspell">Adds support for <pkg>app-text/hunspell</pkg> spell checker</flag>
200 - <flag name="zemberek">Adds support for <pkg>app-text/zemberek-server</pkg> spell checker server</flag>
201 </use>
202 </pkgmetadata>