1 |
commit: d49ceea95de3d72f937c995a04811e03b57e2c9e |
2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Nov 30 03:53:57 2022 +0000 |
4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Nov 30 04:13:36 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d49ceea9 |
7 |
|
8 |
net-misc/iputils: add 20221126 |
9 |
|
10 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
11 |
|
12 |
net-misc/iputils/Manifest | 2 ++ |
13 |
...ils-99999999.ebuild => iputils-20221126.ebuild} | 36 +++++++++++++--------- |
14 |
net-misc/iputils/iputils-99999999.ebuild | 36 +++++++++++++--------- |
15 |
3 files changed, 44 insertions(+), 30 deletions(-) |
16 |
|
17 |
diff --git a/net-misc/iputils/Manifest b/net-misc/iputils/Manifest |
18 |
index 289a9105a6d7..3b7e1d5bcdd1 100644 |
19 |
--- a/net-misc/iputils/Manifest |
20 |
+++ b/net-misc/iputils/Manifest |
21 |
@@ -1,2 +1,4 @@ |
22 |
DIST iputils-20211215.tar.gz 524567 BLAKE2B b88ff84be1d4d6a741f8f3514739ceff45ea40c475b5d4c2df8571fe84d4f1af9bc3fdce29e9ff393417671c75204261c8d64dde00473caa314b0aeb1fbf74ce SHA512 191062e51f7c8e8b38e3e4a96845adb77cd69f487d548c7cc578fad544443b4bc0dbe965d8f8e6fbda0a2f5b2fe2829789c05f873190c53d773245959298f6e9 |
23 |
+DIST iputils-20221126-docs.tar.xz 13000 BLAKE2B 8a9dae136f6555ed933f97d26be82a7d9ab228efd40cc03d065b39374f13000604e3bbbc856124076ec6934c92845d7b974eff64bbf65fc3a63a2266ba920e2f SHA512 efa60b618238b6e7614828a3c3a30e58ac311a82a686a28a186110cc28dae96f509199f057b1855b08954b1b5a3f6be63e0de6c0c028f4eb5f88c6dcd973a93b |
24 |
+DIST iputils-20221126.tar.gz 511944 BLAKE2B 97bdc49810ce9e517211323e8e8ffd2f2be505704d67533db0e8f296701048b82c61b39062aab4a8fa148b29175636a657c2dcdd65e3a16b1572d2f392b8ecf0 SHA512 7fdfd76e6f2977039bc0930a1a5451f17319bf17beefc429751d99ffe143a83344d5b4cdbf008627bd70caafeadaf906a8b7c00393fa819e50d6c02b512c367f |
25 |
DIST iputils-manpages-20211215.tar.xz 17148 BLAKE2B 63a956805b01f57b070b6b4ceb32f6ddf4313c74203cde821fc2f6f16ab8de14861da31163adf496db555f1961592d4fbc2ba7a977ccb18773af3bdb8d3795c0 SHA512 eb8c8508221b06fc13bf196b01b11f3ec87cd77e25d89c088776e39d249e10a3915ebb39942805adee179b352543063ce3dac158d68783c68c23de550ec14eee |
26 |
|
27 |
diff --git a/net-misc/iputils/iputils-99999999.ebuild b/net-misc/iputils/iputils-20221126.ebuild |
28 |
similarity index 83% |
29 |
copy from net-misc/iputils/iputils-99999999.ebuild |
30 |
copy to net-misc/iputils/iputils-20221126.ebuild |
31 |
index 7f3760b7d4f5..9cb95e6d73a7 100644 |
32 |
--- a/net-misc/iputils/iputils-99999999.ebuild |
33 |
+++ b/net-misc/iputils/iputils-20221126.ebuild |
34 |
@@ -8,26 +8,34 @@ |
35 |
# EGIT_COMMIT set to release tag, all USE flags enabled and |
36 |
# tar ${S}/doc folder. |
37 |
|
38 |
-EAPI="7" |
39 |
+EAPI=8 |
40 |
|
41 |
PLOCALES="de fr ja pt_BR tr uk zh_CN" |
42 |
|
43 |
inherit fcaps meson plocale systemd toolchain-funcs |
44 |
|
45 |
-if [[ ${PV} == 99999999 ]] ; then |
46 |
+if [[ ${PV} == *9999 ]] ; then |
47 |
EGIT_REPO_URI="https://github.com/iputils/iputils.git" |
48 |
inherit git-r3 |
49 |
else |
50 |
- SRC_URI="https://github.com/iputils/iputils/archive/${PV}.tar.gz -> ${P}.tar.gz |
51 |
- https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-manpages-${PV}.tar.xz |
52 |
- https://dev.gentoo.org/~whissi/dist/iputils/${PN}-manpages-${PV}.tar.xz" |
53 |
+ SRC_URI=" |
54 |
+ https://github.com/iputils/iputils/archive/${PV}.tar.gz -> ${P}.tar.gz |
55 |
+ https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-docs.tar.xz |
56 |
+ " |
57 |
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" |
58 |
fi |
59 |
|
60 |
DESCRIPTION="Network monitoring tools including ping and ping6" |
61 |
HOMEPAGE="https://wiki.linuxfoundation.org/networking/iputils" |
62 |
|
63 |
-LICENSE="BSD GPL-2+ rdisc" |
64 |
+# We install ping unconditionally so BSD is listed by itself |
65 |
+# See LICENSE on each release, it summaries per-component |
66 |
+LICENSE=" |
67 |
+ BSD |
68 |
+ arping? ( GPL-2+ ) |
69 |
+ clockdiff? ( BSD ) |
70 |
+ tracepath? ( GPL-2+ ) |
71 |
+" |
72 |
SLOT="0" |
73 |
IUSE="+arping caps clockdiff doc idn nls test tracepath" |
74 |
RESTRICT="!test? ( test )" |
75 |
@@ -47,7 +55,7 @@ BDEPEND=" |
76 |
nls? ( sys-devel/gettext ) |
77 |
" |
78 |
|
79 |
-if [[ ${PV} == 99999999 ]] ; then |
80 |
+if [[ ${PV} == *9999 ]] ; then |
81 |
BDEPEND+=" |
82 |
app-text/docbook-xml-dtd:4.2 |
83 |
app-text/docbook-xml-dtd:4.5 |
84 |
@@ -77,7 +85,7 @@ src_configure() { |
85 |
$(meson_use !test SKIP_TESTS) |
86 |
) |
87 |
|
88 |
- if [[ ${PV} == 99999999 ]] ; then |
89 |
+ if [[ ${PV} == *9999 ]] ; then |
90 |
emesonargs+=( |
91 |
-DBUILD_HTML_MANS=$(usex doc true false) |
92 |
-DBUILD_MANS=true |
93 |
@@ -123,28 +131,26 @@ src_install() { |
94 |
dosym tracepath.8 /usr/share/man/man8/tracepath6.8 |
95 |
fi |
96 |
|
97 |
- if [[ ${PV} != 99999999 ]] ; then |
98 |
+ if [[ ${PV} != *9999 ]] ; then |
99 |
local -a man_pages |
100 |
local -a html_man_pages |
101 |
|
102 |
- while IFS= read -r -u 3 -d $'\0' my_bin |
103 |
- do |
104 |
+ while IFS= read -r -u 3 -d $'\0' my_bin; do |
105 |
my_bin=$(basename "${my_bin}") |
106 |
[[ -z "${my_bin}" ]] && continue |
107 |
|
108 |
- if [[ -f "${S}/doc/${my_bin}.8" ]] ; then |
109 |
+ if [[ -f "${WORKDIR}/${PN}-99999999-docs/doc/${my_bin}.8" ]] ; then |
110 |
man_pages+=( ${my_bin}.8 ) |
111 |
fi |
112 |
|
113 |
- if [[ -f "${S}/doc/${my_bin}.html" ]] ; then |
114 |
+ if [[ -f "${WORKDIR}/${PN}-99999999-docs/doc/${my_bin}.html" ]] ; then |
115 |
html_man_pages+=( ${my_bin}.html ) |
116 |
fi |
117 |
done 3< <(find "${ED}"/{bin,usr/bin,usr/sbin} -type f -perm -a+x -print0 2>/dev/null) |
118 |
|
119 |
- pushd doc &>/dev/null || die |
120 |
+ pushd "${WORKDIR}"/${PN}-99999999-docs/doc &>/dev/null || die |
121 |
doman "${man_pages[@]}" |
122 |
if use doc ; then |
123 |
- docinto html |
124 |
dodoc "${html_man_pages[@]}" |
125 |
fi |
126 |
popd &>/dev/null || die |
127 |
|
128 |
diff --git a/net-misc/iputils/iputils-99999999.ebuild b/net-misc/iputils/iputils-99999999.ebuild |
129 |
index 7f3760b7d4f5..9cb95e6d73a7 100644 |
130 |
--- a/net-misc/iputils/iputils-99999999.ebuild |
131 |
+++ b/net-misc/iputils/iputils-99999999.ebuild |
132 |
@@ -8,26 +8,34 @@ |
133 |
# EGIT_COMMIT set to release tag, all USE flags enabled and |
134 |
# tar ${S}/doc folder. |
135 |
|
136 |
-EAPI="7" |
137 |
+EAPI=8 |
138 |
|
139 |
PLOCALES="de fr ja pt_BR tr uk zh_CN" |
140 |
|
141 |
inherit fcaps meson plocale systemd toolchain-funcs |
142 |
|
143 |
-if [[ ${PV} == 99999999 ]] ; then |
144 |
+if [[ ${PV} == *9999 ]] ; then |
145 |
EGIT_REPO_URI="https://github.com/iputils/iputils.git" |
146 |
inherit git-r3 |
147 |
else |
148 |
- SRC_URI="https://github.com/iputils/iputils/archive/${PV}.tar.gz -> ${P}.tar.gz |
149 |
- https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-manpages-${PV}.tar.xz |
150 |
- https://dev.gentoo.org/~whissi/dist/iputils/${PN}-manpages-${PV}.tar.xz" |
151 |
+ SRC_URI=" |
152 |
+ https://github.com/iputils/iputils/archive/${PV}.tar.gz -> ${P}.tar.gz |
153 |
+ https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-docs.tar.xz |
154 |
+ " |
155 |
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" |
156 |
fi |
157 |
|
158 |
DESCRIPTION="Network monitoring tools including ping and ping6" |
159 |
HOMEPAGE="https://wiki.linuxfoundation.org/networking/iputils" |
160 |
|
161 |
-LICENSE="BSD GPL-2+ rdisc" |
162 |
+# We install ping unconditionally so BSD is listed by itself |
163 |
+# See LICENSE on each release, it summaries per-component |
164 |
+LICENSE=" |
165 |
+ BSD |
166 |
+ arping? ( GPL-2+ ) |
167 |
+ clockdiff? ( BSD ) |
168 |
+ tracepath? ( GPL-2+ ) |
169 |
+" |
170 |
SLOT="0" |
171 |
IUSE="+arping caps clockdiff doc idn nls test tracepath" |
172 |
RESTRICT="!test? ( test )" |
173 |
@@ -47,7 +55,7 @@ BDEPEND=" |
174 |
nls? ( sys-devel/gettext ) |
175 |
" |
176 |
|
177 |
-if [[ ${PV} == 99999999 ]] ; then |
178 |
+if [[ ${PV} == *9999 ]] ; then |
179 |
BDEPEND+=" |
180 |
app-text/docbook-xml-dtd:4.2 |
181 |
app-text/docbook-xml-dtd:4.5 |
182 |
@@ -77,7 +85,7 @@ src_configure() { |
183 |
$(meson_use !test SKIP_TESTS) |
184 |
) |
185 |
|
186 |
- if [[ ${PV} == 99999999 ]] ; then |
187 |
+ if [[ ${PV} == *9999 ]] ; then |
188 |
emesonargs+=( |
189 |
-DBUILD_HTML_MANS=$(usex doc true false) |
190 |
-DBUILD_MANS=true |
191 |
@@ -123,28 +131,26 @@ src_install() { |
192 |
dosym tracepath.8 /usr/share/man/man8/tracepath6.8 |
193 |
fi |
194 |
|
195 |
- if [[ ${PV} != 99999999 ]] ; then |
196 |
+ if [[ ${PV} != *9999 ]] ; then |
197 |
local -a man_pages |
198 |
local -a html_man_pages |
199 |
|
200 |
- while IFS= read -r -u 3 -d $'\0' my_bin |
201 |
- do |
202 |
+ while IFS= read -r -u 3 -d $'\0' my_bin; do |
203 |
my_bin=$(basename "${my_bin}") |
204 |
[[ -z "${my_bin}" ]] && continue |
205 |
|
206 |
- if [[ -f "${S}/doc/${my_bin}.8" ]] ; then |
207 |
+ if [[ -f "${WORKDIR}/${PN}-99999999-docs/doc/${my_bin}.8" ]] ; then |
208 |
man_pages+=( ${my_bin}.8 ) |
209 |
fi |
210 |
|
211 |
- if [[ -f "${S}/doc/${my_bin}.html" ]] ; then |
212 |
+ if [[ -f "${WORKDIR}/${PN}-99999999-docs/doc/${my_bin}.html" ]] ; then |
213 |
html_man_pages+=( ${my_bin}.html ) |
214 |
fi |
215 |
done 3< <(find "${ED}"/{bin,usr/bin,usr/sbin} -type f -perm -a+x -print0 2>/dev/null) |
216 |
|
217 |
- pushd doc &>/dev/null || die |
218 |
+ pushd "${WORKDIR}"/${PN}-99999999-docs/doc &>/dev/null || die |
219 |
doman "${man_pages[@]}" |
220 |
if use doc ; then |
221 |
- docinto html |
222 |
dodoc "${html_man_pages[@]}" |
223 |
fi |
224 |
popd &>/dev/null || die |