| 1 |
commit: ceff568ec25f068bd4c5aedd66e1c1c905d0804f |
| 2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Apr 2 00:39:56 2021 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Apr 3 16:10:30 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ceff568e |
| 7 |
|
| 8 |
net-analyzer/thc-ipv6: EAPI 7, consistent style, misc QA |
| 9 |
|
| 10 |
* Port to EAPI 7 |
| 11 |
* Drop unused eutils |
| 12 |
* Missing || die |
| 13 |
* Use standard ebuild "block structure" |
| 14 |
* Sort DEPEND |
| 15 |
* Use consistent semicolon style |
| 16 |
|
| 17 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 18 |
|
| 19 |
net-analyzer/thc-ipv6/thc-ipv6-3.2-r1.ebuild | 42 ++++++++++++++++------------ |
| 20 |
net-analyzer/thc-ipv6/thc-ipv6-9999.ebuild | 42 ++++++++++++++++------------ |
| 21 |
2 files changed, 48 insertions(+), 36 deletions(-) |
| 22 |
|
| 23 |
diff --git a/net-analyzer/thc-ipv6/thc-ipv6-3.2-r1.ebuild b/net-analyzer/thc-ipv6/thc-ipv6-3.2-r1.ebuild |
| 24 |
index 71f98da3f73..396a0b2a216 100644 |
| 25 |
--- a/net-analyzer/thc-ipv6/thc-ipv6-3.2-r1.ebuild |
| 26 |
+++ b/net-analyzer/thc-ipv6/thc-ipv6-3.2-r1.ebuild |
| 27 |
@@ -1,46 +1,52 @@ |
| 28 |
-# Copyright 1999-2019 Gentoo Authors |
| 29 |
+# Copyright 1999-2021 Gentoo Authors |
| 30 |
# Distributed under the terms of the GNU General Public License v2 |
| 31 |
|
| 32 |
-EAPI=6 |
| 33 |
-[[ ${PV} == *9999 ]] && SCM="git-r3" |
| 34 |
-EGIT_REPO_URI="https://github.com/vanhauser-thc/thc-ipv6.git" |
| 35 |
-EGIT_BRANCH=master |
| 36 |
+EAPI=7 |
| 37 |
|
| 38 |
-inherit eutils toolchain-funcs ${SCM} |
| 39 |
+inherit toolchain-funcs |
| 40 |
|
| 41 |
-DESCRIPTION="complete tool set to attack the inherent protocol weaknesses of IPV6 and ICMP6" |
| 42 |
+DESCRIPTION="Complete tool set to attack the inherent protocol weaknesses of IPV6 and ICMP6" |
| 43 |
HOMEPAGE="https://www.thc.org/thc-ipv6/" |
| 44 |
-LICENSE="AGPL-3 openssl" |
| 45 |
-SLOT="0" |
| 46 |
-IUSE="ssl" |
| 47 |
|
| 48 |
-if [[ ${PV} != *9999 ]]; then |
| 49 |
+if [[ ${PV} == *9999 ]]; then |
| 50 |
+ EGIT_REPO_URI="https://github.com/vanhauser-thc/thc-ipv6.git" |
| 51 |
+ EGIT_BRANCH=master |
| 52 |
+ inherit git-r3 |
| 53 |
+else |
| 54 |
SRC_URI="https://github.com/vanhauser-thc/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" |
| 55 |
KEYWORDS="~amd64 ~x86" |
| 56 |
fi |
| 57 |
|
| 58 |
-DEPEND="net-libs/libpcap |
| 59 |
+LICENSE="AGPL-3 openssl" |
| 60 |
+SLOT="0" |
| 61 |
+IUSE="ssl" |
| 62 |
+ |
| 63 |
+DEPEND=" |
| 64 |
net-libs/libnetfilter_queue |
| 65 |
- ssl? ( dev-libs/openssl:0= )" |
| 66 |
+ net-libs/libpcap |
| 67 |
+ ssl? ( dev-libs/openssl:0= ) |
| 68 |
+" |
| 69 |
RDEPEND="${DEPEND}" |
| 70 |
|
| 71 |
PATCHES=( "${FILESDIR}/${PN}-3.2-stdint.patch" ) |
| 72 |
|
| 73 |
src_unpack() { |
| 74 |
- if [[ ${PV} != *9999 ]]; then |
| 75 |
- default_src_unpack |
| 76 |
- else |
| 77 |
+ if [[ ${PV} == *9999 ]]; then |
| 78 |
git-r3_src_unpack |
| 79 |
fi |
| 80 |
+ |
| 81 |
+ default |
| 82 |
} |
| 83 |
|
| 84 |
src_prepare() { |
| 85 |
sed -e '/^CFLAGS=/s,CFLAGS=,CFLAGS?=,' \ |
| 86 |
-i Makefile || die |
| 87 |
- if ! use ssl ; then |
| 88 |
+ |
| 89 |
+ if ! use ssl; then |
| 90 |
sed -e '/^HAVE_SSL/s:^:#:' \ |
| 91 |
- -i Makefile |
| 92 |
+ -i Makefile || die |
| 93 |
fi |
| 94 |
+ |
| 95 |
default |
| 96 |
} |
| 97 |
|
| 98 |
|
| 99 |
diff --git a/net-analyzer/thc-ipv6/thc-ipv6-9999.ebuild b/net-analyzer/thc-ipv6/thc-ipv6-9999.ebuild |
| 100 |
index 71f98da3f73..396a0b2a216 100644 |
| 101 |
--- a/net-analyzer/thc-ipv6/thc-ipv6-9999.ebuild |
| 102 |
+++ b/net-analyzer/thc-ipv6/thc-ipv6-9999.ebuild |
| 103 |
@@ -1,46 +1,52 @@ |
| 104 |
-# Copyright 1999-2019 Gentoo Authors |
| 105 |
+# Copyright 1999-2021 Gentoo Authors |
| 106 |
# Distributed under the terms of the GNU General Public License v2 |
| 107 |
|
| 108 |
-EAPI=6 |
| 109 |
-[[ ${PV} == *9999 ]] && SCM="git-r3" |
| 110 |
-EGIT_REPO_URI="https://github.com/vanhauser-thc/thc-ipv6.git" |
| 111 |
-EGIT_BRANCH=master |
| 112 |
+EAPI=7 |
| 113 |
|
| 114 |
-inherit eutils toolchain-funcs ${SCM} |
| 115 |
+inherit toolchain-funcs |
| 116 |
|
| 117 |
-DESCRIPTION="complete tool set to attack the inherent protocol weaknesses of IPV6 and ICMP6" |
| 118 |
+DESCRIPTION="Complete tool set to attack the inherent protocol weaknesses of IPV6 and ICMP6" |
| 119 |
HOMEPAGE="https://www.thc.org/thc-ipv6/" |
| 120 |
-LICENSE="AGPL-3 openssl" |
| 121 |
-SLOT="0" |
| 122 |
-IUSE="ssl" |
| 123 |
|
| 124 |
-if [[ ${PV} != *9999 ]]; then |
| 125 |
+if [[ ${PV} == *9999 ]]; then |
| 126 |
+ EGIT_REPO_URI="https://github.com/vanhauser-thc/thc-ipv6.git" |
| 127 |
+ EGIT_BRANCH=master |
| 128 |
+ inherit git-r3 |
| 129 |
+else |
| 130 |
SRC_URI="https://github.com/vanhauser-thc/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" |
| 131 |
KEYWORDS="~amd64 ~x86" |
| 132 |
fi |
| 133 |
|
| 134 |
-DEPEND="net-libs/libpcap |
| 135 |
+LICENSE="AGPL-3 openssl" |
| 136 |
+SLOT="0" |
| 137 |
+IUSE="ssl" |
| 138 |
+ |
| 139 |
+DEPEND=" |
| 140 |
net-libs/libnetfilter_queue |
| 141 |
- ssl? ( dev-libs/openssl:0= )" |
| 142 |
+ net-libs/libpcap |
| 143 |
+ ssl? ( dev-libs/openssl:0= ) |
| 144 |
+" |
| 145 |
RDEPEND="${DEPEND}" |
| 146 |
|
| 147 |
PATCHES=( "${FILESDIR}/${PN}-3.2-stdint.patch" ) |
| 148 |
|
| 149 |
src_unpack() { |
| 150 |
- if [[ ${PV} != *9999 ]]; then |
| 151 |
- default_src_unpack |
| 152 |
- else |
| 153 |
+ if [[ ${PV} == *9999 ]]; then |
| 154 |
git-r3_src_unpack |
| 155 |
fi |
| 156 |
+ |
| 157 |
+ default |
| 158 |
} |
| 159 |
|
| 160 |
src_prepare() { |
| 161 |
sed -e '/^CFLAGS=/s,CFLAGS=,CFLAGS?=,' \ |
| 162 |
-i Makefile || die |
| 163 |
- if ! use ssl ; then |
| 164 |
+ |
| 165 |
+ if ! use ssl; then |
| 166 |
sed -e '/^HAVE_SSL/s:^:#:' \ |
| 167 |
- -i Makefile |
| 168 |
+ -i Makefile || die |
| 169 |
fi |
| 170 |
+ |
| 171 |
default |
| 172 |
} |
Archives