commit: f938606de97277bed5d6432cca0e153d5ae20632 Author: Anna (cybertailor) Vyalkova <cyber+gentoo <AT> sysrq <DOT> in> AuthorDate: Thu Sep 30 16:32:52 2021 +0000 Commit: Anna Vyalkova <cyber+gentoo <AT> sysrq <DOT> in> CommitDate: Thu Sep 30 16:35:24 2021 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=f938606d
app-accessibility/rhvoice: update EAPI 7 -> 8 - drop "cli" use flag (deprecated) - drop "utils" use flag (fails to build) - do not remove Hardening.cmake module - fix depends Closes: https://bugs.gentoo.org/815418 Signed-off-by: Anna (cybertailor) Vyalkova <cyber+gentoo <AT> sysrq.in> app-accessibility/rhvoice/Manifest | 2 +- app-accessibility/rhvoice/metadata.xml | 67 +++++++++------------- ...hvoice-1.4.2.ebuild => rhvoice-1.4.2-r1.ebuild} | 39 ++++++------- 3 files changed, 47 insertions(+), 61 deletions(-) diff --git a/app-accessibility/rhvoice/Manifest b/app-accessibility/rhvoice/Manifest index 3a3eadbd1..e6d18c70c 100644 --- a/app-accessibility/rhvoice/Manifest +++ b/app-accessibility/rhvoice/Manifest @@ -4,4 +4,4 @@ DIST rhvoice-evgeniy-eng-4.0.tar.gz 7338125 BLAKE2B 58eaf04e77bde46e5013e3959815 DIST rhvoice-evgeniy-rus-4.0.tar.gz 9962477 BLAKE2B d3fffbd54813d80734b59b6ac0ed96c0e07ce4266594a918acc01fe2bdd649d854ffe7306b57c3cb3718cdc1a090f6f7f28712005c708a39a486867760162cf9 SHA512 4053185fd5cff60a8cf3355fad69ab63348fc5047a7e5d2328a639a5c65cecfaadc92d63599b0b8bc7ca804753593c78c837621cdd153c6ce247100141b96500 DIST rhvoice-victoria-4.0.tar.gz 7425747 BLAKE2B 221805cef8b21cee24dcd34cde06450a7f9a2a588820265ae51729ddc73604caf2e089fb97ee96bf7503018f4fa967aa416fe0f0cfaf597e4d0dea4e0c72de54 SHA512 03b95f76bbd0b213fac867705acd3229f2d62448cdb863968b6ff02cc06f162d07a6154418e3ceee63d8d5352a00c1fed57b635d59424234b6cae3b1914da1cb DIST rhvoice-volodymyr-4.0.tar.gz 10794551 BLAKE2B a0e1f78652ecc8f89bfa404fcab6d3400e0f45282da53317a4af340c9acaffb545460f3a4bbf309b9a2525bd3695a4ff47edd00cb6692651377d44d717949375 SHA512 8f0f15229d451bbcf6db3b0f267e82635603b582f2af18d14421f3e108cdd14e4164e74e3c4723226e37b8ee7287ffa5d4083f9d2defd8b5c1b559eba547e849 -DIST rhvoice-yuriy.tar.gz 12734672 BLAKE2B 7e49c0825bfc148e8e7144d578c95ad159e2c935256174134f0682318f78b5162205b3781d365cc333c61123c1b118b464e28d63046bc497a75afcd6f8fbbc85 SHA512 07c9e65277c1774cf0185ba60107ff8f0dda5fa18eeadbfcb0cbdf5258e3fd2a364bb91c796473c9294a61e5c9366080d4d6ee115aace37f533ea1e6f167690b +DIST rhvoice-yuriy-4.0.tar.gz 12734672 BLAKE2B 7e49c0825bfc148e8e7144d578c95ad159e2c935256174134f0682318f78b5162205b3781d365cc333c61123c1b118b464e28d63046bc497a75afcd6f8fbbc85 SHA512 07c9e65277c1774cf0185ba60107ff8f0dda5fa18eeadbfcb0cbdf5258e3fd2a364bb91c796473c9294a61e5c9366080d4d6ee115aace37f533ea1e6f167690b diff --git a/app-accessibility/rhvoice/metadata.xml b/app-accessibility/rhvoice/metadata.xml index 9e4ffb92d..e90d33d77 100644 --- a/app-accessibility/rhvoice/metadata.xml +++ b/app-accessibility/rhvoice/metadata.xml @@ -1,45 +1,32 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd";> <pkgmetadata> - <upstream> - <remote-id type="github">RHVoice/RHVoice</remote-id> - </upstream> - <maintainer type="person"> - <email>[email protected]</email> - <name>Anna</name> - </maintainer> - <use> - <flag name="cli"> - Build a CLI application that allows you to synthesize speech - </flag> - <flag name="client"> - Build a client allowing to speak text (deprecated - use speech-dispatcher) - </flag> - <flag name="server"> - Build a server application - </flag> - <flag name="speech-dispatcher"> - Build a speech-dispatcher middleware module - </flag> - <flag name="utils"> - Build utilities needed for the ones creating voices - </flag> - </use> - <longdescription lang="en"> - RHVoice is a free and open source speech synthesizer. +<upstream> + <remote-id type="github">RHVoice/RHVoice</remote-id> +</upstream> +<maintainer type="person"> + <email>[email protected]</email> + <name>Anna</name> +</maintainer> +<use> + <flag name="cli">Build a CLI application that allows you to synthesize speech</flag> + <flag name="server">Build a server application</flag> + <flag name="speech-dispatcher">Build a speech-dispatcher middleware module</flag> + <!-- flag name="utils">Build utilities needed for the ones creating voices</flag --> +</use> +<longdescription lang="en"> + RHVoice is a free and open source speech synthesizer. - Voices are built from recordings of natural speech. They have - small footprints, because only statistical models are stored - on users' computers. And though the voices lack the - naturalness of the synthesizers which generate speech by - combining segments of the recordings themselves, they are - still very intelligible and resemble the speakers who recorded - the source material. + Voices are built from recordings of natural speech. They have small + footprints, because only statistical models are stored on users' + computers. And though the voices lack the naturalness of the + synthesizers which generate speech by combining segments of the + recordings themselves, they are still very intelligible and resemble + the speakers who recorded the source material. - Initially, RHVoice could speak only Russian. Now it also - supports American English, Brazilian Portuguese, Esperanto, - Georgian, Ukrainian, Kyrgyz and Tatar. In theory, it is - possible to implement support for other languages, if all the - necessary resources can be found or created. - </longdescription> + Initially, RHVoice could speak only Russian. Now it also supports + American English, Brazilian Portuguese, Esperanto, Georgian, Ukrainian, + Kyrgyz and Tatar. In theory, it is possible to implement support for + other languages, if all the necessary resources can be found or created. +</longdescription> </pkgmetadata> diff --git a/app-accessibility/rhvoice/rhvoice-1.4.2.ebuild b/app-accessibility/rhvoice/rhvoice-1.4.2-r1.ebuild similarity index 89% rename from app-accessibility/rhvoice/rhvoice-1.4.2.ebuild rename to app-accessibility/rhvoice/rhvoice-1.4.2-r1.ebuild index 363d12136..68ee79ca6 100644 --- a/app-accessibility/rhvoice/rhvoice-1.4.2.ebuild +++ b/app-accessibility/rhvoice/rhvoice-1.4.2-r1.ebuild @@ -1,9 +1,10 @@ # Copyright 2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -inherit cmake multilib +CMAKE_REMOVE_MODULES_LIST=( VersionFromGit ) +inherit cmake DESCRIPTION="TTS engine with extended languages support (including Russian)" HOMEPAGE="https://rhvoice.su https://github.com/RHVoice/RHVoice"; @@ -14,17 +15,16 @@ SRC_URI=" https://github.com/${PN}/aleksandr-hq-rus/archive/refs/tags/4.0.tar.gz -> rhvoice-aleksandr-hq-4.0.tar.gz https://github.com/${PN}/evgeniy-rus/archive/refs/tags/4.0.tar.gz -> rhvoice-evgeniy-rus-4.0.tar.gz https://github.com/${PN}/victoria-rus/archive/refs/tags/4.0.tar.gz -> rhvoice-victoria-4.0.tar.gz - https://github.com/${PN}/yuriy-rus/archive/refs/tags/4.0.tar.gz -> rhvoice-yuriy.tar.gz + https://github.com/${PN}/yuriy-rus/archive/refs/tags/4.0.tar.gz -> rhvoice-yuriy-4.0.tar.gz ) l10n_uk? ( https://github.com/${PN}/volodymyr-ukr/archive/refs/tags/4.0.tar.gz -> rhvoice-volodymyr-4.0.tar.gz ) " S="${WORKDIR}/RHVoice-${PV}" -CMAKE_REMOVE_MODULES_LIST="Hardening VersionFromGit" LICENSE="l10n_pt-BR? ( CC-BY-SA-4.0 ) l10n_mk? ( AGPL-3 ) BSD GPL-2 GPL-3+ LGPL-2.1+" KEYWORDS="~amd64 ~x86" SLOT="0" -IUSE="ao cli client portaudio +pulseaudio +server +speech-dispatcher utils" +IUSE="ao cli portaudio +pulseaudio +server +speech-dispatcher" REQUIRED_USE="|| ( ao portaudio pulseaudio )" CC_NC_LANGS=( en eo ky ru uk ) @@ -42,20 +42,22 @@ for lang in "${NC_LANGS[@]}" ; do LICENSE+=" ( free-noncomm )" done -RDEPEND=" - !dev-libs/hts_engine +DEPEND=" ao? ( media-libs/libao ) - client? ( sys-apps/dbus ) portaudio? ( media-libs/portaudio ) pulseaudio? ( media-sound/pulseaudio ) server? ( - dev-libs/glib[dbus] + dev-libs/glib:2[dbus] + dev-libs/libsigc++:2 >=dev-cpp/glibmm-2.66.1:2 ) speech-dispatcher? ( app-accessibility/speech-dispatcher ) " -BDEPEND="${DEPEND} - dev-cpp/cli11 +RDEPEND="${DEPEND} + !dev-libs/hts_engine +" +BDEPEND=" + dev-cpp/cli11:= dev-libs/rapidxml dev-libs/utfcpp " @@ -75,18 +77,18 @@ src_unpack() { # git submodules, which are not present in the snapshot rmdir "${S}"/data/voices/{aleksandr-hq,evgeniy-rus,evgeniy-eng,victoria,volodymyr,yuriy} || die - if use l10n_ru ; then + if use l10n_ru; then mv "${WORKDIR}"/aleksandr-hq-rus-4.0 "${S}"/data/voices/aleksandr-hq || die mv "${WORKDIR}"/evgeniy-rus-4.0 "${S}"/data/voices/evgeniy-rus || die mv "${WORKDIR}"/victoria-rus-4.0 "${S}"/data/voices/victoria || die mv "${WORKDIR}"/yuriy-rus-4.0 "${S}"/data/voices/yuriy || die fi - if use l10n_en ; then + if use l10n_en; then mv "${WORKDIR}"/evgeniy-eng-4.0 "${S}"/data/voices/evgeniy-eng || die fi - if use l10n_uk ; then + if use l10n_uk; then mv "${WORKDIR}"/volodymyr-ukr-4.0 "${S}"/data/voices/volodymyr || die fi } @@ -97,7 +99,7 @@ src_prepare() { sed "s|/lib/speech-dispatcher-modules|/$(get_libdir)/speech-dispatcher-modules|" \ -i src/sd_module/CMakeLists.txt || die - sed 's|/systemd/system||' \ + sed "s|/systemd/system||" \ -i src/service/CMakeLists.txt || die sed -e "/set(RAPIDXML_INCLUDE_DIR/d" \ @@ -108,13 +110,10 @@ src_prepare() { -i src/third-party/mage/CMakeLists.txt || die sed -e "/include(VersionFromGit)/d" \ - -e "/include(Hardening)/d" \ -e "/find_package(Sanitizers)/d" \ -e "/getVersionFromGit/d" \ - -e "/harden/d" \ -i CMakeLists.txt || die sed -e "/add_sanitizers/d" \ - -e "/harden/d" \ -i src/*/CMakeLists.txt \ -i src/third-party/*/CMakeLists.txt || die @@ -136,8 +135,8 @@ src_configure() { -DRHVOICE_VERSION_MAJOR=$(ver_cut 1) -DWITH_CLI11=ON # src/CMakeLists.txt - -DBUILD_CLIENT=$(usex client) - -DBUILD_UTILS=$(usex utils) + -DBUILD_CLIENT=OFF # deprecated + -DBUILD_UTILS=OFF # fails to build because of bundled tclap -DBUILD_TESTS=$(usex cli) -DBUILD_SERVICE=$(usex server) -DBUILD_SPEECHDISPATCHER_MODULE=$(usex speech-dispatcher)
