gentoo resync : 21.06.2020

3 files changed, 40 insertions, 3 deletions

diff --git a/net-misc/ipv6calc/Manifest b/net-misc/ipv6calc/Manifest
index 1aa7772e85c5..317288a418f2 100644
--- a/net-misc/ipv6calc/Manifest
+++ b/net-misc/ipv6calc/Manifest
@@ -1,3 +1,4 @@
+AUX ipv6calc-2.2.0-gcc-10.patch 942 BLAKE2B 2732dca8ac3e593fb51bcc09777278044b6b37fe55007963728483595bfe93eb297ca95e9f79ba01755ed377bebb85cc3475c7289a4ca765d0a2301646d7de88 SHA512 ffef37d1944ed07ba6c4645f160e041c0423f4c5affeeb75f973386e658edb3cf8d5cd34d8462c63850c4ffdb6ad54bef782261925f7dde4f8a0d42fb3f09003
 DIST ipv6calc-1.0.0.tar.gz 1342987 BLAKE2B 0c5a28b8431a82669870c475c5a73c239368f3486c9d16e66918a110937ec134d79f9b3ce79edffe65ab2789b36b7ac9ecd90e57f891759ba4542d608bcc5380 SHA512 46e33697551c4bf0a472c7f2dd51c11ae21d49c7d78fe5213bce60c1d11f9230491c328e425f36733c7262a369644bcedb8392ffe2279031eb2552092a5ac209
 DIST ipv6calc-2.1.0.tar.gz 1452903 BLAKE2B 52221e0ff08f6cffbf37900a750359b3e89fc7711ec0fc15b1dd974aa06a4e093ca53fb59e8d75e12824c60079bcefd9df5092365a375825fa9e2e583f0af6dd SHA512 b2ff8557a4af99e1d08b617b2d0a20652d23d80fb532104aefe3708c90fd42ed1309dc9697c7f405715140a2efdb460f4915b797fddf4a7966d165e74224695e
 DIST ipv6calc-2.1.1.tar.gz 1453854 BLAKE2B c95f66c2f99cb4953a0c9a8416e294a08d4907e0c5df53616fd0d26c31070ca4727fcb6ebe3d9d84b147d8f24bc69a5c789564ef8e0f5e2fedb1af31a664ed85 SHA512 99dfc87c33c48722d75c98d7a4417b68b23da3d691629ebec65a18992d82a09fd01e55f829f4db4440e0becb746907669cb0bcab4a9ecb477bdcf8ecab675dac
@@ -5,5 +6,5 @@ DIST ipv6calc-2.2.0.tar.gz 1546946 BLAKE2B 90dc600c1e83affd6138bfc73ac77160e35d2
 EBUILD ipv6calc-1.0.0.ebuild 1545 BLAKE2B 20604959eec3564329c9deb173fd37d8a624ed474d5aec35efcf76dc9cb3f191eb7e70379ea942981b5cb9813bd19563cf8bd04cd307ef5e16d30bc535907f0a SHA512 4d0b6115980f57558cc2b44db4d71cdb97289e61fe80e19b7bbab07e302177af4c63b43a82c002beb41131614592595ee23b7d9ab13eb984485a8cf1e67d0f27
 EBUILD ipv6calc-2.1.0.ebuild 1584 BLAKE2B ae3bb846df423a60cbae3b1eeecb3cad8457ae7deb438f66003b3d6b60f7ba2619fbf92b1e0e316e2467069bebfa79a01eff90e49cc0da851b5e8ad21a0e60b9 SHA512 0597cd98ff378014e90500c15a99feac6a1318d70c37211c2303f854e5b39a5994f9c308586f060da60adf18363dea7f2c29ae108bbb8a9b2a8f9f4edcb4f1e9
 EBUILD ipv6calc-2.1.1.ebuild 1587 BLAKE2B 1321402a089cd45d8e042f97f1a308dcd812ce556beb927954542bcada2f05775a940d1f746a279a6ae8b9610bc439d84c119402a9d6ef8da7105e83719d39b0 SHA512 a544c4bdb1cccfd97e6887d4ec2dc15e87cb92d8710cc3a5bbc1c5429f20dbc64f67d4488b8eb44ed353d9c521c4404b3463b9a2b8e4e76d966a3f2f4de89f25
-EBUILD ipv6calc-2.2.0.ebuild 1587 BLAKE2B 1321402a089cd45d8e042f97f1a308dcd812ce556beb927954542bcada2f05775a940d1f746a279a6ae8b9610bc439d84c119402a9d6ef8da7105e83719d39b0 SHA512 a544c4bdb1cccfd97e6887d4ec2dc15e87cb92d8710cc3a5bbc1c5429f20dbc64f67d4488b8eb44ed353d9c521c4404b3463b9a2b8e4e76d966a3f2f4de89f25
+EBUILD ipv6calc-2.2.0.ebuild 1637 BLAKE2B c3cde0645cf2d7421767aa48073e2d894cd8fa1434ec44108e0a80dbb19e0d856e9cc20b2a3d196ad687669f3f98aa0317482aa2f6b4b0c541c7bb0a3f3f10e1 SHA512 0a4e972d25b69772527e0c1450967a323ab0669a1589c6b62f3958c5df88f6a60b1f7bd45ca45b10bb5a5e22cbc92e236737d06b252fc172d49fcd6280f2133a
 MISC metadata.xml 334 BLAKE2B 78e76af76293fbb24c7ad6bd4f884a67d449c26d4fd7b4ff220a324f5d421c51d56d53800b2116a02777e59c3d6f4a353823c3df31073c9676443c9816fadfe3 SHA512 ef70d2c2da48d173396b2dbb2e13104ca57e7c9ab81150c07c3c166604168984d37934815eb34a4e26c2cadbdbdcaea8983141c6eea6a36b26dfb4e89157ae6e
diff --git a/net-misc/ipv6calc/files/ipv6calc-2.2.0-gcc-10.patch b/net-misc/ipv6calc/files/ipv6calc-2.2.0-gcc-10.patch
new file mode 100644
index 000000000000..4639fa7406f1
--- /dev/null
+++ b/net-misc/ipv6calc/files/ipv6calc-2.2.0-gcc-10.patch
@@ -0,0 +1,34 @@
+https://bugs.gentoo.org/708056
+
+From 8c7eea58f2034113ae91ff7adc2bda72465b7d1a Mon Sep 17 00:00:00 2001
+From: Peter Bieringer <pb@bieringer.de>
+Date: Fri, 24 Jan 2020 07:15:55 +0100
+Subject: [PATCH] ipv6logconv/ipv6logconv.{h,c}: fix multiple definition of
+ 'cache_lru_limit'
+
+--- a/ipv6logconv/ipv6logconv.c
++++ b/ipv6logconv/ipv6logconv.c
+@@ -58,7 +58,7 @@ static void lineparser(const long int outputtype);
+ /* LRU cache */
+ 
+ #define CACHE_LRU_SIZE 200
+-
++int cache_lru_limit;
+ static int      cache_lru_max = 0;
+ static int      cache_lru_last = 0;
+ static char     cache_lru_key_token[CACHE_LRU_SIZE][NI_MAXHOST];
+--- a/ipv6logconv/ipv6logconv.h
++++ b/ipv6logconv/ipv6logconv.h
+@@ -20,8 +20,7 @@
+ #define DEBUG_ipv6logconv_general      0x00000001l
+ #define DEBUG_ipv6logconv_processing   0x00000002l
+ 
+-/* prototyping */
+-int cache_lru_limit;
++extern int cache_lru_limit;
+ 
+ extern int feature_reg;
+ extern int feature_ieee;
+-- 
+2.27.0
+
diff --git a/net-misc/ipv6calc/ipv6calc-2.2.0.ebuild b/net-misc/ipv6calc/ipv6calc-2.2.0.ebuild
index 65630c1080ec..e08d33c2a5b3 100644
--- a/net-misc/ipv6calc/ipv6calc-2.2.0.ebuild
+++ b/net-misc/ipv6calc/ipv6calc-2.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/pbiering/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="geoip libressl test"
 RESTRICT="!test? ( test )"
 
@@ -22,6 +22,8 @@ DEPEND="${RDEPEND}
 	test? ( dev-perl/Digest-SHA1 )
 "
 
+PATCHES=("${FILESDIR}"/${P}-gcc-10.patch)
+
 #dev-perl/URI is needed for web interface, that is not installed now
 
 src_configure() {