gentoo auto-resync : 08:11:2022 - 09:23:49

3 files changed, 40 insertions, 30 deletions

diff --git a/dev-libs/libtompoly/Manifest b/dev-libs/libtompoly/Manifest
index 512d43e32d0c..1cdc739c6404 100644
--- a/dev-libs/libtompoly/Manifest
+++ b/dev-libs/libtompoly/Manifest
@@ -1,4 +1,4 @@
-AUX libtompoly-0.04-Fix-Wimplicit-function-declaration.patch 3113 BLAKE2B 77f58e605cb897f2ec6ada6edbdbaf582f62c0d54cdcf2456f89cfd6ab8e0dd47e6a622511973b2b926b1a611478d7e8a09c0e337afc1e2f70a3f14764f0fe36 SHA512 599f1bd7c434abf5c68195b54ab569311ebbcc39dbb63ecec7c966d55c3a6ba76b78559be6e667ee15dfa085f83c5860002bfc26f37eb391abb636609c64e460
+AUX libtompoly-0.04-Fix-Wimplicit-function-declaration.patch 3693 BLAKE2B f549593e1540cc34aa65785be8a26caf91b752bbe8d1b77bcd45b3720904cddd1357025cf1aa22035df5ce8644ec609c5ffdb9707c2c61e9ac953fe9ba21144b SHA512 9a46f2bf2b7c065cf8b8a463d7977a0ce45a93ecd9d83c9a0699ffd1df8b136693ea2e859e0711aa70e3069fe5005bb29de29129688c9645fe43f3d87575e5c6
 DIST ltp-0.04.tar.bz2 171966 BLAKE2B 748fd04d55bd3dcdcd9510de1e34e2b9d96c38fc4f48c14137676f60c6d89751e8a095e07687d368d9a46e49ed056484cf8971e96fc400cde15b254a7374c38c SHA512 64a0b25eb058fc2475e6c645138729796099081ad7e926b58d2e83468d988048607e26716b4b669f0e923ea74d4d9705ff5a0466eb41cbe160488d0173447234
-EBUILD libtompoly-0.04-r1.ebuild 787 BLAKE2B 50bd5523b80be11db62f4928a6c8af5098d130c51bc9bc163eafd166e45093887ed484db7f94d6c6fc84fd942c8c8310c1dcc2ef37cc1a3d990bdf00722742b3 SHA512 86ffacdf939609bac18fa29c277244a09502920d142af78f51820d6fd50c9ed0105dfc54ee63a3823b013b67dc45d29d1fbe05d36e1919d08c62baeee865b17f
+EBUILD libtompoly-0.04-r2.ebuild 787 BLAKE2B 7ba4ae35883e39d44d771408d3aca0c3747f76e603bff8323e45950eafef5b01e25667459efc53c93c5b85f2b70ce34fd01a12e3bf737a42c6e992a2ccf80b72 SHA512 7f6bd724c0180787d6fa9db3804c937b3d0c2c9c857c7146b0d35deaae174d903818fef2440b4e74fe2ab4caad145a6acaf86581f3cb6347f6ae7dd115279c92
 MISC metadata.xml 910 BLAKE2B cd74dfeebe4cf884027b6ec410f5e01e79ef59fadac951939a14e6a2483a785ac90e164e14558a8042eb711defe309fd15fcecd7dd97b5f059d11bff477dc883 SHA512 9dfc6fc5a3deb7c91c7cab20915a52003531ba43aa49bad37da9c52a378c94b301b0b3a93bd02542a9a4bb78c83837649ce4347ecdc897eacfdbe52f65eaaa1d
diff --git a/dev-libs/libtompoly/files/libtompoly-0.04-Fix-Wimplicit-function-declaration.patch b/dev-libs/libtompoly/files/libtompoly-0.04-Fix-Wimplicit-function-declaration.patch
index 49a005d44b1e..f02cc99df63c 100644
--- a/dev-libs/libtompoly/files/libtompoly-0.04-Fix-Wimplicit-function-declaration.patch
+++ b/dev-libs/libtompoly/files/libtompoly-0.04-Fix-Wimplicit-function-declaration.patch
@@ -1,38 +1,39 @@
-https://github.com/libtom/libtompoly/pull/4
+https://github.com/libtom/libtompoly/commit/2803e69dcc7cac9b470360c984b62198a3774882
 
-From 62f0b57e577cb3ec371042e60eb82ffcd0ae6bd0 Mon Sep 17 00:00:00 2001
+From 2803e69dcc7cac9b470360c984b62198a3774882 Mon Sep 17 00:00:00 2001
 From: Sam James <sam@gentoo.org>
 Date: Wed, 19 Oct 2022 02:21:00 +0100
 Subject: [PATCH] Fix -Wimplicit-function-declaration
 
-Causes build failures with Clang 16.
+Clang 16 will make -Wimplicit-function-declaration error by default.
+
+For more information, see LWN.net [0] or LLVM's Discourse [1], gentoo-dev@ [2],
+or the (new) c-std-porting mailing list [3].
+
+[0] https://lwn.net/Articles/913505/
+[1] https://discourse.llvm.org/t/configure-script-breakage-with-the-new-werror-implicit-function-declaration/65213
+[2] https://archives.gentoo.org/gentoo-dev/message/dd9f2d3082b8b6f8dfbccb0639e6e240
+[3] hosted at lists.linux.dev.
 
 Bug: https://bugs.gentoo.org/875527
+Signed-off-by: Sam James <sam@gentoo.org>
 --- a/pb_add.c
 +++ b/pb_add.c
-@@ -10,6 +10,7 @@
-  * Tom St Denis, tomstdenis@iahu.ca, http://poly.libtomcrypt.org
-  */
- #include <tompoly.h>
-+#include <math.h>
- 
- int pb_add(pb_poly *a, pb_poly *b, pb_poly *c)
- {
-@@ -17,7 +18,7 @@ int pb_add(pb_poly *a, pb_poly *b, pb_poly *c)
+@@ -17,7 +17,7 @@ int pb_add(pb_poly *a, pb_poly *b, pb_poly *c)
     pb_poly *tmp;
  
     /* grow c to be the max size */
 -   y = MAX(a->used, b->used);
-+   y = fmax(a->used, b->used);
++   y = PB_MAX(a->used, b->used);
     if (c->alloc < y) {
        if ((err = pb_grow(c, y)) != MP_OKAY) {
           return err;
-@@ -28,7 +29,7 @@ int pb_add(pb_poly *a, pb_poly *b, pb_poly *c)
+@@ -28,7 +28,7 @@ int pb_add(pb_poly *a, pb_poly *b, pb_poly *c)
     characteristic = mp_iszero(&(c->characteristic));
  
     /* add the terms */
 -   z = MIN(a->used, b->used);
-+   z = fmin(a->used, b->used);
++   z = PB_MIN(a->used, b->used);
     for (x = 0; x < z; x++) {
         if ((err = mp_add(&(a->terms[x]), &(b->terms[x]), &(c->terms[x]))) != MP_OKAY) {
            return err;
@@ -89,29 +90,38 @@ Bug: https://bugs.gentoo.org/875527
  {
 --- a/pb_sub.c
 +++ b/pb_sub.c
-@@ -10,6 +10,7 @@
-  * Tom St Denis, tomstdenis@iahu.ca, http://poly.libtomcrypt.org
-  */
- #include <tompoly.h>
-+#include <math.h>
- 
- int pb_sub(pb_poly *a, pb_poly *b, pb_poly *c)
- {
-@@ -17,7 +18,7 @@ int pb_sub(pb_poly *a, pb_poly *b, pb_poly *c)
+@@ -17,7 +17,7 @@ int pb_sub(pb_poly *a, pb_poly *b, pb_poly *c)
     pb_poly *tmp;
  
     /* grow c to be the max size */
 -   y = MAX(a->used, b->used);
-+   y = fmax(a->used, b->used);
++   y = PB_MAX(a->used, b->used);
     if (c->alloc < y) {
        if ((err = pb_grow(c, y)) != MP_OKAY) {
           return err;
-@@ -28,7 +29,7 @@ int pb_sub(pb_poly *a, pb_poly *b, pb_poly *c)
+@@ -28,7 +28,7 @@ int pb_sub(pb_poly *a, pb_poly *b, pb_poly *c)
     characteristic = mp_iszero(&(c->characteristic));
  
     /* sub the terms */
 -   z = MIN(a->used, b->used);
-+   z = fmin(a->used, b->used);
++   z = PB_MIN(a->used, b->used);
     for (x = 0; x < z; x++) {
         if ((err = mp_sub(&(a->terms[x]), &(b->terms[x]), &(c->terms[x]))) != MP_OKAY) {
            return err;
+--- a/tompoly.h
++++ b/tompoly.h
+@@ -112,4 +112,13 @@ int pb_rawsize(pb_poly *a);
+ int pb_toraw(pb_poly *a, unsigned char *dst);
+ int pb_readraw(pb_poly *a, unsigned char *buf, int len);
+ 
++/* What follows should be in a private header, but it's fine for now like that. */
++
++#ifndef PB_MIN
++#define PB_MIN(x, y) (((x) < (y)) ? (x) : (y))
++#endif
++#ifndef PB_MAX
++#define PB_MAX(x, y) (((x) > (y)) ? (x) : (y))
++#endif
++
+ #endif
+
diff --git a/dev-libs/libtompoly/libtompoly-0.04-r1.ebuild b/dev-libs/libtompoly/libtompoly-0.04-r2.ebuild
index b8fd20681358..8199bd6ce0cd 100644
--- a/dev-libs/libtompoly/libtompoly-0.04-r1.ebuild
+++ b/dev-libs/libtompoly/libtompoly-0.04-r2.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 inherit toolchain-funcs
 
-DESCRIPTION="portable ISO C library for polynomial basis arithmetic"
+DESCRIPTION="Portable ISO C library for polynomial basis arithmetic"
 HOMEPAGE="https://www.libtom.net/"
 SRC_URI="https://github.com/libtom/libtompoly/releases/download/${PV}/ltp-${PV}.tar.bz2"