16 files changed, 87 insertions, 104 deletions
diff --git a/net-irc/Manifest.gz b/net-irc/Manifest.gz
index 9380ab10299f..5524d1f1a6aa 100644
--- a/net-irc/Manifest.gz
+++ b/net-irc/Manifest.gz
diff --git a/net-irc/irssistats/Manifest b/net-irc/irssistats/Manifest
index 4888065aa83a..e1c3707f7c4e 100644
--- a/net-irc/irssistats/Manifest
+++ b/net-irc/irssistats/Manifest
@@ -1,4 +1,6 @@
 AUX irssistats-0.75-Makefile.patch 625 BLAKE2B b7d3a4e3efa900c3691748c3ef88d648538625fe9b8695856ff640b49314f63d7c1e4c54eca510585bcc55a956de61bc82dd47f077edf3880be5a06fbb419893 SHA512 800469eb250fb5b1e0727eb2774da4247fc96f9fedb133644be43af9ee1572547e2e1c61e222c0c1717ba757a7abf997d3e06b1f5f7f7f52194156057ed59128
+AUX irssistats-0.75-clang16-build-fix.patch 903 BLAKE2B 8e67e46b16535a3121786eef6742515a1feab1bded35bc911a1afcf83519236d0e497550405f43d0f612387339dc7505e15dca7378d6f321c72b6a1feea5ae9e SHA512 3f94ecea46771ca2a78f94a4795df1851ff786f00dfba11a3aac4cea7940b7f24750cc31571de9a7a4aafe7416818ec76e8f81f38403f3e64318ed43579f4790
 DIST irssistats-0.75.tar.gz 54434 BLAKE2B 1bd35158bea9f24b8013834a876cbc3a3f285cea1802e6699f6e10af33dde1a648ec717b031819a999c0beb2cac394130da7a31b5bc877d32abb0a706142d972 SHA512 d7ac167d64c850f3803e6192f1fbf98e13cf296902b92bc3c5847f5f97a678938e7bff41b3195d2845c5ddb92f0557fea1b3a82b61d18b6a307b94ceae1c62f6
 EBUILD irssistats-0.75-r1.ebuild 630 BLAKE2B afa01c457249a1e30a6f6f488143e5dc5e201a8485f13a054a9b26768bbc19f12216f3ac37f1fc234ed83790893b7cfa0d0707a799aa9e5a3bc8e3de8c1e5dbf SHA512 94f56e1aa38381404cec72ec585027b9ae025362ab9b08a78bd0531f58b7bebb7607dc648783036cc1b3436e40e3342c715b20c3bf01ca8ea415d44473774363
+EBUILD irssistats-0.75-r2.ebuild 655 BLAKE2B 485b6b8f0230a8873bd3e87252ff2582ff46f6ac0fbf1849a3d344b47e61c142c8807e3bab7fe75eddde1fbbb7384445806ff7a5c97ccd9f82d24d9981f6cb7a SHA512 913e2cc99c0bfd5a32efd0fb00ad35ff2a2c4c8d16f91546171a386c7e64d80701d16494c2ca43736c50f55776b75f5923ff50383b02daf6892e70e4ae419e25
 MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
diff --git a/net-irc/irssistats/files/irssistats-0.75-clang16-build-fix.patch b/net-irc/irssistats/files/irssistats-0.75-clang16-build-fix.patch
new file mode 100644
index 000000000000..b162c4868ce3
--- /dev/null
+++ b/net-irc/irssistats/files/irssistats-0.75-clang16-build-fix.patch
@@ -0,0 +1,40 @@
+Bug: https://bugs.gentoo.org/897866
+--- a/irssistats.c
++++ b/irssistats.c
+@@ -29,6 +29,7 @@
+ #include <time.h>
+ #include <string.h>
+ #include <locale.h>
++#include <ctype.h>
+ #ifdef __WIN32__
+ #define GLOBALCONF "irssistats.conf"
+ #else
+@@ -1561,19 +1562,19 @@ void gen_xhtml(char *xhtmlfile)
+   fclose(fic);
+ }
+ 
+-void parse_config(char *configfile)
++void expand(char *path)
+ {
+-  void expand(char *path)
++  char temp[MAXLINELENGTH];
++  if (*path=='~')
+   {
+-    char temp[MAXLINELENGTH];
+-    if (*path=='~')
+-    {
+-      snprintf(temp,MAXLINELENGTH-1,"%s%s",getenv("HOME"),path+1);
+-      temp[MAXLINELENGTH-1]='\0';
+-      strcpy(path,temp);
+-    }
++    snprintf(temp,MAXLINELENGTH-1,"%s%s",getenv("HOME"),path+1);
++    temp[MAXLINELENGTH-1]='\0';
++    strcpy(path,temp);
+   }
++}
+   
++void parse_config(char *configfile)
++{
+   FILE *fic;
+   char line[MAXLINELENGTH];
+   char keyword[MAXLINELENGTH];
diff --git a/net-irc/irssistats/irssistats-0.75-r2.ebuild b/net-irc/irssistats/irssistats-0.75-r2.ebuild
new file mode 100644
index 000000000000..c03ca60a255c
--- /dev/null
+++ b/net-irc/irssistats/irssistats-0.75-r2.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="Generates HTML IRC stats based on irssi logs"
+HOMEPAGE="http://royale.zerezo.com/irssistats/"
+SRC_URI="http://royale.zerezo.com/irssistats/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+
+DEPEND="net-irc/irssi"
+
+PATCHES=(
+	"${FILESDIR}/${P}-Makefile.patch"
+	"${FILESDIR}/${P}-clang16-build-fix.patch"
+)
+
+src_compile() {
+	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
+}
+
+src_install() {
+	emake \
+		PRE="${D}"/usr \
+		DOC="${D}"/usr/share/doc/${PF} \
+		install
+}
diff --git a/net-irc/konversation/Manifest b/net-irc/konversation/Manifest
index 5350e10a74a3..b5f70c26696f 100644
--- a/net-irc/konversation/Manifest
+++ b/net-irc/konversation/Manifest
@@ -1,6 +1,6 @@
 AUX konversationrc 346 BLAKE2B 8d236be66f983b3670bbd49578c73a1a868be0b498f965e5f91ecc96f956ba6151ebf6a90cbacd304c9fd16fe62c6cecae7027b5582d1c1b97516c7c89430c68 SHA512 37333594ee6835e61a3dec4c3f48e9a83d69b252768aa22830102199811059cbae8188388e7911503e14c0ef05dbc7d7d7f50c94d0fca4659c6b739e3b8c24dc
 DIST konversation-23.08.5.tar.xz 4490296 BLAKE2B 027b53e5b59f6666818eb83c4ec8bbbafa6ebc4b02c512eb032090f535de166456a93c5f1f4d93a583d11bbf33f8defe165941527c35891a7b40109a99e27552 SHA512 4de29fa128934dcf2a41f6f06bb0d1a6dc0080ca572f1ce9d30c41d16ce36c285fe390f5fc8d06cbf0b0fd307f36c75068954aeb1847482f106d33c0801ba0ef
-DIST konversation-24.02.2.tar.xz 4437360 BLAKE2B 5b8c56168224dfc388ebabda5460f83105b49d5710ba27352a7ebf63556f3f5354cfae008b51e61e0b192b06c45dd2980442963e1b7a1a19c9dc4dd517ec3d8e SHA512 c402713dd2918d0b8ab1f617b371763366b903acc120565b9b9087ca71843ef9dc4aa2f10f61e0fbc4406fe27f5e3d12d3fef14b352f49f384c2c39e24099a71
+DIST konversation-24.04.90.tar.xz 4387140 BLAKE2B 7c042201849320fe6d3e9105397e48d72797506cdaa1e79f868f9af35e067bf8537e64ba35e59cf1c8447687f4bc1269bc031ff0e7d92419a36cb9da6539e609 SHA512 b5f858791f9807194e1ab1a6d9e3b23661100aeae4b61cd58c72b48964007428b02a929c0b730d2ff8d72e1600dbf2a72f44f9637ed772c403bde49ca4f5a3ef
 EBUILD konversation-23.08.5.ebuild 2077 BLAKE2B 8c3580917a1245ab43a7bbe5c713118318589a4d824637970caf09f5a8e0a0e84d5f4989497bc301552c523d5313fc7eaca6ca1cfa538841971baa8cfaee927f SHA512 9fae6848948174aa34183f8332bb7c6be444ea734e6254de745b99000ba9d720581b922b80c1b7bd0634da014c56c5464a2c3d382d975ed4e9df02e0cbffcb83
-EBUILD konversation-24.02.2.ebuild 1950 BLAKE2B 8f49b15cf72bd301060c32cf6a4c36fd3a1eebbac2374d436ca5731d8dcf42f397a50eb0f74d52b89ef7f09d46f181714929f8cf7711a762402eaa3b54135c2b SHA512 944b72cd6e8a3ff337a91e3acd3eeda29e8c5bab9d04781fc1d5926c65d27da47b3e74d50c45e76f4de04a030daecd86305d72c7cbb2b8b0642dfd6ab48e6b76
+EBUILD konversation-24.04.90.ebuild 1908 BLAKE2B e56fcba504aae9a0eefc868b984efb4e1b1747738e911a24bdb6115724a77af0621674eff5aa296407b4485f10d4090e528ee8025c8742237aba54b0daa5514e SHA512 fa9f1b33b3c090a51af192514ee70a794cfc8133786ce7ed0d9be8e305fe2a9f0097c57b2b0ad7d69bbaa92bd3b019473903d36523734e183a1de8f85e1d7b47
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/net-irc/konversation/konversation-24.02.2.ebuild b/net-irc/konversation/konversation-24.04.90.ebuild
index 4709dadeae23..f91970b7bef7 100644
--- a/net-irc/konversation/konversation-24.02.2.ebuild
+++ b/net-irc/konversation/konversation-24.04.90.ebuild
@@ -24,7 +24,6 @@ DEPEND="
 	>=kde-frameworks/karchive-${KFMIN}:6
 	>=kde-frameworks/kbookmarks-${KFMIN}:6
 	>=kde-frameworks/kcodecs-${KFMIN}:6
-	>=kde-frameworks/kcolorscheme-${KFMIN}:6
 	>=kde-frameworks/kcompletion-${KFMIN}:6
 	>=kde-frameworks/kconfig-${KFMIN}:6
 	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
diff --git a/net-irc/kvirc/Manifest b/net-irc/kvirc/Manifest
index 56c22bde2d4a..37ce10ac97dd 100644
--- a/net-irc/kvirc/Manifest
+++ b/net-irc/kvirc/Manifest
@@ -4,6 +4,6 @@ DIST kvirc-5.2.0.tar.gz 6365703 BLAKE2B fda63b6579b9d8d75eae5c2b039f474f4a810c79
 DIST kvirc-5.2.2.tar.gz 6362952 BLAKE2B ba90de3730dee0466c21cd658eda622bfb8f601e1af79d53952b2b016c0bacf0dc1d83c78f307288cc2e3bfda409773adfffc1b53fba6a0d8c682a5ab8739259 SHA512 dcb140051cebe4eaa82d8b8e221e4df3f40695b3b3a9aa9842ef5325e3129c73d08e5849589385793efc1eb70fd115ee634422af8be3f943eea79719a4159ea5
 EBUILD kvirc-5.2.0-r1.ebuild 3840 BLAKE2B 5a55f5df339149b5612e0e5a899e97573b56852a4de3923c826a29eeb9f2be8388924db286116db477869573d18bd454ec881d5ee755d4ed6bed9953b5305b2e SHA512 036a248568ca1a7600afcf1b8b15740b9fc524f2c5237035335bfe32a80aca14a7d58942d14e5c345220be702920e1af257099ed4cf702ef1943ddcc27732cf5
 EBUILD kvirc-5.2.0-r2.ebuild 3957 BLAKE2B 22955fcc7202cfd3191acae1e3a32e9913a25f2b5e276b3a4700c886e0ea5c7254fcb4d667cf41aaa45854661f6eb369b6b0d9e7b0faaef43404ccfaad72a6fb SHA512 d4a5a89c70bbbcdc2046604b8612fbd9fb8481eafcb1a6bc150df316a48bc37f1a4498ab53ca2721f2ea5c144d1f10b3dc2410f413cb42668d96559806dc1210
-EBUILD kvirc-5.2.2.ebuild 3863 BLAKE2B 4e412a5a3fc0b630ca5d1169a5a5cce7e72748d89a4c4ecd238ca2c2467f5f1337769c75015741847cb97262e03e67fbd0823a6630e1edd03c2a803edf6f3318 SHA512 a4614efc093f80d6c9662dc534c240d296218336982678f5a8b75e018f2d94d183186025daeb02089ee6936bde401fdcf4bab88e1752b72298d5f05eb6453523
+EBUILD kvirc-5.2.2.ebuild 3861 BLAKE2B 488d0a67b39a4ecc5eeef98194a236512534766926ed287d1a7b52209c621a4c8cddcf2a946cb3633084708dd3765d29af62ea2b08b18effdcc9d5c81294f9ab SHA512 7cbcb8215edf65ad21322e2d79427cb8d7673da8dcb17fbbc2d89bcf088f71400ec07408d6b5a5d41e50115dafd3753ac0d32ff86710e9f84671fa5bf089af44
 EBUILD kvirc-9999.ebuild 3863 BLAKE2B 4e412a5a3fc0b630ca5d1169a5a5cce7e72748d89a4c4ecd238ca2c2467f5f1337769c75015741847cb97262e03e67fbd0823a6630e1edd03c2a803edf6f3318 SHA512 a4614efc093f80d6c9662dc534c240d296218336982678f5a8b75e018f2d94d183186025daeb02089ee6936bde401fdcf4bab88e1752b72298d5f05eb6453523
 MISC metadata.xml 685 BLAKE2B 910e706182d26d6591d8aaea2d99ab0b3de4d937cb2179fc64adeb5247b4f113475f1088f9f4d38ba248a0c63504f5d43d29506d90b248909a2f8525d10b6bbd SHA512 a740aefd857f92cb9a896b8b0e7b77aebe234835a96fe3d358de060eb6306606273e34e9578e134d8f79118119500e55208020fd31a4a6c48829f606cba979cd
diff --git a/net-irc/kvirc/kvirc-5.2.2.ebuild b/net-irc/kvirc/kvirc-5.2.2.ebuild
index 32a984d0afbb..5f7c77b52cf6 100644
--- a/net-irc/kvirc/kvirc-5.2.2.ebuild
+++ b/net-irc/kvirc/kvirc-5.2.2.ebuild
@@ -14,7 +14,7 @@ if [[ "${PV}" == "9999" ]]; then
 	EGIT_REPO_URI="https://github.com/kvirc/KVIrc"
 else
 	SRC_URI="https://github.com/kvirc/KVIrc/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~ppc ~ppc64 ~riscv ~x86"
+	KEYWORDS="amd64 ~ppc ~ppc64 ~riscv x86"
 	S="${WORKDIR}/KVIrc-${PV}"
 fi
 
diff --git a/net-irc/psybnc/Manifest b/net-irc/psybnc/Manifest
index a9083162fbeb..fb3547591382 100644
--- a/net-irc/psybnc/Manifest
+++ b/net-irc/psybnc/Manifest
@@ -1,6 +1,4 @@
 AUX oidentd.conf.psybnc 92 BLAKE2B 3653139da1f045214c609acc0a655bd617b681778339584ea01bc5373fc159cb581dfeb66c5ba8f58b75f20a12e2d5430977576c5d3c0c42b919543c8886eae2 SHA512 1670c597922c557eb4124ec75c41e30135dce47ced3f080051ef1f896b5b24ce8d0833b147fb5ba7b5056cc0c333ecd7a6105bb68f92a72e64f753253a2595ad
-AUX psybnc-2.3.2.9-compile.patch 3264 BLAKE2B d67880d5a26de0cafa1cd81733b0f8e22ca920989b4acf3aa085cbba592478c8b24e033167bc09d20e5b565772e8de8c65e9c095392dd3abdf12c5aadbc71334 SHA512 7bebf40946a70f93e6ca5fad204e45b1187baafef346d1ef2e549dcdc750ed9853be760a5ec38eee820fdc8e51f2ff798b91b1a5bd5cbeb423c5090ba04fc152
-AUX psybnc-2.3.2.9-ldflags-fix.patch 540 BLAKE2B d1f6c0b41212bec79d9f0381c07e738ec02ca9b54700cc89d6b1da3d94b4fe2555da4abc6262a9b4ed641e23f988e0c57aed94006610eef072763a08960a6c96 SHA512 9ade1e441b0b890a8c2284128124c02786868803771d9acdae560811a7dc56d0cab3673250491b6e99e012a6265db1e0e17fbe5f19aa913d6cc9796c61619d9f
 AUX psybnc-2.3.2.9-multinetwork.patch 265 BLAKE2B 3bca2c18d521fe34445433090564e78e7c948048114231a79defac5082e0419062ee24fed6b4a4759090498340d16a31dc6114d19a397a97822660879c9ba326 SHA512 955b2455aad91d0145597096a7dc75de9279f828de94e8156f98f992734b86da5712d08b6d3ff3538359aaa1c1fb6b496b5cbbee44da7dadd444ddf020389821
 AUX psybnc-2.3.2.9-oidentd.patch 236 BLAKE2B 1af1ba8e2ca6edc8fa64040bfb4e195b9486356284bf83a95df9cbc69c5307a3845dc70586978dc2ee0ffd75cc48f9e88e9fb6c709b504a01e7e8906636c5257 SHA512 60e528060582f07e7b81d522bd93d0b69adba4ec56babde704baa820edc420b7a50d4158ce916f3a767a7d705f98fa30ac8229f64e8549eb551a47780ae002f4
 AUX psybnc-2.3.2.9-scripting.patch 248 BLAKE2B b0dec6f5202f6c5a38020c179fdd3cbe932028141c2c95d4a236a1f0140c1feddc60165197ab69ccad6a481f8e84c16dc950644e56bfd9af2c678a80ff9b6898 SHA512 8fbaa82295c53a8b592500c87aab92d46cc0f28d7d89cb8e3957671cc94f785dee52e405196cea8782a192ae942f3b29c892c03cdc2e94d00a2c73b196d4de36
diff --git a/net-irc/psybnc/files/psybnc-2.3.2.9-compile.patch b/net-irc/psybnc/files/psybnc-2.3.2.9-compile.patch
deleted file mode 100644
index 99e55b6d8cdc..000000000000
--- a/net-irc/psybnc/files/psybnc-2.3.2.9-compile.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-diff -Naurp a/src/p_blowfish.c b/src/p_blowfish.c
---- a/src/p_blowfish.c	2007-02-26 12:16:53.000000000 +0000
-+++ b/src/p_blowfish.c	2007-02-26 12:17:11.000000000 +0000
-@@ -31,7 +31,7 @@ static char rcsid[] = "@(#)# $Id$
- #include <string.h>
- #include <config.h>
- 
--char *strmncpy(char *dest, char *source, size_t len);
-+char *strmncpy(char *dest, const char *source, size_t len);
- char *lngtxt(int msgnum);
- 
- #define pcontext { strmncpy(ctxt,__FILE__,sizeof(ctxt));strmncpy(cfunc,__FUNCTION__,sizeof(cfunc)); cline=__LINE__; }
-diff -Naurp a/src/p_global.h b/src/p_global.h
---- a/src/p_global.h	2007-02-26 12:16:53.000000000 +0000
-+++ b/src/p_global.h	2007-02-26 12:17:11.000000000 +0000
-@@ -972,8 +972,8 @@ int checklogging(int usern);
- #endif
- 
- #ifndef P_MEMORY
--unsigned long *__pmalloc(unsigned long size,char *module,char *function,int line);
--void _pfree(void * pointer,char *module, char *function, int line);
-+unsigned long *__pmalloc(unsigned long size,const char *module,const char *function,int line);
-+void _pfree(void * pointer,char *module, const char *function, int line);
- struct usert *user(int usern);
- struct newpeert *newpeer(int usern);
- struct datalinkt *datalink(int usern);
-@@ -1092,7 +1092,7 @@ int replace(char *rps, char whatc, char 
- char *nobreak(char *tobreak);
- char *randstring(int length);
- char *strmcat(char *first,char *second);
--char *strmncpy(char *dest, char *source, unsigned int len);
-+char *strmncpy(char *dest, const char *source, unsigned int len);
- int strmncasecmp(char *one, char *two);
- int strmcmp(char *one, char *two);
- int strmwildcmp(char *line, char *wildcard);
-diff -Naurp a/src/p_memory.c b/src/p_memory.c
---- a/src/p_memory.c	2007-02-26 12:16:53.000000000 +0000
-+++ b/src/p_memory.c	2007-02-26 12:17:11.000000000 +0000
-@@ -32,7 +32,7 @@ FILE *logm=NULL;
- 
- /* malloc-wrapper. No memory will log an error entry and kill the bouncer */
- 
--unsigned long *__pmalloc(unsigned long size,char *module,char *function, int line)
-+unsigned long *__pmalloc(unsigned long size,const char *module,const char *function, int line)
- {
-     unsigned long *rc;
-     if (!(rc=(unsigned long *)malloc(size)))
-@@ -53,7 +53,7 @@ unsigned long *__pmalloc(unsigned long s
-     return rc;
- }
- 
--void _pfree(unsigned long *pointer, char *module, char *function, int line)
-+void _pfree(unsigned long *pointer, char *module, const char *function, int line)
- {
- #ifdef LOGALLOC
-     if(logm==NULL)
-diff -Naurp a/src/p_string.c b/src/p_string.c
---- a/src/p_string.c	2007-02-26 12:16:53.000000000 +0000
-+++ b/src/p_string.c	2007-02-26 12:17:11.000000000 +0000
-@@ -51,7 +51,7 @@ char *lngtxt(unsigned int msgnum)
- 
- /* string copy with len and zero delimit */
- 
--char *strmncpy(char *dest, char *source, unsigned int len)
-+char *strmncpy(char *dest, const char *source, unsigned int len)
- {
-     char bf[strlen(source)+2];
-     char *pt;
-diff -Naurp a/src/match.c b/src/match.c
---- a/src/match.c	2007-02-26 12:26:10.000000000 +0000
-+++ b/src/match.c	2007-02-26 12:26:17.000000000 +0000
-@@ -36,6 +36,7 @@
- /* Remove the next line to use this in IrcII */
- #define EGGDROP
- 
-+#include <p_global.h>
- 
- /* ===================================================================
-  * Best to leave stuff after this point alone, but go on and change
diff --git a/net-irc/psybnc/files/psybnc-2.3.2.9-ldflags-fix.patch b/net-irc/psybnc/files/psybnc-2.3.2.9-ldflags-fix.patch
deleted file mode 100644
index f5bc776b1e6b..000000000000
--- a/net-irc/psybnc/files/psybnc-2.3.2.9-ldflags-fix.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -aurp a/tools/autoconf.c b/tools/autoconf.c
---- a/tools/autoconf.c	2010-10-10 20:25:29.295001235 +0000
-+++ b/tools/autoconf.c	2010-10-10 20:26:02.738999569 +0000
-@@ -449,7 +449,7 @@ int main()
-     fprintf(makefile,"TARGET	= psybnc\n");
-     fprintf(makefile,"\n");
-     fprintf(makefile,"all:	$(OBJS)\n");
--    fprintf(makefile,"	$(CC) -o $(TARGET) $(CFLAGS) $(OBJS) $(LIBS)\n");
-+    fprintf(makefile,"	$(CC) -o $(TARGET) $(CFLAGS) $(LDFLAGS) $(OBJS) $(LIBS)\n");
-     fprintf(makefile,"	@strip $(TARGET)\n");
-     if(ssl==0)
-     {
diff --git a/net-irc/telepathy-idle/Manifest b/net-irc/telepathy-idle/Manifest
index 89a1da44812d..ec30131020ec 100644
--- a/net-irc/telepathy-idle/Manifest
+++ b/net-irc/telepathy-idle/Manifest
@@ -1,3 +1,3 @@
 DIST telepathy-idle-0.2.2.tar.gz 606406 BLAKE2B e5d4a19df08bbb59c18d0601357134a6edab085b2b04463b085651f35ee135f0d3f3f27fc35417dcf023913f7ead939161cb1a72cb51824a988aad6c0cb2a136 SHA512 c66cf7b70c84a9b7b1ada01712b8d3b683f15a4021bb2d0f6d868b4ab30e2fb12fd26dd8d5ba25b5050e055bf425295049e84a53198d6586f7cfd7c6bc02f826
-EBUILD telepathy-idle-0.2.2.ebuild 697 BLAKE2B aac43ecbc67b26b52330b055f07a36c6682c231cfd43a49956cf49efc114105562144e1b7c07ef75e21c5d1690159bb886bf1eab372dc2f8ed17e07107bef1cc SHA512 4fa15d65f89f025bc9998de2905f2f21ec156e598aec7596ec8785b1dbab29d2004423bdb1eb91297cc2d8f5f4366188e0284ce1680ce29ad11aa08513db208b
+EBUILD telepathy-idle-0.2.2.ebuild 698 BLAKE2B e120ff8cf6d2825e1ceaad3dcdb508d0d0ef426ed54fc8800e8e4aca0b20d47f6dfa27607b7e5d9bbc31e9e0db838c4b90f0c5e17fff8d8997397351c2d57d70 SHA512 07d54e088ab4ead4b515a5d7b8ff75b4dc13c021be7cfe88c4fa7ffdd5454405761a18727185697ebb1141cf8a7775913241f20b7a398efc64488ae899d3599f
 MISC metadata.xml 365 BLAKE2B 5d75572d16f1a02d2855b9557adca281e25584146c3a3ae147552576e9a25e54927640e4a49e6f8ae032bc6f86398ab6b9524c64b20c2c935c76f174ac68e39b SHA512 d0238facf4cd12b295b5bc1bf696b5e26e84672545be322b85f28754209ca6464a56f681d1a63ee25caa95a58b0fdae9dc0175c55ce94f60db03f8a5e65abb15
diff --git a/net-irc/telepathy-idle/telepathy-idle-0.2.2.ebuild b/net-irc/telepathy-idle/telepathy-idle-0.2.2.ebuild
index db90a1e87deb..ccb0f13a940e 100644
--- a/net-irc/telepathy-idle/telepathy-idle-0.2.2.ebuild
+++ b/net-irc/telepathy-idle/telepathy-idle-0.2.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 inherit python-single-r1
 
 DESCRIPTION="Full-featured IRC connection manager for Telepathy"
diff --git a/net-irc/weechat/Manifest b/net-irc/weechat/Manifest
index 0f7ca5531458..f31368defe0f 100644
--- a/net-irc/weechat/Manifest
+++ b/net-irc/weechat/Manifest
@@ -14,5 +14,5 @@ EBUILD weechat-4.0.8.ebuild 4831 BLAKE2B 4aba39bb0df5cb333ab15c0b6e7e9443c5fbb72
 EBUILD weechat-4.1.2.ebuild 4874 BLAKE2B 6dee373ab332ae62b7ec45f18c08fe482f12fae592dc19a9916366686be023287427176228166a18b91d6392e905d8d9379ef9f3047a276fb28c844b9c39c31e SHA512 3bc97d66ef52a171452edaf3d1737378228e8be8666c9aa5327b6bbaae6d2bea942ac66732a8fedc4f12bf7ce059b21f7490ff0eb9c3c9fdb57492ff21a4059e
 EBUILD weechat-4.1.3.ebuild 4877 BLAKE2B 0c38f159d7d80106eb21570609794415d1da032f771c6e9ac90ebc879286122df524b3564114f58b78df468aca0084e308a7e622230c3843c9110f9042cfc593 SHA512 a130e8d4439538bb0727d747444d7eed2e6706ae298e7468a7df36d25e71d0bdf396fb203db7107f597ae90aee668e4e14e14b92670d3666fc8743ef5fe465b4
 EBUILD weechat-4.2.1.ebuild 4895 BLAKE2B 55956a1c2c4889a47bc5a86709fdaf4dbbd2ccc70705e4b62d728a6be60649e23cce8b57a86f8fc0385e945057c93f111c3babc34688903e360c1d87c25299d9 SHA512 0094b099948779173e284c3e8f32a3d31fdb0b3003a3b7cedd12ed41fd15effe40ee62d9109303d923a7bf67d7171c8fc939806c54bcaff5d44b2095edd46a8a
-EBUILD weechat-9999.ebuild 4898 BLAKE2B 84ec000d43a4ac5aa7baae6b5a5b41fe184bc2f63394e44d070f086b0e6f0b43eee9585fef7667d4ca879aaea6049b751d2c206d8f9ae8651802a2bfeb05bf26 SHA512 3de0285d6918389944663a904a864a3d3a0e46007b2b3a74727de58d2f88a00eab0464f5f520fcb2fd9f0aac43896326f8e6341598358ce02f2c60f3c27a0efb
-MISC metadata.xml 1443 BLAKE2B 14d9c8343bd8d900856ec40e1e498bea7add92d350428056204efae50415014744b15da3ecd83a79c40a9cb4451cfc28297d2a1f1a626759ec5e7bde1e00f5bc SHA512 f75f30aab3396a998d09398ed8bb5b4cecea76a341dc8ecd3e9a675acd80344bcf5e04eebdc2d93a04f5d094676bfc6a5c991d52a8f970e6ce8d499c339f87f1
+EBUILD weechat-9999.ebuild 4965 BLAKE2B 98b53d5e717e4f68b9902b9433360c87254c415fe67721722e98f06e08c0f29b72cb0bd880dd90300aac0baa8f01eec67056c92579311f7009d9753b1037a0f6 SHA512 9d7a2342e4e14eae53d969bf6f75fa7427096cc499488c54f497e690f0c020f28b5468cc30933d273343fba779081cce3053fe543ec8c2a65b163a76415c13af
+MISC metadata.xml 1535 BLAKE2B 654e2479cf1fa904e9f91a9a1214ac4bdc17da43ae6c0f344588c68a7dc1fbf200f08911cbc673debe71c7d72488390cbb30c33f6c504e5b1a68404c86a4ee21 SHA512 82b181c67a102f7625342c933c953c6e2fef2fcaec8abb11eb2237983590db8e1947e615e806c17c73efb55f47963a69a63d56174da9b3613f20d15aa5967876
diff --git a/net-irc/weechat/metadata.xml b/net-irc/weechat/metadata.xml
index 24a75e8121cd..905904120abb 100644
--- a/net-irc/weechat/metadata.xml
+++ b/net-irc/weechat/metadata.xml
@@ -24,6 +24,7 @@
 		<flag name="irc">Enable IRC protocol support</flag>
 		<flag name="logger">Enable support for logging</flag>
 		<flag name="relay">Enable relay plugin (experimental)</flag>
+		<flag name="relay-api">Enable json API support for the relay plugin (experimental)</flag>
 		<flag name="scripts">Build infrastructure for scripting</flag>
 		<flag name="trigger">Enable trigger plugin</flag>
 		<flag name="typing">Enable typing plugin</flag>
diff --git a/net-irc/weechat/weechat-9999.ebuild b/net-irc/weechat/weechat-9999.ebuild
index 0a07f1ce102d..84e5faff5549 100644
--- a/net-irc/weechat/weechat-9999.ebuild
+++ b/net-irc/weechat/weechat-9999.ebuild
@@ -32,13 +32,14 @@ PLUGINS="+alias +buflist +charset +exec +fifo +fset +logger +relay +scripts +spe
 # dev-lang/php eclass support is lacking, php plugins don't work. bug #705702
 SCRIPT_LANGS="guile lua +perl +python ruby tcl"
 LANGS=" cs de es fr it ja pl ru"
-IUSE="doc enchant man nls selinux test +zstd ${SCRIPT_LANGS} ${PLUGINS} ${INTERFACES} ${NETWORKS}"
+IUSE="doc enchant man nls relay-api selinux test +zstd ${SCRIPT_LANGS} ${PLUGINS} ${INTERFACES} ${NETWORKS}"
 
 REQUIRED_USE="
 	enchant? ( spell )
 	lua? ( ${LUA_REQUIRED_USE} )
 	python? ( ${PYTHON_REQUIRED_USE} )
 	test? ( nls )
+	relay-api? ( relay )
 "
 
 RDEPEND="
@@ -164,6 +165,7 @@ src_configure() {
 		-DENABLE_PERL=$(usex perl)
 		-DENABLE_PYTHON=$(usex python)
 		-DENABLE_RELAY=$(usex relay)
+		-DENABLE_CJSON=$(usex relay-api)
 		-DENABLE_RUBY=$(usex ruby)
 		-DENABLE_SCRIPT=$(usex scripts)
 		-DENABLE_SCRIPTS=$(usex scripts)