gentoo resync : 28.04.2021

3 files changed, 44 insertions, 48 deletions

diff --git a/net-analyzer/thc-ipv6/Manifest b/net-analyzer/thc-ipv6/Manifest
index e8cad99c6425..efcc5934c92e 100644
--- a/net-analyzer/thc-ipv6/Manifest
+++ b/net-analyzer/thc-ipv6/Manifest
@@ -1,5 +1,5 @@
 AUX thc-ipv6-3.2-stdint.patch 208 BLAKE2B 639a1ceec32ab48b886d721b7ea197dd39efe4ab5f62f8f1fffe04e68560336269e9b3b021c90ef635948bfbbbc0c60e0cb2c56e60e7bca3dfdc7c0d823dfdd9 SHA512 635438ba4a64eb63d51130643afd73e87e83313532f351e1f124cd0f34d719a67d77e592595707e65c8fd5b69a00cf04942688668e5a9c921807934ca602fd8e
 DIST thc-ipv6-3.2.tar.gz 1595453 BLAKE2B f1bb1cdc31f4cf4d067b39997ca3cc2d6d8c15e7a8c585c7c494f03e229fccbcd65677e382a65f0e650d79278f5ede89173db1cdf313ade7c48dff1566856afa SHA512 648db4618ebb83572e2e318cdbb284fe96a86adf335f7dd9b26fd010c76d12e9137ed7367207c66c93c1961c868d3917d706db9f597289ac47ea3f9b83c03441
-EBUILD thc-ipv6-3.2-r1.ebuild 1165 BLAKE2B b2571fbf1a6e0fd1da35c328ed4a9c4989bcbe919115733603ee94200c13d357005fb0c48f16db71c4609a8d71a49c4e44cf0c8b41ab12b1f7aea2e58c451c16 SHA512 fe8fe27aec9b335632ca22e498e14c5cfae2f2bb559d04f77ae7af632cae1a3eec7074484d2be5d62bfa943a438a98b2f89a341dd3ca75cf204437d50a0f49e5
-EBUILD thc-ipv6-9999.ebuild 1165 BLAKE2B b2571fbf1a6e0fd1da35c328ed4a9c4989bcbe919115733603ee94200c13d357005fb0c48f16db71c4609a8d71a49c4e44cf0c8b41ab12b1f7aea2e58c451c16 SHA512 fe8fe27aec9b335632ca22e498e14c5cfae2f2bb559d04f77ae7af632cae1a3eec7074484d2be5d62bfa943a438a98b2f89a341dd3ca75cf204437d50a0f49e5
+EBUILD thc-ipv6-3.2-r1.ebuild 1049 BLAKE2B 06d840fb5de47ccc7feeeb3f93764f08b4752caf2e93274aca98a3c90e46b31f358e6b741cc078815187e4bb26a50215603558114c51d6f9e7466bbb1cb7c20b SHA512 cd045cd455076f9e44a1343dc6763ee9e02b7661a07a4f42f7baafd89d61797fd9eb1089b2c7438bc27d47df5ce64676ffd26bcf495f26b70366d90903773262
+EBUILD thc-ipv6-9999.ebuild 1049 BLAKE2B 06d840fb5de47ccc7feeeb3f93764f08b4752caf2e93274aca98a3c90e46b31f358e6b741cc078815187e4bb26a50215603558114c51d6f9e7466bbb1cb7c20b SHA512 cd045cd455076f9e44a1343dc6763ee9e02b7661a07a4f42f7baafd89d61797fd9eb1089b2c7438bc27d47df5ce64676ffd26bcf495f26b70366d90903773262
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-analyzer/thc-ipv6/thc-ipv6-3.2-r1.ebuild b/net-analyzer/thc-ipv6/thc-ipv6-3.2-r1.ebuild
index 71f98da3f733..b5817554f26c 100644
--- a/net-analyzer/thc-ipv6/thc-ipv6-3.2-r1.ebuild
+++ b/net-analyzer/thc-ipv6/thc-ipv6-3.2-r1.ebuild
@@ -1,46 +1,44 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-[[ ${PV} == *9999 ]] && SCM="git-r3"
-EGIT_REPO_URI="https://github.com/vanhauser-thc/thc-ipv6.git"
-EGIT_BRANCH=master
+EAPI=7
 
-inherit eutils toolchain-funcs ${SCM}
+inherit toolchain-funcs
 
-DESCRIPTION="complete tool set to attack the inherent protocol weaknesses of IPV6 and ICMP6"
+DESCRIPTION="Complete tool set to attack the inherent protocol weaknesses of IPV6 and ICMP6"
 HOMEPAGE="https://www.thc.org/thc-ipv6/"
-LICENSE="AGPL-3 openssl"
-SLOT="0"
-IUSE="ssl"
 
-if [[ ${PV} != *9999 ]]; then
+if [[ ${PV} == *9999 ]]; then
+	EGIT_REPO_URI="https://github.com/vanhauser-thc/thc-ipv6.git"
+	EGIT_BRANCH=master
+	inherit git-r3
+else
 	SRC_URI="https://github.com/vanhauser-thc/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~x86"
 fi
 
-DEPEND="net-libs/libpcap
+LICENSE="AGPL-3 openssl"
+SLOT="0"
+IUSE="ssl"
+
+DEPEND="
 	net-libs/libnetfilter_queue
-	ssl? ( dev-libs/openssl:0= )"
+	net-libs/libpcap
+	ssl? ( dev-libs/openssl:0= )
+"
 RDEPEND="${DEPEND}"
 
 PATCHES=( "${FILESDIR}/${PN}-3.2-stdint.patch" )
 
-src_unpack() {
-	if [[ ${PV} != *9999 ]]; then
-		default_src_unpack
-	else
-		git-r3_src_unpack
-	fi
-}
-
 src_prepare() {
 	sed -e '/^CFLAGS=/s,CFLAGS=,CFLAGS?=,' \
 		-i Makefile || die
-	if ! use ssl ; then
+
+	if ! use ssl; then
 		sed -e '/^HAVE_SSL/s:^:#:' \
-			-i Makefile
+			-i Makefile || die
 	fi
+
 	default
 }
 
diff --git a/net-analyzer/thc-ipv6/thc-ipv6-9999.ebuild b/net-analyzer/thc-ipv6/thc-ipv6-9999.ebuild
index 71f98da3f733..b5817554f26c 100644
--- a/net-analyzer/thc-ipv6/thc-ipv6-9999.ebuild
+++ b/net-analyzer/thc-ipv6/thc-ipv6-9999.ebuild
@@ -1,46 +1,44 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-[[ ${PV} == *9999 ]] && SCM="git-r3"
-EGIT_REPO_URI="https://github.com/vanhauser-thc/thc-ipv6.git"
-EGIT_BRANCH=master
+EAPI=7
 
-inherit eutils toolchain-funcs ${SCM}
+inherit toolchain-funcs
 
-DESCRIPTION="complete tool set to attack the inherent protocol weaknesses of IPV6 and ICMP6"
+DESCRIPTION="Complete tool set to attack the inherent protocol weaknesses of IPV6 and ICMP6"
 HOMEPAGE="https://www.thc.org/thc-ipv6/"
-LICENSE="AGPL-3 openssl"
-SLOT="0"
-IUSE="ssl"
 
-if [[ ${PV} != *9999 ]]; then
+if [[ ${PV} == *9999 ]]; then
+	EGIT_REPO_URI="https://github.com/vanhauser-thc/thc-ipv6.git"
+	EGIT_BRANCH=master
+	inherit git-r3
+else
 	SRC_URI="https://github.com/vanhauser-thc/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~x86"
 fi
 
-DEPEND="net-libs/libpcap
+LICENSE="AGPL-3 openssl"
+SLOT="0"
+IUSE="ssl"
+
+DEPEND="
 	net-libs/libnetfilter_queue
-	ssl? ( dev-libs/openssl:0= )"
+	net-libs/libpcap
+	ssl? ( dev-libs/openssl:0= )
+"
 RDEPEND="${DEPEND}"
 
 PATCHES=( "${FILESDIR}/${PN}-3.2-stdint.patch" )
 
-src_unpack() {
-	if [[ ${PV} != *9999 ]]; then
-		default_src_unpack
-	else
-		git-r3_src_unpack
-	fi
-}
-
 src_prepare() {
 	sed -e '/^CFLAGS=/s,CFLAGS=,CFLAGS?=,' \
 		-i Makefile || die
-	if ! use ssl ; then
+
+	if ! use ssl; then
 		sed -e '/^HAVE_SSL/s:^:#:' \
-			-i Makefile
+			-i Makefile || die
 	fi
+
 	default
 }