1 |
commit: f938606de97277bed5d6432cca0e153d5ae20632 |
2 |
Author: Anna (cybertailor) Vyalkova <cyber+gentoo <AT> sysrq <DOT> in> |
3 |
AuthorDate: Thu Sep 30 16:32:52 2021 +0000 |
4 |
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Sep 30 16:35:24 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=f938606d |
7 |
|
8 |
app-accessibility/rhvoice: update EAPI 7 -> 8 |
9 |
|
10 |
- drop "cli" use flag (deprecated) |
11 |
- drop "utils" use flag (fails to build) |
12 |
- do not remove Hardening.cmake module |
13 |
- fix depends |
14 |
|
15 |
Closes: https://bugs.gentoo.org/815418 |
16 |
Signed-off-by: Anna (cybertailor) Vyalkova <cyber+gentoo <AT> sysrq.in> |
17 |
|
18 |
app-accessibility/rhvoice/Manifest | 2 +- |
19 |
app-accessibility/rhvoice/metadata.xml | 67 +++++++++------------- |
20 |
...hvoice-1.4.2.ebuild => rhvoice-1.4.2-r1.ebuild} | 39 ++++++------- |
21 |
3 files changed, 47 insertions(+), 61 deletions(-) |
22 |
|
23 |
diff --git a/app-accessibility/rhvoice/Manifest b/app-accessibility/rhvoice/Manifest |
24 |
index 3a3eadbd1..e6d18c70c 100644 |
25 |
--- a/app-accessibility/rhvoice/Manifest |
26 |
+++ b/app-accessibility/rhvoice/Manifest |
27 |
@@ -4,4 +4,4 @@ DIST rhvoice-evgeniy-eng-4.0.tar.gz 7338125 BLAKE2B 58eaf04e77bde46e5013e3959815 |
28 |
DIST rhvoice-evgeniy-rus-4.0.tar.gz 9962477 BLAKE2B d3fffbd54813d80734b59b6ac0ed96c0e07ce4266594a918acc01fe2bdd649d854ffe7306b57c3cb3718cdc1a090f6f7f28712005c708a39a486867760162cf9 SHA512 4053185fd5cff60a8cf3355fad69ab63348fc5047a7e5d2328a639a5c65cecfaadc92d63599b0b8bc7ca804753593c78c837621cdd153c6ce247100141b96500 |
29 |
DIST rhvoice-victoria-4.0.tar.gz 7425747 BLAKE2B 221805cef8b21cee24dcd34cde06450a7f9a2a588820265ae51729ddc73604caf2e089fb97ee96bf7503018f4fa967aa416fe0f0cfaf597e4d0dea4e0c72de54 SHA512 03b95f76bbd0b213fac867705acd3229f2d62448cdb863968b6ff02cc06f162d07a6154418e3ceee63d8d5352a00c1fed57b635d59424234b6cae3b1914da1cb |
30 |
DIST rhvoice-volodymyr-4.0.tar.gz 10794551 BLAKE2B a0e1f78652ecc8f89bfa404fcab6d3400e0f45282da53317a4af340c9acaffb545460f3a4bbf309b9a2525bd3695a4ff47edd00cb6692651377d44d717949375 SHA512 8f0f15229d451bbcf6db3b0f267e82635603b582f2af18d14421f3e108cdd14e4164e74e3c4723226e37b8ee7287ffa5d4083f9d2defd8b5c1b559eba547e849 |
31 |
-DIST rhvoice-yuriy.tar.gz 12734672 BLAKE2B 7e49c0825bfc148e8e7144d578c95ad159e2c935256174134f0682318f78b5162205b3781d365cc333c61123c1b118b464e28d63046bc497a75afcd6f8fbbc85 SHA512 07c9e65277c1774cf0185ba60107ff8f0dda5fa18eeadbfcb0cbdf5258e3fd2a364bb91c796473c9294a61e5c9366080d4d6ee115aace37f533ea1e6f167690b |
32 |
+DIST rhvoice-yuriy-4.0.tar.gz 12734672 BLAKE2B 7e49c0825bfc148e8e7144d578c95ad159e2c935256174134f0682318f78b5162205b3781d365cc333c61123c1b118b464e28d63046bc497a75afcd6f8fbbc85 SHA512 07c9e65277c1774cf0185ba60107ff8f0dda5fa18eeadbfcb0cbdf5258e3fd2a364bb91c796473c9294a61e5c9366080d4d6ee115aace37f533ea1e6f167690b |
33 |
|
34 |
diff --git a/app-accessibility/rhvoice/metadata.xml b/app-accessibility/rhvoice/metadata.xml |
35 |
index 9e4ffb92d..e90d33d77 100644 |
36 |
--- a/app-accessibility/rhvoice/metadata.xml |
37 |
+++ b/app-accessibility/rhvoice/metadata.xml |
38 |
@@ -1,45 +1,32 @@ |
39 |
<?xml version="1.0" encoding="UTF-8"?> |
40 |
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
41 |
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> |
42 |
<pkgmetadata> |
43 |
- <upstream> |
44 |
- <remote-id type="github">RHVoice/RHVoice</remote-id> |
45 |
- </upstream> |
46 |
- <maintainer type="person"> |
47 |
- <email>cyber+gentoo@×××××.in</email> |
48 |
- <name>Anna</name> |
49 |
- </maintainer> |
50 |
- <use> |
51 |
- <flag name="cli"> |
52 |
- Build a CLI application that allows you to synthesize speech |
53 |
- </flag> |
54 |
- <flag name="client"> |
55 |
- Build a client allowing to speak text (deprecated - use speech-dispatcher) |
56 |
- </flag> |
57 |
- <flag name="server"> |
58 |
- Build a server application |
59 |
- </flag> |
60 |
- <flag name="speech-dispatcher"> |
61 |
- Build a speech-dispatcher middleware module |
62 |
- </flag> |
63 |
- <flag name="utils"> |
64 |
- Build utilities needed for the ones creating voices |
65 |
- </flag> |
66 |
- </use> |
67 |
- <longdescription lang="en"> |
68 |
- RHVoice is a free and open source speech synthesizer. |
69 |
+<upstream> |
70 |
+ <remote-id type="github">RHVoice/RHVoice</remote-id> |
71 |
+</upstream> |
72 |
+<maintainer type="person"> |
73 |
+ <email>cyber+gentoo@×××××.in</email> |
74 |
+ <name>Anna</name> |
75 |
+</maintainer> |
76 |
+<use> |
77 |
+ <flag name="cli">Build a CLI application that allows you to synthesize speech</flag> |
78 |
+ <flag name="server">Build a server application</flag> |
79 |
+ <flag name="speech-dispatcher">Build a speech-dispatcher middleware module</flag> |
80 |
+ <!-- flag name="utils">Build utilities needed for the ones creating voices</flag --> |
81 |
+</use> |
82 |
+<longdescription lang="en"> |
83 |
+ RHVoice is a free and open source speech synthesizer. |
84 |
|
85 |
- Voices are built from recordings of natural speech. They have |
86 |
- small footprints, because only statistical models are stored |
87 |
- on users' computers. And though the voices lack the |
88 |
- naturalness of the synthesizers which generate speech by |
89 |
- combining segments of the recordings themselves, they are |
90 |
- still very intelligible and resemble the speakers who recorded |
91 |
- the source material. |
92 |
+ Voices are built from recordings of natural speech. They have small |
93 |
+ footprints, because only statistical models are stored on users' |
94 |
+ computers. And though the voices lack the naturalness of the |
95 |
+ synthesizers which generate speech by combining segments of the |
96 |
+ recordings themselves, they are still very intelligible and resemble |
97 |
+ the speakers who recorded the source material. |
98 |
|
99 |
- Initially, RHVoice could speak only Russian. Now it also |
100 |
- supports American English, Brazilian Portuguese, Esperanto, |
101 |
- Georgian, Ukrainian, Kyrgyz and Tatar. In theory, it is |
102 |
- possible to implement support for other languages, if all the |
103 |
- necessary resources can be found or created. |
104 |
- </longdescription> |
105 |
+ Initially, RHVoice could speak only Russian. Now it also supports |
106 |
+ American English, Brazilian Portuguese, Esperanto, Georgian, Ukrainian, |
107 |
+ Kyrgyz and Tatar. In theory, it is possible to implement support for |
108 |
+ other languages, if all the necessary resources can be found or created. |
109 |
+</longdescription> |
110 |
</pkgmetadata> |
111 |
|
112 |
diff --git a/app-accessibility/rhvoice/rhvoice-1.4.2.ebuild b/app-accessibility/rhvoice/rhvoice-1.4.2-r1.ebuild |
113 |
similarity index 89% |
114 |
rename from app-accessibility/rhvoice/rhvoice-1.4.2.ebuild |
115 |
rename to app-accessibility/rhvoice/rhvoice-1.4.2-r1.ebuild |
116 |
index 363d12136..68ee79ca6 100644 |
117 |
--- a/app-accessibility/rhvoice/rhvoice-1.4.2.ebuild |
118 |
+++ b/app-accessibility/rhvoice/rhvoice-1.4.2-r1.ebuild |
119 |
@@ -1,9 +1,10 @@ |
120 |
# Copyright 2021 Gentoo Authors |
121 |
# Distributed under the terms of the GNU General Public License v2 |
122 |
|
123 |
-EAPI=7 |
124 |
+EAPI=8 |
125 |
|
126 |
-inherit cmake multilib |
127 |
+CMAKE_REMOVE_MODULES_LIST=( VersionFromGit ) |
128 |
+inherit cmake |
129 |
|
130 |
DESCRIPTION="TTS engine with extended languages support (including Russian)" |
131 |
HOMEPAGE="https://rhvoice.su https://github.com/RHVoice/RHVoice" |
132 |
@@ -14,17 +15,16 @@ SRC_URI=" |
133 |
https://github.com/${PN}/aleksandr-hq-rus/archive/refs/tags/4.0.tar.gz -> rhvoice-aleksandr-hq-4.0.tar.gz |
134 |
https://github.com/${PN}/evgeniy-rus/archive/refs/tags/4.0.tar.gz -> rhvoice-evgeniy-rus-4.0.tar.gz |
135 |
https://github.com/${PN}/victoria-rus/archive/refs/tags/4.0.tar.gz -> rhvoice-victoria-4.0.tar.gz |
136 |
- https://github.com/${PN}/yuriy-rus/archive/refs/tags/4.0.tar.gz -> rhvoice-yuriy.tar.gz |
137 |
+ https://github.com/${PN}/yuriy-rus/archive/refs/tags/4.0.tar.gz -> rhvoice-yuriy-4.0.tar.gz |
138 |
) |
139 |
l10n_uk? ( https://github.com/${PN}/volodymyr-ukr/archive/refs/tags/4.0.tar.gz -> rhvoice-volodymyr-4.0.tar.gz ) |
140 |
" |
141 |
S="${WORKDIR}/RHVoice-${PV}" |
142 |
-CMAKE_REMOVE_MODULES_LIST="Hardening VersionFromGit" |
143 |
|
144 |
LICENSE="l10n_pt-BR? ( CC-BY-SA-4.0 ) l10n_mk? ( AGPL-3 ) BSD GPL-2 GPL-3+ LGPL-2.1+" |
145 |
KEYWORDS="~amd64 ~x86" |
146 |
SLOT="0" |
147 |
-IUSE="ao cli client portaudio +pulseaudio +server +speech-dispatcher utils" |
148 |
+IUSE="ao cli portaudio +pulseaudio +server +speech-dispatcher" |
149 |
REQUIRED_USE="|| ( ao portaudio pulseaudio )" |
150 |
|
151 |
CC_NC_LANGS=( en eo ky ru uk ) |
152 |
@@ -42,20 +42,22 @@ for lang in "${NC_LANGS[@]}" ; do |
153 |
LICENSE+=" ( free-noncomm )" |
154 |
done |
155 |
|
156 |
-RDEPEND=" |
157 |
- !dev-libs/hts_engine |
158 |
+DEPEND=" |
159 |
ao? ( media-libs/libao ) |
160 |
- client? ( sys-apps/dbus ) |
161 |
portaudio? ( media-libs/portaudio ) |
162 |
pulseaudio? ( media-sound/pulseaudio ) |
163 |
server? ( |
164 |
- dev-libs/glib[dbus] |
165 |
+ dev-libs/glib:2[dbus] |
166 |
+ dev-libs/libsigc++:2 |
167 |
>=dev-cpp/glibmm-2.66.1:2 |
168 |
) |
169 |
speech-dispatcher? ( app-accessibility/speech-dispatcher ) |
170 |
" |
171 |
-BDEPEND="${DEPEND} |
172 |
- dev-cpp/cli11 |
173 |
+RDEPEND="${DEPEND} |
174 |
+ !dev-libs/hts_engine |
175 |
+" |
176 |
+BDEPEND=" |
177 |
+ dev-cpp/cli11:= |
178 |
dev-libs/rapidxml |
179 |
dev-libs/utfcpp |
180 |
" |
181 |
@@ -75,18 +77,18 @@ src_unpack() { |
182 |
# git submodules, which are not present in the snapshot |
183 |
rmdir "${S}"/data/voices/{aleksandr-hq,evgeniy-rus,evgeniy-eng,victoria,volodymyr,yuriy} || die |
184 |
|
185 |
- if use l10n_ru ; then |
186 |
+ if use l10n_ru; then |
187 |
mv "${WORKDIR}"/aleksandr-hq-rus-4.0 "${S}"/data/voices/aleksandr-hq || die |
188 |
mv "${WORKDIR}"/evgeniy-rus-4.0 "${S}"/data/voices/evgeniy-rus || die |
189 |
mv "${WORKDIR}"/victoria-rus-4.0 "${S}"/data/voices/victoria || die |
190 |
mv "${WORKDIR}"/yuriy-rus-4.0 "${S}"/data/voices/yuriy || die |
191 |
fi |
192 |
|
193 |
- if use l10n_en ; then |
194 |
+ if use l10n_en; then |
195 |
mv "${WORKDIR}"/evgeniy-eng-4.0 "${S}"/data/voices/evgeniy-eng || die |
196 |
fi |
197 |
|
198 |
- if use l10n_uk ; then |
199 |
+ if use l10n_uk; then |
200 |
mv "${WORKDIR}"/volodymyr-ukr-4.0 "${S}"/data/voices/volodymyr || die |
201 |
fi |
202 |
} |
203 |
@@ -97,7 +99,7 @@ src_prepare() { |
204 |
sed "s|/lib/speech-dispatcher-modules|/$(get_libdir)/speech-dispatcher-modules|" \ |
205 |
-i src/sd_module/CMakeLists.txt || die |
206 |
|
207 |
- sed 's|/systemd/system||' \ |
208 |
+ sed "s|/systemd/system||" \ |
209 |
-i src/service/CMakeLists.txt || die |
210 |
|
211 |
sed -e "/set(RAPIDXML_INCLUDE_DIR/d" \ |
212 |
@@ -108,13 +110,10 @@ src_prepare() { |
213 |
-i src/third-party/mage/CMakeLists.txt || die |
214 |
|
215 |
sed -e "/include(VersionFromGit)/d" \ |
216 |
- -e "/include(Hardening)/d" \ |
217 |
-e "/find_package(Sanitizers)/d" \ |
218 |
-e "/getVersionFromGit/d" \ |
219 |
- -e "/harden/d" \ |
220 |
-i CMakeLists.txt || die |
221 |
sed -e "/add_sanitizers/d" \ |
222 |
- -e "/harden/d" \ |
223 |
-i src/*/CMakeLists.txt \ |
224 |
-i src/third-party/*/CMakeLists.txt || die |
225 |
|
226 |
@@ -136,8 +135,8 @@ src_configure() { |
227 |
-DRHVOICE_VERSION_MAJOR=$(ver_cut 1) |
228 |
-DWITH_CLI11=ON |
229 |
# src/CMakeLists.txt |
230 |
- -DBUILD_CLIENT=$(usex client) |
231 |
- -DBUILD_UTILS=$(usex utils) |
232 |
+ -DBUILD_CLIENT=OFF # deprecated |
233 |
+ -DBUILD_UTILS=OFF # fails to build because of bundled tclap |
234 |
-DBUILD_TESTS=$(usex cli) |
235 |
-DBUILD_SERVICE=$(usex server) |
236 |
-DBUILD_SPEECHDISPATCHER_MODULE=$(usex speech-dispatcher) |