Gentoo Archives: gentoo-commits

From: Sam James <sam@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/diffutils/
Date: Thu, 07 Apr 2022 03:58:09
Message-Id: 1649303832.dfb053477f7cd2065b75970e6ea5dfb79f435a4e.sam@gentoo
1 commit: dfb053477f7cd2065b75970e6ea5dfb79f435a4e
2 Author: Sam James <sam <AT> gentoo <DOT> org>
3 AuthorDate: Thu Apr 7 03:41:37 2022 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Thu Apr 7 03:57:12 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dfb05347
7
8 sys-apps/diffutils: add verify-sig
9
10 Signed-off-by: Sam James <sam <AT> gentoo.org>
11
12 sys-apps/diffutils/Manifest | 1 +
13 sys-apps/diffutils/diffutils-3.8.ebuild | 14 ++++++++++----
14 2 files changed, 11 insertions(+), 4 deletions(-)
15
16 diff --git a/sys-apps/diffutils/Manifest b/sys-apps/diffutils/Manifest
17 index 60bb7af2dc63..acf8f16cb654 100644
18 --- a/sys-apps/diffutils/Manifest
19 +++ b/sys-apps/diffutils/Manifest
20 @@ -1 +1,2 @@
21 DIST diffutils-3.8.tar.xz 1585120 BLAKE2B 573abbfba55c62ba30d2084ca68860e9681cfe92648407f7fb04e1aaed2e4719e2fb5a29cf25bd125d762f4dfd52f85ee91f2ec19b099365bada7fe27a0394af SHA512 279441270987e70d5ecfaf84b6285a4866929c43ec877e50f154a788858d548a8a316f2fc26ad62f7348c8d289cb29a09d06dfadce1806e3d8b4ea88c8b1aa7c
22 +DIST diffutils-3.8.tar.xz.sig 833 BLAKE2B 439d331d9839d8b434b7192c52628bc9e8e1c11cada28170f85c9390abc3e5e9ea86aee696a4f9260552133053194680ff54b960ed539fabec85fdff54dee3a2 SHA512 0464ac89209411993800666b45ff90243d22fbda53bf1d71c6870d565b39cc8d9c54c141b9d297a181ce74ad8fb5313953f416bced179ff7728a52a3e9a4f5a5
23
24 diff --git a/sys-apps/diffutils/diffutils-3.8.ebuild b/sys-apps/diffutils/diffutils-3.8.ebuild
25 index 4cae3d13edc4..df2a985392fb 100644
26 --- a/sys-apps/diffutils/diffutils-3.8.ebuild
27 +++ b/sys-apps/diffutils/diffutils-3.8.ebuild
28 @@ -1,21 +1,27 @@
29 -# Copyright 1999-2021 Gentoo Authors
30 +# Copyright 1999-2022 Gentoo Authors
31 # Distributed under the terms of the GNU General Public License v2
32
33 EAPI=7
34
35 -inherit flag-o-matic
36 +VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/diffutils.asc
37 +inherit flag-o-matic verify-sig
38
39 DESCRIPTION="Tools to make diffs and compare files"
40 HOMEPAGE="https://www.gnu.org/software/diffutils/"
41 SRC_URI="mirror://gnu/diffutils/${P}.tar.xz
42 - https://alpha.gnu.org/gnu/diffutils/${P}.tar.xz"
43 + https://alpha.gnu.org/gnu/diffutils/${P}.tar.xz
44 + verify-sig? (
45 + mirror://gnu/diffutils/${P}.tar.xz.sig
46 + https://alpha.gnu.org/gnu/diffutils/${P}.tar.xz.sig
47 + )"
48
49 LICENSE="GPL-2"
50 SLOT="0"
51 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
52 IUSE="nls static"
53
54 -BDEPEND="nls? ( sys-devel/gettext )"
55 +BDEPEND="nls? ( sys-devel/gettext )
56 + verify-sig? ( sec-keys/openpgp-keys-diffutils )"
57
58 PATCHES=( "${FILESDIR}/ppc-musl.patch" )