gentoo auto-resync : 16:01:2023 - 11:57:19

4 files changed, 117 insertions, 1 deletions

diff --git a/dev-tcltk/snack/Manifest b/dev-tcltk/snack/Manifest
index cd53a4952391..e26449307e2c 100644
--- a/dev-tcltk/snack/Manifest
+++ b/dev-tcltk/snack/Manifest
@@ -3,10 +3,12 @@ AUX snack-2.2.10-CVE-2012-6303-fix.patch 778 BLAKE2B f6f34248825da751e81f4079d70
 AUX snack-2.2.10-configure-clang16.patch 419 BLAKE2B c35ed26f967184ba66ecf8f559e204dd82194c2d4b076780eb3c53748cf7438d50e8e5d2c583d444df5271123b72351fb0ee4095c7c886aef9df3756c22b9913 SHA512 adf57986c4b888d83bb532ccc8c7bc660340d67d3645e736d80c8480293834dea2b52e3cf7efb0f69e56808d17a5cf112fdaa42696762b0b7320cfe0c4249e6e
 AUX snack-2.2.10-darwin.patch 1108 BLAKE2B 862cd6a36363b45c9a27af08fa4bf347fc3e1a8fbbf972b72dfb4faf4cb135365fbe06377a20a2b77e02126e27de723b642067d8ccedb9947b9aa873069152ce SHA512 0d82270d830c8b7d15dcbead05d80c15666d1bac164f26c045859f7f4dc4c098961b48272ecd0b059a1b36ba8d560c563fe8e40add822f311026faf5f7eeaf0a
 AUX snack-2.2.10-debian-args.patch 4593 BLAKE2B bebc3c5cab2fea2b3fdc1c1c1e419855e49f2457d2014b2aa0f8236a637489e8b79fdac50d0b3369b576eea9a0bb130d46854c79939e6d93711c520e83001810 SHA512 686218bb22c3c8b53dcb18e10025f1a602c06fe11989a6e46dc02022d581fd281c03d2cca0938c2bad5947f8819e3c631f90f0439a8f274742bef80755dbd20e
+AUX snack-2.2.10-implicit.patch 3049 BLAKE2B dd5ac123e234d3395b2463eae66c36e258499c76158e001c6a060d037383d7466383fd3b7dc0dabfe7acbee4e35b385a21b50de7bef75d9e1c4af57acd848b34 SHA512 1a1d0aa4a4e04b8cd805d8a9e8afd014b6784ec50efad54e55fbc6b548bd47b47088884133ff9c7d7dc30924391dc42b1abc60f05b346cceac36b52f0a21fdfa
 AUX snack-2.2.10-lto.patch 744 BLAKE2B 7aa6e82f47bdf21bd610226ab7ed3f3d552103cff9f3a1e3042f181e2424aa065dc49c06557596189ce9f99965e4447aaf2e7e330a4041684c1185fa09b71304 SHA512 140fdf1f78b0061f6b9dbb6a0e654b951b91e5074af677406817a9221946ed0b268b1e92c36024ff43645150791569f1a3999ccc389addd051211507f0bd074d
+AUX snack-2.2.10-parallelMake.patch 777 BLAKE2B 7ace5af982130626aa6f38bc3d8adad057aa87a475ed5fa940bf8f26eb9786a210c645788ee92341e43ae0893364374c6bb6b10d48d5502530d8fdfa5dffd163 SHA512 8ceb435f1904cf4ff7a616ff913559c4146f8275fbbd603abbb0ce30ab1e365ab1c0615cb71f487f3166ee96e298903b9cb87e8d3a5eb95445264f61b7e2128b
 AUX snack-2.2.10-test.patch 11984 BLAKE2B b3d3458aff3de62e3569f67af5c40c9f12311c50e02a7a5002f79a2ea8169e55292f2ed65c26d78cf7fc444b2524fed1dd0047451ffb8b1341914ea4f9ed2716 SHA512 e600d852c078f928cf317669cc23cc6d1cff900f5218b2966d5787a34d76c6277bbcbd42c69dc5737b353db83391765f3887f6b8a6a290175b43e4dd707a7554
 AUX snack2.2.10-seektell-fix.patch 496 BLAKE2B a2e4e782788054c047596bd989241b9ecea3eeb2984c050888aced8289e77f30692386bcc437679bb5cc7a46f1616cbb3f4f64de017c343bcce2241b016d0cd5 SHA512 3e472dc7603426d35b23714435b3a8bfb6d54326eb1eaa54d8b79b4710035b3fed4e1f6a85ebad632950222c5cd55ac917dcb8cf2e87d0baa36124f8a3361fa8
 AUX tcl-snack-2.2.10-python3.patch 12145 BLAKE2B eb33937789e0eab1316fdfcd472b5cf701a4072e498052cb2889e8c9e5a4502f193f386b83c96a2e98efcfca3dfeb389414e1b924b677ef68edfafe0e706048f SHA512 3480d83824e1d7e8250947d6f9d5a38704b302491980b7e8ad46a4d6790e3bdf9588b1d63048a9a5ed081c44b8f6c1dc42e79d3ad543f473b5469c711dc60394
 DIST snack2.2.10.tar.gz 1798252 BLAKE2B e27b8e7d6082cdcfc06e7eea5ab832fb78ba104de9e56a69c6c9cd688183f7d4c6bdb974e4d5d2bf5ef2bc5518a913ddf17c90db8d10cef4dbee533307cc7718 SHA512 c17ad332fa4f3ded006b97ceca85cada079e4c7cd933768b289c13dadca1b8803fccaf709ec2def5af4abe92c307f25597ebfa6f94df2d681e40815cd7eccb9b
-EBUILD snack-2.2.10-r11.ebuild 2702 BLAKE2B 3b9f16f4fdca3e15c8d125a4184fb5c2218bfc78f661923e4fd0bc3789826900e686881aba5a8f5b2870777733ceb05706b6066a75f7c8b1f0ab2df3ff667097 SHA512 ae31a56aabe08dbd8607255c4f561e2d6836b7bdb81f0e617467f0333b87a676876c2c0bf82daefd1fc2cec49aa9e5d8d70bdcf77bd95441f28580f29f0a62b0
+EBUILD snack-2.2.10-r11.ebuild 2776 BLAKE2B a6926c255a08e4c0c5dfc188eb42f6b6e1cc665444f3b07656a1e25a07e5cde521ee7cfe53875bec8a9a0d65f77fc1e990145100ad0e43cd5fd3e161db69570f SHA512 8e3384391281be405d4c0419b73a40cd7727c298a1938fb6e2d4ed954d73537ebff26a9c0aa05a42c37e2e076423877ed789acc8346369a19babdf5ef49e7de7
 MISC metadata.xml 260 BLAKE2B 9864f2503702b03d3ad715b3f2bd7ef7077f9ddef089de0d6a0840599d99a7f99d439ee50c12afc9ca99b0e288babf74b0bb2a6132ae6dd656b8d7c15e9b10a9 SHA512 3d1e4f14995736fb28198da21587a813a31f1330873ae3078dcd9a2452c1196d23e45983877d2e296353e1ac35cc6ff461b309585237bcc768e37e6b2728c23b
diff --git a/dev-tcltk/snack/files/snack-2.2.10-implicit.patch b/dev-tcltk/snack/files/snack-2.2.10-implicit.patch
new file mode 100644
index 000000000000..965b1af0dbe2
--- /dev/null
+++ b/dev-tcltk/snack/files/snack-2.2.10-implicit.patch
@@ -0,0 +1,92 @@
+--- a/generic/sigproc2.c	2023-01-16 08:03:06.605091947 +0100
++++ b/generic/sigproc2.c	2023-01-16 08:11:03.641089339 +0100
+@@ -465,9 +465,7 @@
+ }
+ 
+ /*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
+-int get_window(dout, n, type)
+-     register double *dout;
+-     register int n;
++int get_window(register double *dout, register int n, int type)
+ {
+   static short *din = NULL;
+   static int n0 = 0;
+@@ -506,9 +504,7 @@
+ }
+ 
+ /*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
+-int get_float_window(fout, n, type)
+-     register float *fout;
+-     register int n;
++int get_float_window(register float *fout, register int n, int type)
+ {
+   static int n0 = 0;
+   static double *dout = NULL;
+@@ -533,10 +529,7 @@
+ }
+ 
+ /*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
+-int fwindow(din, dout, n, preemp, type)
+-     register short *din;
+-     register float *dout, preemp;
+-     register int n;
++int fwindow(register short *din, register float *dout, register int n, register float preemp, int type)
+ {
+   static float *fwind=NULL;
+   static int size=0, otype= (-100);
+@@ -572,10 +565,7 @@
+   
+ /*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
+ /* same as fwindow() but input is float */
+-int fwindow_f(din, dout, n, preemp, type)
+-     register float *din;
+-     register float *dout, preemp;
+-     register int n;
++int fwindow_f(register float *din, register float *dout, register int n, register float preemp, int type)
+ {
+   static float *fwind=NULL;
+   static int size=0, otype= (-100);
+@@ -611,10 +601,7 @@
+   
+ /*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
+ /* same as fwindow() but I/O is double */
+-int fwindow_d(din, dout, n, preemp, type)
+-     register double *din;
+-     register double *dout, preemp;
+-     register int n;
++int fwindow_d(register double *din, register double *dout, register int n, register double preemp, int type)
+ {
+   static float *fwind=NULL;
+   static int size=0, otype= (-100);
+@@ -651,10 +638,7 @@
+ 
+ 
+ /*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
+-void w_window(din, dout, n, preemp, type)
+-     register short *din;
+-     register double *dout, preemp;
+-     register int n;
++void w_window(register short *din, register double *dout, register int n, register double preemp, int type)
+ {
+   switch(type) {
+   case 0:
+--- a/generic/jkCanvSpeg.c	2023-01-16 08:25:51.880415841 +0100
++++ b/generic/jkCanvSpeg.c	2023-01-16 08:26:43.667561725 +0100
+@@ -92,7 +92,7 @@
+ 			 Tk_Window tkwin, CONST84 char *value, char *recordPtr,
+ 			 int offset);
+ 
+-static char *PrintColorMap(ClientData clientData, Tk_Window tkwin,
++static const char *PrintColorMap(ClientData clientData, Tk_Window tkwin,
+ 			   char *recordPtr, int offset,
+ 			   Tcl_FreeProc **freeProcPtr);
+ 
+@@ -1797,7 +1797,7 @@
+   return TCL_OK;
+ }
+ 
+-static char*
++static const char*
+ PrintColorMap(ClientData clientData, Tk_Window tkwin, char *recordPtr,
+ 	      int offset, Tcl_FreeProc **freeProcPtr)
+ {
diff --git a/dev-tcltk/snack/files/snack-2.2.10-parallelMake.patch b/dev-tcltk/snack/files/snack-2.2.10-parallelMake.patch
new file mode 100644
index 000000000000..53e79c0f1eff
--- /dev/null
+++ b/dev-tcltk/snack/files/snack-2.2.10-parallelMake.patch
@@ -0,0 +1,20 @@
+--- a/unix/Makefile.in	2023-01-16 08:39:23.021056229 +0100
++++ b/unix/Makefile.in	2023-01-16 08:40:31.485926112 +0100
+@@ -290,7 +290,7 @@
+ SphereFile.o: $(GENERIC_DIR)/SphereFile.c
+ 	$(CC) -c $(CFLAGS) -DUSE_SNACK_STUBS $(GENERIC_DIR)/SphereFile.c
+ 
+-libsnacksphere${SHLIB_SUFFIX}: ${OBJNIST}
++libsnacksphere${SHLIB_SUFFIX}: ${OBJNIST} stublib
+ 	${SHLIB_LD} ${OBJNIST} ${LIBNIST} -o libsnacksphere${SHLIB_SUFFIX}
+ 
+ LIBOGG = @OGGLIBS@ -lc @TCL_LIB_SPEC@ -L. @SNACK_STUB_LIB_FLAG@
+@@ -299,7 +299,7 @@
+ SnackOgg.o: $(GENERIC_DIR)/SnackOgg.c
+ 	$(CC) @OGGINC@ -c $(CFLAGS) -DUSE_SNACK_STUBS $(GENERIC_DIR)/SnackOgg.c
+ 
+-libsnackogg${SHLIB_SUFFIX}: ${OBJOGG}
++libsnackogg${SHLIB_SUFFIX}: ${OBJOGG} stublib
+ 	${SHLIB_LD} ${OBJOGG} ${LIBOGG} -o libsnackogg${SHLIB_SUFFIX}
+ 
+ install:
diff --git a/dev-tcltk/snack/snack-2.2.10-r11.ebuild b/dev-tcltk/snack/snack-2.2.10-r11.ebuild
index ee85a588fdfc..86a34a7ced5e 100644
--- a/dev-tcltk/snack/snack-2.2.10-r11.ebuild
+++ b/dev-tcltk/snack/snack-2.2.10-r11.ebuild
@@ -44,6 +44,8 @@ PATCHES=(
 	"${FILESDIR}"/tcl-${P}-python3.patch
 	"${FILESDIR}"/${P}-lto.patch
 	"${FILESDIR}"/${P}-configure-clang16.patch
+	"${FILESDIR}"/${P}-implicit.patch
+	"${FILESDIR}"/${P}-parallelMake.patch
 )
 
 HTML_DOCS="${WORKDIR}/${PN}${PV}/doc/*"