4 files changed, 13 insertions, 57 deletions
diff --git a/dev-libs/FBGEMM/FBGEMM-2022.01.13-r1.ebuild b/dev-libs/FBGEMM/FBGEMM-2022.01.13-r1.ebuild
deleted file mode 100644
index a505928cb56c..000000000000
--- a/dev-libs/FBGEMM/FBGEMM-2022.01.13-r1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-inherit python-any-r1 flag-o-matic cmake
-
-CommitId=135412d2646f3bd753c8f1cfd33616110bbccd27
-
-DESCRIPTION="Facebook GEneral Matrix Multiplication"
-HOMEPAGE="https://github.com/pytorch/FBGEMM"
-SRC_URI="https://github.com/pytorch/${PN}/archive/${CommitId}.tar.gz
-	-> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-
-DEPEND="
-	~dev-libs/asmjit-2021.11.13
-	dev-libs/cpuinfo
-"
-RDEPEND="${DEPEND}"
-BDEPEND="
-	test? ( dev-cpp/gtest )
-	${PYTHON_DEPS}
-"
-RESTRICT="!test? ( test )"
-
-S="${WORKDIR}"/${PN}-${CommitId}
-
-PATCHES=(
-	"${FILESDIR}"/${P}-gentoo.patch
-)
-
-src_prepare() {
-	# Bug #855668
-	filter-lto
-
-	rm test/RowWiseSparseAdagradFusedTest.cc || die
-	rm test/SparseAdagradTest.cc || die
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DFBGEMM_LIBRARY_TYPE=shared
-		-DFBGEMM_BUILD_BENCHMARKS=OFF
-		-DFBGEMM_BUILD_TESTS=$(usex test ON OFF)
-	)
-	cmake_src_configure
-}
diff --git a/dev-libs/FBGEMM/FBGEMM-2022.07.16.ebuild b/dev-libs/FBGEMM/FBGEMM-2022.07.16.ebuild
index 9a2f09a92e45..b2c8f05937d7 100644
--- a/dev-libs/FBGEMM/FBGEMM-2022.07.16.ebuild
+++ b/dev-libs/FBGEMM/FBGEMM-2022.07.16.ebuild
@@ -33,6 +33,7 @@ S="${WORKDIR}"/${PN}-${CommitId}
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-2022.01.13-gentoo.patch
+	"${FILESDIR}"/${P}-gcc13.patch
 )
 
 src_prepare() {
diff --git a/dev-libs/FBGEMM/Manifest b/dev-libs/FBGEMM/Manifest
index 3377ec6a4bfa..d0ba0d84ea7e 100644
--- a/dev-libs/FBGEMM/Manifest
+++ b/dev-libs/FBGEMM/Manifest
@@ -1,6 +1,5 @@
 AUX FBGEMM-2022.01.13-gentoo.patch 2260 BLAKE2B c3c690490b200e1191013259872ef826b63012161cb5664f11f2e838a632fd010a17d6913bd89c7fc45850c5e3273a0d087081b63964483fefd21f02fee60403 SHA512 f4c7c58e45568303aa2d9308586adb544185f30f72d989928889ef46c9ec44342272a865185cdeef761e5ce4e44299a08de4aff2a7b30efa4cc90a26cca14861
-DIST FBGEMM-2022.01.13.tar.gz 532297 BLAKE2B bced7e1a1712351a87762e8d0a28ed3bbc5678c8ce70b440e769e53dc15f68e3ec8c89df9307f33da788bd376613720892493c0b519d3860a6e2edb48de1fdba SHA512 a416c2c11b0e6798e0dbb376050ead79cb602cd4f0e41b6109eeefe3e939e410adf0ce828d1224a358eb8245a935cc431d8023ccc396f08ca88276fb91c66157
+AUX FBGEMM-2022.07.16-gcc13.patch 230 BLAKE2B f90e3efc20dee725ca1f6b93180b0176090fd314b7049d90285e7d7634af8cacc588560f593d475db73c04c9f14ae620d2ab27ee974e7a473b806254cfb5f923 SHA512 abd30f206bba3104c0b675a52c3320a251b769e9f1ea58a79de351d0d2e57e81265c554e7e8cb505014a1b5d7f7edd77d838eec33bb0fd932dfbc795b1d732e4
 DIST FBGEMM-2022.07.16.tar.gz 744470 BLAKE2B d1ee51ad72a22fb1b7abaefe330f70e27bc5d6dfda2587373d7e0209aef099ab10c8772612a9786fc2bd760f66154053b9e6c9a6b7f3c82ed2114536f7b30213 SHA512 7d245ea47c57c2da0555693624c45c8585aab5d1b171c9f3b909e140d9d0964cb9cf8f029c291c45f8070d5cfad6f7116e606fdd4120b2223279e39d4ba3f189
-EBUILD FBGEMM-2022.01.13-r1.ebuild 1041 BLAKE2B 075f05166dfe0c81a5b0a08ce91db7a52c6b065ca0e2ad40d73e9aeb344712f3abd5bef0b1f67276feee3dc1cd8119c39070a134b291bd9087b69cc212954dae SHA512 d427d15db43f8719b9dffa55ab212561f30d44756bd62982c9315acfb94aec15afbea5c60e0a156753b86290bbf3f5d99a9ae532bc6510bdfc33357a00ad5282
-EBUILD FBGEMM-2022.07.16.ebuild 1112 BLAKE2B d71e659f040c309ce301d8f87bc1814fcd4e9dc49251725363f16a786b342c4a1bbff84530f6edf676efd07f1f76dea5f98296fb0944ca896540e5bafcbe8a38 SHA512 e78deb36177cec4d9494e57304006d18b515d016991495785fd21a6e40f0f86459b1280066507dd316814676fb1d138a032e1448856a6782d51898a117b94944
+EBUILD FBGEMM-2022.07.16.ebuild 1144 BLAKE2B 485079dea4e03467bfe5aedb0cd9fc84fd2beed754264dab4886bd51c357e941fc6e6e9aebd4a007a1ab96fa02342b2cf382f6f132fcd278b1da0c16659fb1b2 SHA512 65d32b92edd01d00e99af037dd72969b07f665a7d47a15e6768071311bf8ad1a43f13976b2ecde0e564f3a7c5a892288bd495af6d04fe34dece801fd503e3acd
 MISC metadata.xml 327 BLAKE2B 860b9c0ecb3b0029c855db0a0054590135f3bd6ec9dad20cdf433fc70c119354518eea50fdbb2a204eb8cc6621de23e6928a2f9ec961ac0c51fd9dae22fa8488 SHA512 3a0d5a69421a41e62ce134636025e0024010c1938ee35f7489d8d870d915a66cd526aa60d107a378dc4522ff71b7f10486e20867c8b424b1b47e458988ebff58
diff --git a/dev-libs/FBGEMM/files/FBGEMM-2022.07.16-gcc13.patch b/dev-libs/FBGEMM/files/FBGEMM-2022.07.16-gcc13.patch
new file mode 100644
index 000000000000..cba259688d96
--- /dev/null
+++ b/dev-libs/FBGEMM/files/FBGEMM-2022.07.16-gcc13.patch
@@ -0,0 +1,10 @@
+--- a/include/fbgemm/UtilsAvx2.h	2023-03-11 17:17:28.365325199 +0100
++++ b/include/fbgemm/UtilsAvx2.h	2023-03-11 17:18:06.076766162 +0100
+@@ -9,6 +9,7 @@
+ // flags.
+ 
+ #include <string>
++#include <cstdint>
+ 
+ namespace fbgemm {
+