gentoo auto-resync : 23:11:2022 - 07:07:57

4 files changed, 88 insertions, 8 deletions

diff --git a/dev-tcltk/tclreadline/Manifest b/dev-tcltk/tclreadline/Manifest
index 0988a90a26a4..4146327b2b74 100644
--- a/dev-tcltk/tclreadline/Manifest
+++ b/dev-tcltk/tclreadline/Manifest
@@ -3,9 +3,10 @@ AUX tclreadline-2.1.0-gold.patch 458 BLAKE2B 2a9e1c4e3809a03a7539f37b38fa09bcf5f
 AUX tclreadline-2.1.0-rl-executing-macro.patch 3788 BLAKE2B a8f1316c3b3b63832c1bd3d94a12349ae23042ef04b728f12d38efc220c36d657e48992c685a6b0d2dd266904565f4850096aa463099c77d1f11a1b0eb094720 SHA512 f7ba38320c7095b4a8450e24a3ed1a75af6dcd7791c17b5546b36faeb5391b00f389a353838f8ea2b81b25f5d9c5ca1b6ccf7db5e6a30d2e304691db42da67dc
 AUX tclreadline-2.1.0-rl-history-expand.patch 969 BLAKE2B 44b2aaf9f5ea2f518888b338edd04a7b274345af2cd86836b1cb8d101428c98f608eecb3454a51d6ff236d32df068f59db93819c57d1f8d8c5670c99ebe0d7fb SHA512 a015a56413c683e2a41e912891138494f43fd12b5383f9514314d87c9cc353cd95a2ea515978b4d1b0c60d4ab1cc0d1d16d982825949e338c0ac69e84e114304
 AUX tclreadline-2.1.0-rl-prompt.patch 463 BLAKE2B c9faea41e07303d94ec6eb08f4098fd9ca483f47509a1e9a6a791649738cc6b31b2266783b84434b25072f100bc88d1a87c0a765245be305d56fbbdd33aef2b9 SHA512 b547e2077861d39701ed53b485f9758c8e0a636ecba7abfc25aa3fabeaa1337c6e48a08ba51425b95a55bae4021c2aa17e66686ee3836eb31cb6b4d115508073
+AUX tclreadline-2.3.8-configure-clang16.patch 2333 BLAKE2B 463cb8439559060b4386460741542e4c8145dffeae2c9530d3de9d9f135b572ba8842fcd6310f3972c3edaca305765c9539ede1d703275f14b67000f35a4baa3 SHA512 c9ba602257ebfdbf34def11cc54c3805044abb76dfed686192c51b8c41f3c5eeedcc0912c5ce6ddc26d70fe85b06eef9c0f3079c29eeb2ca5b4c0a224884185c
 DIST tclreadline-2.1.0.tar.gz 160541 BLAKE2B 44dfd7626b969d03343cfa768d0ad72b9322a13175ca7c713c3981c0abc27967e31a62f3451b5d007569a30a7279be7c2a8f1c7c78e8d0c310964ddba18fa5cb SHA512 bd67a65fe2ec708834fb67fabf2e36e778a6aeeb7a7b69cda298f9e18acc9e03f3a379f81ff7d2d289bfbf1093bc86fecbf96fe5d04a2ca954899cc7df6fe4bf
 DIST tclreadline-2.3.8.tar.gz 393167 BLAKE2B e6a8d35904a0ed22fac01d7f6b6ecc9eef99acea149253ec9a0f7a3463a163ef17daa052bd4801fb9e365b056ab58d69fe2ec9884a9279881638c7b99c12f6a7 SHA512 0c5ce53a8f4cc222de013932698e442c63b36e3f07d10b962d127444f75c28b2caf7f06b5958150748f7a1d535c577c825b9a0dd525e077a348c3ff899a74e61
 DIST tclreadline_2.1.0-12.debian.tar.gz 9636 BLAKE2B b84487e2e05649c899f705ee4c4ea80a7b05c99440e9b905587300342ce54d48a7d32b750ec2c2a3a12f1aa991f2a47167243ec962f539e02383aac62530a3d9 SHA512 293e9ad14a469891f68b25caa78a99874de87df4c44af4ada7528cf74e898be42b7846fbb6eeabb2dec34995a9ccd9707c61f406b90b90dbca2c24df05f451eb
 EBUILD tclreadline-2.1.0-r5.ebuild 1849 BLAKE2B b7fa4bf1db26f914acd559e6b30cfd8515f379d48dcc67b13f8be2e9a1ca8452fd802c59d5a31c34eb2e533c4996cb804fa75133cc309e87583dc3309e355199 SHA512 e07faa38e34fdab0c78673b3a824ae5f8fc9734e7477ae2a19aba437d0a90e1af0a8057a2d58f8dd7af6538ed6181336830402a0e3551c72046100b3fdbc1db6
-EBUILD tclreadline-2.3.8-r1.ebuild 900 BLAKE2B 6073d170c209f1e9ce4cfa31d52c640121df7d7b612761e03c8f3d049ce99a5db54050bacaf7157b863a47c250acfb34e265d711df870a028de786dff1055612 SHA512 e10249b1c81860089102df4a6e8511abac85357740bd340a678aa47947c0f3cecbfabfae7b054d3b5d8ed3638197fdf14a67a9622dc900ab479e48668ae51d54
-MISC metadata.xml 335 BLAKE2B f2e384f23701b4b38e74dc51d1199b70e65544f9006bb257b39f6b316e44107343aae8a4e5aecab960101f019835fad8f899e7ecf5b6cf9b2d4a3e983f4a5b0d SHA512 64b4aab780a660f84aa545c7c437163ebf035fbd8f1d8c49bf8e46a3a7f75c3062379cd4ff4a4128b47397d499492f5a154ecbd08a018beb38833df5c4f09378
+EBUILD tclreadline-2.3.8-r2.ebuild 1044 BLAKE2B b621b9a4ede455be2498535a8d0aa8a52bcb2718e1d780f1a89c09ca821cec3dadb5ce7ef3ae154f188f6ddfa1a2177f93bea3b6e9adb435dd42ce40c979d48d SHA512 0777c4a68b519d75578c39ca6edb4d4bffb2530f77cb7845cba4225db8f7ca6c67cec7fea38454a351869f2bdb3ca8a804ef7b47288080c822fc16b7ccaf5908
+MISC metadata.xml 398 BLAKE2B eb0c7327c3975a7131df10baf513b073cdfb333080a88a4520400f2ab64caaa927f2d08f4058f9417d273a72577082e32a17eb493a817ae435b336ff00f4c414 SHA512 9591781d193a81636c56fd343959988606caf9bd0b2bd45f4471822ceba873179a311b42a0c712bcacf12c4406deb2fb2a21a1903696c2368eb08de5ac605b00
diff --git a/dev-tcltk/tclreadline/files/tclreadline-2.3.8-configure-clang16.patch b/dev-tcltk/tclreadline/files/tclreadline-2.3.8-configure-clang16.patch
new file mode 100644
index 000000000000..1454cf54f698
--- /dev/null
+++ b/dev-tcltk/tclreadline/files/tclreadline-2.3.8-configure-clang16.patch
@@ -0,0 +1,67 @@
+https://github.com/flightaware/tclreadline/pull/46
+
+From 8c75e01b814ac852167611f5edae9659a1f709d2 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Wed, 23 Nov 2022 00:19:55 +0000
+Subject: [PATCH 1/2] Fix configure.ac compatibility with Clang 16
+
+Clang 16 makes -Wimplicit-function-declaration and -Wimplicit-int errors by default.
+
+Unfortunately, this can lead to misconfiguration or miscompilation of software as configure
+tests may then return the wrong result.
+
+We also fix -Wstrict-prototypes while here as it's easy to do and it prepares
+us for C23.
+
+For more information, see LWN.net [0] or LLVM's Discourse [1], the Gentoo wiki [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://wiki.gentoo.org/wiki/Modern_C_porting
+[3] hosted at lists.linux.dev.
+
+Signed-off-by: Sam James <sam@gentoo.org>
+--- a/configure.ac
++++ b/configure.ac
+@@ -245,7 +245,8 @@ AC_TRY_LINK(,[
+ AC_MSG_CHECKING([for the readline version number])
+ AC_TRY_RUN([
+ #include <stdio.h>
+-int main () {
++#include <unistd.h>
++int main (void) {
+     FILE *fp = fopen("conftestversion", "w");
+     extern char *rl_library_version;
+     fprintf(fp, "%s", rl_library_version);
+
+From b64772750c7543fe66165fd7862b355d289412b6 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Wed, 23 Nov 2022 00:21:34 +0000
+Subject: [PATCH 2/2] Fix -Wint-conversion in readline configure test
+
+Fixes the following warning with Clang 16:
+```
+configure:12873: clang-16 -o conftest -g -O2   conftest.c -lreadline  >&5
+conftest.c:33:11: error: incompatible pointer to integer conversion passing 'FILE *' (aka 'struct _IO_FILE *') to parameter of type 'int' [-Wint-conversion]
+    close(fp);
+          ^~
+/usr/include/unistd.h:358:23: note: passing argument to parameter '__fd' here
+extern int close (int __fd);
+```
+
+fopen should be paired with fclose.
+
+Signed-off-by: Sam James <sam@gentoo.org>
+--- a/configure.ac
++++ b/configure.ac
+@@ -250,7 +250,7 @@ int main (void) {
+     FILE *fp = fopen("conftestversion", "w");
+     extern char *rl_library_version;
+     fprintf(fp, "%s", rl_library_version);
+-    close(fp);
++    fclose(fp);
+     return 0;
+ }],
+     READLINE_VERSION=`cat conftestversion`
+
diff --git a/dev-tcltk/tclreadline/metadata.xml b/dev-tcltk/tclreadline/metadata.xml
index 7c7e31e3a203..c218d179a43c 100644
--- a/dev-tcltk/tclreadline/metadata.xml
+++ b/dev-tcltk/tclreadline/metadata.xml
@@ -7,5 +7,6 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">tclreadline</remote-id>
+		<remote-id type="github">flightaware/tclreadline</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-tcltk/tclreadline/tclreadline-2.3.8-r1.ebuild b/dev-tcltk/tclreadline/tclreadline-2.3.8-r2.ebuild
index ff8d8154a93b..f19d330e2688 100644
--- a/dev-tcltk/tclreadline/tclreadline-2.3.8-r1.ebuild
+++ b/dev-tcltk/tclreadline/tclreadline-2.3.8-r2.ebuild
@@ -1,7 +1,9 @@
-# Copyright 2020-2021 Gentoo Authors
+# Copyright 2020-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
+
+inherit autotools
 
 DESCRIPTION="Readline extension to TCL"
 HOMEPAGE="https://github.com/flightaware/tclreadline"
@@ -13,14 +15,23 @@ SLOT="0"
 KEYWORDS="~alpha amd64 ppc ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="tk"
 
-DEPEND="dev-lang/tcl:0=
-	sys-libs/readline:0=
-	tk? ( dev-lang/tk:0= )"
+DEPEND="
+	dev-lang/tcl:=
+	sys-libs/readline:=
+	tk? ( dev-lang/tk:= )
+"
 RDEPEND="${DEPEND}"
-BDEPEND=""
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.3.8-configure-clang16.patch
+)
 
 src_prepare() {
 	default
+
+	# Needed for Clang 16 patch, can drop once in a release
+	eautoreconf
+
 	sed -i \
 		-e "s|^\(TCLRL_LIBDIR\)=.*|\1=\"${EPREFIX}/usr/$(get_libdir)\"|" \
 		configure || die