gentoo auto-resync : 19:04:2023 - 11:57:35

4 files changed, 65 insertions, 4 deletions

diff --git a/app-editors/joe/Manifest b/app-editors/joe/Manifest
index bf6f6d8cb330..04c89bd296bb 100644
--- a/app-editors/joe/Manifest
+++ b/app-editors/joe/Manifest
@@ -1,6 +1,7 @@
 AUX joe-4.3-tinfo.patch 1063 BLAKE2B 574f78a31200df60dab81fea278bb238fbfe0a2b3f70f1f9a2ed78f3ae7a6e7a5d979fec61ad3ed9934aece27ce7836730e7f9755a7f25225dd74928c5454694 SHA512 93db2de58d2a03412cae7dc2b2769103f3ad275b68e22d6e3379871155656c8d4d4f29fbf014c6c8eb5b70ec234189af52a6b6b6826bfde46d6ee93b92f55bcd
+AUX joe-4.6-c99.patch 1427 BLAKE2B 0092531265346574f1bbfbe8a3d45515ec5ac817794cf35c65f695296df2a9a4e4a570fc6ff507da4ae02eada4e31f54f332b609766ea357d73d34254b2d8460 SHA512 201e74d0af44a5c4c9cfd665a2a79222246e535deab017f6bf4884215644e89921a08b051f7ba43cdf8cdbbbb15a17e729088ced4e4b6f57e84c4472b28691bd
 AUX joe-4.6-db.patch 392 BLAKE2B 8ca4d25a1e1be76b87e581720903064f4a54b928c6c7a91991d6ae6227df00e4b13c6c9fa3ac47563f5924c5e9aa18a86f1cb471155d8ca8fccc67e151f7bada SHA512 47eeffc203879ae7a644ef3875bda41c7bd776a51fcf7f6e9d4a30a5e5f0209d1067b516efcd5faac3ecf2fb204e0105eb9cc453df5c853413a613cfdb6e4fc6
 AUX joe-4.6-prototypes.patch 10006 BLAKE2B cf9845339aa30b99223412a9e2c6407bbbd2bb6eb5ce630d3a7e93bc084ee8bffdee97e15ce17765b6a5de9fcc02453b4962126043fe021cf17e6c062b13108f SHA512 9ccd53de36e813c79dbd1c76e43c7f9b756243455e0faf7eb98e8ebeada30256393475270a9858c6f319f28b4fe56f320e81c7898e41cf8b4ade1c22000e6884
 DIST joe-4.6.tar.gz 1895046 BLAKE2B fbf53d3b5b066cb32bb26b08d7d314a3bb89ac5ae22db498cdf3597bf8cb322bd9aa05543debd47ac7380a33982c388e13f38c60747503494c582393ae8eb13d SHA512 3dd64a994fb3d352a12bf027ef16d57d14ac2577fd63fb6b6e25cae46052befaa7c15dc029bff2f8c3275df90f0343bd46313601055d97277ea4540e109fbe82
-EBUILD joe-4.6-r2.ebuild 1479 BLAKE2B 10ac5cae3afdc72b26c3ed032ad779ca67adda50a9e09280bb18aec84a41c2c9190aaceb0f635ac30e75924865f5c3a999e29f88bd0d05a424beb6a2ff317967 SHA512 fccb98942103f2c1d16fbc3941e52c8c094612001b50500681106674f81780dee0e7e8108a42daf6a7ff8ec717aba6a62239d2e5e9d43f7686519551dc6ea423
-MISC metadata.xml 905 BLAKE2B f744fdea647781d08644ff9e1b9475706569b961ad433eec0e3f4a424c0fa8b4128b4978d16bcf14533eeb3fe9006f89c61d1b7ed4913070e4f8c2cafe509c40 SHA512 a2e4ff282ea424f6bd383871523760cc7e555a75489822da5fd010eca7ead013628df767d2c81ed26853aa2493577bd858eba436bd900bc6a268b3344c3ebae1
+EBUILD joe-4.6-r2.ebuild 1509 BLAKE2B 24b1b098d1e31d2c951b70c053a9be9680e9098bb8d3c0145825c4e2131ff425c889fd667d1d0d99462aacec13c9bb0cff7d925c2021b4555fff0aa61b6e6ecf SHA512 bfbb9a6449e437179c1c04c3b4ce4b5a8f1494bdb4bdc779e73db59624743b822f97e88595283d6b0562ca3968118d8693052b11c124e1c4d49d596f2296994f
+MISC metadata.xml 904 BLAKE2B 687b43b7f2d927f5b239ce63ddbcedac0d602cb0a1f51a108c99c5227f6cc9501f357e1e6dd407ecd231bfd6d4ec0acb513b495a86ea7dcb52a0e735cd87012a SHA512 1d9066383090e2fd69955899c9c8e35e58d60f35d3b7e7d29c7cc5184c23f39bd24df5cd59efb9321aa2a8af453849366c8a931c369c9683f9b1aacc2030ad24
diff --git a/app-editors/joe/files/joe-4.6-c99.patch b/app-editors/joe/files/joe-4.6-c99.patch
new file mode 100644
index 000000000000..8d7a64a6419f
--- /dev/null
+++ b/app-editors/joe/files/joe-4.6-c99.patch
@@ -0,0 +1,59 @@
+https://bugs.gentoo.org/900164
+Patch from https://sourceforge.net/p/joe-editor/mercurial/merge-requests/3/
+
+commit 26e83257075789d901cadbe280ff7f1bd7602983
+Authored by: Nikita Popov 2023-01-31
+
+   Port to C99
+
+   Ensure that functions are declared before use for compatibility
+   with newer compiler versions.
+
+--- a/acinclude.m4
++++ b/acinclude.m4
+@@ -9,7 +9,7 @@
+ int main() {
+   int a = 0;
+   isblank(a++);
+-  exit(a != 1);
++  return a != 1;
+ }
+ 			],
+ 			[joe_cv_isblank=yes],
+@@ -34,7 +34,7 @@
+ #endif
+ int main() {
+ 	/* exit succesfully if setpgrp() takes two args (*BSD systems) */
+-	exit(setpgrp(0, 0) != 0);
++	return setpgrp(0, 0) != 0;
+ }],
+ 			[joe_cv_setpgrp_void=no],
+ 			[joe_cv_setpgrp_void=yes],
+@@ -95,7 +95,7 @@
+ 	kill((int)getpid(), SIGINT);
+ 	kill((int)getpid(), SIGINT);
+ 	/* exit succesfully if don't have to reinstall sighandler when invoked */
+-	exit(nsigint != 2);
++	return nsigint != 2;
+ }],
+ 			[joe_cv_reinstall_sighandlers=no],
+ 			[joe_cv_reinstall_sighandlers=yes],
+--- a/joe/selinux.c
++++ b/joe/selinux.c
+@@ -6,6 +6,7 @@
+ 
+ #ifdef WITH_SELINUX
+ #include <selinux/selinux.h>
++#include <error.h>
+ static int selinux_enabled = -1;
+ #endif
+ 
+@@ -108,7 +109,7 @@
+ 		return 0;
+ 
+ 	if (setfscreatecon(0) < 0) {
+-		error(0, errno, joe_gettext(_("Could not reset default security context")));
++		error(0, errno, "%s", joe_gettext(_("Could not reset default security context")));
+ 		return 1;
+ 	}
+ #endif
diff --git a/app-editors/joe/joe-4.6-r2.ebuild b/app-editors/joe/joe-4.6-r2.ebuild
index 1f5bdf049228..ef18848b930d 100644
--- a/app-editors/joe/joe-4.6-r2.ebuild
+++ b/app-editors/joe/joe-4.6-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -22,6 +22,7 @@ PATCHES=(
 	"${FILESDIR}/${PN}-4.3-tinfo.patch"
 	"${FILESDIR}/${P}-db.patch"
 	"${FILESDIR}/${P}-prototypes.patch"
+	"${FILESDIR}/${P}-c99.patch"
 )
 
 DOCS=( README.md NEWS.md docs/hacking.md docs/man.md )
diff --git a/app-editors/joe/metadata.xml b/app-editors/joe/metadata.xml
index f53c3664d7de..cd22587519d6 100644
--- a/app-editors/joe/metadata.xml
+++ b/app-editors/joe/metadata.xml
@@ -15,7 +15,7 @@
   user should expect: full use of termcap/terminfo, excellent screen update
   optimizations, simple installation, and all of the UNIX-integration features
   of VI.
-</longdescription> 
+</longdescription>
 <use>
   <flag name="xterm">Enable full xterm clipboard support</flag>
 </use>