summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoramynka@gentoo.org <amynka@gentoo.org>2018-04-19 21:32:45 +0200
committerAmy Liffey <amynka@gentoo.org>2018-04-20 11:03:02 +0200
commit35f63607907561d6f9b03531925d1c014b52a159 (patch)
treea70738a30747e435e2e2e6db2988d864ddea73f5 /sys-libs/zlib
parentapp-emulation/vagrant: drop old (diff)
downloadgentoo-35f63607907561d6f9b03531925d1c014b52a159.tar.gz
gentoo-35f63607907561d6f9b03531925d1c014b52a159.tar.bz2
gentoo-35f63607907561d6f9b03531925d1c014b52a159.zip
*/*: [QA] remove emul-linux-* blockers
Closes: https://github.com/gentoo/gentoo/pull/8074
Diffstat (limited to 'sys-libs/zlib')
-rw-r--r--sys-libs/zlib/zlib-1.2.11-r1.ebuild6
-rw-r--r--sys-libs/zlib/zlib-1.2.11.ebuild6
2 files changed, 2 insertions, 10 deletions
diff --git a/sys-libs/zlib/zlib-1.2.11-r1.ebuild b/sys-libs/zlib/zlib-1.2.11-r1.ebuild
index 72a283b1cb0..aeddd1a694d 100644
--- a/sys-libs/zlib/zlib-1.2.11-r1.ebuild
+++ b/sys-libs/zlib/zlib-1.2.11-r1.ebuild
@@ -18,11 +18,7 @@ KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86
IUSE="minizip static-libs"
DEPEND="minizip? ( ${AUTOTOOLS_DEPEND} )"
-RDEPEND="abi_x86_32? (
- !<=app-emulation/emul-linux-x86-baselibs-20130224
- !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
- )
- !<dev-libs/libxml2-2.7.7" #309623
+RDEPEND="!<dev-libs/libxml2-2.7.7" #309623
src_prepare() {
epatch "${FILESDIR}"/${PN}-1.2.11-fix-deflateParams-usage.patch
diff --git a/sys-libs/zlib/zlib-1.2.11.ebuild b/sys-libs/zlib/zlib-1.2.11.ebuild
index e8653b406ed..a7d2cb8d2a9 100644
--- a/sys-libs/zlib/zlib-1.2.11.ebuild
+++ b/sys-libs/zlib/zlib-1.2.11.ebuild
@@ -18,11 +18,7 @@ KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86
IUSE="minizip static-libs"
DEPEND="minizip? ( ${AUTOTOOLS_DEPEND} )"
-RDEPEND="abi_x86_32? (
- !<=app-emulation/emul-linux-x86-baselibs-20130224
- !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
- )
- !<dev-libs/libxml2-2.7.7" #309623
+RDEPEND="!<dev-libs/libxml2-2.7.7" #309623
src_prepare() {
if use minizip ; then