gentoo resync : 25.04.2020

3 files changed, 19 insertions, 24 deletions

diff --git a/net-analyzer/ipv6toolkit/Manifest b/net-analyzer/ipv6toolkit/Manifest
index 0d8eeb224ef3..0c8ecbc23733 100644
--- a/net-analyzer/ipv6toolkit/Manifest
+++ b/net-analyzer/ipv6toolkit/Manifest
@@ -1,7 +1,7 @@
 AUX ipv6toolkit-2.1_p20190919-fno-common.patch 5414 BLAKE2B cf9f97ed1155044211e31f7c0d081d283681de63b5f9f00a910f29f91055675f8af8045db7ec77277a9f5bc518063677c9cd0d1cf7df44606a9b253f48089ed1 SHA512 939b9a113867d8a308c4a3802ca55d6c8e5bc050e5dc50ecf8558b2008bca6e734996ee091db33a16a6efbf14a12a00bc213616f0229fb143259d7b069dfe7dc
-DIST ipv6toolkit-2.0_p20160422.tar.gz 796716 BLAKE2B 468375afbf385ac9b571708be1baff0b0c56a0895bb73f3711522120b0e5fdfded3d73fea2a7d48b38f1e6387e0d63674c08eb503281f6eb635ea131ae67ec47 SHA512 532d6b76159fca03bdcebe341540a4071d2381dd3046469d0dfa5e8eecda5ffb4182d40658ef14c67bd11b781773bff1192e96d0ac4210c5ca095c6475d6c26d
 DIST ipv6toolkit-2.1_p20190919.tar.gz 979235 BLAKE2B 1b652b00874b9a71a5e5b86643d9c71fc02917af93d9730e7e4be7e5203d07dfef5bc7d1bb0453a6bf9dece69f7f4256912f0902132dd21530ae8ea9e94b8b4f SHA512 78e7565f4827d21573ced06002311a4f3736df71846085b3e8e47e0d6aebeaa4e60881c148c3c65ee010ffcfb2bf3ad56bb2625203aff5b0fdf40fbb7f37ecb9
-EBUILD ipv6toolkit-2.0_p20160422.ebuild 1245 BLAKE2B e108d57bf264bc9b0d1f42e83b638354520832267bfa6c700dd7630e163e5da3aeebe332be7786c21cb86dcbd216e579ed669d402373135440d98ea0fdabe014 SHA512 f3c18c571a6c341697135c3cb1b355bed43bc79a61bdf048c112819e312658b260b8afca432e046fa391a16af8e97d36644daf77dd11d236d3b70ae263d88ea7
+DIST ipv6toolkit-2.1_p20200412.tar.gz 987247 BLAKE2B 7fcb07c0cbb22e377618f62b69a16e4a5aeda3b3ebc32bd216cf9fa3beb2d8775cec6543482609361bb23304e3284e770ae82ada053fb172c432adfe360e09ba SHA512 480245e4f5ed31d6de726467ab8e1726285ccc7eeb6c84bd75caf62af35409ebf5ea63a29567200b387592317a5d5989c76ad38d3f0842ebdf5392f28e81be9f
 EBUILD ipv6toolkit-2.1_p20190919.ebuild 1222 BLAKE2B 6f5666e4a94bdcfac16aa92f591c14199fd4b2d007adaded56bbe06b6d0648b2d9cb36e228efdf89283247f88267159735648181436c39dd76ee578e109c7613 SHA512 c31766b0b48b0fd62b459bef37a905722612c6f2ec86ab329f6f0cc56643a01b1cecc48aaf9efec6acba257cda496a87f300478991fbe511b67b86659d1bf8c9
-EBUILD ipv6toolkit-99999999.ebuild 1093 BLAKE2B 3dac02bc93aeb2d5428b074ea38655851d191ce32ac33fb31258909782f05cc1d93e7336dd47c5276ca7f50a7d2a33fa5e417514312d7541e3bbc555ee3f713c SHA512 fb3df9ea5c010e0a94d554fa87600b8a6d46b68127cf151008ac8daa9d9caca9dae930f2e603901a2a0b8ba71fb0f3906ba2d4aadc69fa7251649472b113cac4
+EBUILD ipv6toolkit-2.1_p20200412.ebuild 1158 BLAKE2B 69d0efa873b40f8a7fc99712e0016430c66e4645cdcba74f59279045f692e5e8e4c06545a364b32e11326949d300dc349bf596ff5e7d22a5e6da4951673da226 SHA512 bd1b16447f98146e93ec9735c01fd6b63232b82fb8eade13ab472d5ecd75a4a9b3a72ce91af0a24b33e5d47fc09539bcdd6ac0ac398bcb515c45b3f99ff4345a
+EBUILD ipv6toolkit-99999999.ebuild 1029 BLAKE2B da79779c2bb84b817aa197e86931e8fdc8a14597916a867bd01cc211b770425e485bfb19f28345a85a62b60e8bea8f5c2065c26b5e89699d67e306f5746d2a3c SHA512 376b1b2b881e0285f084b8edad8f4aefc83683d3f4c947e3ca4ada0518bc9291ed8f09bc3bbd275e27f32532857ef33ae2006277c6341adf800a5471274d39c1
 MISC metadata.xml 527 BLAKE2B e275ef7193981f8415d0aa0973743deb8b4b0302fb093a26254dd0e681e072e175466869335c909c2f39ecc241f2de1e1a8135b0f6f59f17a566fcd5d9065e51 SHA512 acec773e132e352f4f81af6840f3370da00f48e5e13f39a2fccc441e5d119c5fac4319b24745eef1b4fb0921e8ace7456f7230432fd86978bb27cc54b7de3ec4
diff --git a/net-analyzer/ipv6toolkit/ipv6toolkit-2.0_p20160422.ebuild b/net-analyzer/ipv6toolkit/ipv6toolkit-2.1_p20200412.ebuild
index e16edc154ccf..2d692fb0ea06 100644
--- a/net-analyzer/ipv6toolkit/ipv6toolkit-2.0_p20160422.ebuild
+++ b/net-analyzer/ipv6toolkit/ipv6toolkit-2.1_p20200412.ebuild
@@ -1,38 +1,36 @@
-# Copyright 1999-2018 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
 
 DESCRIPTION="Set of IPv6 security/trouble-shooting tools to send arbitrary IPv6-based packets"
 HOMEPAGE="https://www.si6networks.com/tools/ipv6toolkit/"
+SNAPSHOT="623a0fbc0422cdc0a4b833d7b5ec58a2eaa9bddf"
+SRC_URI="https://github.com/fgont/ipv6toolkit/archive/${SNAPSHOT}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}"/"${PN}"-"${SNAPSHOT}"
 
 LICENSE="GPL-3"
 SLOT="0"
-IUSE=""
+KEYWORDS="~amd64 ~x86"
 
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/fgont/ipv6toolkit.git"
-	inherit git-r3
-	KEYWORDS=""
-else
-	KEYWORDS="~amd64 ~x86"
-	SNAPSHOT="d14d90969e88a455e4ca8ea0ea7d88c9b7fb5c9f"
-	SRC_URI="https://github.com/fgont/ipv6toolkit/archive/${SNAPSHOT}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}"/"${PN}"-"${SNAPSHOT}"
-fi
-
-DEPEND="net-libs/libpcap[ipv6(+)]"
-RDEPEND="${DEPEND}
-	sys-apps/hwids"
+DEPEND="
+	net-libs/libpcap[ipv6(+)]
+"
+RDEPEND="
+	${DEPEND}
+	sys-apps/hwids
+"
 
 HWIDS_OUI_PATH=/usr/share/misc/oui.txt
 
 src_prepare() {
+	default
 	sed -i "s#/usr/share/ipv6toolkit/oui.txt#${HWIDS_OUI_PATH}#" \
 		manuals/ipv6toolkit.conf.5
 }
 src_compile() {
-	emake CFLAGS="${CFLAGS}" PREFIX=/usr
+	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" PREFIX=/usr
 }
 
 src_install() {
diff --git a/net-analyzer/ipv6toolkit/ipv6toolkit-99999999.ebuild b/net-analyzer/ipv6toolkit/ipv6toolkit-99999999.ebuild
index 2248b0b2e758..8a862e677183 100644
--- a/net-analyzer/ipv6toolkit/ipv6toolkit-99999999.ebuild
+++ b/net-analyzer/ipv6toolkit/ipv6toolkit-99999999.ebuild
@@ -19,9 +19,6 @@ RDEPEND="
 	${DEPEND}
 	sys-apps/hwids
 "
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.1_p20190919-fno-common.patch
-)
 
 HWIDS_OUI_PATH=/usr/share/misc/oui.txt