6 files changed, 37 insertions, 2 deletions
diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz
index 344397352179..56050e9c591b 100644
--- a/sci-libs/Manifest.gz
+++ b/sci-libs/Manifest.gz
diff --git a/sci-libs/gloo/Manifest b/sci-libs/gloo/Manifest
index 967cace160e3..4aa555f46c88 100644
--- a/sci-libs/gloo/Manifest
+++ b/sci-libs/gloo/Manifest
@@ -1,4 +1,4 @@
-AUX gloo-2022.05.18-gentoo.patch 2285 BLAKE2B fc8ab0b188fa7e1acacf3a915c34842ff73e7dd72762165530d175c71ccb62bf7a43f754821ded74a2b67d626e2c16b1f3df59fd97968b3544ff8020e6f099b0 SHA512 b8b75b0258a89c5105f0b7888b25aa9c5f9aa1c997136f261559cba4b5f4fae8f6e4dcea4e33c2cf7572b3798ad4ec3033fdc46d937d965bacd34cc5f40e9703
+AUX gloo-2022.05.18-gentoo.patch 2597 BLAKE2B 120e1b6268f3b46cf93b46e98640c32603321c47946c2ba54345d6dc512d5079a880a74a46cc78a9628ff56f5a2496ac93e88939cab653c6210930dcb9bdd603 SHA512 fbcd5fbb75ce54de36d0781d8e55fe9dbf5a8f519c6ed0a1a57d5f1877c24096bb452a294765710dfeb9e2a50e07496db15c08c75ab3297cfe3a1187ffca241a
 DIST gloo-2022.05.18.tar.gz 251778 BLAKE2B 90bd97cff437d030b87c333ebb6679f199491b97826f09278b7a6740d781ca750af4e8eda18f29a4311462473146aae1fd0686443a0eb2c73e8ba34e6837b0af SHA512 356b4bd4480fda0f9db039babd223c17ed24c35945877bdb6c5b28eb45ee8ce08def73d308bc906c478c4c9d485bb0f74080d90c7a4fafe84818df0a97a7f6e2
 EBUILD gloo-2022.05.18.ebuild 1044 BLAKE2B 3123f3d977677405e28d7a80b7666a781fad05880a6894e56187a92c4167a7d72a9d2a0e488ca379668bc15fe2d9a9bc7551a8d0c001f4f9f9ae7ac55a0274d9 SHA512 022673a9308eecf06f81e17b26f58fd29f8daca24b959e1e4ebc44db6b7a0ed49052104a2da683685a530576c0164fd5dafa288780f9936000aada25b1ccd9b7
 MISC metadata.xml 492 BLAKE2B be64dabc0bd193d99c4458e6bad8c78042ef1d65800ebd3a3818ffdac3b361f18011ae044036e3c73deba03886e8aa6ffdcb5c2a66b635ecc2f29d636c660227 SHA512 e342a7d570f7ff12718f51e91fd6d359d038670dfb3b679a4cd8d7de61bef8d4b048e2362303bb925eddfd7c40e67f4179e89c24dc2f9b5c21e5a220bf9d4aa2
diff --git a/sci-libs/gloo/files/gloo-2022.05.18-gentoo.patch b/sci-libs/gloo/files/gloo-2022.05.18-gentoo.patch
index 41a1ace42dc7..e445dc9effdb 100644
--- a/sci-libs/gloo/files/gloo-2022.05.18-gentoo.patch
+++ b/sci-libs/gloo/files/gloo-2022.05.18-gentoo.patch
@@ -62,3 +62,13 @@
    endif()
  endif()
  
+--- a/gloo/transport/tcp/device.cc	2022-08-02 11:25:32.404166606 +0200
++++ b/gloo/transport/tcp/device.cc	2022-08-02 11:25:48.706963018 +0200
+@@ -12,6 +12,7 @@
+ #include <netdb.h>
+ #include <netinet/in.h>
+ #include <string.h>
++#include <array>
+ 
+ #include "gloo/common/linux.h"
+ #include "gloo/common/logging.h"
diff --git a/sci-libs/linux-gpib-modules/Manifest b/sci-libs/linux-gpib-modules/Manifest
index ff5cec12349d..5ae40332aa68 100644
--- a/sci-libs/linux-gpib-modules/Manifest
+++ b/sci-libs/linux-gpib-modules/Manifest
@@ -1,4 +1,5 @@
+AUX linux-gpib-modules-4.3.4-depmod.patch 744 BLAKE2B 6079d0523cafcd15e38a7e73e8a0d98e107220e6816bd7646c254044acaa1d39d19e983987dff70c249a67b7accbc74a836f8ddd9f39503cdd510edc2d6bdbc2 SHA512 417193e768b0b5bd41b053a86ebbab163a74662e7f2912c70ae76a873243fb218b24f0680699f9988d4e9097b8bbd8a23902d3f5652675f8a3dbb02915308f12
 AUX linux-gpib-modules-4.3.4-kernel-5.17.patch 853 BLAKE2B 501282329fdf34d2bb0ccbed9f8bb865711d505ba2a444d659fc97deffae27d179cad522239efd4c63767705e45881c6fb6e1d2f6815085204215bbcbd89606b SHA512 275c693b35885f4913345de26ca17c88deecd3e8513e73787342808fb4ed021dbfc88e6233b5f04cd6b892e43a601a24de27fd656ba6085b3027acbe96c7bc55
 DIST linux-gpib-4.3.4.tar.gz 1395770 BLAKE2B 3c7182ac127851ebf0f5416ea639d7f858c160ba00f01aa7f7e423f6fb7b3be5b089424d3a473497562d040c194483ebc93d8a2a0f64582fb8907b42e2c4b832 SHA512 397ad86883bf562b004673ae47218108d392f2a15121c95926ea38764e7a76b382cb199fd48c35c9777f34c8eb99965e3d4ea2028e86ce02bcda4bd23127cbd5
-EBUILD linux-gpib-modules-4.3.4-r1.ebuild 1333 BLAKE2B 01222b3916c94f37a1c56730250a8c18e7edc7dff38f24deedd8fb03a252bb463be715ce5c876a84b1b9a27296ea99ad3a4003ead13f9b5ab2f2110e87c36e55 SHA512 c0933ba0c463a167566448a5ee2b46dee929c6e9251baa0182a681d75c71eefb367fbc385cc2b48b0debd4ccda9259c40caf5eccd4a08587cf3ed2b2eadb0f5c
+EBUILD linux-gpib-modules-4.3.4-r1.ebuild 1413 BLAKE2B d3e198d765aa8b80471213444d13e0f28a09cc19586b46d3672812e7fc3fd22df29562724af6382c08bc6041c5a87ee1005475ee9e750a2cb8bfdb656a2cfaca SHA512 0df86e4e6ce843cef29f333e7f562c9a6bd4f5846dec4354e2584a23266615a642dc91bf7e8bb67276b81f7216bacd6047ed8c831fa6494e6b1fd517758193e3
 MISC metadata.xml 481 BLAKE2B 5ee2924d1131f188c19c84bbfa8a3e2c6093387d15db5a0bc86ea14d4b0c0f36924df7525fb26f0b6660efe1a75f20e19afbd71270386795bd6af82bc5cd38f8 SHA512 dd41ed66cff7ad48e4a107f512e1121fb630f6487ef7872aeab219ff39d6cdb4b5dc14fa19c1b7931697c555702c2bd8bb8ec553b060c11581f02d8a46f76ef4
diff --git a/sci-libs/linux-gpib-modules/files/linux-gpib-modules-4.3.4-depmod.patch b/sci-libs/linux-gpib-modules/files/linux-gpib-modules-4.3.4-depmod.patch
new file mode 100644
index 000000000000..e858b974324c
--- /dev/null
+++ b/sci-libs/linux-gpib-modules/files/linux-gpib-modules-4.3.4-depmod.patch
@@ -0,0 +1,21 @@
+Depmod fails here since we're still in DESTDIR and the actual target path may
+not exist...
+
+
+diff -ruN linux-gpib-kernel-4.3.4.orig/Makefile linux-gpib-kernel-4.3.4/Makefile
+--- linux-gpib-kernel-4.3.4.orig/Makefile	2020-12-29 10:42:34.000000000 +0100
++++ linux-gpib-kernel-4.3.4/Makefile	2022-08-02 12:21:38.097344102 +0200
+@@ -20,13 +20,9 @@
+ 		M="$(GPIB_SRCDIR)/drivers/gpib" \
+ 		GPIB_TOP_DIR=$(GPIB_SRCDIR) 
+ 
+-#We run depmod explicitly because the depmod.sh script run
+-#by modules_install fails on Debian due to it failing to find
+-#the System.map file.
+ install:
+ 	$(MAKE) -C $(LINUX_SRCDIR) V=$(VERBOSE) modules_install\
+ 		M="$(GPIB_SRCDIR)/drivers/gpib" \
+ 		GPIB_TOP_DIR=$(GPIB_SRCDIR) \
+ 		INSTALL_MOD_DIR=gpib
+-	/sbin/depmod -A
+ 
diff --git a/sci-libs/linux-gpib-modules/linux-gpib-modules-4.3.4-r1.ebuild b/sci-libs/linux-gpib-modules/linux-gpib-modules-4.3.4-r1.ebuild
index deba2dcfbbd1..40897bc634f4 100644
--- a/sci-libs/linux-gpib-modules/linux-gpib-modules-4.3.4-r1.ebuild
+++ b/sci-libs/linux-gpib-modules/linux-gpib-modules-4.3.4-r1.ebuild
@@ -25,6 +25,9 @@ BDEPEND="virtual/pkgconfig"
 PATCHES=(
 	# https://sourceforge.net/p/linux-gpib/code/1998/
 	"${FILESDIR}/${P}-kernel-5.17.patch"
+
+	# don't fix debian bugs if they break gentoo
+	"${FILESDIR}/${P}-depmod.patch"
 )
 
 pkg_setup() {