[gentoo-commits] repo/proj/guru:dev commit in: app-accessibility/rhvoice/

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

* [gentoo-commits] repo/proj/guru:dev commit in: app-accessibility/rhvoice/
@ 2021-05-22 15:21 Anna Vyalkova
  0 siblings, 0 replies; 12+ messages in thread
From: Anna Vyalkova @ 2021-05-22 15:21 UTC (permalink / raw
  To: gentoo-commits

commit:     6a4155f2dc55c8da8650c043f14d779cd88edd8f
Author:     Anna Vyalkova <cyber+gentoo <AT> sysrq <DOT> in>
AuthorDate: Sat May 22 07:55:44 2021 +0000
Commit:     Anna Vyalkova <cyber+gentoo <AT> sysrq <DOT> in>
CommitDate: Sat May 22 15:21:08 2021 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=6a4155f2

app-accessibility/rhvoice: initial import

Signed-off-by: Anna Vyalkova <cyber+gentoo <AT> sysrq.in>

 app-accessibility/rhvoice/Manifest             |   4 +
 app-accessibility/rhvoice/metadata.xml         |  45 ++++++++
 app-accessibility/rhvoice/rhvoice-1.2.4.ebuild | 145 +++++++++++++++++++++++++
 3 files changed, 194 insertions(+)

diff --git a/app-accessibility/rhvoice/Manifest b/app-accessibility/rhvoice/Manifest
new file mode 100644
index 000000000..19a7e754e
--- /dev/null
+++ b/app-accessibility/rhvoice/Manifest
@@ -0,0 +1,4 @@
+DIST rhvoice-1.2.4.tar.gz 187812264 BLAKE2B 0756e22758f530a4a4f969425ed07e9bdab9e9ce9a6bcf13b435992f4854d204febf88799153c3041134adbddbba2b29823740b65de6c8d2aea1d4d33b94d59a SHA512 747985a8a0fe27fd1dc15e434dc41bbdca169747ae5cb3695df89ceced9131fc9d196916af08f3caacd21c34cfc022989e3753e21dbc2c0095ba7e991dc58bb8
+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

diff --git a/app-accessibility/rhvoice/metadata.xml b/app-accessibility/rhvoice/metadata.xml
new file mode 100644
index 000000000..b48257dea
--- /dev/null
+++ b/app-accessibility/rhvoice/metadata.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<upstream>
+		<remote-id type="github">RHVoice/RHVoice</remote-id>
+	</upstream>
+	<maintainer type="person">
+		<email>cyber+gentoo@sysrq.in</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>
+		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.
+
+		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.2.4.ebuild b/app-accessibility/rhvoice/rhvoice-1.2.4.ebuild
new file mode 100644
index 000000000..47b42e13c
--- /dev/null
+++ b/app-accessibility/rhvoice/rhvoice-1.2.4.ebuild
@@ -0,0 +1,145 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake multilib
+
+MY_PN="RHVoice"
+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_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
+	)
+"
+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"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+IUSE="ao bindist cli client portaudio pulseaudio +server +speech-dispatcher utils"
+REQUIRED_USE="( ao || portaudio || pulseaudio )"
+
+CC_NC_LANGS=( en eo ky ru uk )
+NC_LANGS=( ka tt )
+LANGS=" ${CC_NC_LANGS[@]} ${NC_LANGS[@]} pt-BR"
+IUSE+="${LANGS// / l10n_}"
+
+for lang in "${CC_NC_LANGS[@]}" ; do
+	LICENSE+=" l10n_${lang}?"
+	LICENSE+=" ( CC-BY-NC-ND-4.0 )"
+done
+
+for lang in "${NC_LANGS[@]}" ; do
+	LICENSE+=" l10n_${lang}?"
+	LICENSE+=" ( free-noncomm )"
+done
+
+RDEPEND="
+	!dev-libs/hts_engine
+	media-sound/sonic
+	ao? ( media-libs/libao )
+	portaudio? ( media-libs/portaudio )
+	pulseaudio? ( media-sound/pulseaudio )
+	speech-dispatcher? ( app-accessibility/speech-dispatcher )
+	server? (
+		dev-libs/glib[dbus]
+		>=dev-cpp/glibmm-2.66.1:2
+	)
+"
+BDEPEND="${DEPEND}
+	dev-cpp/cli11
+	dev-libs/utfcpp
+"
+REQUIRED_USE="|| ( ao portaudio pulseaudio )"
+
+DOCS=( README.md NEWS doc config/dicts )
+
+delete_voices() {
+	for voice in "$@"; do
+		rm -r "data/voices/${voice}" || die
+	done
+}
+
+src_unpack() {
+	default
+
+	# git submodules, which are not present in the snapshot
+	rmdir "${S}"/data/voices/{victoria,evgeniy-rus,evgeniy-eng} || die
+
+	if use l10n_ru ; then
+		mv "${WORKDIR}"/victoria-rus-4.0 "${S}"/data/voices/victoria || die
+		mv "${WORKDIR}"/evgeniy-rus-4.0 "${S}"/data/voices/evgeniy-rus || die
+	fi
+
+	if use l10n_en ; then
+		mv "${WORKDIR}"/evgeniy-eng-4.0 "${S}"/data/voices/evgeniy-eng || die
+	fi
+}
+
+src_prepare() {
+	cmake_src_prepare
+
+	sed "s|/lib/speech-dispatcher-modules|/$(get_libdir)/speech-dispatcher-modules|" \
+		-i src/sd_module/CMakeLists.txt || die
+
+	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 "/set(UTF8_INCLUDE_DIR/d" -i src/CMakeLists.txt || die
+
+	sed 's/ "RHVoice_question_match"//' \
+		-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_ru || delete_voices aleksandr anna arina artemiy elena irina pavel
+	use l10n_en || delete_voices alan bdl clb slt
+	use l10n_uk || delete_voices anatol natalia
+	use l10n_eo || delete_voices spomenka
+	use l10n_ka || delete_voices natia
+	use l10n_ky || delete_voices azamat nazgul
+	use l10n_tt || delete_voices talgat
+	use l10n_pt-BR || delete_voices Leticia-F123
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-Dcommon_doc_dir=/usr/share/doc/${PF}
+		-DRHVOICE_VERSION=${PV}
+		-DRHVOICE_VERSION_MAJOR=$(ver_cut 1)
+		-DWITH_CLI11=ON
+		# src/CMakeLists.txt
+		-DBUILD_CLIENT=$(usex client)
+		-DBUILD_UTILS=$(usex utils)
+		-DBUILD_TESTS=$(usex cli)
+		-DBUILD_SERVICE=$(usex server)
+		-DBUILD_SPEECHDISPATCHER_MODULE=$(usex speech-dispatcher)
+		# src/audio/CMakeLists.txt
+		-DWITH_LIBAO=$(usex ao)
+		-DWITH_PULSE=$(usex pulseaudio)
+		-DWITH_PORTAUDIO=$(usex portaudio)
+		# src/third-party/CMakeLists.txt
+		-DRAPIDXML_INCLUDE_DIR="${S}"/src/third-party/rapidxml
+		-DUTF8_INCLUDE_DIR=/usr/include/utf8cpp
+	)
+
+	append-cppflags -std=gnu++11
+	cmake_src_configure
+}


^ permalink raw reply related	[flat|nested] 12+ messages in thread

* [gentoo-commits] repo/proj/guru:dev commit in: app-accessibility/rhvoice/
@ 2021-05-26  1:57 Anna Vyalkova
  0 siblings, 0 replies; 12+ messages in thread
From: Anna Vyalkova @ 2021-05-26  1:57 UTC (permalink / raw
  To: gentoo-commits

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
 }


^ permalink raw reply related	[flat|nested] 12+ messages in thread

* [gentoo-commits] repo/proj/guru:dev commit in: app-accessibility/rhvoice/
@ 2021-07-15 10:04 Anna Vyalkova
  0 siblings, 0 replies; 12+ messages in thread
From: Anna Vyalkova @ 2021-07-15 10:04 UTC (permalink / raw
  To: gentoo-commits

commit:     699f5a2d72c32eecbbb526726c422e0316bccb4b
Author:     Anna (cybertailor) Vyalkova <cyber+gentoo <AT> sysrq <DOT> in>
AuthorDate: Wed Jul 14 08:37:06 2021 +0000
Commit:     Anna Vyalkova <cyber+gentoo <AT> sysrq <DOT> in>
CommitDate: Thu Jul 15 09:05:27 2021 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=699f5a2d

app-accessibility/rhvoice: add 1.4.2, drop 1.2.4

Signed-off-by: Anna (cybertailor) Vyalkova <cyber+gentoo <AT> sysrq.in>

 app-accessibility/rhvoice/Manifest                 |  5 ++-
 .../{rhvoice-1.2.4.ebuild => rhvoice-1.4.2.ebuild} | 46 +++++++++++++---------
 2 files changed, 31 insertions(+), 20 deletions(-)

diff --git a/app-accessibility/rhvoice/Manifest b/app-accessibility/rhvoice/Manifest
index 19a7e754e..3a3eadbd1 100644
--- a/app-accessibility/rhvoice/Manifest
+++ b/app-accessibility/rhvoice/Manifest
@@ -1,4 +1,7 @@
-DIST rhvoice-1.2.4.tar.gz 187812264 BLAKE2B 0756e22758f530a4a4f969425ed07e9bdab9e9ce9a6bcf13b435992f4854d204febf88799153c3041134adbddbba2b29823740b65de6c8d2aea1d4d33b94d59a SHA512 747985a8a0fe27fd1dc15e434dc41bbdca169747ae5cb3695df89ceced9131fc9d196916af08f3caacd21c34cfc022989e3753e21dbc2c0095ba7e991dc58bb8
+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.tar.gz 12734672 BLAKE2B 7e49c0825bfc148e8e7144d578c95ad159e2c935256174134f0682318f78b5162205b3781d365cc333c61123c1b118b464e28d63046bc497a75afcd6f8fbbc85 SHA512 07c9e65277c1774cf0185ba60107ff8f0dda5fa18eeadbfcb0cbdf5258e3fd2a364bb91c796473c9294a61e5c9366080d4d6ee115aace37f533ea1e6f167690b

diff --git a/app-accessibility/rhvoice/rhvoice-1.2.4.ebuild b/app-accessibility/rhvoice/rhvoice-1.4.2.ebuild
similarity index 69%
rename from app-accessibility/rhvoice/rhvoice-1.2.4.ebuild
rename to app-accessibility/rhvoice/rhvoice-1.4.2.ebuild
index a550f7b13..363d12136 100644
--- a/app-accessibility/rhvoice/rhvoice-1.2.4.ebuild
+++ b/app-accessibility/rhvoice/rhvoice-1.4.2.ebuild
@@ -1,33 +1,35 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 inherit cmake multilib
 
-MY_PN="RHVoice"
 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/${MY_PN}/evgeniy-eng/archive/refs/tags/4.0.tar.gz -> rhvoice-evgeniy-eng-4.0.tar.gz )
+	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/${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
+		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
 	)
+	l10n_uk? ( https://github.com/${PN}/volodymyr-ukr/archive/refs/tags/4.0.tar.gz -> rhvoice-volodymyr-4.0.tar.gz )
 "
-S="${WORKDIR}/${MY_PN}-${PV}"
+S="${WORKDIR}/RHVoice-${PV}"
 CMAKE_REMOVE_MODULES_LIST="Hardening VersionFromGit"
 
-LICENSE="l10n_pt-BR? ( CC-BY-SA-4.0 ) BSD GPL-2 GPL-3+ LGPL-2.1+"
+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 bindist cli client portaudio +pulseaudio +server +speech-dispatcher utils"
+IUSE="ao cli client portaudio +pulseaudio +server +speech-dispatcher utils"
 REQUIRED_USE="|| ( ao portaudio pulseaudio )"
 
 CC_NC_LANGS=( en eo ky ru uk )
 NC_LANGS=( ka tt )
-LANGS=" ${CC_NC_LANGS[@]} ${NC_LANGS[@]} pt-BR"
+LANGS=" ${CC_NC_LANGS[@]} ${NC_LANGS[@]} mk pt-BR"
 IUSE+="${LANGS// / l10n_}"
 
 for lang in "${CC_NC_LANGS[@]}" ; do
@@ -42,15 +44,15 @@ done
 
 RDEPEND="
 	!dev-libs/hts_engine
-	media-libs/sonic
 	ao? ( media-libs/libao )
+	client? ( sys-apps/dbus )
 	portaudio? ( media-libs/portaudio )
 	pulseaudio? ( media-sound/pulseaudio )
-	speech-dispatcher? ( app-accessibility/speech-dispatcher )
 	server? (
 		dev-libs/glib[dbus]
 		>=dev-cpp/glibmm-2.66.1:2
 	)
+	speech-dispatcher? ( app-accessibility/speech-dispatcher )
 "
 BDEPEND="${DEPEND}
 	dev-cpp/cli11
@@ -59,7 +61,7 @@ BDEPEND="${DEPEND}
 "
 REQUIRED_USE="|| ( ao portaudio pulseaudio )"
 
-DOCS=( README.md NEWS doc config/dicts )
+DOCS=( README.md doc config/dicts )
 
 delete_voices() {
 	for voice in "$@"; do
@@ -71,16 +73,22 @@ src_unpack() {
 	default
 
 	# git submodules, which are not present in the snapshot
-	rmdir "${S}"/data/voices/{victoria,evgeniy-rus,evgeniy-eng} || die
+	rmdir "${S}"/data/voices/{aleksandr-hq,evgeniy-rus,evgeniy-eng,victoria,volodymyr,yuriy} || die
 
 	if use l10n_ru ; then
-		mv "${WORKDIR}"/victoria-rus-4.0 "${S}"/data/voices/victoria || die
+		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() {
@@ -92,8 +100,7 @@ src_prepare() {
 	sed 's|/systemd/system||' \
 		-i src/service/CMakeLists.txt || die
 
-	sed -e "/sonic/d" \
-		-e "/set(RAPIDXML_INCLUDE_DIR/d" \
+	sed -e "/set(RAPIDXML_INCLUDE_DIR/d" \
 		-i src/third-party/CMakeLists.txt || die
 	sed "/set(UTF8_INCLUDE_DIR/d" -i src/CMakeLists.txt || die
 
@@ -111,13 +118,14 @@ src_prepare() {
 		-i src/*/CMakeLists.txt \
 		-i src/third-party/*/CMakeLists.txt || die
 
-	use l10n_ru || delete_voices aleksandr anna arina artemiy elena irina pavel
 	use l10n_en || delete_voices alan bdl clb slt
-	use l10n_uk || delete_voices anatol natalia
 	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_tt || delete_voices talgat
+	use l10n_uk || delete_voices anatol natalia
 	use l10n_pt-BR || delete_voices Leticia-F123
 }
 


^ permalink raw reply related	[flat|nested] 12+ messages in thread

* [gentoo-commits] repo/proj/guru:dev commit in: app-accessibility/rhvoice/
@ 2021-09-30 16:36 Anna Vyalkova
  0 siblings, 0 replies; 12+ messages in thread
From: Anna Vyalkova @ 2021-09-30 16:36 UTC (permalink / raw
  To: gentoo-commits

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>cyber+gentoo@sysrq.in</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>cyber+gentoo@sysrq.in</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)


^ permalink raw reply related	[flat|nested] 12+ messages in thread

* [gentoo-commits] repo/proj/guru:dev commit in: app-accessibility/rhvoice/
@ 2021-10-02 18:17 Anna Vyalkova
  0 siblings, 0 replies; 12+ messages in thread
From: Anna Vyalkova @ 2021-10-02 18:17 UTC (permalink / raw
  To: gentoo-commits

commit:     87763181c76492da87562ce7ca9490ab6d3312df
Author:     Anna (cybertailor) Vyalkova <cyber+gentoo <AT> sysrq <DOT> in>
AuthorDate: Sat Oct  2 17:36:40 2021 +0000
Commit:     Anna Vyalkova <cyber+gentoo <AT> sysrq <DOT> in>
CommitDate: Sat Oct  2 18:16:47 2021 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=87763181

app-accessibility/rhvoice: use bundled rapidxml

dev-libs/rapidxml is last-rited in ::gentoo

Signed-off-by: Anna (cybertailor) Vyalkova <cyber+gentoo <AT> sysrq.in>

 app-accessibility/rhvoice/rhvoice-1.4.2-r1.ebuild | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/app-accessibility/rhvoice/rhvoice-1.4.2-r1.ebuild b/app-accessibility/rhvoice/rhvoice-1.4.2-r1.ebuild
index 68ee79ca6..e3756dd73 100644
--- a/app-accessibility/rhvoice/rhvoice-1.4.2-r1.ebuild
+++ b/app-accessibility/rhvoice/rhvoice-1.4.2-r1.ebuild
@@ -56,9 +56,9 @@ DEPEND="
 RDEPEND="${DEPEND}
 	!dev-libs/hts_engine
 "
+# TODO: readd dev-libs/rapidxml in ::guru
 BDEPEND="
-	dev-cpp/cli11:=
-	dev-libs/rapidxml
+	dev-cpp/cli11
 	dev-libs/utfcpp
 "
 REQUIRED_USE="|| ( ao portaudio pulseaudio )"
@@ -99,13 +99,15 @@ src_prepare() {
 	sed "s|/lib/speech-dispatcher-modules|/$(get_libdir)/speech-dispatcher-modules|" \
 		-i src/sd_module/CMakeLists.txt || die
 
+	# fix dbus service install path
 	sed "s|/systemd/system||" \
 		-i src/service/CMakeLists.txt || die
 
-	sed -e "/set(RAPIDXML_INCLUDE_DIR/d" \
-		-i src/third-party/CMakeLists.txt || die
+	#sed -e "/set(RAPIDXML_INCLUDE_DIR/d" \
+	#	-i src/third-party/CMakeLists.txt || die
 	sed "/set(UTF8_INCLUDE_DIR/d" -i src/CMakeLists.txt || die
 
+	# fix build failure
 	sed 's/ "RHVoice_question_match"//' \
 		-i src/third-party/mage/CMakeLists.txt || die
 
@@ -145,7 +147,7 @@ src_configure() {
 		-DWITH_PULSE=$(usex pulseaudio)
 		-DWITH_PORTAUDIO=$(usex portaudio)
 		# src/third-party/CMakeLists.txt
-		-DRAPIDXML_INCLUDE_DIR=/usr/include/rapidxml
+		#-DRAPIDXML_INCLUDE_DIR=/usr/include/rapidxml
 		-DUTF8_INCLUDE_DIR=/usr/include/utf8cpp
 	)
 


^ permalink raw reply related	[flat|nested] 12+ messages in thread

* [gentoo-commits] repo/proj/guru:dev commit in: app-accessibility/rhvoice/
@ 2021-10-30  9:02 Anna Vyalkova
  0 siblings, 0 replies; 12+ messages in thread
From: Anna Vyalkova @ 2021-10-30  9:02 UTC (permalink / raw
  To: gentoo-commits

commit:     152b093007b3f139a955d88007e3621013b15881
Author:     Anna (cybertailor) Vyalkova <cyber+gentoo <AT> sysrq <DOT> in>
AuthorDate: Sat Oct 30 08:58:05 2021 +0000
Commit:     Anna Vyalkova <cyber+gentoo <AT> sysrq <DOT> in>
CommitDate: Sat Oct 30 09:01:23 2021 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=152b0930

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 <cyber+gentoo <AT> sysrq.in>

 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
 }
 


^ permalink raw reply related	[flat|nested] 12+ messages in thread

* [gentoo-commits] repo/proj/guru:dev commit in: app-accessibility/rhvoice/
@ 2021-11-08 17:39 Anna Vyalkova
  0 siblings, 0 replies; 12+ messages in thread
From: Anna Vyalkova @ 2021-11-08 17:39 UTC (permalink / raw
  To: gentoo-commits

commit:     6fa2e5a5ceda1bfbc28d9369dfebf0db208b5df6
Author:     Anna (cybertailor) Vyalkova <cyber+gentoo <AT> sysrq <DOT> in>
AuthorDate: Mon Nov  8 17:20:35 2021 +0000
Commit:     Anna Vyalkova <cyber+gentoo <AT> sysrq <DOT> in>
CommitDate: Mon Nov  8 17:20:35 2021 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=6fa2e5a5

app-accessibility/rhvoice: keep FindSanitizers.cmake

Sanitizers are disabled by default.

Signed-off-by: Anna (cybertailor) Vyalkova <cyber+gentoo <AT> sysrq.in>

 app-accessibility/rhvoice/rhvoice-1.4.2-r1.ebuild | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/app-accessibility/rhvoice/rhvoice-1.4.2-r1.ebuild b/app-accessibility/rhvoice/rhvoice-1.4.2-r1.ebuild
index e23f725d7..2479dbca9 100644
--- a/app-accessibility/rhvoice/rhvoice-1.4.2-r1.ebuild
+++ b/app-accessibility/rhvoice/rhvoice-1.4.2-r1.ebuild
@@ -75,11 +75,8 @@ src_prepare() {
 		-i src/third-party/mage/CMakeLists.txt || die
 
 	sed -e "/include(VersionFromGit)/d" \
-		-e "/find_package(Sanitizers)/d" \
 		-e "/getVersionFromGit/d" \
 		-i CMakeLists.txt || die
-	sed -e "/add_sanitizers/d" \
-		-i src/*/CMakeLists.txt src/third-party/*/CMakeLists.txt || die
 
 	use l10n_en || delete_voices alan bdl clb evgeniy-eng slt
 	use l10n_eo || delete_voices spomenka


^ permalink raw reply related	[flat|nested] 12+ messages in thread

* [gentoo-commits] repo/proj/guru:dev commit in: app-accessibility/rhvoice/
@ 2021-11-08 17:39 Anna Vyalkova
  0 siblings, 0 replies; 12+ messages in thread
From: Anna Vyalkova @ 2021-11-08 17:39 UTC (permalink / raw
  To: gentoo-commits

commit:     b35c40c2fd6e98f28de0641d30b7849a5a46c08b
Author:     Anna (cybertailor) Vyalkova <cyber+gentoo <AT> sysrq <DOT> in>
AuthorDate: Mon Nov  8 17:17:14 2021 +0000
Commit:     Anna Vyalkova <cyber+gentoo <AT> sysrq <DOT> in>
CommitDate: Mon Nov  8 17:19:50 2021 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=b35c40c2

app-accessibility/rhvoice: keep Hardening.cmake

Turns out it has options to not add weird flags.

Signed-off-by: Anna (cybertailor) Vyalkova <cyber+gentoo <AT> sysrq.in>

 app-accessibility/rhvoice/rhvoice-1.4.2-r1.ebuild | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/app-accessibility/rhvoice/rhvoice-1.4.2-r1.ebuild b/app-accessibility/rhvoice/rhvoice-1.4.2-r1.ebuild
index f593a64fa..e23f725d7 100644
--- a/app-accessibility/rhvoice/rhvoice-1.4.2-r1.ebuild
+++ b/app-accessibility/rhvoice/rhvoice-1.4.2-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-CMAKE_REMOVE_MODULES_LIST=( Hardening VersionFromGit )
+CMAKE_REMOVE_MODULES_LIST=( VersionFromGit )
 inherit cmake
 
 DESCRIPTION="TTS engine with extended languages support (including Russian)"
@@ -75,15 +75,11 @@ 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
+		-i src/*/CMakeLists.txt src/third-party/*/CMakeLists.txt || die
 
 	use l10n_en || delete_voices alan bdl clb evgeniy-eng slt
 	use l10n_eo || delete_voices spomenka
@@ -116,6 +112,9 @@ src_configure() {
 		# src/third-party/CMakeLists.txt
 		#-DRAPIDXML_INCLUDE_DIR=/usr/include/rapidxml
 		-DUTF8_INCLUDE_DIR=/usr/include/utf8cpp
+		# Hardening.cmake: don't mess with flags
+		-DHARDENING_COMPILE_FLAGS=
+		-DHARDENING_LINK_FLAGS=
 	)
 
 	cmake_src_configure


^ permalink raw reply related	[flat|nested] 12+ messages in thread

* [gentoo-commits] repo/proj/guru:dev commit in: app-accessibility/rhvoice/
@ 2021-12-07  4:20 Anna Vyalkova
  0 siblings, 0 replies; 12+ messages in thread
From: Anna Vyalkova @ 2021-12-07  4:20 UTC (permalink / raw
  To: gentoo-commits

commit:     f30051c43841ba749a08f9b3e460f077818fdc7a
Author:     Anna (cybertailor) Vyalkova <cyber+gentoo <AT> sysrq <DOT> in>
AuthorDate: Tue Dec  7 04:16:53 2021 +0000
Commit:     Anna Vyalkova <cyber+gentoo <AT> sysrq <DOT> in>
CommitDate: Tue Dec  7 04:19:49 2021 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=f30051c4

app-accessibility/rhvoice: add 1.6.0

Signed-off-by: Anna (cybertailor) Vyalkova <cyber+gentoo <AT> sysrq.in>

 app-accessibility/rhvoice/Manifest             |   1 +
 app-accessibility/rhvoice/rhvoice-1.6.0.ebuild | 126 +++++++++++++++++++++++++
 2 files changed, 127 insertions(+)

diff --git a/app-accessibility/rhvoice/Manifest b/app-accessibility/rhvoice/Manifest
index 79881ad96..13d2330eb 100644
--- a/app-accessibility/rhvoice/Manifest
+++ b/app-accessibility/rhvoice/Manifest
@@ -1 +1,2 @@
 DIST rhvoice-1.4.2-release.tar.gz 252269229 BLAKE2B 0f5564dcb986eec49bead04b46afe7e5caf8a186cdd23f3c9727ee9e6bdeb4b326d6b9cec3f9cdde78d01286d16f05aad840f67aa44b22ce05b7db85d04f2144 SHA512 edee8fa79fa0f3eecd2bca6a6c4846876cce2fc7b843a481357b536a42485f9524fc64e9e8a6766cbe46bcc2ef9ad0375cab16ad35722895db5697e14234a8de
+DIST rhvoice-1.6.0.tar.gz 307395200 BLAKE2B b31110d15dddb4d1607c8b3a24a551876f0612840eb0d668546bbde1929259c84a0188059e1470b90049e6d410c85116d46b0d1059aa3712bae464d8c8cdca48 SHA512 320a773a647af3bd3f6eac21003c7db790c65849baa87f7cc5c2bee874d0ad8074c21ed0962851dd2e0721ecd6b0f52f03a876788e6609275516fe2d1e46905d

diff --git a/app-accessibility/rhvoice/rhvoice-1.6.0.ebuild b/app-accessibility/rhvoice/rhvoice-1.6.0.ebuild
new file mode 100644
index 000000000..2918efd80
--- /dev/null
+++ b/app-accessibility/rhvoice/rhvoice-1.6.0.ebuild
@@ -0,0 +1,126 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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"
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.gz"
+
+AGPL_LANGS=( mk )
+CC_SA_LANGS=( pt-BR )
+CC_NC_LANGS=( en eo ky ru uk )
+NC_LANGS=( ka tt )
+LANGS=(
+	"${AGPL_LANGS[@]}"
+	"${CC_SA_LANGS[@]}"
+	"${CC_NC_LANGS[@]}"
+	"${LGPL2_LANGS[@]}"
+	"${NC_LANGS[@]}"
+	sq # LGPL-2.1+
+)
+
+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 )
+	portaudio? ( media-libs/portaudio )
+	pulseaudio? ( media-sound/pulseaudio )
+	server? (
+		dev-libs/glib:2[dbus]
+		dev-libs/libsigc++:2
+		>=dev-cpp/glibmm-2.66.1:2
+	)
+	speech-dispatcher? ( app-accessibility/speech-dispatcher )
+"
+RDEPEND="${DEPEND}
+	!dev-libs/hts_engine
+"
+# TODO: readd dev-libs/rapidxml in ::guru
+BDEPEND="
+	dev-cpp/cli11
+	dev-libs/utfcpp
+"
+REQUIRED_USE="|| ( ao portaudio pulseaudio )"
+
+DOCS=( README.md doc config/dicts )
+
+delete_voices() {
+	for voice in "$@"; do
+		rm -r "data/voices/${voice}" || die
+	done
+}
+
+src_prepare() {
+	cmake_src_prepare
+
+	sed "s|/lib/speech-dispatcher-modules|/$(get_libdir)/speech-dispatcher-modules|" \
+		-i src/sd_module/CMakeLists.txt || die
+
+	# fix dbus service install path
+	sed "s|/systemd/system||" \
+		-i src/service/CMakeLists.txt || die
+
+	#sed -e "/set(RAPIDXML_INCLUDE_DIR/d" \
+	#	-i src/third-party/CMakeLists.txt || die
+	sed "/set(UTF8_INCLUDE_DIR/d" -i src/CMakeLists.txt || die
+
+	# fix build failure
+	sed 's/ "RHVoice_question_match"//' \
+		-i src/third-party/mage/CMakeLists.txt || die
+
+	sed -e "/include(VersionFromGit)/d" \
+		-e "/getVersionFromGit/d" \
+		-i CMakeLists.txt || die
+
+	use l10n_en || delete_voices alan bdl clb evgeniy-eng lubov 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 aleksandr-hq anna arina artemiy \
+		elena evgeniy-rus irina mikhail pavel tatiana victoria yuriy
+	use l10n_sq || delete-voices hana
+	use l10n_tt || delete_voices talgat
+	use l10n_uk || delete_voices anatol marianna natalia volodymyr
+	use l10n_pt-BR || delete_voices Leticia-F123
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-Dcommon_doc_dir=/usr/share/doc/${PF}
+		-DRHVOICE_VERSION=${PV}
+		-DRHVOICE_VERSION_MAJOR=$(ver_cut 1)
+		-DWITH_CLI11=ON
+		# src/CMakeLists.txt
+		-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)
+		# src/audio/CMakeLists.txt
+		-DWITH_LIBAO=$(usex ao)
+		-DWITH_PULSE=$(usex pulseaudio)
+		-DWITH_PORTAUDIO=$(usex portaudio)
+		# src/third-party/CMakeLists.txt
+		#-DRAPIDXML_INCLUDE_DIR=/usr/include/rapidxml
+		-DUTF8_INCLUDE_DIR=/usr/include/utf8cpp
+		# Hardening.cmake: don't mess with flags
+		-DHARDENING_COMPILE_FLAGS=
+		-DHARDENING_LINK_FLAGS=
+	)
+
+	cmake_src_configure
+}


^ permalink raw reply related	[flat|nested] 12+ messages in thread

* [gentoo-commits] repo/proj/guru:dev commit in: app-accessibility/rhvoice/
@ 2024-02-06  8:44 Anna Vyalkova
  0 siblings, 0 replies; 12+ messages in thread
From: Anna Vyalkova @ 2024-02-06  8:44 UTC (permalink / raw
  To: gentoo-commits

commit:     3a82871fb73d64fef2455ac16dcf522b419009e2
Author:     Anna (cybertailor) Vyalkova <cyber+gentoo <AT> sysrq <DOT> in>
AuthorDate: Tue Feb  6 08:38:39 2024 +0000
Commit:     Anna Vyalkova <cyber+gentoo <AT> sysrq <DOT> in>
CommitDate: Tue Feb  6 08:43:05 2024 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=3a82871f

app-accessibility/rhvoice: add 1.14.0

Signed-off-by: Anna (cybertailor) Vyalkova <cyber+gentoo <AT> sysrq.in>

 app-accessibility/rhvoice/metadata.xml          | 44 ++++++++++++-------------
 app-accessibility/rhvoice/rhvoice-1.14.0.ebuild | 35 ++++++++++++++++++++
 2 files changed, 57 insertions(+), 22 deletions(-)

diff --git a/app-accessibility/rhvoice/metadata.xml b/app-accessibility/rhvoice/metadata.xml
index 596997d701..acac05e05d 100644
--- a/app-accessibility/rhvoice/metadata.xml
+++ b/app-accessibility/rhvoice/metadata.xml
@@ -1,29 +1,29 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<upstream>
-	<remote-id type="github">RHVoice/RHVoice</remote-id>
-</upstream>
 <!-- maintainer-needed -->
-<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.
+	<upstream>
+		<remote-id type="github">RHVoice/RHVoice</remote-id>
+	</upstream>
+	<use>
+		<flag name="cli" restrict="&lt;app-accessibility/rhvoice-1.14">Build a CLI application that allows you to synthesize speech</flag>
+		<flag name="redistributable" restrict="&gt;=app-accessibility/rhvoice-1.14">Install also non-free (but redistributable) voices</flag>
+		<flag name="server" restrict="&lt;app-accessibility/rhvoice-1.14">Build a server application</flag>
+		<flag name="speech-dispatcher" restrict="&lt;app-accessibility/rhvoice-1.14">Build a speech-dispatcher middleware module</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.14.0.ebuild b/app-accessibility/rhvoice/rhvoice-1.14.0.ebuild
new file mode 100644
index 0000000000..5aeed05b5f
--- /dev/null
+++ b/app-accessibility/rhvoice/rhvoice-1.14.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+declare -A VOICES=(
+	[en]="
+		redistributable? (
+			app-voices/rhvoice-bdl
+			app-voices/rhvoice-clb
+			app-voices/rhvoice-slt
+		)
+	"
+	[ru]="redistributable? ( app-voices/rhvoice-arina )"
+)
+
+DESCRIPTION="TTS engine with extended languages support (metapackage)"
+HOMEPAGE="
+	https://rhvoice.org
+	https://github.com/RHVoice/RHVoice
+"
+
+LICENSE="metapackage"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="redistributable"
+
+for lang in "${!VOICES[@]}"; do
+	usestr="l10n_${lang:?}"
+	IUSE+=" ${usestr:?}"
+	RHVOICE_REQ_USE+="${usestr:?}?,"
+	RDEPEND+=" ${usestr}? ( ${VOICES[${lang:?}]} )"
+done
+
+RDEPEND+=" >=app-accessibility/rhvoice-core-${PV}[${RHVOICE_REQ_USE%,}]"


^ permalink raw reply related	[flat|nested] 12+ messages in thread

* [gentoo-commits] repo/proj/guru:dev commit in: app-accessibility/rhvoice/
@ 2024-02-06  8:44 Anna Vyalkova
  0 siblings, 0 replies; 12+ messages in thread
From: Anna Vyalkova @ 2024-02-06  8:44 UTC (permalink / raw
  To: gentoo-commits

commit:     59fa3f191d6160601e785d40f8fe7899f952ab95
Author:     Anna (cybertailor) Vyalkova <cyber+gentoo <AT> sysrq <DOT> in>
AuthorDate: Tue Feb  6 08:40:00 2024 +0000
Commit:     Anna Vyalkova <cyber+gentoo <AT> sysrq <DOT> in>
CommitDate: Tue Feb  6 08:43:05 2024 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=59fa3f19

app-accessibility/rhvoice: drop 1.4.2-r1

Signed-off-by: Anna (cybertailor) Vyalkova <cyber+gentoo <AT> sysrq.in>

 app-accessibility/rhvoice/Manifest                |   1 -
 app-accessibility/rhvoice/rhvoice-1.4.2-r1.ebuild | 118 ----------------------
 2 files changed, 119 deletions(-)

diff --git a/app-accessibility/rhvoice/Manifest b/app-accessibility/rhvoice/Manifest
index 1e31e53987..56739188cf 100644
--- a/app-accessibility/rhvoice/Manifest
+++ b/app-accessibility/rhvoice/Manifest
@@ -1,3 +1,2 @@
-DIST rhvoice-1.4.2-release.tar.gz 252269229 BLAKE2B 0f5564dcb986eec49bead04b46afe7e5caf8a186cdd23f3c9727ee9e6bdeb4b326d6b9cec3f9cdde78d01286d16f05aad840f67aa44b22ce05b7db85d04f2144 SHA512 edee8fa79fa0f3eecd2bca6a6c4846876cce2fc7b843a481357b536a42485f9524fc64e9e8a6766cbe46bcc2ef9ad0375cab16ad35722895db5697e14234a8de
 DIST rhvoice-1.6.0.tar.gz 307395200 BLAKE2B b31110d15dddb4d1607c8b3a24a551876f0612840eb0d668546bbde1929259c84a0188059e1470b90049e6d410c85116d46b0d1059aa3712bae464d8c8cdca48 SHA512 320a773a647af3bd3f6eac21003c7db790c65849baa87f7cc5c2bee874d0ad8074c21ed0962851dd2e0721ecd6b0f52f03a876788e6609275516fe2d1e46905d
 DIST rhvoice-1.6.0.tar.gz.sig 4516 BLAKE2B 0798b0666b18b78c99e0a4d5ebace7582b28516073a342e665a421782574ec28ed7d11c514cd4ce0a92a6cb400b019644c58db7ba39c7dd21134698ef23f458e SHA512 4a75ec5b8411788a53b6700ef77fc6cc5a206eac9c03399cc361dd6c4e7fe4c2c058964501f1da421b26933abd1f82c3f3d1c5ef3d9538600af4c32d10a5e5b7

diff --git a/app-accessibility/rhvoice/rhvoice-1.4.2-r1.ebuild b/app-accessibility/rhvoice/rhvoice-1.4.2-r1.ebuild
deleted file mode 100644
index 2479dbca99..0000000000
--- a/app-accessibility/rhvoice/rhvoice-1.4.2-r1.ebuild
+++ /dev/null
@@ -1,118 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-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"
-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=( "${AGPL_LANGS[@]}" "${CC_SA_LANGS[@]}" "${CC_NC_LANGS[@]}" "${NC_LANGS[@]}" )
-
-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 )
-	portaudio? ( media-libs/portaudio )
-	pulseaudio? ( media-sound/pulseaudio )
-	server? (
-		dev-libs/glib:2[dbus]
-		dev-libs/libsigc++:2
-		>=dev-cpp/glibmm-2.66.1:2
-	)
-	speech-dispatcher? ( app-accessibility/speech-dispatcher )
-"
-RDEPEND="${DEPEND}
-	!dev-libs/hts_engine
-"
-# TODO: readd dev-libs/rapidxml in ::guru
-BDEPEND="
-	dev-cpp/cli11
-	dev-libs/utfcpp
-"
-REQUIRED_USE="|| ( ao portaudio pulseaudio )"
-
-DOCS=( README.md doc config/dicts )
-
-delete_voices() {
-	for voice in "$@"; do
-		rm -r "data/voices/${voice}" || die
-	done
-}
-
-src_prepare() {
-	cmake_src_prepare
-
-	sed "s|/lib/speech-dispatcher-modules|/$(get_libdir)/speech-dispatcher-modules|" \
-		-i src/sd_module/CMakeLists.txt || die
-
-	# fix dbus service install path
-	sed "s|/systemd/system||" \
-		-i src/service/CMakeLists.txt || die
-
-	#sed -e "/set(RAPIDXML_INCLUDE_DIR/d" \
-	#	-i src/third-party/CMakeLists.txt || die
-	sed "/set(UTF8_INCLUDE_DIR/d" -i src/CMakeLists.txt || die
-
-	# fix build failure
-	sed 's/ "RHVoice_question_match"//' \
-		-i src/third-party/mage/CMakeLists.txt || die
-
-	sed -e "/include(VersionFromGit)/d" \
-		-e "/getVersionFromGit/d" \
-		-i CMakeLists.txt || die
-
-	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 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 volodymyr
-	use l10n_pt-BR || delete_voices Leticia-F123
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-Dcommon_doc_dir=/usr/share/doc/${PF}
-		-DRHVOICE_VERSION=${PV}
-		-DRHVOICE_VERSION_MAJOR=$(ver_cut 1)
-		-DWITH_CLI11=ON
-		# src/CMakeLists.txt
-		-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)
-		# src/audio/CMakeLists.txt
-		-DWITH_LIBAO=$(usex ao)
-		-DWITH_PULSE=$(usex pulseaudio)
-		-DWITH_PORTAUDIO=$(usex portaudio)
-		# src/third-party/CMakeLists.txt
-		#-DRAPIDXML_INCLUDE_DIR=/usr/include/rapidxml
-		-DUTF8_INCLUDE_DIR=/usr/include/utf8cpp
-		# Hardening.cmake: don't mess with flags
-		-DHARDENING_COMPILE_FLAGS=
-		-DHARDENING_LINK_FLAGS=
-	)
-
-	cmake_src_configure
-}


^ permalink raw reply related	[flat|nested] 12+ messages in thread

* [gentoo-commits] repo/proj/guru:dev commit in: app-accessibility/rhvoice/
@ 2024-10-07  0:31 Anna Vyalkova
  0 siblings, 0 replies; 12+ messages in thread
From: Anna Vyalkova @ 2024-10-07  0:31 UTC (permalink / raw
  To: gentoo-commits

commit:     aadff33eedf58bb8d86fbbeead3b07a1fff7b518
Author:     Anna (cybertailor) Vyalkova <cyber+gentoo <AT> sysrq <DOT> in>
AuthorDate: Mon Oct  7 00:28:24 2024 +0000
Commit:     Anna Vyalkova <cyber+gentoo <AT> sysrq <DOT> in>
CommitDate: Mon Oct  7 00:31:01 2024 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=aadff33e

app-accessibility/rhvoice: add myself as a maintainer

Signed-off-by: Anna (cybertailor) Vyalkova <cyber+gentoo <AT> sysrq.in>

 app-accessibility/rhvoice/metadata.xml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/app-accessibility/rhvoice/metadata.xml b/app-accessibility/rhvoice/metadata.xml
index acac05e05..e899d2fdc 100644
--- a/app-accessibility/rhvoice/metadata.xml
+++ b/app-accessibility/rhvoice/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>cyber+gentoo@sysrq.in</email>
+		<name>Anna</name>
+	</maintainer>	
 	<upstream>
 		<remote-id type="github">RHVoice/RHVoice</remote-id>
 	</upstream>


^ permalink raw reply related	[flat|nested] 12+ messages in thread

end of thread, other threads:[~2024-10-07  0:31 UTC | newest]

Thread overview: 12+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-02-06  8:44 [gentoo-commits] repo/proj/guru:dev commit in: app-accessibility/rhvoice/ Anna Vyalkova
  -- strict thread matches above, loose matches on Subject: below --
2024-10-07  0:31 Anna Vyalkova
2024-02-06  8:44 Anna Vyalkova
2021-12-07  4:20 Anna Vyalkova
2021-11-08 17:39 Anna Vyalkova
2021-11-08 17:39 Anna Vyalkova
2021-10-30  9:02 Anna Vyalkova
2021-10-02 18:17 Anna Vyalkova
2021-09-30 16:36 Anna Vyalkova
2021-07-15 10:04 Anna Vyalkova
2021-05-26  1:57 Anna Vyalkova
2021-05-22 15:21 Anna Vyalkova

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox