[gentoo-commits] repo/proj/prefix:master commit in: sys-libs/zlib/

[Fabian Groffen]

commit:     1f1f4d93530cf0dbb94a518ee5c244c9f8d95a8a
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sun Aug  2 15:03:04 2020 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sun Aug  2 15:03:04 2020 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=1f1f4d93

sys-libs/zlib: make as close to gx86 as possible

Package-Manager: Portage-3.0.1-prefix, Repoman-2.3.23
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 sys-libs/zlib/Manifest              |  4 ++--
 sys-libs/zlib/zlib-1.2.11-r2.ebuild | 15 ++++-----------
 2 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/sys-libs/zlib/Manifest b/sys-libs/zlib/Manifest
index b81b8a96b5..8c23d4e6e6 100644
--- a/sys-libs/zlib/Manifest
+++ b/sys-libs/zlib/Manifest
@@ -1,3 +1,3 @@
-DIST 1.2.11-gzopen_w.patch 1170 SHA256 
2eea64808bc6edd2f12a7f7ef66381a73a546fa31ec9f95e5305cf51f3db3d86 SHA512 
14cc63a17fbf6afb6c8a8dd0b92df9807b48e0faf09c88f952083f10716ae62be8de2a0e1424b77fb538605b88898b381160521f2872afdda59e12bd27535c5a
 WHIRLPOOL 
f7ac23bd77c2de46877788733ccea829a70c3fc6edf2b107c2b1b6542264be01252d44d25384c1844a60691a1d76434d3aa5244377afb0ea4d940c28545ad724
-DIST 1.2.7-minizip-cygwin.patch 2626 SHA256 
0352e8b84ea4c9c8e3de1817fe42db6a729cce834d5784b399974418ec0e44e8 SHA512 
e372f1e06311e843eca2092e182c41abb009b5e9880b60292d708e4bc0de5a9e4c43d49b25b0c09df4784bc46a1254472bc5cdbdd8d6c762a9f6a145a555bfe7
 WHIRLPOOL 
ebe80cee80ba6b6fee91ead27e3a5fd3988de918ab50d5567ec567e66a42a1de36271cb62a8c2b7bb7e391b6b086db4fc493e1eaa06bd8ff671528407d3458ef
+DIST 1.2.11-gzopen_w.patch 1170 BLAKE2B 
fe351436716634bd823da8c2811d332327d335d450d89bee85d7713b09dd454fe6aee264b044a41bf3be603aa36d67943ba6c7d8b46470e180e9b639728b5274
 SHA512 
14cc63a17fbf6afb6c8a8dd0b92df9807b48e0faf09c88f952083f10716ae62be8de2a0e1424b77fb538605b88898b381160521f2872afdda59e12bd27535c5a
+DIST 1.2.7-minizip-cygwin.patch 2626 BLAKE2B 
885f1fda877c0b783618b163702fb46126b7db572767cd4edb86bd92db1f432c887ef1724e70c8319c26886368dba3a962af5284ec0875c20ec8ad2245fd100a
 SHA512 
e372f1e06311e843eca2092e182c41abb009b5e9880b60292d708e4bc0de5a9e4c43d49b25b0c09df4784bc46a1254472bc5cdbdd8d6c762a9f6a145a555bfe7
 DIST zlib-1.2.11.tar.gz 607698 BLAKE2B 
6bfc4bca5dcadba8a0d4121a2b3ed0bfe440c261003521862c8e6381f1a6f0a72d3fc037351d30afd7ef321e8e8d2ec817c046ac749f2ca0c97fbdc2f7e840b7
 SHA512 
73fd3fff4adeccd4894084c15ddac89890cd10ef105dd5e1835e1e9bbb6a49ff229713bd197d203edfa17c2727700fce65a2a235f07568212d820dca88b528ae

diff --git a/sys-libs/zlib/zlib-1.2.11-r2.ebuild 
b/sys-libs/zlib/zlib-1.2.11-r2.ebuild
index dae3b48fe6..4bdcc47b50 100644
--- a/sys-libs/zlib/zlib-1.2.11-r2.ebuild
+++ b/sys-libs/zlib/zlib-1.2.11-r2.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
 AUTOTOOLS_AUTO_DEPEND="no"
 
-inherit autotools toolchain-funcs multilib multilib-minimal
+inherit autotools toolchain-funcs multilib multilib-minimal usr-ldscript
 
 CYGWINPATCHES=(
        
"https://github.com/cygwinports/zlib/raw/22a3462cae33a82ad966ea0a7d6cbe8fc1368fec/1.2.11-gzopen_w.patch";
@@ -24,11 +24,7 @@ KEYWORDS="~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux 
~ppc-macos ~x64-macos ~x8
 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
@@ -41,13 +37,10 @@ src_prepare() {
        done
 
        if use minizip ; then
-               pushd contrib/minizip >/dev/null || die
+               cd contrib/minizip || die
                eautoreconf
-               popd >/dev/null || die
        fi
 
-#      epatch "${FILESDIR}"/${PN}-1.2.7-aix-soname.patch #213277
-
        case ${CHOST} in
        *-cygwin*)
                # do not use _wopen, is a mingw symbol only