Gentoo Archives: gentoo-commits

From: Sam James <sam@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-arch/bzip2/
Date: Wed, 06 Apr 2022 23:34:30
Message-Id: 1649288017.7eda253785d276a8439584e4d76b93eb24876fa9.sam@gentoo
1 commit: 7eda253785d276a8439584e4d76b93eb24876fa9
2 Author: Sam James <sam <AT> gentoo <DOT> org>
3 AuthorDate: Wed Apr 6 23:11:49 2022 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Wed Apr 6 23:33:37 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7eda2537
7
8 app-arch/bzip2: add verify-sig
9
10 Not syncing 9999 intentionally as it's a different upstream anyway
11 & completely different ebuild.
12
13 Signed-off-by: Sam James <sam <AT> gentoo.org>
14
15 app-arch/bzip2/Manifest | 1 +
16 app-arch/bzip2/bzip2-1.0.8-r1.ebuild | 6 +++++-
17 2 files changed, 6 insertions(+), 1 deletion(-)
18
19 diff --git a/app-arch/bzip2/Manifest b/app-arch/bzip2/Manifest
20 index a4b18f5d5bf2..099151807c27 100644
21 --- a/app-arch/bzip2/Manifest
22 +++ b/app-arch/bzip2/Manifest
23 @@ -1 +1,2 @@
24 DIST bzip2-1.0.8.tar.gz 810029 BLAKE2B 22ab3acd84f4db8c3d6f59340c252faedfd4447cea00dafbd652e65b6cf8a20adf6835c22e58563004cfafdb15348c924996230b4b23cae42da5e25eeac4bdad SHA512 083f5e675d73f3233c7930ebe20425a533feedeaaa9d8cc86831312a6581cefbe6ed0d08d2fa89be81082f2a5abdabca8b3c080bf97218a1bd59dc118a30b9f3
25 +DIST bzip2-1.0.8.tar.gz.sig 310 BLAKE2B 0d702dcb19f7738da9f05ee9d719f5cd3653540365e78db143404e599ea54bc6f9d5e6a38cdf5cdd3c6550243d34266343467c6b1db9d5d3c134f9353b00f395 SHA512 4a4a3fa0ec1c10a704b9870e8e629fd007cca55184423c6bfc3049a702fb41e4aeb73bfe9ca7442c27d32d278f1f34f27523a6be67d35b37896acdded12bf40d
26
27 diff --git a/app-arch/bzip2/bzip2-1.0.8-r1.ebuild b/app-arch/bzip2/bzip2-1.0.8-r1.ebuild
28 index 20e9e8edeb87..27ae77914b3c 100644
29 --- a/app-arch/bzip2/bzip2-1.0.8-r1.ebuild
30 +++ b/app-arch/bzip2/bzip2-1.0.8-r1.ebuild
31 @@ -6,7 +6,8 @@
32
33 EAPI=7
34
35 -inherit toolchain-funcs multilib-minimal usr-ldscript
36 +VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/bzip2.gpg
37 +inherit toolchain-funcs multilib-minimal usr-ldscript verify-sig
38
39 if [[ ${PVR} != 1.0.8-r1 ]]; then
40 die "Please remove libbz2.so.1.0 logic from multilib_src_install"
41 @@ -15,12 +16,15 @@ fi
42 DESCRIPTION="A high-quality data compressor used extensively by Gentoo Linux"
43 HOMEPAGE="https://sourceware.org/bzip2/"
44 SRC_URI="https://sourceware.org/pub/${PN}/${P}.tar.gz"
45 +SRC_URI+=" verify-sig? ( https://sourceware.org/pub/${PN}/${P}.tar.gz.sig )"
46
47 LICENSE="BZIP2"
48 SLOT="0/1" # subslot = SONAME
49 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
50 IUSE="static static-libs"
51
52 +BDEPEND="verify-sig? ( sec-keys/openpgp-keys-bzip2 )"
53 +
54 PATCHES=(
55 "${FILESDIR}"/${PN}-1.0.4-makefile-CFLAGS.patch
56 "${FILESDIR}"/${PN}-1.0.8-saneso.patch