gentoo auto-resync : 27:11:2022 - 13:17:13

7 files changed, 60 insertions, 3 deletions

diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index b7e60ef0f4ce..303013203b62 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/kbuild/Manifest b/dev-util/kbuild/Manifest
index f43f4a71842a..c6d188655ed6 100644
--- a/dev-util/kbuild/Manifest
+++ b/dev-util/kbuild/Manifest
@@ -2,8 +2,10 @@ AUX kbuild-0.1.5-gentoo-docdir.patch 358 BLAKE2B 978d4081821098a4e035fdd41b801c7
 AUX kbuild-0.1.9998.3407-glibc-2.32+.patch 1402 BLAKE2B 4dabbf9ccb5cd60aa7998d36a3766edc5a89992ae10606375774d4cf648478187ffa88aac9016b65acb77353b25d445c1f8b3f2cf17bc60106a9fcf83d2df7fe SHA512 fae4058b85da11fe8934323501193d2947e17e6b36baf83487c7543b0c6b7a4382682159d789a0f661f5cb346ed6e4b4609573255f3b5f244733049353497528
 AUX kbuild-0.1.9998.3407-gold.patch 590 BLAKE2B 654459b94017d4bacae37151c71d4b43b3d9a76d934a2a220bada87e0b96e2a8a13a6f446199eb5475faf604129966bcca6e3e34691e588df6b40fe65e4e4ded SHA512 3cf6827b482661704a8cdcdcf3152fa07d18c80a6e9cbe8979b732173f0127a5bc5009590c5cc155cdd11bed1e95d918835e697b6fecc1a1bc51127d2f13845f
 AUX kbuild-0.1.9998.3407-unknown_configure_opt.patch 697 BLAKE2B 5f974bc451a12f4b4c02656b501d07515c14499c53ee1fca00aec00cf28d6dd5faf690f262b79f34861a3bfd317a5bd37eb78cbeb61ce833d8117c2cd74e7813 SHA512 63435effcf109b40390574da09453314ffac109ffee79419cef81705b4f7ceb145f692c9a81b54dd0d58f69a1a6f80b9dc412baa5d416066f05300cc9eccc11e
+AUX kbuild-0.1.9998.3499-fix-CC.patch 504 BLAKE2B cb30a2f3dbdc374d1570cc089d9fbdda38b0d6e35eb9023c7d5f989e1a9538ede6eaf1b857b8ae92bb0e6bb139232d02e461851f2a4fc6343a3a774017f0cdef SHA512 16728f446bcc8ab15fc2b4a556ab79eb84385a217b3624f53297fde341b28a0d523caf357d871b5f1a58907adb61915a5480beca4fec56bafe92fa957176919b
 AUX kbuild-0.1.9998.3499-gold.patch 934 BLAKE2B 486b6154eeba1541f87856e0d4bddd89ee689393669161f60ae9f6b5ce3a199cf72187ac77d766e5c26b707af79b63b13f2cc597e7ee15ee1c46972401fe80d3 SHA512 5e885b504c095c062da0c2ed7836821c5ab95aa6b90e847070a87228a3e1456b9ae2dc2c463e0771552a504f0f309569e762667cd11aa891f5236b5402b77a08
 AUX kbuild-0.1.9998.3499-implicit-function-declaration.patch 1444 BLAKE2B 21bbdeb7502bfb024ff0dcdee2b7cf6f793910289d02fea9fb0bb21b3292dd25b98aab86cfa2f6733c50ecdec1c12ec59d6d7a5f577ce1943a971cdeabd558e5 SHA512 f579eb7516f7f9b7d885a33621167fee915f1665d225d5d9abf6f64d60a3ede0a9730e80a51ef2afbedbf36aaadef25872f1575f8034a1b3b10eceb6a78e1f0a
+AUX kbuild-0.1.9998.3499-int-conversion.patch 719 BLAKE2B 77d4efe872b1114b2fa155bca466816018e0909678b83249f37d543c0831f0126b45a7d7356f378acf77b60c2f719452f8b4c7112253ba95b57c851ec521386f SHA512 f2199d2cf55fa90ad7327f94400aaee311830aef22b1c5a7bea009e375171ea6e0fd1d253c2d60d2079daa11ce14322bebd3723c98d3ff937e65d0b07b5dc5cf
 AUX kbuild-0.1.9998.3499-kash-no_separate_parser_allocator.patch 374 BLAKE2B 9ea9ac286217760b6933821ec3901a4e102bf8fe98517805b23e19e86a8ac86a81c93c72c13d69490d91c80c2e01581b5926f358f988b6b0de8e04ed0ba93820 SHA512 f83bcd523241d3b6bda3038d1c2a6a18ba2497d166f5a9704ba5f4a96b2d6857ea810ab2969b931b60b5818b69ea24cbeab2068cb92765704f7666874751e27d
 AUX kbuild-0.1.9998.3572-fix-bison.patch 375 BLAKE2B ab316943b88fac929e747d0c1062f827a2049238d29eaa26e81590b0982462f6428e5be52a82ca5325c6ed11e0771cf22ee2f70f719162ad4915199bb24bb1ff SHA512 870f8d8f5be776b490a21b018fe5aa5fd12251eb0319098cb4c2785524482e7174a77e45e8b1d28252b244de7571209b006bb36c16f616803dba64111e5f8a10
 AUX kbuild-0.1.9998.3572-fix-lto.patch 314 BLAKE2B 42a7c1d3f735870b92c6ffdaf0400c1db63389b430890a892c9b48b90a126508729baeef2fc45bd747c089856a26ec3d10b8a9bfedd4e25a6d6ffd6606ef770b SHA512 7bb2526b4c59533dbfc8ad7c53fb38985fec4cab17740f4a3965fa3e982ba42faaabfe8d78d94c83bd74c771dde9088b1446a6937f96d37808fe9597d6a049f9
@@ -13,7 +15,7 @@ DIST kbuild-0.1.9998.3407-src.tar.xz 2351596 BLAKE2B ed562a739831c465ba66b2c357b
 DIST kbuild-0.1.9998.3499-src.tar.xz 2371580 BLAKE2B 847c5c67ded37ca87228ff7164d6c7f2f670a57f2fd94d6d0bf4f8896266e7fe5442666c03dbda016564a52dc91d10be83f0d4b0ef5093db0f5210ac8d5f3aaa SHA512 eebdcd1d2fa71313edd764d45a4aa3580078af22d7c5fed32d3d139a4f41c4e028282fdfdda0ee9b617ed0e8e63b8f5d065b3cf6647f08fe446560938b7577fc
 DIST kbuild-0.1.9998.3572-src.tar.xz 3973848 BLAKE2B 103e42d719fd77bc5c55aea48bdfd01c8ad136529cc76cc8c1297f87e21e5d4e2e7149f9321c5174808613a84331dbea8bb4c0a7662eb2de9e1045c8ad365047 SHA512 96bb5e1759990bf3acaca4b0ba7c02926c6607b0cd94f7fca222b13eee5c3364c64b35e3473c5cee45fa094cb2b851ac9f3a3a9fe60cff894baf46238ccb4006
 EBUILD kbuild-0.1.9998.3407.ebuild 1780 BLAKE2B 52b4b1e13d6049fddc6e11edcbb3d881ba8abb1af48dfa6853331b5eec5a0d346d435f0a3e4e6ea747d1a27fcf6df190bbdfb950b12845c7192fbddd0fae6f16 SHA512 59976d3b48a2b65c2ac1d9e28e4a216bc641b1b0a6b64c0107ea864a57a95dee41d813cc5433e626b9223cee92151e7c361fee37bd7420fc20f03c7a74f49c8b
-EBUILD kbuild-0.1.9998.3499-r1.ebuild 1980 BLAKE2B 27d237ba9209bc0874cee33e8f6eb8b4bb4c7a991978998b8577b8da8a10c5e543628204dba50cb70b804c75fb7ee33ef033c7579dd79261880fa6b97341e9b8 SHA512 29d65d5190a544c0019d4a39f67fbd10ad547045bb566a0cac50b272a4fe8e2a78dad3febebbea892c921f1fee8978eee10cdcd61180a6195d77301703705378
-EBUILD kbuild-0.1.9998.3572-r1.ebuild 1784 BLAKE2B e614715034c9af519625394eeab508b5d66380769843773d7456440c66f53f78cdd183b8b3a45f2d29122835ebf58fa79258cbd7c128d44996941555e249787d SHA512 d4706e2bb00f803067ce61556d19802e59099bd29ef7c5002ce5fca825b953576ff5e8a4cb027632c8e0f345e0fd151ef5f39a2a65a2a10c031e7f605113a87e
-EBUILD kbuild-9999.ebuild 2012 BLAKE2B 73f2dead7577f67e7bde208347c60c9837d6c7147be55fb4970ce2c94cb92ef44c1190cc37a4840fe581fd645084c81b68e965436d76d8168379d3671642786d SHA512 d140dec58ea03efe72b63a7bb0be9ed74e535e0d7885018d02f4b2d0c73689bcb432a68bf1ab27d72b270571edeec2d07d67444c83b110c9ab39833920d78191
+EBUILD kbuild-0.1.9998.3499-r2.ebuild 2084 BLAKE2B 5cb98c4e67d98b89c0b81e487b11509926385e1d4250d4c074875e7707fe38261d6d7c81e759ff906da659550e58bb2cf6e61a649517f8d9e419a838d328e975 SHA512 48eb7e04ebf35f48b4ed976572ab826fb5e31fd42c82b0573518d3d887ad0e439a7ba20b4dccf2739bb8a34eda81bea28c79d5d8d09dfbecb600022a2acd2b42
+EBUILD kbuild-0.1.9998.3572-r2.ebuild 1888 BLAKE2B 5635921e71a5f4be138cae538e70efae0b8fa10f8abc4a43e842cfd35c6a68d453f0d290919dd07d086d08dc96401c08eb5a23b4d0e48411dafd90e932db4dd1 SHA512 719bc11d9186a2385f3d7a8830457be9a1981314297eedd831e4787b2e974dfe00cb767ff663ac7dd2ac1cf8b9296c6a2bb7e27e50123f40a98ab750d388ed22
+EBUILD kbuild-9999.ebuild 2116 BLAKE2B cc33e43cef9e4394fea13ea1e2b1498fbfdb5cd79b0b09a6bd729e5c4f86cf7b7d828a433611b9ef8b43bd6ad8d05eefa36901aaf2e341d1c5c18ecee8215ad1 SHA512 24adfb38fe71c1896e2b32b77d1228c895db3e2eed955bbd9c05408c105a064ac2a03bee55d546551dffc32baa558b148a936927017c9acf663a995d4ec3669f
 MISC metadata.xml 249 BLAKE2B 3bc7510e014ef8df90da064f4ef969eab6cc3311951a6dd556ca7b6f4e2e74e229f12a16ceb641393d1ec1f89d1942718267ecc664a8136df194c40de94a58e4 SHA512 63f88d798d410e4fb6670d199a86a665ab61b09cb9508b4047f13fe73070c682231d35a27c9d2c1fd82a1b8a84676d857b534c96bd09f4562cf13d7fc8de36b2
diff --git a/dev-util/kbuild/files/kbuild-0.1.9998.3499-fix-CC.patch b/dev-util/kbuild/files/kbuild-0.1.9998.3499-fix-CC.patch
new file mode 100644
index 000000000000..7d7f1f7232eb
--- /dev/null
+++ b/dev-util/kbuild/files/kbuild-0.1.9998.3499-fix-CC.patch
@@ -0,0 +1,23 @@
+A few files are compiled with gcc regardless of setting CC
+
+This file seems to do some guesswork, override it with CC if set
+
+Bug: https://bugs.gentoo.org/734302
+
+--- a/kBuild/tools/GCC3.kmk
++++ b/kBuild/tools/GCC3.kmk
+@@ -84,6 +84,14 @@
+  TOOL_GCC3_CXX += -fmessage-length=0
+ endif
+ 
++ifneq ($(CC),)
++	TOOL_GCC3_CC = $(CC)
++	TOOL_GCC3_LD = $(CC)
++endif
++ifneq ($(AR),)
++	TOOL_GCC3_AR = $(AR)
++endif
++
+ # General Properties used by kBuild
+ TOOL_GCC3_COBJSUFF         ?= .o
+ TOOL_GCC3_CFLAGS           ?=
diff --git a/dev-util/kbuild/files/kbuild-0.1.9998.3499-int-conversion.patch b/dev-util/kbuild/files/kbuild-0.1.9998.3499-int-conversion.patch
new file mode 100644
index 000000000000..6afdeeb6e7a6
--- /dev/null
+++ b/dev-util/kbuild/files/kbuild-0.1.9998.3499-int-conversion.patch
@@ -0,0 +1,26 @@
+Fix int to pointer conversion for clang
+
+Note - this parameter was not actually used inside eval_buffer because of a define.
+
+Bug: https://bugs.gentoo.org/875449
+
+--- a/src/kmk/loadapi.c
++++ b/src/kmk/loadapi.c
+@@ -20,6 +20,8 @@
+ #include "variable.h"
+ #include "dep.h"
+ 
++#include <string.h>
++
+ /* Allocate a buffer in our context, so we can free it.  */
+ char *
+ gmk_alloc (unsigned int len)
+@@ -59,7 +61,7 @@
+   install_variable_buffer (&pbuf, &plen);
+ 
+   s = xstrdup (buffer);
+-  eval_buffer (s, flp IF_WITH_VALUE_LENGTH_PARAM (strlen (s) /** @todo suboptimal */));
++  eval_buffer (s, flp IF_WITH_VALUE_LENGTH_PARAM (strchr (s, 0) /** @todo suboptimal */));
+   free (s);
+ 
+   restore_variable_buffer (pbuf, plen);
diff --git a/dev-util/kbuild/kbuild-0.1.9998.3499-r1.ebuild b/dev-util/kbuild/kbuild-0.1.9998.3499-r2.ebuild
index 26cf9c604e83..63ab7642a44d 100644
--- a/dev-util/kbuild/kbuild-0.1.9998.3499-r1.ebuild
+++ b/dev-util/kbuild/kbuild-0.1.9998.3499-r2.ebuild
@@ -37,6 +37,8 @@ PATCHES=(
 	"${FILESDIR}/${PN}-0.1.9998.3572-fix-bison.patch"
 	"${FILESDIR}/${PN}-0.1.9998.3572-fix-lto.patch"
 	"${FILESDIR}/${PN}-0.1.9998.3499-implicit-function-declaration.patch"
+	"${FILESDIR}/${PN}-0.1.9998.3499-int-conversion.patch"
+	"${FILESDIR}/${PN}-0.1.9998.3499-fix-CC.patch"
 )
 
 pkg_setup() {
diff --git a/dev-util/kbuild/kbuild-0.1.9998.3572-r1.ebuild b/dev-util/kbuild/kbuild-0.1.9998.3572-r2.ebuild
index 37288f1c0a38..cd4193e79001 100644
--- a/dev-util/kbuild/kbuild-0.1.9998.3572-r1.ebuild
+++ b/dev-util/kbuild/kbuild-0.1.9998.3572-r2.ebuild
@@ -30,6 +30,8 @@ PATCHES=(
 	"${FILESDIR}/${PN}-0.1.9998.3572-fix-bison.patch"
 	"${FILESDIR}/${PN}-0.1.9998.3572-fix-lto.patch"
 	"${FILESDIR}/${PN}-0.1.9998.3499-implicit-function-declaration.patch"
+	"${FILESDIR}/${PN}-0.1.9998.3499-int-conversion.patch"
+	"${FILESDIR}/${PN}-0.1.9998.3499-fix-CC.patch"
 )
 
 pkg_setup() {
diff --git a/dev-util/kbuild/kbuild-9999.ebuild b/dev-util/kbuild/kbuild-9999.ebuild
index 79e18d1b7a14..889cf6178062 100644
--- a/dev-util/kbuild/kbuild-9999.ebuild
+++ b/dev-util/kbuild/kbuild-9999.ebuild
@@ -37,6 +37,8 @@ PATCHES=(
 	"${FILESDIR}/${PN}-0.1.9998.3572-fix-bison.patch"
 	"${FILESDIR}/${PN}-0.1.9998.3572-fix-lto.patch"
 	"${FILESDIR}/${PN}-0.1.9998.3499-implicit-function-declaration.patch"
+	"${FILESDIR}/${PN}-0.1.9998.3499-int-conversion.patch"
+	"${FILESDIR}/${PN}-0.1.9998.3499-fix-CC.patch"
 )
 
 pkg_setup() {