| 1 |
commit: 6d977ecde366852ebb137ea7dacd3ab6825f8736 |
| 2 |
Author: Anna Vyalkova <cyber+gentoo <AT> sysrq <DOT> in> |
| 3 |
AuthorDate: Tue May 25 22:44:03 2021 +0000 |
| 4 |
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed May 26 01:53:15 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=6d977ecd |
| 7 |
|
| 8 |
app-accessibility/rhvoice: unbundle rapidxml |
| 9 |
|
| 10 |
Bug in dev-libs/rapidxml is resolved now, so using bundled version is |
| 11 |
not necessary anymore. |
| 12 |
https://bugs.gentoo.org/791328 |
| 13 |
|
| 14 |
Signed-off-by: Anna Vyalkova <cyber+gentoo <AT> sysrq.in> |
| 15 |
|
| 16 |
app-accessibility/rhvoice/rhvoice-1.2.4.ebuild | 17 +++++++++-------- |
| 17 |
1 file changed, 9 insertions(+), 8 deletions(-) |
| 18 |
|
| 19 |
diff --git a/app-accessibility/rhvoice/rhvoice-1.2.4.ebuild b/app-accessibility/rhvoice/rhvoice-1.2.4.ebuild |
| 20 |
index a467dbdff..a550f7b13 100644 |
| 21 |
--- a/app-accessibility/rhvoice/rhvoice-1.2.4.ebuild |
| 22 |
+++ b/app-accessibility/rhvoice/rhvoice-1.2.4.ebuild |
| 23 |
@@ -10,16 +10,16 @@ DESCRIPTION="TTS engine with extended languages support (including Russian)" |
| 24 |
HOMEPAGE="https://rhvoice.su https://github.com/RHVoice/RHVoice" |
| 25 |
SRC_URI=" |
| 26 |
https://github.com/${MY_PN}/${MY_PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz |
| 27 |
- l10n_en? ( https://github.com/RHVoice/evgeniy-eng/archive/refs/tags/4.0.tar.gz -> rhvoice-evgeniy-eng-4.0.tar.gz ) |
| 28 |
+ l10n_en? ( https://github.com/${MY_PN}/evgeniy-eng/archive/refs/tags/4.0.tar.gz -> rhvoice-evgeniy-eng-4.0.tar.gz ) |
| 29 |
l10n_ru? ( |
| 30 |
- https://github.com/RHVoice/evgeniy-rus/archive/refs/tags/4.0.tar.gz -> rhvoice-evgeniy-rus-4.0.tar.gz |
| 31 |
- https://github.com/RHVoice/victoria-rus/archive/refs/tags/4.0.tar.gz -> rhvoice-victoria-4.0.tar.gz |
| 32 |
+ https://github.com/${MY_PN}/evgeniy-rus/archive/refs/tags/4.0.tar.gz -> rhvoice-evgeniy-rus-4.0.tar.gz |
| 33 |
+ https://github.com/${MY_PN}/victoria-rus/archive/refs/tags/4.0.tar.gz -> rhvoice-victoria-4.0.tar.gz |
| 34 |
) |
| 35 |
" |
| 36 |
S="${WORKDIR}/${MY_PN}-${PV}" |
| 37 |
CMAKE_REMOVE_MODULES_LIST="Hardening VersionFromGit" |
| 38 |
|
| 39 |
-LICENSE="l10n_pt-BR? ( CC-BY-SA-4.0 ) BSD GPL-2 GPL-3+ LGPL-2.1+ MIT" |
| 40 |
+LICENSE="l10n_pt-BR? ( CC-BY-SA-4.0 ) BSD GPL-2 GPL-3+ LGPL-2.1+" |
| 41 |
KEYWORDS="~amd64 ~x86" |
| 42 |
SLOT="0" |
| 43 |
IUSE="ao bindist cli client portaudio +pulseaudio +server +speech-dispatcher utils" |
| 44 |
@@ -54,6 +54,7 @@ RDEPEND=" |
| 45 |
" |
| 46 |
BDEPEND="${DEPEND} |
| 47 |
dev-cpp/cli11 |
| 48 |
+ dev-libs/rapidxml |
| 49 |
dev-libs/utfcpp |
| 50 |
" |
| 51 |
REQUIRED_USE="|| ( ao portaudio pulseaudio )" |
| 52 |
@@ -91,8 +92,9 @@ src_prepare() { |
| 53 |
sed 's|/systemd/system||' \ |
| 54 |
-i src/service/CMakeLists.txt || die |
| 55 |
|
| 56 |
- rm -r src/third-party/{sonic,tclap,utf8} || die |
| 57 |
- sed "/sonic/d" -i src/third-party/CMakeLists.txt || die |
| 58 |
+ sed -e "/sonic/d" \ |
| 59 |
+ -e "/set(RAPIDXML_INCLUDE_DIR/d" \ |
| 60 |
+ -i src/third-party/CMakeLists.txt || die |
| 61 |
sed "/set(UTF8_INCLUDE_DIR/d" -i src/CMakeLists.txt || die |
| 62 |
|
| 63 |
sed 's/ "RHVoice_question_match"//' \ |
| 64 |
@@ -136,10 +138,9 @@ src_configure() { |
| 65 |
-DWITH_PULSE=$(usex pulseaudio) |
| 66 |
-DWITH_PORTAUDIO=$(usex portaudio) |
| 67 |
# src/third-party/CMakeLists.txt |
| 68 |
- -DRAPIDXML_INCLUDE_DIR="${S}"/src/third-party/rapidxml |
| 69 |
+ -DRAPIDXML_INCLUDE_DIR=/usr/include/rapidxml |
| 70 |
-DUTF8_INCLUDE_DIR=/usr/include/utf8cpp |
| 71 |
) |
| 72 |
|
| 73 |
- append-cppflags -std=gnu++11 |
| 74 |
cmake_src_configure |
| 75 |
} |
Archives