From 879d3da37f8ff627e38dba3d06d0ae22035835a2 Mon Sep 17 00:00:00 2001
From: Nicolas PARLANT <nicolas.parlant@parhuet.fr>
Date: Mon, 27 Apr 2026 16:19:04 +0200
Subject: [PATCH] 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>
---
 .../espeak-ng/espeak-ng-9999.ebuild           |  7 ------
 .../espeak-ng-1.52.1-path_pkgconfig.patch     | 13 -----------
 .../files/espeak-ng-1.52.1-rm_which.patch     | 22 -------------------
 3 files changed, 42 deletions(-)
 delete mode 100644 app-accessibility/espeak-ng/files/espeak-ng-1.52.1-path_pkgconfig.patch
 delete mode 100644 app-accessibility/espeak-ng/files/espeak-ng-1.52.1-rm_which.patch

diff --git a/app-accessibility/espeak-ng/espeak-ng-9999.ebuild b/app-accessibility/espeak-ng/espeak-ng-9999.ebuild
index 31b6a2f249f56..fe6458f011617 100644
--- a/app-accessibility/espeak-ng/espeak-ng-9999.ebuild
+++ b/app-accessibility/espeak-ng/espeak-ng-9999.ebuild
@@ -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
 
diff --git a/app-accessibility/espeak-ng/files/espeak-ng-1.52.1-path_pkgconfig.patch b/app-accessibility/espeak-ng/files/espeak-ng-1.52.1-path_pkgconfig.patch
deleted file mode 100644
index ea816a02c1afe..0000000000000
--- a/app-accessibility/espeak-ng/files/espeak-ng-1.52.1-path_pkgconfig.patch
+++ /dev/null
@@ -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
-+)
diff --git a/app-accessibility/espeak-ng/files/espeak-ng-1.52.1-rm_which.patch b/app-accessibility/espeak-ng/files/espeak-ng-1.52.1-rm_which.patch
deleted file mode 100644
index d916f9594db40..0000000000000
--- a/app-accessibility/espeak-ng/files/espeak-ng-1.52.1-rm_which.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-see PR pending https://github.com/espeak-ng/espeak-ng/pull/2399.patch
-tests: replace which with POSIX‑compliant 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"