4 files changed, 27 insertions, 4 deletions
diff --git a/sci-chemistry/Manifest.gz b/sci-chemistry/Manifest.gz
index f3d3e8d96dbc..ba253adfd993 100644
--- a/sci-chemistry/Manifest.gz
+++ b/sci-chemistry/Manifest.gz
diff --git a/sci-chemistry/psi/Manifest b/sci-chemistry/psi/Manifest
index abf16d28e732..fe4d4b98e63d 100644
--- a/sci-chemistry/psi/Manifest
+++ b/sci-chemistry/psi/Manifest
@@ -5,10 +5,11 @@ AUX 3.4.0-gcc-4.3.patch 8000 BLAKE2B fe6762d9bd30f73357099f675dc31687dd4b81988b8
 AUX 3.4.0-ldflags.patch 407 BLAKE2B 86184259773301499137c36c4a8ac938ad5b4743fb3e72a355e97a213a4a1d6f1ef22cecab64571ac7ca19949ef7e6b961825c8347892a0a28f11d0bee22578a SHA512 3442fbbd93e149fb585399b290cdb202b9b1d15602e4c923f351d182b3e579324123071dfb28e590b81c7b5d0de6158b774ed65e7a048342824befcb250056e6
 AUX 3.4.0-man_paths.patch 611 BLAKE2B b0463f3ec16d89e91298de55b680475de819443cafcc228fe02a2efa63a07929fd98b11ed60b2343e9d35d517f2021dca25586e01ab3d6433d988524d7207d18 SHA512 561eb482cb505e3bed38ceefe7677ae8ea6e62d1465ba504276ccef3e4f8296855b271cf5fbbc263aaae34ca59e0261351b0a8b52b446846199882b14fc27632
 AUX 3.4.0-parallel_fix.patch 10714 BLAKE2B 4e35122cb2f47432ecf4271dad43bf28c425395f0f0fc579b0d4564ef1363d2dcbe9c77f1175d332c15334d41a64fc6413e328ae5718df25b57c741f7493dd28 SHA512 931f6eedc58527447f2604af323db08c27b47e3cdf4c80c0937f5f1218c9f2cb126d8fd85b88f36a50f41d8b15d4bb23cb0d035bbc38cbd6bac74c944780c102
+AUX psi-3.4.0-C99.patch 438 BLAKE2B 961ff6091c51cc8d6fc67977545fa31b68a78989014d72e375e2f240df9ace552418a8d339bd9a0af65801cac7c62a402229b0b0a3c43a04d3e152d69f588f74 SHA512 ef931f52eb40122f4d81dc7cc1a61466fb6cbe831b1da7ce4b0e500cbfad13e0f34c7413e8d2c10730f91a6957eaf676ecdf59bd26be1f522954839bd1960017
 AUX psi-3.4.0-format-security.patch 1021 BLAKE2B 58aebbd7d8d8fd8c78c8cce7ad28574210b6fecebbfe982426d14c355ee524e0ab07364e10a80c28db066208a7fbb1f7ec794fcfcc934bb339a8005d05dad8c8 SHA512 f828866ae90711f244104c6443c750a148e9c848eedfe38d9a74fc2e5b56543ced7ae0beadbafa3fe338eddd391969e197104838afb5820b50f227ecbfa472de
 AUX psi-3.4.0-parallel-make.patch 445 BLAKE2B e98ee4f5d0feb639058c3b589c6eb6747b35386276f48a6775ab40833364d0feadc55fb4f91abb58009b83f8122fbb119f0588acc13eabb5fb9857af202ac3d5 SHA512 bf574c6c9c1e1ffc8747fb51896b8f9d8b29c4796b0a06529a58a2ab1ed5ee0a4270fe071eb86ca745bad2c760701c4d9eb7f269cd390f6d9cadf4065962e52e
 AUX psi-3.4.0-perl-File-Temp.patch 488 BLAKE2B 03c5ab1f1b801321063f389e3ae9989061013cb645cbfecbb94043b809d14df9dbac9b650c9ee5afde5eed88f2f8707d8d8b57713b0134311c62bc36b5247e07 SHA512 683418b28dbdaf4161b679a4fb6aa875ac7834fd4a1b3829c89230be6cdc4b92dc2e23ee3a59a1d5fd3008fdbc7967101a6249a6d42715cedddc2ea756a7e54b
 AUX use-external-libint.patch 1359 BLAKE2B 24fe9d7eb369f6c6846915cd87471d4f2bcf66da09105d73c4b75cebfa7138d318d5dfca653368d80eb5b39a31eabde60da5b439786ed00d95b31b90e56a44ed SHA512 8b4749b0c449dbc89067eec466d3d557da86e7f2d950cc0a94409e158a31a3fb8ceafefd090168acd97975ff3ccc7859e6f2df3c2cd57a3571b79f71aca6fff7
 DIST psi-3.4.0.tar.gz 7413072 BLAKE2B de8b5e0fb1692780446385bf13f6b9984f5be8d441730babacf6f59dd18be6e13b1cff17170cec87def1f743d7e634354b57afbc046e6f34c79c9fc52c31b146 SHA512 b13d2464502545cceec3a3b6048b505b918da26730c1614617b04ee6c1d637c9f799ef7fd92ad9554fa2db87617004aa810a6a81400a04df3c06787d51654ca6
-EBUILD psi-3.4.0-r2.ebuild 1970 BLAKE2B 4fc20b0e1ffa15732b3969c5eca0bb574d6a5ac9f7ba375344a6a365d52d58b9f9fc553e66d603d9f04d20716f95813a3bbfb57f67ee71a0d126b9b5c2c9b847 SHA512 f6f5bcc4720c4a570cadd0349dec4b06643e12e29ef50135c2b3c1f44a6d3e085bd21f47e151757145de74bfacefc9b09e866291d848f8226efa5e64bdbd1c0b
+EBUILD psi-3.4.0-r3.ebuild 1999 BLAKE2B 286e40c5cbdec0f266d4e1e21d8b1d21a0913504da421383d0824865ca34783b80565f06629813f0f8662f56a67c32ee070252982dc9c80398408e6950725edb SHA512 6e84ced2af53722701923e4ed80600094ef38c5ebc4f2036c547b318f0a80cc2b62def849e6e444a61531e219a7e02cac965716ef3394f37116267054534b0f3
 MISC metadata.xml 353 BLAKE2B 4205c6e944b90033531f13b347ceb80f0f4410993e400fafddce2501f73048f005ae73614bfdc10c41ff7655c4ce36bee084167ed984a5818ca050ab3be73fbf SHA512 9ccb40364500c7eb60dd1edb4551ed0e58cde5c4b52b184b0b0bfcf76957daeed1d098c7a04066011bf255ec869ba39316a875806329f2d4ec375955d69de5a5
diff --git a/sci-chemistry/psi/files/psi-3.4.0-C99.patch b/sci-chemistry/psi/files/psi-3.4.0-C99.patch
new file mode 100644
index 000000000000..798e29fadd96
--- /dev/null
+++ b/sci-chemistry/psi/files/psi-3.4.0-C99.patch
@@ -0,0 +1,22 @@
+https://bugs.gentoo.org/886127
+
+--- a/src/lib/libipv1/parse.y
++++ b/src/lib/libipv1/parse.y
+@@ -1,6 +1,7 @@
+ %{
+ #include <stdio.h>
+ #include <tmpl.h>
++#include "ip_error.gbl"
+ #include "ip_types.h"
+ #include "ip_read.gbl"
+ %}
+--- a/src/lib/libipv1/scan.l
++++ b/src/lib/libipv1/scan.l
+@@ -1,6 +1,7 @@
+ %{
+ #include <string.h>
+ #include <tmpl.h>
++#include "ip_error.gbl"
+ #include "ip_types.h"
+ #include "ip_global.h"
+ #include "scan.gbl"
diff --git a/sci-chemistry/psi/psi-3.4.0-r2.ebuild b/sci-chemistry/psi/psi-3.4.0-r3.ebuild
index d719fe265a17..aaeed8c8d19c 100644
--- a/sci-chemistry/psi/psi-3.4.0-r2.ebuild
+++ b/sci-chemistry/psi/psi-3.4.0-r3.ebuild
@@ -1,13 +1,14 @@
 # Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit autotools fortran-2 toolchain-funcs
 
 DESCRIPTION="Suite for ab initio quantum chemistry computing various molecular properties"
 HOMEPAGE="http://www.psicode.org/"
 SRC_URI="https://downloads.sourceforge.net/psicode/${P}.tar.gz"
+S="${WORKDIR}/${PN}${PV:0:1}"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -27,8 +28,6 @@ BDEPEND="
 	virtual/pkgconfig
 	test? ( dev-lang/perl )"
 
-S="${WORKDIR}/${PN}${PV:0:1}"
-
 PATCHES=(
 	"${FILESDIR}"/${PV}-dont-build-libint.patch
 	"${FILESDIR}"/use-external-libint.patch
@@ -41,6 +40,7 @@ PATCHES=(
 	"${FILESDIR}"/${PV}-fortify.patch
 	"${FILESDIR}"/${P}-format-security.patch
 	"${FILESDIR}"/${P}-perl-File-Temp.patch
+	"${FILESDIR}"/${P}-C99.patch
 )
 
 src_prepare() {