gentoo resync : 14.12.2020

3 files changed, 52 insertions, 15 deletions

diff --git a/app-editors/hexcurse/Manifest b/app-editors/hexcurse/Manifest
index c45b7d9f3bf1..0c56eaeb8568 100644
--- a/app-editors/hexcurse/Manifest
+++ b/app-editors/hexcurse/Manifest
@@ -1,9 +1,10 @@
 AUX 1.55-gcc.patch 261 BLAKE2B 323f9408222a994b0571b1a154fc0117f9b1015f2592b35d98156fa783d26f4e1377d23b1820e280e5b8ce885e826fa00f9ce51b9400c0ebac4186aa2b0af0ce SHA512 ff9612dcc75e2e0aeb67c5170c97e2705a1447ffeade77457924f5b7c354b4f7a69f53c237d1674c39fab5c057c27b5b7fa3e0779ce2f19e0a128f0b0228023b
 AUX 1.55-tinfo.patch 339 BLAKE2B 9860fe0cead822ee4773b6500e53cc10366527fd2e9068ea29561e1b3c695719f210f860f840b65888ecfaccb6b4e4d5a9af5d0328652d948a53104609df547d SHA512 267841535437a1e71ae94fbfbfa7e2250cba919ee8a1c7a19f861d667f9b4e2032ed1cc6ed5b6b6ad7093aa62425d16f99a56d7a3e0737a4dd9f87bf7564f5e1
 AUX hexcurse-1.60.0-Werror.patch 291 BLAKE2B ce310d08d4880d53c2eb3c17794294cc124fffcbd991d00471a00fd796ed1bd4f1a1317e8a8690f5cd94abd0ede9b317f38cf2ee20ca1f5bffe60acdf89b7571 SHA512 01d6a272b2fd0bd033e4157f2fd2c13e1a8ec6148534217f0d38fbac04ac402b0be919abddffba519afb4bec16dba951a9bdd998cf21aa4fcf8b81b0d6d2b6ff
+AUX hexcurse-1.60.0-gcc10.patch 1095 BLAKE2B 399cbef6c1136626f83851a23e82dd180cc4f92d121e5c6563da0048a934947f2a96a3a3dbefbe0230ab8dac3aefea1dfa19a946b9f21a1feab5d033e2f1d0c4 SHA512 8b1e4cfaaa53f00e140bdce4fb3ee9c728c8f362689f2f85aab0ba537532475e1016cfc7c2bf36a3bd53a44b532cf3e257203d73a7aaab38d6a5ad79a5c9f974
 AUX hexcurse-1.60.0-tinfo.patch 386 BLAKE2B e4f376cc9cf60c9163553aa9082e5c84a228f0704c575941414cde6527cb6c9b867d55cba45dbb35bdd95d79ee8d13acee3a139256d794f9f648af87581ed458 SHA512 ce0c25842a874d631d75826f6b967fe0d0f53a435e6222eed1310caa884b570c1cf131c14e0be84fc7de728e37cdaee5b950ada527fd03ddba0dacf578e4fe42
 DIST hexcurse-1.55.tar.gz 113512 BLAKE2B 68dbb21e0c8830256f51a477a968449d86da174ca3cc7d29232c6d2a2f909339a0555ff459ed373e62e35b3d1d8abfbbd32a9462006b20bfa1f4f641f4eba825 SHA512 39f9eae0bb891bdfb702fb871b75c53d15acf6e74b3272b616f00303f444bfddced6fbe3041eb3769fa90fbc226dd584f5d84f7427b659e63f3b74511938a4a7
 DIST hexcurse-1.60.0.tar.gz 171904 BLAKE2B f591469a859e71e0ada99975c3632f29b293f5bcf65dece9fb047908c860e11ee5b5d5f78e636d3163497acf396de64e568e560427cf0ee7f2c752e0fc5a2b72 SHA512 2301f10e9190922fc61cbbe3a834826ebf87bc5ece9191d368181e2336af240e68cbe46e3a60dee3e0e42281b2f05ae4a7060ee1083b37f4906eacc66e58a094
 EBUILD hexcurse-1.55.ebuild 667 BLAKE2B 3e6fbad3a1f63fee93d6b0e95f3fca1b169f4f47ec4a24ce8ccefbad01a1f88a159ff3b8b412a77fe19761fbca3a92649382e6dba3adacf94b200f4cc22a8814 SHA512 46c9e32f704a557cc6d8445b711aa22da954201a894ee8d71f7d6aace738a41c1939df969595043ca62a75375c8fc2fcb3172c7b284f42a6906aa5f07ed780dc
-EBUILD hexcurse-1.60.0.ebuild 706 BLAKE2B dc3b15be8fd7f967c25624ff29ea7ddd29e6dd787d427d6ac3ea0cebb73e1d89db13c05d91170f12af24dcd755de295f02942b852f340f8c40788b3f1bc1feb8 SHA512 6c69ea5924d248d9c4bcaf6a801377ee070bc759702568cf98ffcb4b03dd907f6b9a633cf7cd380d5a69f2fb823068d3efcc002b5e1c624feddb678b39dc4e22
+EBUILD hexcurse-1.60.0.ebuild 655 BLAKE2B d5f139a4a1c8646ba71be250bc46093ebd65805d1408b28d96f8cc04a3087eb04639862f11b651843ba5e3aa57a943d478c94a4833d2c6e10c007cf9e28e12f6 SHA512 b0b26bb38e2fc197226e9926e9028066119cfe13579bf29bab123c6a687cacacccfe343f6fd0ca45bb71c95e0ca5eeb44ee712db663c8bda08664114456dd845
 MISC metadata.xml 341 BLAKE2B f4e87e5d95358a8f4078d0e6940f7d6b3f7f68f6ba7b5ecd4b2d28b3a55528e0ab70787c5768b9b6fe27e293a3225c87a147d163eab3d3798d4f6e14d2c54f67 SHA512 9dae98987744bc9a84ac94d729dbd6e1147abc81bde05cfc784ce039b34c75f6c22d1da88b25cee28594ffb5286a65cf38331c30b45af2bba5dec61580260ec6
diff --git a/app-editors/hexcurse/files/hexcurse-1.60.0-gcc10.patch b/app-editors/hexcurse/files/hexcurse-1.60.0-gcc10.patch
new file mode 100644
index 000000000000..dfd8f4c2c557
--- /dev/null
+++ b/app-editors/hexcurse/files/hexcurse-1.60.0-gcc10.patch
@@ -0,0 +1,41 @@
+From 9cf7c9dcd012656df949d06f2986b57db3a72bdc Mon Sep 17 00:00:00 2001
+From: "Azamat H. Hackimov" <azamat.hackimov@gmail.com>
+Date: Tue, 9 Jun 2020 01:25:04 +0300
+Subject: [PATCH] Fix compilation with GCC 10
+
+Fixed compilation with -fno-common, which enabled in GCC 10 by default.
+See https://bugs.gentoo.org/706762.
+---
+ include/hex.h  | 2 +-
+ src/hexcurse.c | 2 ++
+ 2 files changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/include/hex.h b/include/hex.h
+index 57845c0..845bac0 100644
+--- a/include/hex.h
++++ b/include/hex.h
+@@ -126,7 +126,7 @@ extern bool color_enabled;
+ #define max(a,b) ((a) >(b) ? (a) : (b))
+ #endif
+ 
+-FILE *fpIN;		        		/* global file ptr           */
++extern FILE *fpIN;	        		/* global file ptr           */
+ 
+ /* function prototypes */
+ 
+diff --git a/src/hexcurse.c b/src/hexcurse.c
+index e723ddc..3c167b6 100644
+--- a/src/hexcurse.c
++++ b/src/hexcurse.c
+@@ -27,6 +27,8 @@
+ /*#define DEBUG_LLIST*/
+ /*#define DEBUG_GOTO*/
+ 
++FILE *fpIN;
++
+ int     BASE, MAXY, resize = 0;
+ int     MIN_ADDR_LENGTH;
+ hexList *head;						/* linked list struct */
+-- 
+2.26.2
+
diff --git a/app-editors/hexcurse/hexcurse-1.60.0.ebuild b/app-editors/hexcurse/hexcurse-1.60.0.ebuild
index 95d897125147..3512038ef7e8 100644
--- a/app-editors/hexcurse/hexcurse-1.60.0.ebuild
+++ b/app-editors/hexcurse/hexcurse-1.60.0.ebuild
@@ -1,7 +1,8 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
+
 inherit autotools
 
 DESCRIPTION="ncurses based hex editor"
@@ -12,23 +13,17 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
 
-RDEPEND="
-	>=sys-libs/ncurses-5.2:0=
-"
-DEPEND="
-	${RDEPEND}
-"
+RDEPEND=">=sys-libs/ncurses-5.2:0="
+DEPEND="${RDEPEND}"
+
 PATCHES=(
-	"${FILESDIR}"/${PN}-1.60.0-Werror.patch
-	"${FILESDIR}"/${PN}-1.60.0-tinfo.patch
+	"${FILESDIR}"/${P}-Werror.patch
+	"${FILESDIR}"/${P}-tinfo.patch
+	"${FILESDIR}"/${P}-gcc10.patch
 )
 
 src_prepare() {
 	default
+	rm README.Irix || die
 	eautoreconf
 }
-
-src_install() {
-	emake install DESTDIR="${D}"
-	dodoc AUTHORS ChangeLog NEWS README
-}