commit: 6d977ecde366852ebb137ea7dacd3ab6825f8736 Author: Anna Vyalkova <cyber+gentoo <AT> sysrq <DOT> in> AuthorDate: Tue May 25 22:44:03 2021 +0000 Commit: Anna Vyalkova <cyber+gentoo <AT> sysrq <DOT> in> CommitDate: Wed May 26 01:53:15 2021 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=6d977ecd
app-accessibility/rhvoice: unbundle rapidxml Bug in dev-libs/rapidxml is resolved now, so using bundled version is not necessary anymore. https://bugs.gentoo.org/791328 Signed-off-by: Anna Vyalkova <cyber+gentoo <AT> sysrq.in> app-accessibility/rhvoice/rhvoice-1.2.4.ebuild | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/app-accessibility/rhvoice/rhvoice-1.2.4.ebuild b/app-accessibility/rhvoice/rhvoice-1.2.4.ebuild index a467dbdff..a550f7b13 100644 --- a/app-accessibility/rhvoice/rhvoice-1.2.4.ebuild +++ b/app-accessibility/rhvoice/rhvoice-1.2.4.ebuild @@ -10,16 +10,16 @@ DESCRIPTION="TTS engine with extended languages support (including Russian)" HOMEPAGE="https://rhvoice.su https://github.com/RHVoice/RHVoice"; SRC_URI=" https://github.com/${MY_PN}/${MY_PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz - l10n_en? ( https://github.com/RHVoice/evgeniy-eng/archive/refs/tags/4.0.tar.gz -> rhvoice-evgeniy-eng-4.0.tar.gz ) + l10n_en? ( https://github.com/${MY_PN}/evgeniy-eng/archive/refs/tags/4.0.tar.gz -> rhvoice-evgeniy-eng-4.0.tar.gz ) l10n_ru? ( - https://github.com/RHVoice/evgeniy-rus/archive/refs/tags/4.0.tar.gz -> rhvoice-evgeniy-rus-4.0.tar.gz - https://github.com/RHVoice/victoria-rus/archive/refs/tags/4.0.tar.gz -> rhvoice-victoria-4.0.tar.gz + https://github.com/${MY_PN}/evgeniy-rus/archive/refs/tags/4.0.tar.gz -> rhvoice-evgeniy-rus-4.0.tar.gz + https://github.com/${MY_PN}/victoria-rus/archive/refs/tags/4.0.tar.gz -> rhvoice-victoria-4.0.tar.gz ) " S="${WORKDIR}/${MY_PN}-${PV}" CMAKE_REMOVE_MODULES_LIST="Hardening VersionFromGit" -LICENSE="l10n_pt-BR? ( CC-BY-SA-4.0 ) BSD GPL-2 GPL-3+ LGPL-2.1+ MIT" +LICENSE="l10n_pt-BR? ( CC-BY-SA-4.0 ) BSD GPL-2 GPL-3+ LGPL-2.1+" KEYWORDS="~amd64 ~x86" SLOT="0" IUSE="ao bindist cli client portaudio +pulseaudio +server +speech-dispatcher utils" @@ -54,6 +54,7 @@ RDEPEND=" " BDEPEND="${DEPEND} dev-cpp/cli11 + dev-libs/rapidxml dev-libs/utfcpp " REQUIRED_USE="|| ( ao portaudio pulseaudio )" @@ -91,8 +92,9 @@ src_prepare() { sed 's|/systemd/system||' \ -i src/service/CMakeLists.txt || die - rm -r src/third-party/{sonic,tclap,utf8} || die - sed "/sonic/d" -i src/third-party/CMakeLists.txt || die + sed -e "/sonic/d" \ + -e "/set(RAPIDXML_INCLUDE_DIR/d" \ + -i src/third-party/CMakeLists.txt || die sed "/set(UTF8_INCLUDE_DIR/d" -i src/CMakeLists.txt || die sed 's/ "RHVoice_question_match"//' \ @@ -136,10 +138,9 @@ src_configure() { -DWITH_PULSE=$(usex pulseaudio) -DWITH_PORTAUDIO=$(usex portaudio) # src/third-party/CMakeLists.txt - -DRAPIDXML_INCLUDE_DIR="${S}"/src/third-party/rapidxml + -DRAPIDXML_INCLUDE_DIR=/usr/include/rapidxml -DUTF8_INCLUDE_DIR=/usr/include/utf8cpp ) - append-cppflags -std=gnu++11 cmake_src_configure }
