Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: Sam James <sam@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/iputils/
Date: Sun, 03 Apr 2022 02:48:56
Message-Id: 1648953962.7b86d886a186879903872c1e0dd3c57512ad5d04.sam@gentoo
1 commit: 7b86d886a186879903872c1e0dd3c57512ad5d04
2 Author: Sam James <sam <AT> gentoo <DOT> org>
3 AuthorDate: Sun Apr 3 02:46:02 2022 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Sun Apr 3 02:46:02 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7b86d886
7
8 net-misc/iputils: use consistent style
9
10 Signed-off-by: Sam James <sam <AT> gentoo.org>
11
12 net-misc/iputils/iputils-20211215.ebuild | 60 +++++++++++++++-----------------
13 net-misc/iputils/iputils-99999999.ebuild | 52 +++++++++++++--------------
14 2 files changed, 54 insertions(+), 58 deletions(-)
15
16 diff --git a/net-misc/iputils/iputils-20211215.ebuild b/net-misc/iputils/iputils-20211215.ebuild
17 index e468421730e4..010a74464c06 100644
18 --- a/net-misc/iputils/iputils-20211215.ebuild
19 +++ b/net-misc/iputils/iputils-20211215.ebuild
20 @@ -32,33 +32,30 @@ SLOT="0"
21 IUSE="+arping caps clockdiff doc gcrypt idn nettle nls rarpd rdisc ssl static test tracepath"
22 RESTRICT="!test? ( test )"
23
24 -BDEPEND="
25 - virtual/pkgconfig
26 - test? ( sys-apps/iproute2 )
27 - nls? ( sys-devel/gettext )
28 -"
29 -
30 LIB_DEPEND="
31 caps? ( sys-libs/libcap[static-libs(+)] )
32 idn? ( net-dns/libidn2:=[static-libs(+)] )
33 nls? ( virtual/libintl[static-libs(+)] )
34 "
35 -
36 RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )"
37 -
38 DEPEND="
39 ${RDEPEND}
40 virtual/os-headers
41 static? ( ${LIB_DEPEND} )
42 "
43 +BDEPEND="
44 + virtual/pkgconfig
45 + test? ( sys-apps/iproute2 )
46 + nls? ( sys-devel/gettext )
47 +"
48
49 -if [[ ${PV} == "99999999" ]] ; then
50 +if [[ ${PV} == 99999999 ]] ; then
51 BDEPEND+="
52 app-text/docbook-xml-dtd:4.2
53 app-text/docbook-xml-dtd:4.5
54 app-text/docbook-xsl-ns-stylesheets
55 app-text/docbook-xsl-stylesheets
56 - dev-libs/libxslt:0
57 + dev-libs/libxslt
58 "
59 fi
60
61 @@ -72,32 +69,32 @@ src_configure() {
62 use static && append-ldflags -static
63
64 local emesonargs=(
65 - -DUSE_CAP="$(usex caps true false)"
66 - -DUSE_IDN="$(usex idn true false)"
67 - -DBUILD_ARPING="$(usex arping true false)"
68 - -DBUILD_CLOCKDIFF="$(usex clockdiff true false)"
69 - -DBUILD_PING="true"
70 - -DBUILD_RARPD="$(usex rarpd true false)"
71 - -DBUILD_RDISC="$(usex rdisc true false)"
72 - -DENABLE_RDISC_SERVER="$(usex rdisc true false)"
73 - -DBUILD_TRACEPATH="$(usex tracepath true false)"
74 - -DBUILD_NINFOD="false"
75 - -DNINFOD_MESSAGES="false"
76 - -DNO_SETCAP_OR_SUID="true"
77 - -Dsystemdunitdir="$(systemd_get_systemunitdir)"
78 - -DUSE_GETTEXT="$(usex nls true false)"
79 + -DUSE_CAP=$(usex caps true false)
80 + -DUSE_IDN=$(usex idn true false)
81 + -DBUILD_ARPING=$(usex arping true false)
82 + -DBUILD_CLOCKDIFF=$(usex clockdiff true false)
83 + -DBUILD_PING=true
84 + -DBUILD_RARPD=$(usex rarpd true false)
85 + -DBUILD_RDISC=$(usex rdisc true false)
86 + -DENABLE_RDISC_SERVER=$(usex rdisc true false)
87 + -DBUILD_TRACEPATH=$(usex tracepath true false)
88 + -DBUILD_NINFOD=false
89 + -DNINFOD_MESSAGES=false
90 + -DNO_SETCAP_OR_SUID=true
91 + -Dsystemdunitdir=$(systemd_get_systemunitdir)
92 + -DUSE_GETTEXT=$(usex nls true false)
93 $(meson_use !test SKIP_TESTS)
94 )
95
96 if [[ ${PV} == 99999999 ]] ; then
97 emesonargs+=(
98 - -DBUILD_HTML_MANS="$(usex doc true false)"
99 - -DBUILD_MANS="true"
100 + -DBUILD_HTML_MANS=$(usex doc true false)
101 + -DBUILD_MANS=true
102 )
103 else
104 emesonargs+=(
105 - -DBUILD_HTML_MANS="false"
106 - -DBUILD_MANS="false"
107 + -DBUILD_HTML_MANS=false
108 + -DBUILD_MANS=false
109 )
110 fi
111
112 @@ -106,12 +103,13 @@ src_configure() {
113
114 src_compile() {
115 tc-export CC
116 +
117 meson_src_compile
118 }
119
120 src_test() {
121 - if [[ ${EUID} != 0 ]]; then
122 - einfo "Tests require root privileges; Skipping ..."
123 + if [[ ${EUID} != 0 ]] ; then
124 + einfo "Tests require root privileges. Skipping ..."
125 return
126 fi
127
128 @@ -135,7 +133,7 @@ src_install() {
129 dosym tracepath.8 /usr/share/man/man8/tracepath6.8
130 fi
131
132 - if [[ "${PV}" != 99999999 ]] ; then
133 + if [[ ${PV} != 99999999 ]] ; then
134 local -a man_pages
135 local -a html_man_pages
136
137
138 diff --git a/net-misc/iputils/iputils-99999999.ebuild b/net-misc/iputils/iputils-99999999.ebuild
139 index 320cee546b5e..cef1837240e2 100644
140 --- a/net-misc/iputils/iputils-99999999.ebuild
141 +++ b/net-misc/iputils/iputils-99999999.ebuild
142 @@ -14,7 +14,7 @@ PLOCALES="de fr ja pt_BR tr uk zh_CN"
143
144 inherit fcaps flag-o-matic meson plocale systemd toolchain-funcs
145
146 -if [[ ${PV} == "99999999" ]] ; then
147 +if [[ ${PV} == 99999999 ]] ; then
148 EGIT_REPO_URI="https://github.com/iputils/iputils.git"
149 inherit git-r3
150 else
151 @@ -32,33 +32,30 @@ SLOT="0"
152 IUSE="+arping caps clockdiff doc gcrypt idn nettle nls ssl static test tracepath"
153 RESTRICT="!test? ( test )"
154
155 -BDEPEND="
156 - virtual/pkgconfig
157 - test? ( sys-apps/iproute2 )
158 - nls? ( sys-devel/gettext )
159 -"
160 -
161 LIB_DEPEND="
162 caps? ( sys-libs/libcap[static-libs(+)] )
163 idn? ( net-dns/libidn2:=[static-libs(+)] )
164 nls? ( virtual/libintl[static-libs(+)] )
165 "
166 -
167 RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )"
168 -
169 DEPEND="
170 ${RDEPEND}
171 virtual/os-headers
172 static? ( ${LIB_DEPEND} )
173 "
174 +BDEPEND="
175 + virtual/pkgconfig
176 + test? ( sys-apps/iproute2 )
177 + nls? ( sys-devel/gettext )
178 +"
179
180 -if [[ ${PV} == "99999999" ]] ; then
181 +if [[ ${PV} == 99999999 ]] ; then
182 BDEPEND+="
183 app-text/docbook-xml-dtd:4.2
184 app-text/docbook-xml-dtd:4.5
185 app-text/docbook-xsl-ns-stylesheets
186 app-text/docbook-xsl-stylesheets
187 - dev-libs/libxslt:0
188 + dev-libs/libxslt
189 "
190 fi
191
192 @@ -72,27 +69,27 @@ src_configure() {
193 use static && append-ldflags -static
194
195 local emesonargs=(
196 - -DUSE_CAP="$(usex caps true false)"
197 - -DUSE_IDN="$(usex idn true false)"
198 - -DBUILD_ARPING="$(usex arping true false)"
199 - -DBUILD_CLOCKDIFF="$(usex clockdiff true false)"
200 - -DBUILD_PING="true"
201 - -DBUILD_TRACEPATH="$(usex tracepath true false)"
202 - -DNO_SETCAP_OR_SUID="true"
203 - -Dsystemdunitdir="$(systemd_get_systemunitdir)"
204 - -DUSE_GETTEXT="$(usex nls true false)"
205 + -DUSE_CAP=$(usex caps true false)
206 + -DUSE_IDN=$(usex idn true false)
207 + -DBUILD_ARPING=$(usex arping true false)
208 + -DBUILD_CLOCKDIFF=$(usex clockdiff true false)
209 + -DBUILD_PING=true
210 + -DBUILD_TRACEPATH=$(usex tracepath true false)
211 + -DNO_SETCAP_OR_SUID=true
212 + -Dsystemdunitdir=$(systemd_get_systemunitdir)
213 + -DUSE_GETTEXT=$(usex nls true false)
214 $(meson_use !test SKIP_TESTS)
215 )
216
217 if [[ ${PV} == 99999999 ]] ; then
218 emesonargs+=(
219 - -DBUILD_HTML_MANS="$(usex doc true false)"
220 - -DBUILD_MANS="true"
221 + -DBUILD_HTML_MANS=$(usex doc true false)
222 + -DBUILD_MANS=true
223 )
224 else
225 emesonargs+=(
226 - -DBUILD_HTML_MANS="false"
227 - -DBUILD_MANS="false"
228 + -DBUILD_HTML_MANS=false
229 + -DBUILD_MANS=false
230 )
231 fi
232
233 @@ -101,12 +98,13 @@ src_configure() {
234
235 src_compile() {
236 tc-export CC
237 +
238 meson_src_compile
239 }
240
241 src_test() {
242 - if [[ ${EUID} != 0 ]]; then
243 - einfo "Tests require root privileges; Skipping ..."
244 + if [[ ${EUID} != 0 ]] ; then
245 + einfo "Tests require root privileges. Skipping ..."
246 return
247 fi
248
249 @@ -130,7 +128,7 @@ src_install() {
250 dosym tracepath.8 /usr/share/man/man8/tracepath6.8
251 fi
252
253 - if [[ "${PV}" != 99999999 ]] ; then
254 + if [[ ${PV} != 99999999 ]] ; then
255 local -a man_pages
256 local -a html_man_pages
Report Message
Find on MARC Find on Google Groups