gentoo auto-resync : 16:03:2023 - 00:22:55

4 files changed, 223 insertions, 2 deletions

diff --git a/dev-tcltk/tclx/Manifest b/dev-tcltk/tclx/Manifest
index 4572622555a2..702cabedb25e 100644
--- a/dev-tcltk/tclx/Manifest
+++ b/dev-tcltk/tclx/Manifest
@@ -2,6 +2,8 @@ AUX tclx-8.4-ldflags.patch 359 BLAKE2B 275ed541e5f88bb9ebeaa0ea9e19b5a9554c6aa9c
 AUX tclx-8.4-varinit.patch 399 BLAKE2B 92173ca104c538655436b991914d421b32a7b09e2bb2b2c6205470653de405c413ebbd2ee5620f0067128f333033d8536f8bd93d05b7954ee36f39cdc07be864 SHA512 68f4e8a1bd1be1f98e286cf4ccba0a97aca2613c13059f8e06e446e376c4ebb8e66d16bbe5e5972e761a58417bb67fcc34b000ef0c95b740a4ad6801f8b43353
 AUX tclx-8.4.4-configure-clang16-deux.patch 2857 BLAKE2B 9e088477d6abcf8211bb75b6d1da08fee6b85e2cfe26c4c4d861f1d9dd0ecb2bab14580b9074e93b7306eca60d1e9c2c5c1b4e1c3eef439f99b2a9ff4565e344 SHA512 fe9ead80d9ed0ae0d9cbe51a3b69850aa9b1297484514bb4bebcb558b058644eeccc0c7520a3032465f4d800582ac31b8909a944b48210147781faafe7f6b818
 AUX tclx-8.4.4-configure-clang16.patch 1138 BLAKE2B 29ab8278d758ab4bed1c01f4234dced3ff2d17188a12207677dfed9b4cb8f56f8f854b5e68e8f3b1698e5115779d723c6c8f8d4863a80e699c5e0c850368b6ce SHA512 fb950278705cc2ba7d37cd79592a9cbad891ed91244678e3ac0252d083c421a9631220403cd7090a3edfa9f0b7757d004d909bd400431fcdb5e71a594452fc49
+AUX tclx-8.4.4-gcc11.patch 5971 BLAKE2B e91b897f871e990dabc70c56054ba2b90f5f0406cd06af121c5e0dca45ffc15c24802079ecd3eff881238e26027914966fac651155a83206ce8a91f1b8fb9c10 SHA512 05528d6ae322dcbfcfdc74bf16cb87e63214bd988c28487e92dbcf85ffbb0e6c5ef15ab8f24f09644889e6cd1430b10876ed148ba63996899f13f47274069af3
+AUX tclx-8.4.4-musl.patch 836 BLAKE2B 3fe5316588c859761bef23e39052d0e0661aac210672e4213211e53f94982cba42f9a4cedada1c9228dc4e787c72969b6813e83129022567aaa2ab9e1a5a9033 SHA512 b517a9061fa453b530290d2c65b97d93ef2e88198570bc4c0fe18bf6980c6c23bc241d6e614a7e9254473591b1e5d26b6dff2d46c85a812f0d5cfbc54e0c3246
 DIST tclx-8.4.4.tar.gz 456569 BLAKE2B 50123f95ed780c28dae9e2f0db956b81b559ee9ea33563b999f33a727c451374a63c0cba3012d4dd46df020426c7fdb3b04f932fc5b6ec742156e9dad81a7d3b SHA512 dcf9cbd08eae0cc4901e8e871a440e6c85d7d5ac923306206afaf0a1d931866ce3b91177d7b3a37e87a5cdcccb068ed7b9c76cb1a71a13f4f26cf204b8c42090
-EBUILD tclx-8.4.4-r2.ebuild 1207 BLAKE2B efcaa7a92875f48e7326592d915c33024a73bb906364247c2c0c62d95a4b6ed42a517fcd36ab24ab7cd43ac87a6a49f62d864ec02f9e4363c9e41aac07f93543 SHA512 371b0c9b214ec3d84350bd5a879e50a25602951d1073363afc16b2e1b8c616940351f61079d383248739ee2e650b71806875c3bdaece208f884b1c5ccce691f5
+EBUILD tclx-8.4.4-r4.ebuild 1270 BLAKE2B 7aeffa009483a1cb9671fcc808719f6ccd4f6b97fea182b8214f525d2c286e228b3f10d9604826a72255f2f36780104fe91a5cb26048dfd25979b741ea02d45b SHA512 1a246afd13b9a1b6470a6c9631d7d90986d261ba4dab63121e044bc438aefa37d6699b1590bb180df548ab9c70bd96734fb278fdb70b906e56014a35ed7d81bb
 MISC metadata.xml 378 BLAKE2B 85acc6b26cf2a5686c7f1a136f42a0bfa4fd6319a6f8af581e91a857f5fec673962cf9e72d28be5d928f7b34381fa33a82017789ed015752847165d3991ea21e SHA512 73280ffa0d27b24a103e7531dc9f789173a909b382e466c942aafef54f8df5b7c113c942b34d6824d4aed2dc56404a5e594424e5d44bd7c5d7b55b3ea1e44bfb
diff --git a/dev-tcltk/tclx/files/tclx-8.4.4-gcc11.patch b/dev-tcltk/tclx/files/tclx-8.4.4-gcc11.patch
new file mode 100644
index 000000000000..6af41afd3ce3
--- /dev/null
+++ b/dev-tcltk/tclx/files/tclx-8.4.4-gcc11.patch
@@ -0,0 +1,192 @@
+--- a/generic/tclXfcntl.c	2023-03-15 19:34:15.074669138 +0100
++++ b/generic/tclXfcntl.c	2023-03-15 19:33:20.805545639 +0100
+@@ -200,8 +200,12 @@
+         value = (optValue == TCLX_BUFFERING_LINE);
+         break;
+       case ATTR_KEEPALIVE:
+-        if (TclXOSgetsockopt (interp, channel, SO_KEEPALIVE, &value) != TCL_OK)
++        {
++        socklen_t len;
++        if (TclXOSgetsockopt (interp, channel, SO_KEEPALIVE, &len) != TCL_OK)
+             return TCL_ERROR;
++        value = len;
++        }
+         break;
+       default:
+         panic ("bug in fcntl get attrib");
+--- a/generic/tclXhandles.c	2023-03-15 19:36:33.992425688 +0100
++++ b/generic/tclXhandles.c	2023-03-15 19:43:05.552120448 +0100
+@@ -20,6 +20,9 @@
+ 
+ #include "tclExtdInt.h"
+ 
++#include <stdint.h>
++#include <inttypes.h>
++
+ /*
+  * Variable set to contain the alignment factor (in bytes) for this machine.
+  * It is set on the first table initialization.
+@@ -539,7 +542,7 @@
+ 
+     entryHdrPtr = HEADER_AREA (entryPtr);
+     if (entryHdrPtr->freeLink != ALLOCATED_IDX)
+-        panic ("Tcl_HandleFree: entry not allocated %x\n", entryHdrPtr);
++        panic ("Tcl_HandleFree: entry not allocated %" PRIxPTR "\n", (intptr_t)entryHdrPtr);
+ 
+     entryHdrPtr->freeLink = tblHdrPtr->freeHeadIdx;
+     tblHdrPtr->freeHeadIdx =
+--- a/generic/tclXkeylist.c	2023-03-15 20:02:16.177763876 +0100
++++ b/generic/tclXkeylist.c	2023-03-15 20:04:46.029420986 +0100
+@@ -17,6 +17,7 @@
+  */
+ 
+ #include "tclExtdInt.h"
++#include <stdint.h>
+ 
+ /*
+  * Keyed lists are stored as arrays recursively defined objects.  The data
+@@ -338,7 +339,7 @@
+     if (keylIntPtr->hashTbl != NULL) {
+ 	Tcl_HashEntry *entryPtr;
+ 	Tcl_HashSearch search;
+-	int nidx;
++	intptr_t nidx;
+ 
+ 	entryPtr = Tcl_FindHashEntry(keylIntPtr->hashTbl,
+ 		keylIntPtr->entries [entryIdx].key);
+@@ -354,7 +355,7 @@
+ 	 */
+ 	for (entryPtr = Tcl_FirstHashEntry(keylIntPtr->hashTbl, &search);
+ 	     entryPtr != NULL; entryPtr = Tcl_NextHashEntry(&search)) {
+-	    nidx = (int) Tcl_GetHashValue(entryPtr);
++	    nidx = (intptr_t) Tcl_GetHashValue(entryPtr);
+ 	    if (nidx > entryIdx) {
+ 		Tcl_SetHashValue(entryPtr, (ClientData) (uintptr_t) (nidx - 1));
+ 	    }
+@@ -394,7 +395,8 @@
+                     char	    **nextSubKeyPtr)
+ {
+     char *keySeparPtr;
+-    int keyLen, findIdx = -1;
++    int keyLen;
++    intptr_t findIdx = -1;
+ 
+     keySeparPtr = strchr (key, '.');
+     if (keySeparPtr != NULL) {
+@@ -416,7 +418,7 @@
+ 	}
+ 	entryPtr = Tcl_FindHashEntry(keylIntPtr->hashTbl, key);
+ 	if (entryPtr != NULL) {
+-	    findIdx = (int) Tcl_GetHashValue(entryPtr);
++	    findIdx = (intptr_t) Tcl_GetHashValue(entryPtr);
+ 	}
+ 	if (keySeparPtr != NULL) {
+ 	    key[keyLen] = tmp;
+--- a/generic/tclXsignal.c	2023-03-15 20:07:18.687031905 +0100
++++ b/generic/tclXsignal.c	2023-03-15 20:07:55.997447649 +0100
+@@ -463,7 +463,7 @@
+  *-----------------------------------------------------------------------------
+  */
+ static int
+-BlockSignals (Tcl_Interp *interp, int action, unsigned char signals[])
++BlockSignals (Tcl_Interp *interp, int action, unsigned char signals[MAXSIG])
+ {
+ #ifndef NO_SIGACTION
+     int      signalNum;
+--- a/unix/tclXunixDup.c	2023-03-15 20:09:58.482528699 +0100
++++ b/unix/tclXunixDup.c	2023-03-15 20:13:22.981321777 +0100
+@@ -17,6 +17,7 @@
+  */
+ 
+ #include "tclExtdInt.h"
++#include <stdint.h>
+ 
+ 
+ /*-----------------------------------------------------------------------------
+@@ -75,7 +76,8 @@
+     ClientData handle;
+     const Tcl_ChannelType *channelType;
+     Tcl_Channel newChannel = NULL;
+-    int srcFileNum, newFileNum = -1;
++    intptr_t srcFileNum;
++    int newFileNum = -1;
+ 
+     /*
+      * On Unix, the channels we can dup share the same file for the read and
+@@ -86,7 +88,7 @@
+     } else {
+         Tcl_GetChannelHandle (srcChannel, TCL_WRITABLE, &handle);
+     }
+-    srcFileNum = (int) handle;
++    srcFileNum = (intptr_t) handle;
+     channelType = Tcl_GetChannelType (srcChannel);
+ 
+     /*
+--- a/unix/tclXunixId.c	2023-03-15 20:14:58.037829847 +0100
++++ b/unix/tclXunixId.c	2023-03-15 20:15:50.699002979 +0100
+@@ -444,7 +444,7 @@
+ #endif
+     char hostNameBuf[MAXHOSTNAMELEN];
+ 
+-    if (objc != 2)
++	if (objc != 2)
+         return TclX_WrongArgs (interp, objv [0], "host");
+ 
+ 	if (gethostname (hostNameBuf, MAXHOSTNAMELEN) < 0) {
+--- a/unix/tclXunixOS.c	2023-03-15 20:16:27.021432520 +0100
++++ b/unix/tclXunixOS.c	2023-03-15 20:25:12.202242082 +0100
+@@ -23,6 +23,7 @@
+ 
+ #include "tclExtdInt.h"
+ 
++#include <stdint.h>
+ #ifndef NO_GETPRIORITY
+ #include <sys/resource.h>
+ #endif
+@@ -113,7 +114,7 @@
+             return -1;
+ 	}
+     }
+-    return (int) handle;
++    return (intptr_t) handle;
+ }
+ 
+ /*-----------------------------------------------------------------------------
+@@ -401,7 +402,7 @@
+     if (pid == 0) {
+         close (errPipes [0]);
+         execl ("/bin/sh", "sh", "-c", command, (char *) NULL);
+-        write (errPipes [1], &errno, sizeof (errno));
++        if(write (errPipes [1], &errno, sizeof (errno))) {};
+         _exit (127);
+     }
+ 
+@@ -918,8 +919,9 @@
+ int
+ TclXOSgetsockname (Tcl_Interp *interp, Tcl_Channel channel, void *sockaddr, int sockaddrSize)
+ {
++    socklen_t siz = sockaddrSize;
+     if (getsockname (ChannelToFnum (channel, 0),
+-		(struct sockaddr *) sockaddr, &sockaddrSize) < 0) {
++		(struct sockaddr *) sockaddr, &siz) < 0) {
+ 	TclX_AppendObjResult (interp, Tcl_GetChannelName (channel), ": ",
+ 		Tcl_PosixError (interp), (char *) NULL);
+ 	return TCL_ERROR;
+@@ -943,7 +945,7 @@
+ int
+ TclXOSgetsockopt (Tcl_Interp *interp, Tcl_Channel channel, int option, socklen_t *valuePtr)
+ {
+-    int valueLen = sizeof (*valuePtr);
++    socklen_t valueLen = sizeof (*valuePtr);
+ 
+     if (getsockopt (ChannelToFnum (channel, 0), SOL_SOCKET, option, 
+ 		(void*) valuePtr, &valueLen) != 0) {
+@@ -1385,7 +1387,7 @@
+                               (char *) NULL);
+         return TCL_ERROR;
+     }
+-    *fnumPtr = (int) handle;
++    *fnumPtr = (intptr_t) handle;
+     return TCL_OK;
+ }
+ 
diff --git a/dev-tcltk/tclx/files/tclx-8.4.4-musl.patch b/dev-tcltk/tclx/files/tclx-8.4.4-musl.patch
new file mode 100644
index 000000000000..2fc45e05b6ab
--- /dev/null
+++ b/dev-tcltk/tclx/files/tclx-8.4.4-musl.patch
@@ -0,0 +1,25 @@
+--- a/configure.in	2023-03-15 22:00:11.725506240 +0100
++++ b/configure.in	2023-03-15 22:00:29.230246904 +0100
+@@ -253,6 +253,7 @@
+     
+     AC_CHECK_FUNC(inet_aton, , [AC_DEFINE(NO_INET_ATON)])
+     AC_CHECK_FUNC(gethostname, , [AC_DEFINE(NO_GETHOSTNAME)])
++    AC_CHECK_FUNCS([rresvport])
+     
+     #-------------------------------------------------------------------------
+     # Check for additional libraries the Tcl/Tk does not check for.
+--- a/unix/tclXunixSock.c	2023-03-15 22:02:32.255424538 +0100
++++ b/unix/tclXunixSock.c	2023-03-15 22:03:35.094493443 +0100
+@@ -194,10 +194,12 @@
+      * Allocate a reserved port if requested.
+      */
+     if (getReserved) {
++#ifdef HAVE_RRESVPORT
+         int port;
+         if (rresvport (&port) < 0)
+             goto unixError;
+         local.sin_port = port;
++#endif
+     }
+ 
+     /*
diff --git a/dev-tcltk/tclx/tclx-8.4.4-r2.ebuild b/dev-tcltk/tclx/tclx-8.4.4-r4.ebuild
index 38ea1746b9a3..ac35e033b305 100644
--- a/dev-tcltk/tclx/tclx-8.4.4-r2.ebuild
+++ b/dev-tcltk/tclx/tclx-8.4.4-r4.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit autotools
 
@@ -26,6 +26,8 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-8.4-ldflags.patch
 	"${FILESDIR}"/${P}-configure-clang16.patch
 	"${FILESDIR}"/${P}-configure-clang16-deux.patch
+	"${FILESDIR}"/${P}-gcc11.patch
+	"${FILESDIR}"/${P}-musl.patch
 )
 
 QA_CONFIG_IMPL_DECL_SKIP=(