3 files changed, 85 insertions, 2 deletions
diff --git a/dev-db/qdbm/Manifest b/dev-db/qdbm/Manifest
index ec24a2ed6be4..abb13b565f64 100644
--- a/dev-db/qdbm/Manifest
+++ b/dev-db/qdbm/Manifest
@@ -1,8 +1,9 @@
 AUX qdbm-configure.patch 5913 BLAKE2B a899d4d281eddbe974afd5969e4766d5f2eb55dfa545e6187003c4bb12f3224ead704cc1b14fd33841c8a9788832763d641ef04b5e49eee307aa71412d1301a4 SHA512 a15c513243f2b4976acf9a27f8572726bbaa7e55c7314228fa9fbc5899454c12d8c7efbf7ab24f1b3af427e64daded8ace1a5e4af4a227cae7fbb436e875461c
 AUX qdbm-darwin.patch 1060 BLAKE2B 76cabc68ade7ab738d99f2f60902a65aa1d2e617b2ca0665ad9281b0956ad02f480302bdbc295f1f04b9b9c67d5fc1e7a983e9444bcf31cbf69190b2a2f3dd73 SHA512 eb249d0fb3b3e91234798de8809ea69e6fb4e57940df8a096a63f0268ffa74656972ebc521398e161fbec8092a3d8ac276d0635bd6f6e1eec43b30a676162427
 AUX qdbm-perl.patch 1260 BLAKE2B e180ba6c2d57f6d813bbc6ae01ed787f6262a290eb59253b8950ec6f80ed29964e41cd3297b063db62e8c726a8e57399fe4ee52e67887bcaa74fad829b0b372f SHA512 a7356c2f5a4313e7da2524a6276bca5720459858d8619bfd8e6514cd9c1cd9aa1a2f7f0592e5ad1ee8b05e7e34452761e26be351f8e933e79a75cb4d19c862f3
+AUX qdbm-ruby.patch 2517 BLAKE2B 504437bdb8858e8970ddcd61b05903de5aa1b0bc3c6139cad0caf4e2bd4e0dce52abccebb8029cb896b9e451182e02a38e7f768c7fbf895f121e804da3f5c9eb SHA512 1346e3f0e9a4feab58e79907a186da15488dd8391fac29aa9cfecf81a34170bd831e9238e3e946c7c13ab72c2bb16f3ec0930694cfa267717c7c171cf0037e02
 AUX qdbm-ruby19.patch 10116 BLAKE2B 9a15c5d2e0cf8237edb78e68b2f9fde4868841bcca6abc08a33d110b9f25283e37fcb306c18bcca5495c7e5cedc778e3a2de2fe8414ce46c661a7c40d517cddc SHA512 f3e6c320a600ad3355fc74a333c28fc2dd904a2a52ca91a51f21b3dd14c7527bf312f5040dbc3e4f61d2dbcc0ade185e226333c79f9a04fc05437a156befc0e7
 AUX qdbm-runpath.patch 1133 BLAKE2B 9b1c8c211d8e4075a77a34f3d79ca15cb3d833801777bdb328293047539bdd1a51c08031b3400c11d10732aa7864078ca8db02713a95cd90704e1a9e26f5bd10 SHA512 de8bde4a614617d742131e8025fd661019ec81b803817ef32ffca461b2c8b60c20756f6e6f84d6f23124eed3947ab3573b8c4a05b254f8b4d3e53f0cf7bc8452
 DIST qdbm-1.8.78.tar.gz 1015429 BLAKE2B 1b985d856ff18ddfeb2d779694ba9a76006908b4b2a7509d4e3668aded80e08bbde28bcc24762ec27048cdc01dc84f9872dbfc221e8eea6f1c68f5e81cdc69d3 SHA512 480549c56071bf82edf714a611aef863599c858ed63702820ae0890fd2c0029d1a231ed94a8090c74420dd648bd3625d270a5c078b113cbb86a12ef509e19037
-EBUILD qdbm-1.8.78-r4.ebuild 3682 BLAKE2B 68bf64d0297b239c4163b13cfdfe487fdbd3354f5d973475a6773966bcaf7898bcdd7add66ff61518096a28ed1b27b6ba9ab43e952c9c28709de6c5bb3ef908f SHA512 c6c2c1991616dc741233387cd189b225800f771718eeaba3fdcf846d50ecb026e6af7b3b3935a5c103761d3d15517e57abe5971bb92ede073b72f6f837405d60
+EBUILD qdbm-1.8.78-r5.ebuild 3714 BLAKE2B 4ebaa29198cbccd35fb7ae95d0d179c23d1c7b742d4ba51168cca041a3978bb6b6b132b2e7f579171f7d87e77e1252713fa1f6a4137a11af2c6344bad182e486 SHA512 71c2f03ce6d4befdd3893276e0ed2931af854766d411a25e47bb15a487fa619cbcaa307936074bb11861fab509c52cf14c1738a57dbf3c760b4d3cd86e6638b6
 MISC metadata.xml 222 BLAKE2B 425bba0db7c4bc483eddcb51bb4151324b62afc42496047413bf9d0480fd731ea78201a8b99c42d9adfa9b20614f9507e8e89a87e9afce32aa9db82f42f827ed SHA512 7ae4d3d64e85fb01194d31b41843c10e3bf6a782e9f308cbe3f0a75c0a07d6af2a88013549b5840b3cd5e766d5044f0da290c31a4800d1823f6eca4028b082da
diff --git a/dev-db/qdbm/files/qdbm-ruby.patch b/dev-db/qdbm/files/qdbm-ruby.patch
new file mode 100644
index 000000000000..8b1a946d8d8c
--- /dev/null
+++ b/dev-db/qdbm/files/qdbm-ruby.patch
@@ -0,0 +1,81 @@
+--- a/ruby/curia/extconf.rb
++++ b/ruby/curia/extconf.rb
+@@ -2,10 +2,9 @@
+ 
+ dir_config("curia")
+ 
+-home = ENV['HOME']
+-$CFLAGS = "-I. -I../.. -I#{home}/include -I/usr/local/include"
+-$LDFLAGS = "-L../.. -L#{home}/lib -L/usr/local/lib"
+-$LIBS = "-L../.. -L#{home}/lib -L/usr/local/lib"
++$CFLAGS  << " -I../.. " << ENV["CFLAGS"]
++$LDFLAGS << " -L../.. " << ENV["LDFLAGS"]
++$LIBS    << " -L../.."
+ 
+ have_library("c", "main")
+ have_library("pthread", "main")
+--- a/ruby/curia/mod_curia.c
++++ b/ruby/curia/mod_curia.c
+@@ -84,7 +84,7 @@
+  *************************************************************************************************/
+ 
+ 
+-Init_mod_curia(){
++void Init_mod_curia(void){
+   crinit();
+   ccuriaerror = rb_define_class("CuriaError", rb_eStandardError);
+   ccuriaerror_ENOERR = rb_define_class("CuriaError_ENOERR", ccuriaerror);
+--- a/ruby/depot/extconf.rb
++++ b/ruby/depot/extconf.rb
+@@ -2,10 +2,9 @@
+ 
+ dir_config("depot")
+ 
+-home = ENV['HOME']
+-$CFLAGS = "-I. -I../.. -I#{home}/include -I/usr/local/include"
+-$LDFLAGS = "-L../.. -L#{home}/lib -L/usr/local/lib"
+-$LIBS = "-L../.. -L#{home}/lib -L/usr/local/lib"
++$CFLAGS  << " -I../.. " << ENV["CFLAGS"]
++$LDFLAGS << " -L../.. " << ENV["LDFLAGS"]
++$LIBS    << " -L../.."
+ 
+ have_library("c", "main")
+ have_library("pthread", "main")
+--- a/ruby/depot/mod_depot.c
++++ b/ruby/depot/mod_depot.c
+@@ -83,7 +83,7 @@
+  *************************************************************************************************/
+ 
+ 
+-Init_mod_depot(){
++void Init_mod_depot(void){
+   dpinit();
+   cdepoterror = rb_define_class("DepotError", rb_eStandardError);
+   cdepoterror_ENOERR = rb_define_class("DepotError_ENOERR", cdepoterror);
+--- a/ruby/villa/extconf.rb
++++ b/ruby/villa/extconf.rb
+@@ -2,10 +2,9 @@
+ 
+ dir_config("villa")
+ 
+-home = ENV['HOME']
+-$CFLAGS = "-I. -I../.. -I#{home}/include -I/usr/local/include"
+-$LDFLAGS = "-L../.. -L#{home}/lib -L/usr/local/lib"
+-$LIBS = "-L../.. -L#{home}/lib -L/usr/local/lib"
++$CFLAGS  << " -I../.. " << ENV["CFLAGS"]
++$LDFLAGS << " -L../.. " << ENV["LDFLAGS"]
++$LIBS    << " -L../.."
+ 
+ have_library("c", "main")
+ have_library("pthread", "main")
+--- a/ruby/villa/mod_villa.c
++++ b/ruby/villa/mod_villa.c
+@@ -97,7 +97,7 @@
+  *************************************************************************************************/
+ 
+ 
+-Init_mod_villa(){
++void Init_mod_villa(void){
+   vlinit();
+   cvillaerror = rb_define_class("VillaError", rb_eStandardError);
+   cvillaerror_ENOERR = rb_define_class("VillaError_ENOERR", cvillaerror);
diff --git a/dev-db/qdbm/qdbm-1.8.78-r4.ebuild b/dev-db/qdbm/qdbm-1.8.78-r5.ebuild
index f1ea111f2075..d2b808795c42 100644
--- a/dev-db/qdbm/qdbm-1.8.78-r4.ebuild
+++ b/dev-db/qdbm/qdbm-1.8.78-r5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="8"
@@ -30,6 +30,7 @@ RUBY_S="${P}/ruby"
 PATCHES=(
 	"${FILESDIR}"/${PN}-configure.patch
 	"${FILESDIR}"/${PN}-perl.patch
+	"${FILESDIR}"/${PN}-ruby.patch
 	"${FILESDIR}"/${PN}-ruby19.patch
 	"${FILESDIR}"/${PN}-runpath.patch
 	"${FILESDIR}"/${PN}-darwin.patch