app-accessibility/espeak-ng: update live w/ patches merged

Signed-off-by: Nicolas PARLANT <nicolas.parlant@parhuet.fr>
Part-of: https://codeberg.org/gentoo/gentoo/pulls/760
Merges: https://codeberg.org/gentoo/gentoo/pulls/760
Signed-off-by: Sam James <sam@gentoo.org>
This commit is contained in:
Nicolas PARLANT
2026-04-27 16:19:04 +02:00
committed by Sam James
parent b265da5af7
commit 879d3da37f
3 changed files with 0 additions and 42 deletions
@@ -43,13 +43,6 @@ fi
DOCS=( ChangeLog.md README.md docs )
PATCHES=(
# PR pending https://github.com/espeak-ng/espeak-ng/pull/2394
"${FILESDIR}"/${PN}-1.52.1-path_pkgconfig.patch
# PR pending https://github.com/espeak-ng/espeak-ng/pull/2399
"${FILESDIR}"/${PN}-1.52.1-rm_which.patch
)
src_prepare() {
cmake_src_prepare
@@ -1,13 +0,0 @@
PR pending https://github.com/espeak-ng/espeak-ng/pull/2394.patch
cmake: use libdir to install .pc
--- a/cmake/package.cmake
+++ b/cmake/package.cmake
@@ -31,5 +31,5 @@ configure_file(
)
install(
- FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.pc DESTINATION lib/pkgconfig
-)
\ No newline at end of file
+ FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig
+)
@@ -1,22 +0,0 @@
see PR pending https://github.com/espeak-ng/espeak-ng/pull/2399.patch
tests: replace which with POSIXcompliant command -v
--- a/tests/common
+++ b/tests/common
@@ -14,7 +14,7 @@ is_hash() {
fi
}
check_hash() {
- which $1 &&
+ command -v $1 &&
$1 </dev/null 2>/dev/null |
awk '{if ($1 != "da39a3ee5e6b4b0d3255bfef95601890afd80709") { exit 1; }}'
# Test some common commands to find the correct one for the system being tested on.
@@ -23,7 +23,7 @@ check_hash() {
# test if MBROLA synthesizer is installed
is_mbrola() {
echo -n "checking if MBROLA is installed ... "
- if [ "`which mbrola`" != "" ]; then
+ if [ "`command -v mbrola`" != "" ]; then
echo "yes"
else
echo "no"