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-libs/zlib/
Date: Mon, 28 Mar 2022 06:45:18
Message-Id: 1648449861.a261b990b7a1da9264aab075c1104ff4a76afc47.sam@gentoo
1 commit: a261b990b7a1da9264aab075c1104ff4a76afc47
2 Author: Sam James <sam <AT> gentoo <DOT> org>
3 AuthorDate: Mon Mar 28 06:44:21 2022 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Mon Mar 28 06:44:21 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a261b990
7
8 sys-libs/zlib: drop (very) obsolete blocker on old libxml2
9
10 Old libxml2 would crash when using new zlib. A looong time ago.
11
12 Signed-off-by: Sam James <sam <AT> gentoo.org>
13
14 sys-libs/zlib/zlib-1.2.12.ebuild | 6 +-----
15 1 file changed, 1 insertion(+), 5 deletions(-)
16
17 diff --git a/sys-libs/zlib/zlib-1.2.12.ebuild b/sys-libs/zlib/zlib-1.2.12.ebuild
18 index 88872d40aa55..df1e5ec494cf 100644
19 --- a/sys-libs/zlib/zlib-1.2.12.ebuild
20 +++ b/sys-libs/zlib/zlib-1.2.12.ebuild
21 @@ -25,11 +25,7 @@ SLOT="0/1" # subslot = SONAME
22 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 ~x86-winnt"
23 IUSE="minizip static-libs"
24
25 -# See bug #309623 for libxml2
26 -RDEPEND="
27 - !<dev-libs/libxml2-2.7.7
28 - !sys-libs/zlib-ng[compat]
29 -"
30 +RDEPEND="!sys-libs/zlib-ng[compat]"
31 DEPEND="${RDEPEND}"
32 BDEPEND="minizip? ( ${AUTOTOOLS_DEPEND} )
33 verify-sig? ( sec-keys/openpgp-keys-madler )"