6 files changed, 50 insertions, 8 deletions
diff --git a/app-emacs/Manifest.gz b/app-emacs/Manifest.gz
index e097b8e20655..288607f1c412 100644
--- a/app-emacs/Manifest.gz
+++ b/app-emacs/Manifest.gz
diff --git a/app-emacs/dape/Manifest b/app-emacs/dape/Manifest
index 66561eab9e0b..c7c0b08e8175 100644
--- a/app-emacs/dape/Manifest
+++ b/app-emacs/dape/Manifest
@@ -1,6 +1,6 @@
 AUX 50dape-gentoo.el 82 BLAKE2B 64f2f945045a5ce10e6735fa5d14c89fb8cdcfea6201375509476a8f22a18e97f6733d7d74daaefab3f94cac7a9d3420791a92b05b165616977f683b295a23ca SHA512 bd715c76b340beb8a19d30cc1490af1e56eeda99bd37d0421fa43820da83aa44cdfbde845dbf659332228205d2c050f3e4a9222695824e63050ebe9937edcdaf
-DIST dape-0.21.0.tar.gz 78689 BLAKE2B 12ae2ea5771ff303693b1477fe5f535d9295d138bd16ca0859bd7cbdfbf93c18347cb6dc9910c93001947dc58cba4064c0782f0007057ea99932a2674963da90 SHA512 0ecbe997859148f5bd1154b946d617df054772244cadb8697c97fe82d1deb572d47d26668229e3d0dbb02f4339b51a334cd06922050dbb592a4f05581fb35012
 DIST dape-0.22.0.tar.gz 78792 BLAKE2B 42743bcb2c82680b90f42c01a9212eca08eba7c41bc8874ffebbe9f1b4003812ad453afb8ef049c085def3466c835a7f63c4b96efe6fccfd6366089d303df990 SHA512 057776fd479dbf1ca3206593fd778e35182e9a2915966ff6e45c87c76e62a96dc19474d35a5bba4015f419e34cf8fa31d214c4164c6cab2ed6e5edb788e4a658
-EBUILD dape-0.21.0.ebuild 1407 BLAKE2B 66eaf37b7eefffdf48099ab876fe0a896960821294e3708d6344c5e3bbcb9d53ae16aaa92eea9d3b79eeea9f79725bceaf6605406da00a2076fb98736d3bb615 SHA512 dee3395e6e20e12660dfb5f7146324ec8dd2ac9ddacd1cf16a5a6cfb11a78f32e406bc1f577bf19c10d3ce8c1a9a7c81e8dcb91ad282be4eee9a513a7680d7c3
+DIST dape-0.23.0.tar.gz 79466 BLAKE2B 70c6741d11c392eb420aa3173aff8b4c293d640b28ee02c352bc2f2ccff9293c15d8855aca421fff3e7d2824865c8fa6e3f218471b8cb2bceef51e3e7e30355a SHA512 e3c4fb922cb1cd328e49afd8cb52df15fd0dcf5636f9ba0b5c882cfdaf12a2c7349749f23a7c6bae98210cf5e2f9224570edbdcba9748c2a7ac216b4890d5952
 EBUILD dape-0.22.0.ebuild 1481 BLAKE2B f13e9941557d3682d300ceeda3fd7bdcc011ad15f4d06bbf89d499737ba154034fc82d3e15665db342b628e2b790e943efbd6ac63136efe0e6b8dc82ad86a72e SHA512 191211aec399c94e0648101eb310716735c0e92560a486126f93b3b3d3e3b6dd8af761d4ec99499455023348ed4adfcd366e4bf8c086f507bb00d8a2b9c0ec09
+EBUILD dape-0.23.0.ebuild 1481 BLAKE2B f13e9941557d3682d300ceeda3fd7bdcc011ad15f4d06bbf89d499737ba154034fc82d3e15665db342b628e2b790e943efbd6ac63136efe0e6b8dc82ad86a72e SHA512 191211aec399c94e0648101eb310716735c0e92560a486126f93b3b3d3e3b6dd8af761d4ec99499455023348ed4adfcd366e4bf8c086f507bb00d8a2b9c0ec09
 MISC metadata.xml 570 BLAKE2B 824518a308a9b876366ee7e2513706c256170868e98c8c18edd0866096f8639b14b51164543c2657db1760085186d67a0196a72ae61c6c18d5c6521ce34be9fe SHA512 159f35835c561bdd0d9d1573104e371c3b4621c8b691c65863868fdc117678cbe681ec11aa47383eb48799ee72b166a606e86702769c03c0c6231a11ba2963f9
diff --git a/app-emacs/dape/dape-0.21.0.ebuild b/app-emacs/dape/dape-0.23.0.ebuild
index c4b8f0561c5d..e3cc513f8bb9 100644
--- a/app-emacs/dape/dape-0.21.0.ebuild
+++ b/app-emacs/dape/dape-0.23.0.ebuild
@@ -38,6 +38,9 @@ DEPEND="
 # js-debug.  Most tests use only the former.
 RESTRICT="test"
 
+# Remove tests.el to skip compilation and failing tests (see above comment).
+ELISP_REMOVE="${PN}-tests.el"
+
 DOCS=( README.org CHANGELOG.org LICENSE )
 SITEFILE="50${PN}-gentoo.el"
 
@@ -59,10 +62,6 @@ src_compile() {
 	elisp-make-autoload-file
 }
 
-# src_test() {
-# 	elisp-test
-# }
-
 src_install() {
 	# Need to ignore dape-tests.el.
 	einstalldocs
diff --git a/app-emacs/proofgeneral/Manifest b/app-emacs/proofgeneral/Manifest
index cb7947edcec6..fb962a4bdc5c 100644
--- a/app-emacs/proofgeneral/Manifest
+++ b/app-emacs/proofgeneral/Manifest
@@ -1,6 +1,7 @@
 AUX 50proofgeneral-gentoo.el 68 BLAKE2B 14c41f176f78dee51fdb893f355c2b8cf00456e0b586c7c41c91f2eea6f8d0baaf8d6a04eda385031c96c138d47c0e7e99a75be7cd27ffd0d2087e0a69ded0b2 SHA512 32f3d33d85776f1695d542adadb8e35e372659fcce2805fc205732cd911be186cd5a1a63a8438287467dea744da9ef212f7338c0edb735a525ec30f892f1afca
 AUX proofgeneral-4.4-desktop.patch 425 BLAKE2B fdefa2835502ded79bc08ffff7906315913a0e740269ba5a1863bf4ef8c602ee56eda1c25fc2ff161cd0131b6c615bbcea3770bc39ef18ae654b892571c92deb SHA512 dc594dc08432fb5a4068b7aabcb85ff58b9e784903f912694da08ef97ec9bfca229dcc4d965ca5286993173083c89dc53805f09f7152eb183829985c3c4c5b22
 AUX proofgeneral-4.5-paths.patch 762 BLAKE2B 77f7b828dfa1648b6d8818951fca297194192b4c2d6ef2f510c25f33a9cb8d9db8f11a1dbeda5a9235d60063fcaede1ad10efbd2e28e2cbe0f6485af9d90bbcf SHA512 89d7ea239e5530e7dc2b6520bfaeafd68cc77db58ba0786401dad57d52e5fdaa3efe83e9402449581f89c683d044401a2f4aec93dc69c7fcae972d423cab6594
+AUX proofgeneral-4.5-posix-no-which.patch 1455 BLAKE2B 976fa6d8dac92d3bfd8e23004e85a3cb0acdcd45f69607829168f0605c5e54bc4864dd7425b076e0e11a63003e8d3c5e18568f6475e82beb5a7d92abd3634ddd SHA512 8683e164f8f0ee4325ac4f075f709f116a2bf7f172544dc5a9edc98c2869443336f8b17490dd4a878a949995df844b809c4b912f85e12969aea9dad7647db32c
 DIST proofgeneral-4.5.tar.gz 1198535 BLAKE2B 24f93200d01752fb358ac88531b4b34392b7b968c7dbd7a7b3dcedfe71fa985ca893465bff503e3fc0efd267faeb3f5d8bd3d35f68847a4c90252e3a0bdd456b SHA512 ab2eed43053e3b6749e840a8d742058eaa91bfff7edbe12ea67bc492ffab07e1d77cf6a7772cb8c42ac73cae2cce65b48898b1cd10a77b906089768f8055b366
-EBUILD proofgeneral-4.5.ebuild 1445 BLAKE2B a4d97562bb2ba747aca7e01a90eaec57712e6900a98b8b754a88eae8b8d9ea2bab3508f371e6f7242802a4eb9989a3ca46dd8d767939e7ceaf68d417f319d026 SHA512 aa09b4dccef3ac3149570c78fd024822c0dd494819f9ef141ab34a9726f5141986fe72bf0d5814eb8d3972ff5a648c254a69611319ec87bca3896e2a21670708
+EBUILD proofgeneral-4.5.ebuild 1492 BLAKE2B a453ebf25a5e9f6b8800e2905ffd1b05c09c8e8106c26b52cadebf309e6364f861ec25a2e4124fea3e18f7e16bacd41b74be648307cf51a5104b9067dd46122b SHA512 e788e00bcdacbc94e9a1b901ea0596910e792a2233196d5b8527c4f88dc351173515f566d7d847c39d14d5228917ccc590211b570e611eb79b7cfdd35784d8aa
 MISC metadata.xml 656 BLAKE2B 5fde6e347ee778bf4ac7f46bd6b8928eb9fa1a6aaf02b8dff5b533f7dbf989799a6fa948161fccab5716ed7d61866750e8e8e8127a83258075009f2e1dd1a0e9 SHA512 481b819f3541c90b114f79eb831b0d1f0d7f3510e468f4b9d9ec7e98078dc4fc15c7fc983d25accd5a8ab3d588ff820af1d46d479bd11b6134fa1b0842072d2f
diff --git a/app-emacs/proofgeneral/files/proofgeneral-4.5-posix-no-which.patch b/app-emacs/proofgeneral/files/proofgeneral-4.5-posix-no-which.patch
new file mode 100644
index 000000000000..cd1ed1529407
--- /dev/null
+++ b/app-emacs/proofgeneral/files/proofgeneral-4.5-posix-no-which.patch
@@ -0,0 +1,40 @@
+From 2dac06d9e3f8e66f1619585c86f05a538a75de08 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ulrich=20M=C3=BCller?= <ulm@gentoo.org>
+Date: Mon, 24 Feb 2025 19:29:48 +0100
+Subject: [PATCH] Makefile: Replace "which" by POSIX "command -v"
+
+---
+ Makefile | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 7a5df5602..b9b28aab5 100644
+--- a/Makefile
++++ b/Makefile
+@@ -21,7 +21,7 @@
+ 
+ # Set this according to your version of Emacs.
+ # NB: this is also used to set default install path names below.
+-EMACS=$(shell if [ -z "`which emacs`" ]; then echo "Emacs executable not found"; exit 1; else echo emacs; fi)
++EMACS=$(shell if [ -z "`command -v emacs`" ]; then echo "Emacs executable not found"; exit 1; else echo emacs; fi)
+ 
+ # We default to /usr rather than /usr/local because installs of
+ # desktop and doc files under /usr/local are unlikely to work with
+@@ -273,7 +273,7 @@ scripts: bashscripts perlscripts
+ 
+ .PHONY: bashscripts
+ bashscripts:
+-	(bash="`which bash`";					    \
++	(bash="`command -v bash`";					    \
+ 	 if [ -z "$$bash" ]; then				    \
+ 	   echo "Could not find bash - bash paths not checked" >&2; \
+ 	   exit 0;						    \
+@@ -281,7 +281,7 @@ bashscripts:
+ 
+ .PHONY: perlscripts
+ perlscripts:
+-	(perl="`which perl`";					    \
++	(perl="`command -v perl`";					    \
+ 	 if [ -z "$$perl" ]; then				    \
+ 	   echo "Could not find perl - perl paths not checked" >&2; \
+ 	   exit 0;						    \
diff --git a/app-emacs/proofgeneral/proofgeneral-4.5.ebuild b/app-emacs/proofgeneral/proofgeneral-4.5.ebuild
index 021c56340c58..a5ca4a5d9022 100644
--- a/app-emacs/proofgeneral/proofgeneral-4.5.ebuild
+++ b/app-emacs/proofgeneral/proofgeneral-4.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -18,7 +18,9 @@ KEYWORDS="amd64 ppc x86"
 PATCHES=(
 	"${FILESDIR}"/${PN}-4.4-desktop.patch
 	"${FILESDIR}"/${PN}-4.5-paths.patch
+	"${FILESDIR}"/${PN}-4.5-posix-no-which.patch
 )
+
 DOCS=( AUTHORS BUGS CHANGES COMPATIBILITY FAQ.md INSTALL README.md )
 SITEFILE="50${PN}-gentoo.el"