gentoo Easter resync : 12.04.2020

5 files changed, 63 insertions, 8 deletions

diff --git a/media-gfx/fbida/Manifest b/media-gfx/fbida/Manifest
index ddb5d4bf6304..deeb2265be5c 100644
--- a/media-gfx/fbida/Manifest
+++ b/media-gfx/fbida/Manifest
@@ -2,13 +2,14 @@ AUX fbida-2.10-fprintf-format.patch 172 BLAKE2B 1abaa348e1bdd459b9f6458d361bed01
 AUX fbida-2.10-giflib-4.2.patch 542 BLAKE2B e41f1cb27860b0fdf99d4e9a3961021e4be64f6ac9e47099e6dd7b784b96599490137f6340e54052216af1692e2d9177d831612248ed7be849e6141ab5eb86b0 SHA512 7610721d965c3640c4524311626ba099501cac1aef6cea62d32158e8a7720cc23bdb0c83422795676de021f88a592c3d2f7d4d26d810dc06d959f7c85e91019e
 AUX fbida-2.13-Autoconf.patch 239 BLAKE2B 749fa77fe9f2a5b8b61051dcebfacc6efcf97cd2f9bd7d9d4de737bca89689203dff7a1c3baff620289ddc211419a1b31a3924b7542049db345af5503479e5f0 SHA512 b87ed3f79fe9efea02fc97d6cde0e6d67c2e6baf93ab3a19564090f2806cbfa1b67610a16a4151ba8df31d570f79f8f964dd608ce4fda95e7f7cbcc562902847
 AUX fbida-2.14-Autoconf.patch 244 BLAKE2B 52b9fff1bcb3eaae0753842e953566ce7eebb4ff445dc288b2ca84342247ec0744dac9327c53dc863cf564543e791305d5a27ffda059837320cac461f4e222fb SHA512 cb31757e3ca3eabbff4c4ecb27581b39b8fef386412b4f26558a070b6b08891b09a31a06861d965009f5158e03ab227b86873f4b64316cf63bc7b51ce6074221
+AUX fbida-2.14-fno-common.patch 1148 BLAKE2B 108c21e732afaebe6183835732341b814b1def9a77a4faa55742858d2eeb75a8d2ba4c4151505dbaa683b31b49e1ce6d88aef6ab9b3e6b830a59533903e02597 SHA512 4fe7560be0a5cb4f00ebe8a1574f131b6fd83902c6dbe54995f384a250b25b03e5f0022a5c38c306a709de6240f447c53c9af3ba3aca863b08e725567746185e
 AUX ida-desktop.patch 384 BLAKE2B 627319b163e62af11acc2c0957254cc671145b9df22f27af8988e5f0bcdf383f7cf2ad4fa7b7c97acfbba3181081ee1c025c4b3c82e99bfd7fe4efe69edd59c0 SHA512 0e14a3b848774d1538e309a9c8a8f0445a870db21723d11d0c39d86760ccb9c6f9a5f08ec75016875b2867c2d2075b59aad0fa810621f2c2afcccd14fef26737
 DIST fbida-2.12.tar.gz 294842 BLAKE2B f9de5957f9015e022868d2b14d0269951fccbe8f10b591b3b58758fb67232487aaaf2de23c8ee9b42a7ad9e645e3fed2ac1f05588c039ce9270f418b60b1a3da SHA512 383eb766a98137f7252cd981d0e8c9a7382223705a43332f50990ea26763d4882ed1585e72fe9199528502d7f8f9de2e90718dbce71ee08d2181c74aa3e7e515
 DIST fbida-2.13.tar.gz 296020 BLAKE2B 119be4103b53ab7e7d1791a22172e1311ced0db5e9c928faf22ab08dbe1670c91d30f7dafbf8873a9621c16a7902354f5e21e2a86d45c9572b30fe8e205bfc4d SHA512 a316776f381fac6ec6a5d085ece7a42e8e34b2c0f5ae1cc58ad5b5736dc83d8f2e7776779716abfc0ae9c51baacdf911df6a0be610d2b7b2e3ce6d0c81e1fdc3
 DIST fbida-2.14.tar.gz 296826 BLAKE2B 0015b426c5deaf72737a52bddb065e7d0cb804ea97157dded522061d8fabb5c632d5e66b1ef1b4e75b355537ef4f4e603f3a877e2ef92d1581eaa4791ab5be99 SHA512 8f3596ad8a22497880ac698d3b324e038ac5ccae7481fe4a902fc6e8bf43ba1bb3a96af8c7a3347bea86c1988f35674e2647901ac256bd4e8261d467a6a343ec
 DIST ida.png.bz2 11928 BLAKE2B 8a1c89fc5adfb16c69f9591a299beb62c84d66960b586fbc819e53f904c90beef821ecf3539236563644c28e3ad3c7dbf861b140c820be649305a658b3613433 SHA512 cf3c1bc8d25fe75f10c0a0414b5c082348df2fa94864ec4537c36e0b357cf35b68e2eca205bbf48578a41c27317701aee621c6dd176e0bf3857c52f895d6bfd3
-EBUILD fbida-2.12.ebuild 2417 BLAKE2B 3aa05ed88d79037d361985b70919ca0d711d248484d55659cc307aece06729ff6208d73807ae2ed2ceab55e4195de8207d032db522152b27a6205baab545894c SHA512 edd97cf604f7c8ec8be49ab7fbe987f9007809e84cd279001ac94076864d6d31393aee25bf5932c093ec4058b4afe5f59d57760abb9e783f8052c6536459923b
-EBUILD fbida-2.13-r1.ebuild 2402 BLAKE2B 22a7d44291b990a24e6fe92bf3cf7e210d9854af92c7bae76ac343dd975f41a5e1e790623abce9a29190120123a2d09bc963564f69cef084762e26a513a6c594 SHA512 de8c0bd27773aa0e33f155ed80e16c1cd6387a60cc5260472460e996d636efa58cabf38831f41c45a64c2473b6cfa111b9f47974457a5d0f5da9e57813d03c7f
-EBUILD fbida-2.14.ebuild 2355 BLAKE2B fdae71cabb570115f0898a00f60c6c7edd6913861c7108990dc62d8f3931bbfe621b7776362354dd456e6d5cc58fccd6a2a294a4430f9bf76cd1ebe3cf8c71bf SHA512 1acf426bf24d070b8207a8196871566dab72ebc49464b6a26a6afdb31d1f81b867969a11d53ef2e0bc129565694d0f8662a82233b4e059f731e866e44c0227b3
+EBUILD fbida-2.12.ebuild 2413 BLAKE2B 2fde21f65df975032f3638e2f22ff4aef0ccd81b408e571fe88cc180ae9cc7d11c00f296158abac0c0b891dd46d3bc9c9bbd0a4e4e332e9c53cb074c74e256da SHA512 e2b31fb9cee9204d38060a2269996c8142a981e0179e67ab86bfebb7967bcfae59a45794106e9e741a5a5269b307290885bdfa1b009919550a034d7302390200
+EBUILD fbida-2.13-r1.ebuild 2395 BLAKE2B b3f42d22b78ce8a0fe9158fad16daef4cf0fea76585c0f83035604b48664dd9f8a98adcbe2cb6e47fdd4c2fde8f33ec03087796c656dcc92682954864a54333b SHA512 e1809154631d9a298007bd02fca72914ffe9244fd904bbd6fa322831e944f02887cca4ac8e7dc50411efd0cd9356cb4ae663677cfd2a50eda5357132c082c30d
+EBUILD fbida-2.14.ebuild 2391 BLAKE2B d43531e71d419ade0e6c06bb2fe92bb72523e466af372a94d6291eeb9dbf3ec36ffbb61ea293e7c590c844f846685c96ee7fd7de78009bfb877dc879891f5b5c SHA512 29ea58a36af771231ea4d7cef4004681662440495ae98893bb143bd0e9ec26fb653688eddaa65f667241a868103e2216394b3685f3543f3848c9594d4cf73209
 EBUILD fbida-9999.ebuild 1239 BLAKE2B 78ae23ef4d8f11b72f9c426a35bbcb8d10cc4f2b566c7e13855e631c07d3cf05746c33cac3bd5c48028b1710b10f51f3af3db96fe09978906b460bc40ae2be29 SHA512 2c8aaa0ff740002b3b2b8c4f6de05f9e356d9848fbaf03b30cffa1a492580676494ef9aa2f67410d8f6982180b20c69ba9d96a847f4a8229a3a4a00458400db4
 MISC metadata.xml 439 BLAKE2B 66a897b749b63e389153a97d84be2d4cf7e9c06c0b967ae715bd8202e038005ee724110d7d62ff99ef6ba21c8a365634f9350fc43e7dce44c81717cdeee85c54 SHA512 078e39413b3d63c3324c1f98e83b1b9747f2653108e34986dfc869cc3b65452d1b85ecefdaab17c0c53bd50cdb879f68c8b55a9da7d0cdee47ca329af10eec58
diff --git a/media-gfx/fbida/fbida-2.12.ebuild b/media-gfx/fbida/fbida-2.12.ebuild
index ab56de804a32..ac6cac234948 100644
--- a/media-gfx/fbida/fbida-2.12.ebuild
+++ b/media-gfx/fbida/fbida-2.12.ebuild
@@ -12,7 +12,7 @@ SRC_URI="
 "
 LICENSE="GPL-2 IJG"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ppc ppc64 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ppc ppc64 sparc x86"
 IUSE="curl fbcon ghostscript +gif lirc +png scanner +tiff X +webp"
 REQUIRED_USE="
 	ghostscript? ( tiff )
diff --git a/media-gfx/fbida/fbida-2.13-r1.ebuild b/media-gfx/fbida/fbida-2.13-r1.ebuild
index 64860913dbe4..9c67c20e1341 100644
--- a/media-gfx/fbida/fbida-2.13-r1.ebuild
+++ b/media-gfx/fbida/fbida-2.13-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ SRC_URI="
 "
 LICENSE="GPL-2 IJG"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
 IUSE="curl fbcon ghostscript +gif lirc +png scanner +tiff X +webp"
 REQUIRED_USE="
 	ghostscript? ( tiff )
diff --git a/media-gfx/fbida/fbida-2.14.ebuild b/media-gfx/fbida/fbida-2.14.ebuild
index 7f663d4f3424..9e5d00b136d3 100644
--- a/media-gfx/fbida/fbida-2.14.ebuild
+++ b/media-gfx/fbida/fbida-2.14.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ SRC_URI="
 "
 LICENSE="GPL-2 IJG"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
 IUSE="curl fbcon ghostscript +gif lirc +png scanner +tiff X +webp"
 REQUIRED_USE="
 	ghostscript? ( tiff )
@@ -60,6 +60,7 @@ PATCHES=(
 	"${FILESDIR}"/ida-desktop.patch
 	"${FILESDIR}"/${PN}-2.10-giflib-4.2.patch
 	"${FILESDIR}"/${PN}-2.14-Autoconf.patch
+	"${FILESDIR}"/${PN}-2.14-fno-common.patch
 )
 
 src_configure() {
diff --git a/media-gfx/fbida/files/fbida-2.14-fno-common.patch b/media-gfx/fbida/files/fbida-2.14-fno-common.patch
new file mode 100644
index 000000000000..e2f29f6be7f7
--- /dev/null
+++ b/media-gfx/fbida/files/fbida-2.14-fno-common.patch
@@ -0,0 +1,53 @@
+--- a/fbi.c
++++ b/fbi.c
+@@ -86,7 +86,6 @@ static int img_mem, max_mem_mb;
+ 
+ /* graphics interface */
+ gfxstate                   *gfx;
+-int                        debug;
+ 
+ /* framebuffer */
+ char                       *fbdev = NULL;
+--- a/filter.c
++++ b/filter.c
+@@ -6,8 +6,6 @@
+ #include "readers.h"
+ #include "filter.h"
+ 
+-int debug = 0;
+-
+ /* ----------------------------------------------------------------------- */
+ 
+ static void
+--- a/idaconfig.h
++++ b/idaconfig.h
+@@ -17,7 +17,7 @@
+ 
+ /* -------------------------------------------------------------------------- */
+ 
+-char *ida_lists;
++extern char *ida_lists;
+ 
+ void ida_init_config(void);
+ void ida_read_config(void);
+--- a/readers.c
++++ b/readers.c
+@@ -7,6 +7,8 @@
+ #include "readers.h"
+ #include "byteorder.h"
+ 
++int debug=0;
++
+ /* ----------------------------------------------------------------------- */
+ 
+ void load_bits_lsb(unsigned char *dst, unsigned char *src, int width,
+--- a/viewer.c
++++ b/viewer.c
+@@ -38,7 +38,6 @@
+ 
+ #define PROCESS_LINES    16
+ 
+-int debug;
+ Cursor ptrs[POINTER_COUNT];
+ 
+ /* ----------------------------------------------------------------------- */