gentoo auto-resync : 16:03:2023 - 12:24:20

7 files changed, 69 insertions, 53 deletions

diff --git a/dev-tcltk/Manifest.gz b/dev-tcltk/Manifest.gz
index 0f1dd821ea5e..87259d3b7bd9 100644
--- a/dev-tcltk/Manifest.gz
+++ b/dev-tcltk/Manifest.gz
diff --git a/dev-tcltk/iwidgets/Manifest b/dev-tcltk/iwidgets/Manifest
index 0bd7b9f818bb..dab0e757099a 100644
--- a/dev-tcltk/iwidgets/Manifest
+++ b/dev-tcltk/iwidgets/Manifest
@@ -1,5 +1,6 @@
+AUX iwidgets-4.1.1-dash.patch 453 BLAKE2B 2e6b0b187f834f208c84f5c206aadba19536560a0eebe348588917a5917332574906d935af548658fdc20ad2ac0fbc7e6968fed290c3e10ade9c0070b656b376 SHA512 cdabeecea4b33126d63af8d4b34bfbf328f0fe222d1d30e8c4c6cd05856569b43c782a68610505a9331b7e20fd20e5ce8baea92843494dec46f2dfd96007efd7
 DIST itcl4.1.1.tar.gz 436718 BLAKE2B 50f5518460dc6569edcd0229b71439cb10a724b50c31387ebd1ffa85f9fbf58d5bd5163847a1d7ffa791d5acd5d72b08188f01f0e5c4730ba9060fc531071cd4 SHA512 1e08dbefe33e5464320c62e32d153b3e473462cded2d715ba1c504deacf190062672fbece40a021f25798440e2fbed4ecda763db5789fc6afb5eb2052bdf66e2
 DIST itk4.1.0.tar.gz 253796 BLAKE2B 7d51689d41871f39fbdf940f1aede2c89ee0165cc6be989f7da65df85a0d15e5db037722a5e30a284e51129b7bfff20dfde0fbc78d2d72d8acb9031f328a5d16 SHA512 1deed09daf66ae1d0cc88550be13814edff650f3ef2ecb5ae8d28daf92e37550b0e46921eb161da8ccc3886aaf62a4a3087df0f13610839b7c2d6f4b39c9f07e
 DIST iwidgets-4.1.1.tar.gz 720630 BLAKE2B f276159893b19d7af7cbbe3653f9e406184c76065ae7906c34388545bdfff1b9e427a6e9b1985f349e9229c69c935b5b85ae8a0fd15ef28b0a1312fc4fcec8f4 SHA512 56fd91d832c59426b030bde2ec7136e46751503dac1b650d195251cac7ef1d1a7024adb2d995fe835f1039a0f99eb616db97a9e9c591f827a911eea2c233c305
-EBUILD iwidgets-4.1.1-r1.ebuild 1486 BLAKE2B 76ebf3790075b629d03eeec88fe91f682a2df8429479ee0d73f84a5af1e81c9030af6f4c5c15bdc478b4fa17eacfa1c693ab12040d67bb738cdad5ae5f0140dc SHA512 0fc429d08ef2fb8ea10076ddd0f04f0f26e72d0f64bebaade88d59a3d8edd1be89cd3e7a79effc9c26713237f467a8a47e1cbe004042039569bc731fc6b94da4
+EBUILD iwidgets-4.1.1-r2.ebuild 1529 BLAKE2B f5a0f64f1b4d22f01f48b49d34e79088562603ad4ebf1fef3af791654d3e765404ce67046a338318bcb8f9322e7ead9eebe2f0ac4f3d9cf643a3123039c59bd2 SHA512 f500981df684b7c4695ebc3df38eeb3f0a1b2b16207b6c6a0b04f02fac809e682c5f047b19031d14ed71e0246ab8e0cea49b03a81236ec38a4685cc49c27c48c
 MISC metadata.xml 331 BLAKE2B cbfdc70f22edb7232306f89415cbcc6fa3470bea62eafd86b3a6f9fe81c78a5623a3b88c44b2d30d9029fe0d8a551c607abd63abe012dbf2891101d1f2270ff6 SHA512 fc1787936c65143bf99af7adb3f83d4e4166c2584de2608bdc19e6ad2a749055df5337cb7417c34ca9adc112197d55ec7058acaf85695d1bd9215abdcc073ac4
diff --git a/dev-tcltk/iwidgets/files/iwidgets-4.1.1-dash.patch b/dev-tcltk/iwidgets/files/iwidgets-4.1.1-dash.patch
new file mode 100644
index 000000000000..0a928506ee6c
--- /dev/null
+++ b/dev-tcltk/iwidgets/files/iwidgets-4.1.1-dash.patch
@@ -0,0 +1,11 @@
+--- a/tclconfig/tcl.m4	2023-03-16 08:23:24.920934671 +0100
++++ b/tclconfig/tcl.m4	2023-03-16 08:24:06.288775313 +0100
+@@ -794,7 +794,7 @@
+ 	    # results, and the version is kept in special file).
+ 	
+ 	    if test -r /etc/.relid -a "X`uname -n`" = "X`uname -s`" ; then
+-		system=MP-RAS-`awk '{print $3}' /etc/.relid'`
++		system=MP-RAS-`awk '{print $3}' /etc/.relid`
+ 	    fi
+ 	    if test "`uname -s`" = "AIX" ; then
+ 		system=AIX-`uname -v`.`uname -r`
diff --git a/dev-tcltk/iwidgets/iwidgets-4.1.1-r1.ebuild b/dev-tcltk/iwidgets/iwidgets-4.1.1-r2.ebuild
index 4bcb21331fc0..bec5525391f4 100644
--- a/dev-tcltk/iwidgets/iwidgets-4.1.1-r1.ebuild
+++ b/dev-tcltk/iwidgets/iwidgets-4.1.1-r2.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 inherit virtualx autotools
 
@@ -31,6 +31,8 @@ QA_CONFIG_IMPL_DECL_SKIP=(
 	stat64 # used to test for Large File Support
 )
 
+PATCHES=( "${FILESDIR}"/${P}-dash.patch )
+
 src_prepare() {
 	default
 	sed \
diff --git a/dev-tcltk/tkimg/Manifest b/dev-tcltk/tkimg/Manifest
index e7255529be46..229d01123c00 100644
--- a/dev-tcltk/tkimg/Manifest
+++ b/dev-tcltk/tkimg/Manifest
@@ -1,6 +1,6 @@
 AUX tkimg-1.4-jpeg-9.patch 364 BLAKE2B bc9b3e4e404b49a9909d7198929033ebee4ab839f1f2ec71aea9435637bdcb6a3f0dd9c2ed379d9e0f7215853b0e693337876ac0842a37b32533151ef4d9b739 SHA512 4bb6cf0b7774700d607bccfb1590660344754749c40acefcba23046333b1029006acede784177473c629ab63247402bbbc4ab172946485af950c5e8ec6abb8c9
 AUX tkimg-1.4.13-test.patch 313 BLAKE2B eee0540a659b4ec7af738281e14847228cb596344792f7b8e2c9c690ac37212226b2cc5979649626b9729abc75571ca42ab96f41deed71075970b75eec5ca1e1 SHA512 189920d66119f08c8330e501b681717d5737a2c2bbc907294367d75cefadce0354c876135d788d44de5bf90ba199953e9a0a1b41b3c1aec13d45f1e1d74de796
-AUX tkimg-1.4.14-gcc11.patch 2844 BLAKE2B 91091d5de8d5c28c065026ef9a2d1e8928d1dc6a38847bd2e641d4441df1db56a5ee099b6fd24610e6a2264c87cdfc1a07916fed6cf317e15a3ff7c5e976834a SHA512 6cdd09d78919b999f6864e6d4fa3d0a35389aab3ea47d46154ba652db26862ffe96a52b8f4aaa3849a6c0555eb7e88019b0dd2f6bb0c1247072d53950d3dbb2b
+AUX tkimg-1.4.14-gcc11.patch 2795 BLAKE2B 48d3f322def2d49ef56808e6e27e118435a5bad1141f5f667c05cc5166659e49fbcc4b0336927cc8487cf038951a4850ea94c717131e4ebd545dfb59032b1835 SHA512 11f8815ce4a8e9917ae3ce6d460195602411e01719831dd7acd43392e46873dc9e590779e740b6d74a16dc932e6a50ef830f928b13372e163c24555d7e00d413
 AUX tkimg-1.4.9-fno-common.patch 274 BLAKE2B b3b3ac5c7e849195fe7dbd6a86ad085825799144ddd05b445abe96577e41a52b50665aaf04fc08cf43a3b5d3d3b1a3a5494a59f8297f68036df4c7948d83dc90 SHA512 8599751f097914fa2757fed9599f3df08f6941c3693d4216f5dcb60a4be8bf603c4869b3f55cf12bea2752d77114c7c1cd2890de1b5635a0665a12053117712f
 DIST Img-1.4.13-Source.tar.gz 8366556 BLAKE2B 9e9ddeb5681300fdb320a7f428cf1c30bccee51c9b204690c82f37a72283e1f5300227463d878eb9aa3ea92ddab666d1e8aa4e51bf8fbf219058109b8c76432f SHA512 922d22a664a1cab06932361a25d26c23f282037eb342dcc96a60c5a40f40d7e546ce6154d56552a7722c071a004c12a45cc687fc8e139f3edd3a7c7443f3861b
 DIST Img-1.4.14-Source.tar.gz 9844859 BLAKE2B f373859104c7f1b2d2b5c10adf6b8d3349e22765936916b493589772d2b56e1717cbecf074034989e7e927df16d387ff6533170a1ae9f677ea358a96a86fe67d SHA512 41bfc6909a6836cbdce34f5e5672a02ac67e6d7263a97d48b564994462cc089905a0824444bd849b6d228750bf09f0cf617989dc9008705938a283fa4e5f1b45
@@ -9,6 +9,6 @@ DIST tkimg-1.4.12-patchset-1.tar.gz 3494 BLAKE2B 3b172f4a5cae4d9ee0668957a599131
 DIST tkimg-1.4.14-patchset-1.tar.gz 3256 BLAKE2B 8f182365b70b4d7a3f4d9002618285b11293644755304600d302fbb8cf8945cd4bd4eb45e66ed0aec93d19e42556ef294508587f7d4e66821ad960ea5c26c7b6 SHA512 8c93e2b669b56ce5621a4d6d96e7412f623bd42dd777a99ec74741621a5be84f24f47149efae58baa874f49088b053b8466d16dffd79edf9594195ff41c38c0e
 DIST tkimg-1.4.7-patchset-1.tar.xz 8208 BLAKE2B c2e6f5d6ef415c897cac33da4a003efec467312e844912e5a519cfb3ddf04ac5cac830eed05418ef74f931df2211c53c40669e53ce3bed219a7c2c714a398de5 SHA512 596c505db7f2ff40c786b83a018eba7f82718d350b6a601f8b93aa64fac238d6b8def603cd719f89fc526e5d2891a94b46de1a2ba628b8ff0ec80979892e28d8
 EBUILD tkimg-1.4.13-r3.ebuild 1999 BLAKE2B 92dd77e25c0972002732a5e657ce86b46096e31fc005fd2f7fba5015a88db80183d801b51a49342c5a217af2807bbc59b37bb925d73de06dc1950861a7d40610 SHA512 13a1aa296200d158191882a85e945a34fe65d0b1029e7f13486d4a5b37c01c5c4ad1c0f3dd5d29c78cdec359b463f76ccea93b14a0cae20ad18579115f2a09bd
-EBUILD tkimg-1.4.14-r2.ebuild 2398 BLAKE2B 80275d50b4c7497046be4870014a7c3d340da30846781ce79cbc5444e5949f74a65558b7306f9d722df449cfe6eba7d9e780941071b31571dbbb7bad9657b568 SHA512 5c3f3954c69b9f8fbc6f613cfe69ce6c7e88b11b1c1b20d352451e1350325437452956530b7917116fca22cca760baf8644b8ada594a3e639d22832a9bad0c14
+EBUILD tkimg-1.4.14-r2.ebuild 2438 BLAKE2B 195f0dd01ccd930fb6d9d9c18280b3fe29fe21c49ec1ce086e75d15e34f1d1d72b2ae231e7f8afa10a5b47d68637f2db3eacf428fb373b5131ea3b2edc2443f1 SHA512 f12d5fd94ac6081b06177a1b98d3937a9e5f06454679bdf318d24692947ca826b33d6d443f77715cc19dca34e9a1aca7a8d527950ed1640e33345252e1f161d1
 EBUILD tkimg-1.4.9-r1.ebuild 2310 BLAKE2B b698928eacaba3e3ac461b6318a79f00509ac9e9af100a71babd4c061e9ae3832de972c511dab7cc3ef2e9eacd674f4a30c6faf25c092ed3b4bf9cfa767848b1 SHA512 148972819ebed0d52ec735cf851eb6d1cfc7b19881c30b989c708a0ab3bc031fefcb88fbf32ac87907200daedecba95be44c9267493605febdfe1d8295839b57
 MISC metadata.xml 329 BLAKE2B 53d89f1f85a90a476918fde2904b7be67b22b1793f8d09655b2ca18525cd9f2c49ae2848fe54b4206a49da23a9d9ab54b0750ac5437d0591c306a8311a2c945e SHA512 3a12737d8033b88e6a418f2183c8013e75777f5a15774b11d4d93b4e27360d136ad0ecfc6ff0e5d4097d669542e52e6a1d71114e4c1d1bc63ba45e0f9a0caf7e
diff --git a/dev-tcltk/tkimg/files/tkimg-1.4.14-gcc11.patch b/dev-tcltk/tkimg/files/tkimg-1.4.14-gcc11.patch
index 6f9e575db2ac..9b889315efb3 100644
--- a/dev-tcltk/tkimg/files/tkimg-1.4.14-gcc11.patch
+++ b/dev-tcltk/tkimg/files/tkimg-1.4.14-gcc11.patch
@@ -16,59 +16,59 @@
 --- a/tiff/tiffZip.c	2023-03-14 19:04:42.869354563 +0100
 +++ b/tiff/tiffZip.c	2023-03-14 19:05:14.768849607 +0100
 @@ -22,6 +22,7 @@
-  * OF THIS SOFTWARE.

-  */

- 

-+#include <stdint.h>

- #include "tiffInt.h"

- 

- /*

+  * OF THIS SOFTWARE.
+  */
+ 
++#include <stdint.h>
+ #include "tiffInt.h"
+ 
+ /*
 @@ -233,7 +234,7 @@
- 	    we need to simplify this code to reflect a ZLib that is likely updated

- 	    to deal with 8byte memory sizes, though this code will respond

- 	    appropriately even before we simplify it */

--	sp->stream.avail_out = (uint64)tif->tif_rawdatasize <= 0xFFFFFFFFU ? (uInt)tif->tif_rawdatasize : 0xFFFFFFFFU;

-+	sp->stream.avail_out = (uint64_t)tif->tif_rawdatasize <= 0xFFFFFFFFU ? (uInt)tif->tif_rawdatasize : 0xFFFFFFFFU;

- 	return (deflateReset(&sp->stream) == Z_OK);

- }

- 

+ 	    we need to simplify this code to reflect a ZLib that is likely updated
+ 	    to deal with 8byte memory sizes, though this code will respond
+ 	    appropriately even before we simplify it */
+-	sp->stream.avail_out = (uint64)tif->tif_rawdatasize <= 0xFFFFFFFFU ? (uInt)tif->tif_rawdatasize : 0xFFFFFFFFU;
++	sp->stream.avail_out = (uint64_t)tif->tif_rawdatasize <= 0xFFFFFFFFU ? (uInt)tif->tif_rawdatasize : 0xFFFFFFFFU;
+ 	return (deflateReset(&sp->stream) == Z_OK);
+ }
+ 
 --- a/tiff/tiffPixar.c	2023-03-14 20:52:33.865532115 +0100
 +++ b/tiff/tiffPixar.c	2023-03-14 20:54:14.606973646 +0100
 @@ -592,8 +592,8 @@
- #define DecoderState(tif)	((PixarLogState*) (tif)->tif_data)

- #define EncoderState(tif)	((PixarLogState*) (tif)->tif_data)

- 

--static int PixarLogEncode(TIFF* tif, uint8_t bp, tmsize_t cc, uint16_t s);

--static int PixarLogDecode(TIFF* tif, uint8_t op, tmsize_t occ, uint16_t s);

-+static int PixarLogEncode(TIFF* tif, uint8_t *bp, tmsize_t cc, uint16_t s);

-+static int PixarLogDecode(TIFF* tif, uint8_t *op, tmsize_t occ, uint16_t s);

- 

- #define PIXARLOGDATAFMT_UNKNOWN	-1

- 

+ #define DecoderState(tif)	((PixarLogState*) (tif)->tif_data)
+ #define EncoderState(tif)	((PixarLogState*) (tif)->tif_data)
+ 
+-static int PixarLogEncode(TIFF* tif, uint8_t bp, tmsize_t cc, uint16_t s);
+-static int PixarLogDecode(TIFF* tif, uint8_t op, tmsize_t occ, uint16_t s);
++static int PixarLogEncode(TIFF* tif, uint8_t *bp, tmsize_t cc, uint16_t s);
++static int PixarLogDecode(TIFF* tif, uint8_t *op, tmsize_t occ, uint16_t s);
+ 
+ #define PIXARLOGDATAFMT_UNKNOWN	-1
+ 
 @@ -747,7 +747,7 @@
- }

- 

- static int

--PixarLogDecode(TIFF* tif, uint8_t op, tmsize_t occ, uint16_t s)

-+PixarLogDecode(TIFF* tif, uint8_t *op, tmsize_t occ, uint16_t s)

- {

- 	static const char module[] = "PixarLogDecode";

- 	TIFFDirectory *td = &tif->tif_dir;

+ }
+ 
+ static int
+-PixarLogDecode(TIFF* tif, uint8_t op, tmsize_t occ, uint16_t s)
++PixarLogDecode(TIFF* tif, uint8_t *op, tmsize_t occ, uint16_t s)
+ {
+ 	static const char module[] = "PixarLogDecode";
+ 	TIFFDirectory *td = &tif->tif_dir;
 @@ -1111,7 +1111,7 @@
-  * Encode a chunk of pixels.

-  */

- static int

--PixarLogEncode(TIFF* tif, uint8_t bp, tmsize_t cc, uint16_t s)

-+PixarLogEncode(TIFF* tif, uint8_t *bp, tmsize_t cc, uint16_t s)

- {

- 	static const char module[] = "PixarLogEncode";

- 	TIFFDirectory *td = &tif->tif_dir;

+  * Encode a chunk of pixels.
+  */
+ static int
+-PixarLogEncode(TIFF* tif, uint8_t bp, tmsize_t cc, uint16_t s)
++PixarLogEncode(TIFF* tif, uint8_t *bp, tmsize_t cc, uint16_t s)
+ {
+ 	static const char module[] = "PixarLogEncode";
+ 	TIFFDirectory *td = &tif->tif_dir;
 @@ -1411,7 +1411,7 @@
- 	/*

- 	 * Allocate state block so tag methods have storage to record values.

- 	 */

--	tif->tif_data = (uint8_t) TkimgTIFFmalloc(sizeof (PixarLogState));

-+	tif->tif_data = (uint8_t *) TkimgTIFFmalloc(sizeof (PixarLogState));

- 	if (tif->tif_data == NULL)

- 		goto bad;

- 	sp = (PixarLogState*) tif->tif_data;

+ 	/*
+ 	 * Allocate state block so tag methods have storage to record values.
+ 	 */
+-	tif->tif_data = (uint8_t) TkimgTIFFmalloc(sizeof (PixarLogState));
++	tif->tif_data = (uint8_t *) TkimgTIFFmalloc(sizeof (PixarLogState));
+ 	if (tif->tif_data == NULL)
+ 		goto bad;
+ 	sp = (PixarLogState*) tif->tif_data;
diff --git a/dev-tcltk/tkimg/tkimg-1.4.14-r2.ebuild b/dev-tcltk/tkimg/tkimg-1.4.14-r2.ebuild
index 904cc6621894..38c87072f7ed 100644
--- a/dev-tcltk/tkimg/tkimg-1.4.14-r2.ebuild
+++ b/dev-tcltk/tkimg/tkimg-1.4.14-r2.ebuild
@@ -51,6 +51,8 @@ src_prepare() {
 		libjpeg/jpegtclDecls.h \
 		zlib/zlibtclDecls.h \
 		libpng/pngtclDecls.h \
+		tiff/tiffZip.c \
+		tiff/tiffPixar.c \
 		libtiff/tifftclDecls.h
 
 	# libtiff unbundle is problematic