gentoo auto-resync : 03:12:2022 - 08:59:05

6 files changed, 258 insertions, 31 deletions

diff --git a/dev-db/firebird/Manifest b/dev-db/firebird/Manifest
index c48bf703f441..1de433e63906 100644
--- a/dev-db/firebird/Manifest
+++ b/dev-db/firebird/Manifest
@@ -1,11 +1,31 @@
+AUX firebird-3.0.10.33601.0-configure-autoconf2.72.patch 800 BLAKE2B 4248d5745873bc414c746b9e473dcf63b9b5c7612d9c0a09a44fb38aa4dcfe60a07dde6d1447e22bfd2ee963b55675f8544559545f8056fbed3712332e62b07a SHA512 d7c80ed448c80edc60ff25d827b659fc74bda9c67a2acf5650c1b5a5f32f0ef456b500dadcb09f7497acbcc7debd594b13c45d34bed64fd0f33dfa6dfe7c2542
+AUX firebird-3.0.10.33601.0-configure-clang16.patch 1726 BLAKE2B 58f7a9aaf90ecebf4fac09f9c6a8d080267cd2d5da51b9d8cdeb75ef8ef9b546b1fb989d762b91f8c9aaa86a2d1a634cbdd84c24f639416bb94ebc8358177f02 SHA512 c52a01e889422cff983c273bfc5ea19da227e77c62946aa654ce8ec8ef617cfb3d7a26b23820d1ba6dc5936e962563416f91e6f371ef1fe923740ab07ab3060c
+AUX firebird-3.0.10.33601.0-flags.patch 1233 BLAKE2B bd669967c2fc04cd62d0dcf8a487e9a7e31a36e177bd8dd4ee48ba8fcb29c88bdbfb4e2e34daa0c4b8fd353fada25d35e42e03802db1a2fe5d6efca3e1bd4075 SHA512 89aaf417e933887ba95dab85001d3e1438308da053018d8c34592c77a2a84b849b50129eb1b5c8aaf156470a70a34197a495033a960ff0578fb8cd8ac6f17606
+AUX firebird-3.0.10.33601.0-unbundle.patch 3361 BLAKE2B 8ec60391e1bc72c40a9f6c87e88c26a6d512941cf907a8541d4422e561e276b38e6f4e8096de389d1be2846872218125830564d8d5a5dc798a2ec68dd0c31fa7 SHA512 bf424f10266ac6e67a56316b216266c760d4e3df617ec44b8f0f308425fc1d337496f06790b7afed4a9f29f0108b0ea332ffbfd10f7b812f0b7d098d43b4e128
 AUX firebird-3.0.2.32703.0-cloop-compiler.patch 349 BLAKE2B 6906993819f5aa68c39522d82bb7fb57b910f8f311d173a326147a98e983d8cd95ca90dbb538a5caa696ce4337305ece744306bf88f608cc8639bdda198e4576 SHA512 1d57f26ada2023d8bd04d73dd0f55951cef6b373710c8cf73b6bea0b4d54f879d689644d26541b2366bd1071b08eda2e1b531f3779a88b8fb52d3c9312f0c091
 AUX firebird-3.0.2.32703.0-unbundle.patch 1786 BLAKE2B 660af04975ecfdac0ae12a1ee89e0a4d97d321ac7de7e17ba53484a909962584828c18d1f119ecc1af63c1cb2b93f451b847c9363a25831630a807b89ad13bc8 SHA512 bb0f8cb283ee230f9128a9da16da21933a1709615b34bbfac117a0563e2451a07381b52ffc1fed665e74688ff8e2c2548f86c1413427665914cb3df8500543c5
 AUX firebird.init.d.3.0 642 BLAKE2B 70f9b07a69c01e391ea8b1f1747a35eb303ff43a4923d65f76064257bfe5178601fa0b06dbf332b6a3529df30ddbe3e3c58e170ca33acfeb06a32474f1806938 SHA512 0805311d7e4ceb9cd5266be88fe61fb7d2d7cf5bf3c9482841c6431767cba9960d4f38418629519b23cdf64893173ebd01641056123ddc7f24c1f1bbf969812b
 AUX firebird.init.d.3.0-r1 637 BLAKE2B 18d947e20229f217ba0fb2d1df2cab8241c1f7e48087c0673cd02c43f3653b3d68fcc99359dffd1c5c6dffec0c0f50ca7ea16eb1042ca4a1fd0deb386c0847b9 SHA512 91393e1dd2a543a0382502897bed38f1d77f20c291e76bf6c27d77bf9e820cae714c6643b7f464d1e3b3294c4fee49e818c8cf57601bdf72221fcf63105fa50a
 AUX firebird.logrotate 169 BLAKE2B 84d2d17eb1b2afa10ec17788add2ec09e42b354d7e4c9e513fe0c0f7d88390d26d41293b327b658c940d620b871796f3c41eb6b6fc69d9aae61ccb04308425c5 SHA512 d2c7c218e3ce5570e3c89408b391f754c900f5d7074a75f38eb08c66c6f0695eae5db62c80d7937d076f32f1b62b3cbc755f1d4ec633b24ed2b9a7043e531d2f
 AUX firebird.xinetd.3.0 193 BLAKE2B 34017b978344bc2b05cfe7b92eafd56ba20dd78d1fa21dfb5455d7972325cedae9a6ac25b4fa491899b19cb3bbe2949b8ca78626467100661767f6c944b01c20 SHA512 e02c011b55c1d6823b051d14dbfabef6d034db32ee8046adc796fdf393c837b995c270e0efdcb97950f6fead82cd73773099a247dc29961b0e8f6c4f6c0723ae
+DIST Firebird-3.0.10.33601-0.tar.bz2 13270269 BLAKE2B 1c30b002525287b239a6e24e59f146fdb61e1a9880cf66f2c59605b9f2a28c42603e21b2c5275e03a319af24c18f8fa5a7fa73f34c9a0d6c19e36e69864ad122 SHA512 0297a191ea1d0eda9557519d8ce6b7686cc3698a98b9c6c00547c2d36bf098083ae9d34b61614a7232b6195344bea1d66d2cbd3b092844b11f5b139162f8f886
 DIST Firebird-3.0.4.33054-0.tar.bz2 9778106 BLAKE2B 4b9116cbc351e0c2e10d15e6ea8e9754a383da77d8e016337604143eb2677ff2519da34b1a5c2e9b7b071fa9774eddbb535e9f926058ee626573b0411f6c042d SHA512 a346ebd53aeccf0b33eac5d35c3c3356624c1fbd0ad897173b3f68d940143062b28460a2822df807e8e8a1ea8792ebf98ed33e5b3ae273d86e6e36295a7fc8ad
+DIST firebird-3-quickstartguide.pdf 392796 BLAKE2B ef867664d107a9ee6dba3d724a5696fafe07a84305f1827dbeb5acf33d54aada45fad4e37971419fc7c26dba9b99577844a33c6e566485059329a8717fa79c1d SHA512 480ed2e79f83741c5b0b268f07e1ac1e317fbd9572a6e646411dc7fb94e5f44187e90d50b6ce761fc5e562e5ad2abafe89b2766e651eb7a36dbcb9ed49c3289f
+DIST firebird-30-developers-guide.pdf 1747057 BLAKE2B 9bde38dd5e997fec7fe69ada2ab1d74b0d59c440dd7a67d49e87a9464d7955f3766dde63aa60caf3e320759c934ec9f4088deed06cfae1b98e4d7ae6de364f02 SHA512 6a2a5ba1334e4a45839a950dd7b9c0a136b71a7626212b8aad5d173e8afd9a89c20ae51bdc5d309ebc206e0ac5af79138c28a10c64585d6f51c497e784445760
+DIST firebird-30-language-reference.pdf 3130464 BLAKE2B 975550c77e1b9cfcd53eef023781f1a1bc2282b7ba7bcedd57027399cbd44ad06c35d3f58bdcb2bdb953abe8ab948149ea9c284bc37eb35770dd57369f6838cd SHA512 9f17737733e2dd6e3a3f367c97c7053508621bc97b37b16ba36e6fe3554bf60363e3c06bf55ac6703d65e66039da7c16b71b70187c45b2206f6191c543cc1e95
+DIST firebird-fbmgr.pdf 151933 BLAKE2B b57394745a90732ee74f86d903690e0906be4bd5da5663ef28bd6959eb96f2d0f712cc06079a9730d9efa58e75258673b77b7b72db7897928632d315ffe1b5e1 SHA512 68b255d0de427df071400097f95205b8417c358e66a80c91d068b5e567f0a210c5494598cce871c83564cfbcd04b2f805cb53074a933ef963e94f1d1552ea2c9
+DIST firebird-gbak.pdf 196327 BLAKE2B c79e360a58c79c39e87b84b2653bd5fad1b1d45df8f02c8b6279277ea32b191533be52146ce8c03c3858ea86d23300c00d6eb31c30f0d6b466b5131aac4a7d54 SHA512 8a58adf94ea93bf51e55c7a0fd3adb7b6fc1f5fcaf71e29934f7bc192b5cac7dbd97113acf2ecda36df5470de5ee20f0100b65ab2b260a2194b846c52e0d816f
+DIST firebird-generator-guide.pdf 172298 BLAKE2B a923cc6aa5bab82b40d49b255d5ed2482e30f390ae76bffcd51294f9ee2000b827696bcb15b5bc5d9224a5650faf195daf89938c73ebce22d1e31411522c5800 SHA512 a043b84a1e7dff6b240b4786de7155fce266091d11f2a088e6864087e7d24c42cc70e44816d6abebf003feccf2676f9f8bbbb612b00db00366aead01f7e08c00
+DIST firebird-gfix.pdf 250034 BLAKE2B 2073f5348d6bd5989ba2496aa59865bf107e08c7a8a4058866a53b482f5f8012d9f6877e7ceb5cbe42d1587d8d29f1fa6622f3e5842d241eeca8da1ae5afcb4b SHA512 2f8de1fe4b45012c0d08e9e5d85d9ed1269629ac95c1ede5a9c8ae69aa69570ebfebe0f313ba54d6f00e785818f8801831c581be8b5ab427b189d3857a2b73fc
+DIST firebird-gsec.pdf 146403 BLAKE2B f20ddaee95c968df7b348ef5516ea53e3e6e866fdb2848951bd3ae5ed68e491360a24b6fbd71e2cf8fd03555284bf60bf0623db11d7b2569050fd022716eea55 SHA512 e930da593a9c0a8cdc0a669012c73b05e5844fe946807308bbe5e7a8ccd9a98261c7f4690fa7e07cfb39930359e30fdbfbe9c012565bf279a3471badf5eb46fa
+DIST firebird-gsplit.pdf 106100 BLAKE2B fd1e7edf7e6ea9556594395602739daa51253becf61db011548d763782ae57c5a2618ed79b91faf94264c1c0faff643f3941b6be0912c57e5d4b75d22ad5defa SHA512 70dafc072a1265ee9db63902b58e52833ea2c7482a12030ac13c35e51e3b94dde746090a7a02060475bf85d5170348207816e3997102fd4e33820c695d7d3e57
+DIST firebird-gstat.pdf 162939 BLAKE2B c63825c52f85020c095b90e8482a6e5f38c752178b135331268b5c2800fcfe3a035ccc68c14b83219bff1cb864c9f405e851e64f44919854e7e8e7290f4ad94d SHA512 c711122d9d020505f8475cda5b3621361a4d48cc39545a5e840430f43cb4dd7c97280a91085499547c95ce4cf9229b4ffec0f68c008fc04d7918b14fb7b8ec8a
+DIST firebird-isql.pdf 369327 BLAKE2B 3ea02b7a7b97bf231d43906f2fc8feb79aba525f1cb642da834c68c436d81d2f4408bcfe287d4ace089d6f37d9b3c8dc002fa98121fe2819c27c7840482ca91c SHA512 5f85a7ef98ab68df08c1225efab5859e988e63c3c3083e2320966cc4bf0976f9bbb4bea43906752f1710c860b33dae92c118ce13217ba61ee3ee9b0052204a3c
+DIST firebird-metadata-security.pdf 117765 BLAKE2B 67075db42cca196f019eef15fd2474be6d92353f0697b134ee5d3bb1e4cc6cd5c38cd978236f289d6c9cc300d9ebc5ee856ad871f1bd1816b7d92d46ee0cffe3 SHA512 8f24ff48ff177fdd98dfc1272f43de979fc405139475bd630a8f1c10feaf773425c85704194b8245235c2c61c0f7ebaf9d0d1741b68323146630a1361ed478a4
+DIST firebird-nbackup.pdf 202108 BLAKE2B 5ee794890f69935ec238d946649d05a72c3108674781af546e279e3d6cbbb82bbf81789270ad284a365f05cc6fdbca108baf86c5cb4eeacd242960e12e54d6b2 SHA512 c8e83a8e2bf23f3bcb17277b07eb822d1ae2ed412d6d1881f60c7c3003f60f1b6fe09e5dd52367c62a9311f9a7057fe4c85dd0c64a93554556f31cefc45e18c1
+DIST firebird-null-guide.pdf 487359 BLAKE2B 346d942b7d4780496c2c212433660415437f6b17a42bb109aaf1cd8a8de31a394a1d2a3b52bb6dc1c3830bc839a692b611c7fe3289243e86ab874a84d989a7b8 SHA512 b5b9981a3f15fe933a44deb001d1d85b0dc340ae0ff55e79d160da8590406515f0ba73360a3904556aa36d94cdafb17fe2452b5f63138cb1f585d70842511cd3
 DIST ib_b60_doc.zip 10530848 BLAKE2B b4008b3e8b0416014d024cbbc9ac2e648ad671c71b91b7aeb0eedf0f8479aef80e22aff7105c5e7417e88bcf57f2cdacbc2d5f51a2ef7fb870f9d361c5f0ed6d SHA512 59eccf1d6b1f0410eddbc5967fd77a3d00e09749640b3f81e2f8b624f5a45461dffad4af5ec61488e941fb3d3af266fe86c0b56e6b7e023239537cb6557a145a
+DIST using-firebird.pdf 236646 BLAKE2B 54b296ac8c6281ff501678a24dac76e203a66e569b1cda7dc475a7fe9bbed9fc03923377c320a621a225d0277fc68cfb9820514d3f12191902cdeb18ccb87270 SHA512 ec16c33082524aa5df8907c1143a8707f1193c42882956c220e6c95442d43751ec3e2ba77ded004866f7dab7f58ecf4fac3a0027cf89ec7536c0771260f09cc4
+EBUILD firebird-3.0.10.33601.0-r1.ebuild 7448 BLAKE2B 2be36fbe537de6ccc4893ab57b4cdb9a5f8ad5e499c7ae08d9f572918bcc948a86be8415778e62e6756a47e873ba24f7d1b126c96a971176c02648007d52a2eb SHA512 8367c8bb93598d359a43229682d556e071851339db8a581c3d9e3b11508e84e0eb19ae121f0504cb91a0b8161710645b2296304bd5aee53512cc405e72ef2d1f
 EBUILD firebird-3.0.4.33054.0-r2.ebuild 5998 BLAKE2B e84183dd9b35781e7d896f8f48ec575d1a4d9c01bc9bcaad327a0467d408c5aed957d30d411925a44fdf6582619e58aa640db64caa32f0d582ddace6804d73af SHA512 532725cb1fadc031eb91f828a0b7cdb346f39e1eec036ceef6fe1e633b8c4ef25eef7f21faa277d91c65a97611b787952c80335385ddff19a102bb746c79fd7d
-EBUILD firebird-3.0.4.33054.0-r3.ebuild 6001 BLAKE2B b739f1109f153bb1c2404757895b45041d8459506cd743170fd88219fd91aeae28de853ab31df7bd0eb371c82501e76718c9b36ea1f6a9ae1d40bee2c7c034ab SHA512 474b5d85b6fa2a94ffa2bc9ad2ae0bc7b3253268c5b44c4727035e242d1503c87b464be46182b671e36330be031afa3b88bb2bac60ea313ebabcce1d57f735dd
 MISC metadata.xml 898 BLAKE2B 0233f529337d00c8f0682983bf17e684ecabf35e0def11b284043d3df03d330ac3dfac04ebe613dca6de39628fcbd9f93783cfa537a3fb2943db66ac893cebd9 SHA512 427aa3c158e914471cb3d71058e3a067afce5bb4313fed1ea22f6777443d73dcc88f52c6526aafd69b6f0f8137a340f42676a85c6351c025c45dd91558715070
diff --git a/dev-db/firebird/files/firebird-3.0.10.33601.0-configure-autoconf2.72.patch b/dev-db/firebird/files/firebird-3.0.10.33601.0-configure-autoconf2.72.patch
new file mode 100644
index 000000000000..29cca62fc790
--- /dev/null
+++ b/dev-db/firebird/files/firebird-3.0.10.33601.0-configure-autoconf2.72.patch
@@ -0,0 +1,21 @@
+https://github.com/FirebirdSQL/firebird/commit/3fe8f6510de79689a26868e244840b24dcb19567
+
+From 3fe8f6510de79689a26868e244840b24dcb19567 Mon Sep 17 00:00:00 2001
+From: AlexPeshkoff <alexander.peshkoff@gmail.com>
+Date: Wed, 23 Nov 2022 20:30:03 +0300
+Subject: [PATCH] Fixed #7394: autoconf 2.72 support
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -696,8 +696,9 @@ if test "$STD_EDITLINE" = "true"; then
+       AC_CHECK_LIB(readline, readline, [READLINE=readline EDITLINE_FLG=Y],
+         [STD_EDITLINE=false
+          if test "$EDITLINE_FLG" = "Y"; then
+-           AC_MSG_WARN([[[--with-system-editline specified, not found. Using bundled editline]]])])))
++           AC_MSG_WARN([[[--with-system-editline specified, not found. Using bundled editline]]])
+ 		 fi
++           ])))
+ fi
+ XE_RESTORE_ENV()
+ 
+
diff --git a/dev-db/firebird/files/firebird-3.0.10.33601.0-configure-clang16.patch b/dev-db/firebird/files/firebird-3.0.10.33601.0-configure-clang16.patch
new file mode 100644
index 000000000000..06d6907369ca
--- /dev/null
+++ b/dev-db/firebird/files/firebird-3.0.10.33601.0-configure-clang16.patch
@@ -0,0 +1,48 @@
+https://github.com/FirebirdSQL/firebird/pull/7407
+
+From a39cde31c4c78866c8f8ee0285fc4bcb81496d81 Mon Sep 17 00:00:00 2001
+From: Florian Weimer <fweimer@redhat.com>
+Date: Thu, 1 Dec 2022 18:26:06 +0100
+Subject: [PATCH] configure.ac: Add missing int return types to main
+
+Implicit ints are a language feature that was removed in C99 and
+future compilers may require declaration of all return types.
+--- a/configure.ac
++++ b/configure.ac
+@@ -1118,7 +1118,7 @@ AC_CHECK_FUNCS(sem_init)
+ if test "$ac_cv_func_sem_init" = "yes"; then
+ AC_MSG_CHECKING(for working sem_init())
+ AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <semaphore.h>
+-	main () {
++	int main () {
+ 		sem_t s;
+ 		return sem_init(&s,0,0);
+ 		}
+@@ -1159,7 +1159,7 @@ AC_SYS_LARGEFILE
+ if test "$ac_cv_sys_file_offset_bits" = "no"; then
+   AC_MSG_CHECKING(for native large file support)
+   AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <unistd.h>
+-    main () {
++    int main () {
+     return !(sizeof(off_t) == 8);
+   }]])],[ac_cv_sys_file_offset_bits=64; AC_DEFINE(_FILE_OFFSET_BITS,64)
+    AC_MSG_RESULT(yes)],[AC_MSG_RESULT(no)],[])
+@@ -1206,7 +1206,7 @@ dnl EKU: try to determine the alignment of long and double
+ dnl      replaces FB_ALIGNMENT and FB_DOUBLE_ALIGN in src/jrd/common.h
+ AC_MSG_CHECKING(alignment of long)
+ AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <semaphore.h>
+-main () {
++int main () {
+   struct s {
+     char a;
+     union { long long x; sem_t y; } b;
+@@ -1217,7 +1217,7 @@ AC_MSG_RESULT($ac_cv_c_alignment)
+ AC_DEFINE_UNQUOTED(FB_ALIGNMENT, $ac_cv_c_alignment, [Alignment of long])
+ 
+ AC_MSG_CHECKING(alignment of double)
+-AC_RUN_IFELSE([AC_LANG_SOURCE([[main () {
++AC_RUN_IFELSE([AC_LANG_SOURCE([[int main () {
+   struct s {
+     char a;
+     double b;
+
diff --git a/dev-db/firebird/files/firebird-3.0.10.33601.0-flags.patch b/dev-db/firebird/files/firebird-3.0.10.33601.0-flags.patch
new file mode 100644
index 000000000000..a0ecef4693c4
--- /dev/null
+++ b/dev-db/firebird/files/firebird-3.0.10.33601.0-flags.patch
@@ -0,0 +1,25 @@
+# Compile externs with same CXX/CC/CFLAGS/CXXFLAGS/LDFLAGS as main
+--- a/builds/posix/Makefile.in
++++ b/builds/posix/Makefile.in
+@@ -127,8 +127,8 @@
+ endif
+ 
+ extern:
+-	$(MAKE) -C $(ROOT)/extern/btyacc
+-	$(MAKE) -C $(ROOT)/extern/cloop TARGET=release WITH_FPC=0 BUILD_DIR=$(TMP_ROOT)/cloop OUT_DIR=$(GEN_ROOT)/$(TARGET)/cloop
++	$(MAKE) -C $(ROOT)/extern/btyacc CC="$(CC)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)"
++	$(MAKE) -C $(ROOT)/extern/cloop TARGET=release WITH_FPC=0 BUILD_DIR=$(TMP_ROOT)/cloop OUT_DIR=$(GEN_ROOT)/$(TARGET)/cloop CXX="$(CXX)" CXXFLAGS="$(OPTIMIZE_FLAGS)" CFLAGS="${CFLAGS}" CC="${CC}" LDFLAGS="$(LDDFLAGS)"
+ 
+ ifeq ($(TOMBUILD_FLG),Y)
+ 	$(MAKE) -C $(ROOT)/extern/libtommath -f makefile.shared LIBTOOL=$(LIBTOOL)
+@@ -592,8 +592,8 @@
+ 	$(EXE_LINK) $(EXE_LINK_OPTIONS) $^ -o $@ $(FIREBIRD_LIBRARY_LINK) $(LINK_LIBS) $(call LINK_DARWIN_RPATH,..)
+ 
+ examples: include_generic
+-	$(MAKE) -f Makefile.examples -C $(GEN_ROOT)/examples/
+-	$(MAKE) -f Makefile.plugins_examples
++	$(MAKE) -f Makefile.examples -C $(GEN_ROOT)/examples/ CXX="${CXX}" CXXFLAGS="${CXXFLAGS}" LDFLAGS="${LDFLAGS}"
++	$(MAKE) -f Makefile.plugins_examples CXX="${CXX}" CXXFLAGS="${CXXFLAGS}" LDFLAGS="${LDFLAGS}"
+ 
+ message_file:	$(FIREBIRD_MSG)
+ 
diff --git a/dev-db/firebird/files/firebird-3.0.10.33601.0-unbundle.patch b/dev-db/firebird/files/firebird-3.0.10.33601.0-unbundle.patch
new file mode 100644
index 000000000000..4e5399f198b6
--- /dev/null
+++ b/dev-db/firebird/files/firebird-3.0.10.33601.0-unbundle.patch
@@ -0,0 +1,97 @@
+Partly based on:
+- https://github.com/freebsd/freebsd-ports/blob/main/databases/firebird30-server/files/patch-builds-posix_Makefile.in.plugins_examples
+- https://github.com/freebsd/freebsd-ports/blob/main/databases/firebird30-server/files/patch-extern_btyacc_Makefile
+- https://github.com/freebsd/freebsd-ports/blob/main/databases/firebird30-server/files/patch-extern_cloop_Makefile
+- https://github.com/freebsd/freebsd-ports/blob/main/databases/firebird30-server/files/patch-builds_posix_make.defaults
+--- a/builds/posix/Makefile.in
++++ b/builds/posix/Makefile.in
+@@ -688,8 +688,8 @@ install install-embedded silent_install package packages dist:
+ # various cleaning
+ #
+ .PHONY: clean clean_objects clean_dependancies clean_extern_objects clean_build \
+-		clean_gpre_gen clean_icu clean_dbs clean_examples clean_makefiles \
+-		clean_editline clean_all
++		clean_gpre_gen clean_dbs clean_examples clean_makefiles \
++		clean_all
+ 
+ 
+ clean: clean_objects clean_dependancies clean_extern_objects clean_build \
+@@ -708,8 +708,6 @@ clean_config clean_all: clean clean_makefiles
+ 	$(RM) $(ROOT)/config.status
+ 	$(RM) $(ROOT)/libtool
+ 	$(RM_R) $(ROOT)/autom4te.cache
+-	-$(MAKE) -C $(ROOT)/extern/editline distclean
+-#	-$(MAKE) -C $(ROOT)/extern/icu/source distclean
+ 	-$(MAKE) -C $(ROOT)/extern/btyacc distclean
+ 
+ clean_dbs:
+@@ -724,12 +722,6 @@ clean_dbs:
+ clean_examples:
+ 	$(RM) `find $(GEN_ROOT)/examples/ -type f ! -name 'Make*'`
+ 
+-clean_editline:
+-	-$(MAKE) -C $(ROOT)/extern/editline clean
+-
+-#clean_icu:
+-#	-$(MAKE) -C $(ROOT)/extern/icu/source clean
+-
+ clean_tommath:
+ 	-$(MAKE) -C $(ROOT)/extern/libtommath clean
+ 
+--- a/builds/posix/Makefile.in.plugins_examples
++++ b/builds/posix/Makefile.in.plugins_examples
+@@ -99,7 +99,7 @@ AllObjects += $(CA_Objects)
+ crypt_app: $(CRYPT_APP)
+ 
+ $(CRYPT_APP):	$(CA_Objects)
+-	$(EXE_LINK) $^ -o $@ $(FIREBIRD_LIBRARY_LINK)
++	$(EXE_LINK) $(LDFLAGS) $^ -o $@ $(FIREBIRD_LIBRARY_LINK)
+ 
+ 
+ include $(ROOT)/gen/make.shared.targets
+--- a/builds/posix/make.defaults
++++ b/builds/posix/make.defaults
+@@ -240,7 +240,7 @@ LIBFBINTL_SO = $(FB_BUILD)/intl/$(LIB_PREFIX)fbintl.$(SHRLIB_EXT)
+ 
+ ifeq ($(EDITLINE_FLG),Y)
+   ifeq ($(STD_EDITLINE), true)
+-	LIBEDITLINE := -l$(READLINE)
++	LIBEDITLINE := $(shell ${PKG_CONFIG} libedit --libs)
+   else
+ 	LIBEDITLINE := $(LIB)/libedit.a
+   endif
+--- a/extern/btyacc/Makefile
++++ b/extern/btyacc/Makefile
+@@ -42,7 +42,7 @@ OTHERS	      = README README.BYACC \
+ all:		$(PROGRAM)
+ 
+ $(PROGRAM):     $(OBJS) $(LIBS)
+-		$(CC) $(LDFLAGS) -o $(PROGRAM) $(OBJS) $(LIBS)
++		$(CC) $(CFLAGS) $(LDFLAGS) -o $(PROGRAM) $(OBJS) $(LIBS)
+ 
+ clean:;		rm -f $(OBJS)
+ 
+--- a/extern/cloop/Makefile
++++ b/extern/cloop/Makefile
+@@ -6,7 +6,7 @@ TARGET	:= release
+ 
+ CC	:= $(CC)
+ CXX	:= $(CXX)
+-LD	:= $(CXX)
++LD	:= $(CXX) $(LDFLAGS)
+ 
+ SRC_DIR		:= src
+ BUILD_DIR	:= build
+@@ -27,8 +27,10 @@ SRCS_CPP := $(foreach sdir,$(SRC_DIRS),$(wildcard $(sdir)/*.cpp))
+ OBJS_C := $(patsubst $(SRC_DIR)/%.c,$(OBJ_DIR)/%.o,$(SRCS_C))
+ OBJS_CPP := $(patsubst $(SRC_DIR)/%.cpp,$(OBJ_DIR)/%.o,$(SRCS_CPP))
+ 
+-C_FLAGS := -ggdb -fPIC -MMD -MP -W -Wall -Wno-unused-parameter
+-CXX_FLAGS := $(C_FLAGS)
++
++COMMON_C_FLAGS := -ggdb -fPIC -MMD -MP -W -Wall -Wno-unused-parameter
++C_FLAGS := $(COMMON_C_FLAGS) $(CFLAGS) $(CPPFLAGS)
++CXX_FLAGS := $(COMMON_C_FLAGS) $(CXXFLAGS) $(CPPFLAGS)
+ FPC_FLAGS := -Mdelphi
+ 
+ ifeq ($(TARGET),release)
diff --git a/dev-db/firebird/firebird-3.0.4.33054.0-r3.ebuild b/dev-db/firebird/firebird-3.0.10.33601.0-r1.ebuild
index 3ee04900edfe..61f61df905da 100644
--- a/dev-db/firebird/firebird-3.0.4.33054.0-r3.ebuild
+++ b/dev-db/firebird/firebird-3.0.10.33601.0-r1.ebuild
@@ -1,16 +1,33 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 MY_P=${PN/f/F}-$(ver_rs 4 '-')
 inherit autotools flag-o-matic
 
 DESCRIPTION="Relational database offering many ANSI SQL:2003 and some SQL:2008 features"
 HOMEPAGE="https://www.firebirdsql.org/"
+
 SRC_URI="
-	https://github.com/FirebirdSQL/firebird/releases/download/R$(ver_rs 1-3 '_' $(ver_cut 1-3))/${MY_P}.tar.bz2
-	doc? ( ftp://ftpc.inprise.com/pub/interbase/techpubs/ib_b60_doc.zip )
+	https://github.com/FirebirdSQL/firebird/releases/download/v$(ver_cut 1-3)/${MY_P}.tar.bz2
+	doc? (
+		https://firebirdsql.org/file/documentation/pdf/en/refdocs/fblangref30/firebird-30-language-reference.pdf
+		https://firebirdsql.org/file/documentation/pdf/en/firebirddocs/qsg3/firebird-3-quickstartguide.pdf
+		https://firebirdsql.org/file/documentation/pdf/en/refdocs/fbdevgd30/firebird-30-developers-guide.pdf
+		https://firebirdsql.org/file/documentation/pdf/en/firebirddocs/isql/firebird-isql.pdf
+		https://firebirdsql.org/file/documentation/pdf/en/firebirddocs/gsec/firebird-gsec.pdf
+		https://firebirdsql.org/file/documentation/pdf/en/firebirddocs/gbak/firebird-gbak.pdf
+		https://firebirdsql.org/file/documentation/pdf/en/firebirddocs/nbackup/firebird-nbackup.pdf
+		https://firebirdsql.org/file/documentation/pdf/en/firebirddocs/gstat/firebird-gstat.pdf
+		https://firebirdsql.org/file/documentation/pdf/en/firebirddocs/gfix/firebird-gfix.pdf
+		https://firebirdsql.org/file/documentation/pdf/en/firebirddocs/fbmgr/firebird-fbmgr.pdf
+		https://firebirdsql.org/file/documentation/pdf/en/firebirddocs/gsplit/firebird-gsplit.pdf
+		https://firebirdsql.org/file/documentation/pdf/en/firebirddocs/generatorguide/firebird-generator-guide.pdf
+		https://firebirdsql.org/file/documentation/pdf/en/firebirddocs/nullguide/firebird-null-guide.pdf
+		https://firebirdsql.org/file/documentation/pdf/en/firebirddocs/fbmetasecur/firebird-metadata-security.pdf
+		https://firebirdsql.org/file/documentation/pdf/en/firebirddocs/ufb/using-firebird.pdf
+	)
 "
 S="${WORKDIR}/${MY_P}"
 
@@ -20,7 +37,6 @@ KEYWORDS="~amd64 ~x86"
 IUSE="doc examples +server xinetd"
 
 BDEPEND="
-	>=dev-util/btyacc-3.0-r2
 	doc? ( app-arch/unzip )
 "
 # FIXME: cloop?
@@ -38,8 +54,10 @@ RDEPEND="
 "
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-3.0.2.32703.0-unbundle.patch
-	"${FILESDIR}"/${PN}-3.0.2.32703.0-cloop-compiler.patch
+	"${FILESDIR}"/${PN}-3.0.10.33601.0-unbundle.patch
+	"${FILESDIR}"/${PN}-3.0.10.33601.0-flags.patch
+	"${FILESDIR}"/${P}-configure-autoconf2.72.patch
+	"${FILESDIR}"/${P}-configure-clang16.patch
 )
 
 pkg_pretend() {
@@ -59,16 +77,6 @@ check_sed() {
 	[[ $1 -ge $2 ]] || die "${MSG}"
 }
 
-src_unpack() {
-	unpack "${MY_P}.tar.bz2"
-	if use doc; then
-		# Unpack docs
-		mkdir "manuals" || die
-		cd "manuals" || die
-		unpack ib_b60_doc.zip
-	fi
-}
-
 src_prepare() {
 	default
 
@@ -83,20 +91,21 @@ src_prepare() {
 		-e 's:ISQL :FBSQL :w /dev/stdout' \
 		src/msgs/messages2.sql | wc -l)" "6" "src/msgs/messages2.sql" # 6 lines
 
+	# use gentoo's CXXFLAGS instead of whatever firebird decided on
+	# doesn't replace all firebird's CXXFLAGS, but at least this is last,
+	# so it can do some overrides
+	sed -i -e "/OPTIMIZE_FLAGS=/s/=.*/=${CXXFLAGS}/" builds/posix/prefix.*
+
 	find . -name \*.sh -exec chmod +x {} + || die
-	rm -r extern/{btyacc,editline,icu} || die
+	# firebird's patched btyacc is needed now as of
+	# https://github.com/FirebirdSQL/firebird/commit/9aab6ed8cc6872e2ebc6bfa2531e089cb96e8305#diff-a01303d63fcb967bea34359c3c7f79e4356d6549ab22a1a9190e8020c0b33a3d
+	rm -r extern/{editline,icu} || die
 
 	eautoreconf
 }
 
 src_configure() {
-	filter-flags -fprefetch-loop-arrays
-	filter-mfpmath sse
-
-	# otherwise this doesnt build with gcc-6
-	# http://tracker.firebirdsql.org/browse/CORE-5099
-	append-cflags -fno-sized-deallocation -fno-delete-null-pointer-checks
-	append-cxxflags -fno-sized-deallocation -fno-delete-null-pointer-checks -std=c++11
+	tc-export PKG_CONFIG
 
 	local myeconfargs=(
 		--prefix=/usr/$(get_libdir)/firebird
@@ -109,18 +118,19 @@ src_configure() {
 		--with-fbinclude=/usr/include
 		--with-fbdoc=/usr/share/doc/${PF}
 		--with-fbudf=/usr/$(get_libdir)/${PN}/UDF
-		--with-fbsample=/usr/share/doc/${PF}/examples
-		--with-fbsample-db=/usr/share/doc/${PF}/examples/db
-		--with-fbhelp=/usr/$(get_libdir)/${PN}/help
+		--with-fbsample=/usr/share/${PN}/examples
+		--with-fbsample-db=/usr/share/${PN}/examples/empbuild
+		--with-fbhelp=/usr/share/${PN}/help
 		--with-fbintl=/usr/$(get_libdir)/${PN}/intl
 		--with-fbmisc=/usr/share/${PN}
 		--with-fbsecure-db=/etc/${PN}
-		--with-fbmsg=/usr/$(get_libdir)/${PN}
+		--with-fbmsg=/usr/share/${PN}/msg
 		--with-fblog=/var/log/${PN}/
 		--with-fbglock=/var/run/${PN}
 		--with-fbplugins=/usr/$(get_libdir)/${PN}/plugins
 		--with-gnu-ld
 	)
+
 	econf "${myeconfargs[@]}"
 }
 
@@ -128,7 +138,13 @@ src_configure() {
 src_install() {
 	if use doc; then
 		dodoc -r doc
-		find "${WORKDIR}"/manuals -type f -iname "*.pdf" -exec dodoc '{}' + || die
+
+		local x
+		for x in ${A}; do
+			if [[ ${x} == *.pdf ]] ; then
+				dodoc "${DISTDIR}"/${x}
+			fi
+		done
 	fi
 
 	cd "${S}/gen/Release/${PN}" || die
@@ -224,5 +240,5 @@ src_install() {
 	elog "Starting with version 3, server mode is set in firebird.conf"
 	elog "The default setting is superserver."
 	elog
-	elog "If you're using UDFs, please remember to move them to /usr/$(get_libdir)/firebird/UDF"
+	elog "If you're using UDFs, please remember to move them to ${EPREFIX}/usr/$(get_libdir)/firebird/UDF"
 }