From 152b093007b3f139a955d88007e3621013b15881 Mon Sep 17 00:00:00 2001 From: "Anna (cybertailor) Vyalkova" Date: Sat, 30 Oct 2021 13:58:05 +0500 Subject: app-accessibility/rhvoice: cleanups * Use release tarball instead of github-generated one * Remove Hardening.cmake (it messes with flags badly) * Use printf to generate LICENSE and IUSE Signed-off-by: Anna (cybertailor) Vyalkova --- app-accessibility/rhvoice/Manifest | 8 +-- app-accessibility/rhvoice/rhvoice-1.4.2-r1.ebuild | 77 +++++++---------------- 2 files changed, 23 insertions(+), 62 deletions(-) diff --git a/app-accessibility/rhvoice/Manifest b/app-accessibility/rhvoice/Manifest index e6d18c70c..79881ad96 100644 --- a/app-accessibility/rhvoice/Manifest +++ b/app-accessibility/rhvoice/Manifest @@ -1,7 +1 @@ -DIST rhvoice-1.4.2.tar.gz 192825025 BLAKE2B 104beee30f335a2770f64b42994a604294690491ca703bf8937ce4ac0646f6cbd003f3cf83a99b8fdff015447882c8719ec9a2f7f0f981b66fb6ef00ad90b96f SHA512 bcd7cc6aadba1a619cd83e2dbd06836e985fbc4fce886a19c2272a2f6fff0792d15d4ff0b685b43705b68689ade932858e9d3b9173e6f829292d21d69a85c61a -DIST rhvoice-aleksandr-hq-4.0.tar.gz 7315219 BLAKE2B 011a37696f3c30af1e7d63d62dcea640c1a0329b116fdf8d12152e5f22e1928a9ad2484e0ce01c9821c1eb668f7d9fb096a1406e66fbe6e88fd856cfa6465c2d SHA512 2519eb5b8c1e39bfe557258d1f54c7d02ff4159ccc513de903b48e7ef136f2f875b5f4405a1064bd9b706baa6394f7c67373a4593edf369222597223ccc341e9 -DIST rhvoice-evgeniy-eng-4.0.tar.gz 7338125 BLAKE2B 58eaf04e77bde46e5013e3959815e2ea0234b8c33f7737df0b00e4b32fb49d169f651f6341ede876c331c40b1d17afffd25c4e2741871aea02ee4bdd8d7c2246 SHA512 1096b2d898292739f86333414a32b97b99112a57cf2c98c5ea31d1b92974f3adc4119e0ee031e6961810365432b77eb96229f7a45c55d8b9337a22aa3848dcc8 -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-4.0.tar.gz 12734672 BLAKE2B 7e49c0825bfc148e8e7144d578c95ad159e2c935256174134f0682318f78b5162205b3781d365cc333c61123c1b118b464e28d63046bc497a75afcd6f8fbbc85 SHA512 07c9e65277c1774cf0185ba60107ff8f0dda5fa18eeadbfcb0cbdf5258e3fd2a364bb91c796473c9294a61e5c9366080d4d6ee115aace37f533ea1e6f167690b +DIST rhvoice-1.4.2-release.tar.gz 252269229 BLAKE2B 0f5564dcb986eec49bead04b46afe7e5caf8a186cdd23f3c9727ee9e6bdeb4b326d6b9cec3f9cdde78d01286d16f05aad840f67aa44b22ce05b7db85d04f2144 SHA512 edee8fa79fa0f3eecd2bca6a6c4846876cce2fc7b843a481357b536a42485f9524fc64e9e8a6766cbe46bcc2ef9ad0375cab16ad35722895db5697e14234a8de diff --git a/app-accessibility/rhvoice/rhvoice-1.4.2-r1.ebuild b/app-accessibility/rhvoice/rhvoice-1.4.2-r1.ebuild index e3756dd73..f593a64fa 100644 --- a/app-accessibility/rhvoice/rhvoice-1.4.2-r1.ebuild +++ b/app-accessibility/rhvoice/rhvoice-1.4.2-r1.ebuild @@ -3,44 +3,29 @@ EAPI=8 -CMAKE_REMOVE_MODULES_LIST=( VersionFromGit ) +CMAKE_REMOVE_MODULES_LIST=( Hardening VersionFromGit ) inherit cmake DESCRIPTION="TTS engine with extended languages support (including Russian)" HOMEPAGE="https://rhvoice.su https://github.com/RHVoice/RHVoice" -SRC_URI=" - https://github.com/${PN}/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz - l10n_en? ( https://github.com/${PN}/evgeniy-eng/archive/refs/tags/4.0.tar.gz -> rhvoice-evgeniy-eng-4.0.tar.gz ) - l10n_ru? ( - 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-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}" - -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 portaudio +pulseaudio +server +speech-dispatcher" -REQUIRED_USE="|| ( ao portaudio pulseaudio )" +SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.gz -> ${P}-release.tar.gz" +AGPL_LANGS=( mk ) +CC_SA_LANGS=( pt-BR ) CC_NC_LANGS=( en eo ky ru uk ) NC_LANGS=( ka tt ) -LANGS=" ${CC_NC_LANGS[@]} ${NC_LANGS[@]} mk pt-BR" -IUSE+="${LANGS// / l10n_}" - -for lang in "${CC_NC_LANGS[@]}" ; do - LICENSE+=" l10n_${lang}?" - LICENSE+=" ( CC-BY-NC-ND-4.0 )" -done +LANGS=( "${AGPL_LANGS[@]}" "${CC_SA_LANGS[@]}" "${CC_NC_LANGS[@]}" "${NC_LANGS[@]}" ) -for lang in "${NC_LANGS[@]}" ; do - LICENSE+=" l10n_${lang}?" - LICENSE+=" ( free-noncomm )" -done +LICENSE="BSD GPL-2 GPL-3+ LGPL-2.1+ + $(printf 'l10n_%s? ( AGPL-3 )\n' "${AGPL_LANGS[@]}") + $(printf 'l10n_%s? ( CC-BY-SA-4.0 )\n' "${CC_SA_LANGS[@]}") + $(printf 'l10n_%s? ( CC-BY-NC-ND-4.0 )\n' "${CC_NC_LANGS[@]}") + $(printf 'l10n_%s? ( free-noncomm )\n' "${NC_LANGS[@]}") +" +KEYWORDS="~amd64 ~x86" +IUSE="$(printf 'l10n_%s ' ${LANGS[@]}) ao cli portaudio +pulseaudio +server +speech-dispatcher" +SLOT="0" +REQUIRED_USE="|| ( ao portaudio pulseaudio )" DEPEND=" ao? ( media-libs/libao ) @@ -71,28 +56,6 @@ delete_voices() { done } -src_unpack() { - default - - # 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 - 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 - mv "${WORKDIR}"/evgeniy-eng-4.0 "${S}"/data/voices/evgeniy-eng || die - fi - - if use l10n_uk; then - mv "${WORKDIR}"/volodymyr-ukr-4.0 "${S}"/data/voices/volodymyr || die - fi -} - src_prepare() { cmake_src_prepare @@ -112,21 +75,25 @@ 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 - use l10n_en || delete_voices alan bdl clb slt + use l10n_en || delete_voices alan bdl clb evgeniy-eng slt use l10n_eo || delete_voices spomenka use l10n_ka || delete_voices natia use l10n_ky || delete_voices azamat nazgul use l10n_mk || delete_voices kiko - use l10n_ru || delete_voices aleksandr anna arina artemiy elena irina pavel + use l10n_ru || delete_voices aleksandr aleksandr-hq anna arina artemiy \ + elena evgeniy-rus irina pavel victoria yuriy use l10n_tt || delete_voices talgat - use l10n_uk || delete_voices anatol natalia + use l10n_uk || delete_voices anatol natalia volodymyr use l10n_pt-BR || delete_voices Leticia-F123 } -- cgit v1.2.3-65-gdbad