Gentoo Archives: gentoo-commits

From: Mike Gilbert <floppym@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-arch/bzip2/
Date: Tue, 06 Sep 2022 16:10:15
Message-Id: 1662480607.876ad3a2e8d9893a31390c0f7b8a956dad4df17a.floppym@gentoo
1 commit: 876ad3a2e8d9893a31390c0f7b8a956dad4df17a
2 Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
3 AuthorDate: Tue Sep 6 16:01:50 2022 +0000
4 Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
5 CommitDate: Tue Sep 6 16:10:07 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=876ad3a2
7
8 app-arch/bzip2: add blocker against app-arch/pbzip2[symlink]
9
10 Bug: https://bugs.gentoo.org/868318
11 Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
12
13 app-arch/bzip2/{bzip2-1.0.8-r2.ebuild => bzip2-1.0.8-r3.ebuild} | 3 ++-
14 app-arch/bzip2/bzip2-9999.ebuild | 3 ++-
15 2 files changed, 4 insertions(+), 2 deletions(-)
16
17 diff --git a/app-arch/bzip2/bzip2-1.0.8-r2.ebuild b/app-arch/bzip2/bzip2-1.0.8-r3.ebuild
18 similarity index 97%
19 rename from app-arch/bzip2/bzip2-1.0.8-r2.ebuild
20 rename to app-arch/bzip2/bzip2-1.0.8-r3.ebuild
21 index b2e7d764d2eb..1bdda90d94f3 100644
22 --- a/app-arch/bzip2/bzip2-1.0.8-r2.ebuild
23 +++ b/app-arch/bzip2/bzip2-1.0.8-r3.ebuild
24 @@ -20,7 +20,8 @@ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv
25 IUSE="static static-libs"
26
27 BDEPEND="verify-sig? ( sec-keys/openpgp-keys-bzip2 )"
28 -RDEPEND="!app-arch/lbzip2[symlink(-)]"
29 +RDEPEND="!app-arch/lbzip2[symlink(-)]
30 + !app-arch/pbzip2[symlink(-)]"
31
32 PATCHES=(
33 "${FILESDIR}"/${PN}-1.0.4-makefile-CFLAGS.patch
34
35 diff --git a/app-arch/bzip2/bzip2-9999.ebuild b/app-arch/bzip2/bzip2-9999.ebuild
36 index 80435914e091..38d766cedafc 100644
37 --- a/app-arch/bzip2/bzip2-9999.ebuild
38 +++ b/app-arch/bzip2/bzip2-9999.ebuild
39 @@ -19,7 +19,8 @@ SLOT="0/1" # subslot = SONAME
40
41 IUSE="static-libs"
42
43 -RDEPEND="!app-arch/lbzip2[symlink(-)]"
44 +RDEPEND="!app-arch/lbzip2[symlink(-)]
45 + !app-arch/pbzip2[symlink(-)]"
46
47 multilib_src_configure() {
48 local emesonargs=(