gentoo resync : 16.04.2022

4 files changed, 41 insertions, 2 deletions

diff --git a/games-roguelike/Manifest.gz b/games-roguelike/Manifest.gz
index 1ebb8076833c..17b1d10ca1f0 100644
--- a/games-roguelike/Manifest.gz
+++ b/games-roguelike/Manifest.gz
diff --git a/games-roguelike/nethack/Manifest b/games-roguelike/nethack/Manifest
index 0fb57d1dc7e5..50f72f4fdd19 100644
--- a/games-roguelike/nethack/Manifest
+++ b/games-roguelike/nethack/Manifest
@@ -2,6 +2,7 @@ AUX nethack-3.6.0-nethackrc 2458 BLAKE2B a051f476ffed8fb1598c65f243df3aa412a4bb3
 AUX nethack-3.6.3-hint-tty 266 BLAKE2B b9c3babf39ec3e7a8c5bfaa0efc9da9f91d7a6d31702100de04d93878563d07e8dded475a5f044e251b47404b22a00744f4e28d83e71743013cfe823dd699fe1 SHA512 7aa224680622a1c86ca2fe14aaf48dd202a0104aae108767494a822b29ae110c2b8489234622b1da8e9eafca30b2ccbbec7a8b2dec5d53f44ef21b303daa8c89
 AUX nethack-3.6.3-hint-x11 420 BLAKE2B 42d2681cd36a0bdb81a1d4c61c7be69c4fe85b43daf9e3ad28ed0a867a8e4dcb684fafe4125d4e9d4f7176274bc2def4e83bc086a523ab2d99ed89699b494dcb SHA512 44f48a5f7b5302b9e1deaf5449b3dc67ee59b1eaca14cace5f699cffa17b92f1dbf0d1793ae31dfa0d1ebc77c65ab04d67b3988fd1f934d3ed5620ae2aaeaf21
 AUX nethack-3.6.3-recover.patch 3795 BLAKE2B b00102072a9f23b7b736d1d18bc6cdc0a77f156ca963bd14bd86dadd92f5f77baee8f518f26f9dfa36fee64df39afab88ebe026da7fff3a8a9602a271e94851c SHA512 7ec01f9485efe679c734b1b8cf0292212bac38a9fdf0622b34262fe88f197c46f09d62679f362b37b36b4cea7b5c89373f32b5277949ebe72c7cf34b7941c007
+AUX nethack-3.6.6-wunused-result.patch 1279 BLAKE2B dc8e6c157746b8ecc4233be370d0674d0d45606cdd4b5e95d6be3d8a882d053c77fe85560f73a3e8e93137552cc1bba0a0849c8a12297b5370ab2e1bbecd811f SHA512 38219bf7c9dac9af90aa18f83aab80cbe4f033a2c0ff33c8434d9dd68afdd34463a183a04794938d3a507e1682b645f696e7fa5c8e99eed0b87be2f72696f5fd
 DIST nethack-3.6.6.tar.gz 5577633 BLAKE2B 7b4b12f3a711785c86208dab83f9de725c33470e056ee57e6d96c3a68f06c1d0d98343ed82eca669986361d0663ddbe56d9a74d9cb45b42bf005c2f323b3cd79 SHA512 579fde93a37a1b5df637d5bac2601194beeb455c175fbe3ef89342122c8567bb8221ce60d8a6168e6b45c67ade7d7b09c86bf202c8cbe2d6294d276be3e53055
-EBUILD nethack-3.6.6.ebuild 4409 BLAKE2B cbb37754eb784ab2a5cdd1b6497df3d969a73e983f00d7b18c4769a294a9a454877f7b88cbadf5aa618521a824d316e6ee18c16d0a5a0efbeed5c4bfc2319a69 SHA512 6a63a00f0ceaf8ad3e87d889a7ccdbed6a7f3d3f09765195ead229f25f15443f6f1034cc440598ea47cfad52ec983df1a14358a8b9c6d32e83d75a824dafc215
+EBUILD nethack-3.6.6.ebuild 4477 BLAKE2B c51366442b4d77137195dfd29cba31e7065f2941d7f7247b9a5befd7598df9476936c99837b23927c711af1b151a1e096c9c88736ea9198ca5d499b9f3a894be SHA512 d681b8e9d3e1d787ed6e0eb437db6be25adae2edebeeb1fc81113db708dd0889f69076a2d9a6a73a35687bf0354db9a7d82914a342fb372caf0f5a3090ec7dc4
 MISC metadata.xml 331 BLAKE2B c3337002e52be30db0c37c49e1eb7b68db924b124bd354cfee11c8d103a6f3af7743ea0e02dbba63447cf5c085b9685349dc4913600f3a3fbd5201766c8d44b5 SHA512 2dfca1aa8269956f622061051c8254f2de2bb8fe08bd309c40354825149e0c5b9208b44a004ee8d546df07d1256ecc0f5d966aa40baa28a9da606633030b9ea4
diff --git a/games-roguelike/nethack/files/nethack-3.6.6-wunused-result.patch b/games-roguelike/nethack/files/nethack-3.6.6-wunused-result.patch
new file mode 100644
index 000000000000..e26d1190fda3
--- /dev/null
+++ b/games-roguelike/nethack/files/nethack-3.6.6-wunused-result.patch
@@ -0,0 +1,37 @@
+From 1cb5dc04605daa45f1c6a647c17442ed7ff2fe4e Mon Sep 17 00:00:00 2001
+From: nhmall <nhmall@nethack.org>
+Date: Tue, 4 Jan 2022 08:24:08 -0500
+Subject: [PATCH] work around ubuntu 20.10 build issue
+
+NetHack was trying to suppress warn_unused_result
+in include/tradstdc.h, by defining warn_unused_result
+to an empty string. That began causing a build error
+in a system-supplied header file cdefs.h
+when using 20.10 ubuntu impish.
+
+Try skipping that in tradstdc.h for any linux, unless
+the NetHack build defines GCC_URWARN to force it into
+play.
+---
+ include/tradstdc.h | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/include/tradstdc.h b/include/tradstdc.h
+index 09decb4b15..8c33d55e0a 100644
+--- a/include/tradstdc.h
++++ b/include/tradstdc.h
+@@ -405,12 +405,14 @@ typedef genericptr genericptr_t; /* (void *) or (char *) */
+ #if __GNUC__ >= 3
+ #define UNUSED __attribute__((unused))
+ #define NORETURN __attribute__((noreturn))
++#if !defined(__linux__) || defined(GCC_URWARN)
+ /* disable gcc's __attribute__((__warn_unused_result__)) since explicitly
+    discarding the result by casting to (void) is not accepted as a 'use' */
+ #define __warn_unused_result__ /*empty*/
+ #define warn_unused_result /*empty*/
+ #endif
+ #endif
++#endif
+ 
+ #ifndef PRINTF_F
+ #define PRINTF_F(f, v)
diff --git a/games-roguelike/nethack/nethack-3.6.6.ebuild b/games-roguelike/nethack/nethack-3.6.6.ebuild
index 7d315c7ecad2..1d26ceda38ae 100644
--- a/games-roguelike/nethack/nethack-3.6.6.ebuild
+++ b/games-roguelike/nethack/nethack-3.6.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -40,6 +40,7 @@ S="${WORKDIR}/NetHack-NetHack-${PV}_Released"
 
 src_prepare() {
 	eapply "${FILESDIR}/${PN}-3.6.3-recover.patch"
+	eapply "${FILESDIR}/${PN}-3.6.6-wunused-result.patch" # bug 830556
 	eapply_user
 
 	cp "${FILESDIR}/${PN}-3.6.3-hint-$(usex X x11 tty)" hint || die "Failed to copy hint file"