1 |
commit: ee7b3b86ee1337d444c5ae4f2754d48cc36f7ee1 |
2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Apr 22 21:38:11 2021 +0000 |
4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Apr 22 22:00:33 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ee7b3b86 |
7 |
|
8 |
net-misc/chrony: sync 4.0-r1 with live ebuild (template changes) |
9 |
|
10 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
11 |
|
12 |
net-misc/chrony/chrony-4.0-r1.ebuild | 13 ++++++++----- |
13 |
1 file changed, 8 insertions(+), 5 deletions(-) |
14 |
|
15 |
diff --git a/net-misc/chrony/chrony-4.0-r1.ebuild b/net-misc/chrony/chrony-4.0-r1.ebuild |
16 |
index 4fc6e56261e..bf4786c5977 100644 |
17 |
--- a/net-misc/chrony/chrony-4.0-r1.ebuild |
18 |
+++ b/net-misc/chrony/chrony-4.0-r1.ebuild |
19 |
@@ -3,8 +3,7 @@ |
20 |
|
21 |
EAPI=7 |
22 |
|
23 |
-VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/mlichvar.asc |
24 |
-inherit systemd tmpfiles toolchain-funcs verify-sig |
25 |
+inherit systemd tmpfiles toolchain-funcs |
26 |
|
27 |
DESCRIPTION="NTP client and server programs" |
28 |
HOMEPAGE="https://chrony.tuxfamily.org/ https://git.tuxfamily.org/chrony/chrony.git" |
29 |
@@ -13,9 +12,12 @@ if [[ ${PV} == "9999" ]]; then |
30 |
EGIT_REPO_URI="https://git.tuxfamily.org/chrony/chrony.git" |
31 |
inherit git-r3 |
32 |
else |
33 |
+ VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/mlichvar.asc |
34 |
+ inherit verify-sig |
35 |
+ |
36 |
SRC_URI="https://download.tuxfamily.org/${PN}/${P/_/-}.tar.gz" |
37 |
SRC_URI+=" verify-sig? ( https://download.tuxfamily.org/chrony/${P}-tar-gz-asc.txt -> ${P}.tar.gz.asc )" |
38 |
- KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 sparc x86" |
39 |
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86" |
40 |
fi |
41 |
|
42 |
S="${WORKDIR}/${P/_/-}" |
43 |
@@ -37,13 +39,14 @@ RESTRICT="test" |
44 |
|
45 |
BDEPEND=" |
46 |
nettle? ( virtual/pkgconfig ) |
47 |
- verify-sig? ( app-crypt/openpgp-keys-mlichvar ) |
48 |
" |
49 |
|
50 |
if [[ ${PV} == "9999" ]]; then |
51 |
# Needed for doc generation in 9999 |
52 |
- BDEPEND+=" virtual/w3m" |
53 |
REQUIRED_USE+=" html" |
54 |
+ BDEPEND+=" virtual/w3m" |
55 |
+else |
56 |
+ BDEPEND+=" verify-sig? ( app-crypt/openpgp-keys-mlichvar )" |
57 |
fi |
58 |
|
59 |
DEPEND=" |