4 files changed, 86 insertions, 8 deletions
diff --git a/x11-misc/Manifest.gz b/x11-misc/Manifest.gz
index c6d9551e7cd6..ad62af26de70 100644
--- a/x11-misc/Manifest.gz
+++ b/x11-misc/Manifest.gz
diff --git a/x11-misc/xsetleds/Manifest b/x11-misc/xsetleds/Manifest
index 5f603b91283f..54dec80adf10 100644
--- a/x11-misc/xsetleds/Manifest
+++ b/x11-misc/xsetleds/Manifest
@@ -1,5 +1,6 @@
 AUX xsetleds-0.1.3-assignment.patch 208 BLAKE2B a1f5d7814e17fac4ca1a3f0e02e17be063d7dd61316bfa7c5899a3d1812d3bae3aaed25b5bd6512c22fd0d36e0ea0f19cca837a7e0ef655fef09ba164d05f57b SHA512 8434fecb410cdfa35de8e1b93b4c3021df0629fa8d44a05b484e0d9ced597811fdbfd740acc70f9900af7e38b6f866eb3c9fc0173664dfa260d5a3ccef5aa2bd
+AUX xsetleds-0.1.3-configure-implicit-function-decl.patch 2153 BLAKE2B 4a59852792750c589422bca75a2061b7962fd0500a0af13c07a65958bddbaddc7cb1f1b2081a933881b159556ed15341b5bc8fdb7fc6cba8f75ad18b5fc0eb0d SHA512 4caef78a148a9a567a2a3a487830521e8ce5b41a8e79d58012531b345d90fb601465a7c2eaa8229f0ede4fe56d98bf9b20e24eb258ef983c57cd96aac8ba74e5
 AUX xsetleds-0.1.3-isalpha.patch 236 BLAKE2B 0a4599f5f4f0a56521967c30ceee7d79e65d7321b2f99065e42b77e94baf9cfd53611d192326a3e574c57f7de1df3a459ddd0905bb37c8013de21c65068d6ad6 SHA512 5191fc8ed447d921dfd0a47514de03e03dc744f17b22a1ac3973b1c91104c015c7881cc156c4e2e073f3ba18e17187b34b5db80359489ffc372a07c1e6bcbb10
 DIST xsetleds-0.1.3.tar.gz 221399 BLAKE2B 11311f972abc0f0c83ec47dbfe2743d4220daa4fe445c4c0f4a5d7c827d690549611bd373577882d1ac75b853e468ce36d3a6a447873a523a530676528bbd011 SHA512 7fe6baa77b4b2c8f57dfc331776bb457520facdb2f54a5c101764c590d7c5556cd00477e56d36e64cb7264a8de28698422b99ec4852798069189fbe6c1c19f72
-EBUILD xsetleds-0.1.3-r2.ebuild 737 BLAKE2B 5836d66c4667bfcbabb226d7518cf6d77f27efee7a3a209a59300435f398266bc995e26242a512a7aa923286b76c32bebda28068c3c49c4757e7499866a5e53e SHA512 e90c1794944aa246d12b750d7ea56e820560b550915c8920f13b5bd9b83439fd777e10890d00098a208f54701b7c102259759be4d60abf5a5f55e9bde0f9c1db
+EBUILD xsetleds-0.1.3-r3.ebuild 761 BLAKE2B fa54de141ea7d47f2a1285ccabe76a1709a96fa6a2ce49b700f65993ead292be14fc4b3306cf551977b8934e347d83f8a183883f085d37c34ac1510b47044aad SHA512 dc3a7f22fcb5f09c17e18ff9a1d51a2d3173e44a62a68afeedcd0ad0bccb8be1005596b7fdb55327b99bac414fe1cef4e114a43d3c5d0c32e5e398e1aa745b50
 MISC metadata.xml 277 BLAKE2B ebaa8353413cfc5519fce99f8627c71cf765fc6d42b42651e232274de315487c156d45dcb23a401dffb8f112600b0dadd56f93d2283ff86b4293dc5490ad4059 SHA512 c8ef9069153b124118a6be64375c6954ccc6f518a13805e4ff1c33c9cec136170132a580c4a9781930b709c93678c94d6448291625de34d18fea41bfd17f685d
diff --git a/x11-misc/xsetleds/files/xsetleds-0.1.3-configure-implicit-function-decl.patch b/x11-misc/xsetleds/files/xsetleds-0.1.3-configure-implicit-function-decl.patch
new file mode 100644
index 000000000000..3235053c8b7e
--- /dev/null
+++ b/x11-misc/xsetleds/files/xsetleds-0.1.3-configure-implicit-function-decl.patch
@@ -0,0 +1,75 @@
+https://bugs.gentoo.org/870571
+
+Not sent upstream as it's a generated file and configure.in
+is written for autoconf 2.13.
+--- a/configure
++++ b/configure
+@@ -1057,7 +1057,7 @@ cat > conftest.$ac_ext << EOF
+ #line 1058 "configure"
+ #include "confdefs.h"
+ 
+-main(){return(0);}
++int main(){return(0);}
+ EOF
+ if { (eval echo configure:1063: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   ac_cv_prog_cc_works=yes
+@@ -1304,6 +1304,7 @@ else
+ #line 1305 "configure"
+ #include "confdefs.h"
+ #include <ctype.h>
++#include <stdlib.h>
+ #define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
+ #define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
+ #define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
+@@ -2477,7 +2478,7 @@ for ac_kw in inline __inline__ __inline; do
+ #include "confdefs.h"
+ 
+ int main() {
+-} $ac_kw foo() {
++} int $ac_kw foo() {
+ ; return 0; }
+ EOF
+ if { (eval echo configure:2484: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+@@ -2855,13 +2856,14 @@ else
+   cat > conftest.$ac_ext <<EOF
+ #line 2857 "configure"
+ #include "confdefs.h"
++#include <unistd.h>
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func(); below.  */
+ #include <assert.h>
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+     builtin and then its argument prototype would still apply.  */
+-char $ac_func();
++int $ac_func();
+ 
+ int main() {
+ 
+@@ -2934,14 +2936,13 @@ else
+    * does it exist and is it safe to write into the mmap'd area
+    * how to use it (BSD variants)  */
+ #include <sys/types.h>
++#include <sys/stat.h>
+ #include <fcntl.h>
+ #include <sys/mman.h>
++#include <stdlib.h>
++#include <unistd.h>
+ 
+-/* This mess was copied from the GNU getpagesize.h.  */
+ #ifndef HAVE_GETPAGESIZE
+-# ifdef HAVE_UNISTD_H
+-#  include <unistd.h>
+-# endif
+ 
+ /* Assume that all systems that can run configure have sys/param.h.  */
+ # ifndef HAVE_SYS_PARAM_H
+@@ -2981,7 +2982,7 @@ else
+ #ifdef __cplusplus
+ extern "C" { void *malloc(unsigned); }
+ #else
+-char *malloc();
++void *malloc();
+ #endif
+ 
+ int
diff --git a/x11-misc/xsetleds/xsetleds-0.1.3-r2.ebuild b/x11-misc/xsetleds/xsetleds-0.1.3-r3.ebuild
index 1de8663792e8..5a8da903b1c3 100644
--- a/x11-misc/xsetleds/xsetleds-0.1.3-r2.ebuild
+++ b/x11-misc/xsetleds/xsetleds-0.1.3-r3.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
+
 inherit toolchain-funcs
 
-DESCRIPTION="small tool to report and change the keyboard LED states of an X display"
+DESCRIPTION="Small tool to report and change the keyboard LED states of an X display"
 HOMEPAGE="https://github.com/bmeurer/xsetleds"
 SRC_URI="
 	ftp://ftp.unix-ag.org/user/bmeurer/xsetleds/src/${P}.tar.gz
@@ -23,14 +24,15 @@ DEPEND="
 	${RDEPEND}
 	x11-base/xorg-proto
 "
+
 PATCHES=(
 	"${FILESDIR}"/${P}-assignment.patch
 	"${FILESDIR}"/${P}-isalpha.patch
+	"${FILESDIR}"/${P}-configure-implicit-function-decl.patch
 )
 
-src_prepare() {
-	default
+src_configure() {
 	tc-export CC
-}
 
-DOCS=( AUTHORS ChangeLog README TODO )
+	default
+}