gentoo resync : 25.11.2020

3 files changed, 63 insertions, 4 deletions

diff --git a/sys-block/cec/Manifest b/sys-block/cec/Manifest
index 048427a4e943..1a3652f094b1 100644
--- a/sys-block/cec/Manifest
+++ b/sys-block/cec/Manifest
@@ -1,3 +1,4 @@
+AUX cec-14-fno-common.patch 915 BLAKE2B 7c27607c44abb9e321c1891d2683ce7a6a8601d01b1d0d4021bb319bf83951193863a071ec46d7d3cac3ff795a17642b4fba455f6eb13c4a91447c736cefc0da SHA512 ea02e6dc3c0d546285a948966ba149e08684df62efea371230bd2e5dd1fbd2eb6969a490fcb6f238bdf934cd9a19da9c343d71d3ae1a392c071f1d140eb02934
 DIST cec-14.tgz 22654 BLAKE2B 01bf2c301983a5183bcffb3975ffb148b7efd2b7ea945c71654f090b1063ec1502bb4b64885924ef1fcd5798378537182a3b54e64400187fb515a6fc864a539c SHA512 b024c26badc7992c1d2804378119e214923bd7cfbac80de374efd22084595f74752db0edf3b83ac0e258db1847a3b49734958effc3961c9e086e61d5b806782c
-EBUILD cec-14.ebuild 475 BLAKE2B 97934cdaae8e05e21a8b52a39042f34f1910127dded28554fdad84cb8e1ac13fbb97276d320581558323973e05c4965b37696fe57a145b00408d5f95989fa559 SHA512 edde09ad57506b3e4b12a31ca4cff6ce3ec515d567fbc634a0bf0cfcc8146e7f8b85467a5315a8bbcc23a3d1758a94cf32286baa568b0903411d810d2ab9c513
+EBUILD cec-14.ebuild 513 BLAKE2B bd45dc6a07308d44228a41a314c8c7b838d713583ebdb024ef280686e5aa24a17f46a0d73d83423cc71594c51d0b55dbde942d1d20c68ea5718a8da717684043 SHA512 93868f0f138f398438a0fee92897e06d7469bd32fb8e8de7d789d62e3f6313f4b376200c7e1b477ae84bfbaf6de7ab85286b2cc0b66f101f198b7a23d69e6429
 MISC metadata.xml 245 BLAKE2B 1b7a6d4a39b54b959230e9f6941be9369471f402c248a481c4cb0e5cd707b3c4b1d4e8b8a80c01ea9a4dafdf5a0406da9e67a40e1e622427dd3a28e106aea76f SHA512 ed2e6dddb717dffd70eb6a115254a3743c1fc04be9166844e94272797800f8d4dfb39f43c693f31385837b948f365f2fa9ab9010c06bd3cc3ac1d06dc4e3078d
diff --git a/sys-block/cec/cec-14.ebuild b/sys-block/cec/cec-14.ebuild
index 1b70ba738da6..367dcfda642f 100644
--- a/sys-block/cec/cec-14.ebuild
+++ b/sys-block/cec/cec-14.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 inherit toolchain-funcs
 
@@ -12,7 +12,8 @@ SRC_URI="mirror://sourceforge/aoetools/${P}.tgz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
+
+PATCHES=( "${FILESDIR}"/${P}-fno-common.patch )
 
 src_compile() {
 	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
diff --git a/sys-block/cec/files/cec-14-fno-common.patch b/sys-block/cec/files/cec-14-fno-common.patch
new file mode 100644
index 000000000000..e7e3ce022675
--- /dev/null
+++ b/sys-block/cec/files/cec-14-fno-common.patch
@@ -0,0 +1,57 @@
+--- a/cec.c
++++ b/cec.c
+@@ -20,6 +20,9 @@
+ typedef struct Shelf Shelf;
+ typedef struct Pkt Pkt;
+ 
++int debug;
++char *progname;
++
+ struct Pkt {
+ 	uchar		dst[6];
+ 	uchar		src[6];
+@@ -76,7 +79,7 @@ extern int errno;
+ Shelf	tab[Ntab];
+ int	ntab;
+ uchar	contag;
+-extern 	int fd;		/* set in netopen */
++int fd;		/* set in netopen */
+ int	shelf;
+ Shelf	*connp;
+ char 	esc = '';
+--- a/cec.h
++++ b/cec.h
+@@ -6,8 +6,8 @@ typedef unsigned char uchar;
+ typedef unsigned int uint;
+ #endif
+ 
+-int debug;
+-char *progname;
++extern int debug;
++extern char *progname;
+ extern char hbacecfile[];
+ 
+ int netopen(char *name);
+--- a/hba.c
++++ b/hba.c
+@@ -9,7 +9,7 @@
+ 
+ #include "cec.h"
+ 
+-int fd;
++extern int fd;
+ static char hba_bytes[1<<14];
+ static int hba_len;
+ 
+--- a/linux.c
++++ b/linux.c
+@@ -25,7 +25,8 @@
+ 
+ #include "cec.h"
+ 
+-int fd;
++extern int fd;
++extern int debug;
+ char net_bytes[1<<14];
+ int net_len;
+ char srcaddr[6];