diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2021-10-08 23:06:07 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2021-10-08 23:06:07 +0100 |
| commit | e23a08d0c97a0cc415aaa165da840b056f93c997 (patch) | |
| tree | 4c5f7db60483518201fef36f8cc0712789a08db2 /sys-libs/zlib | |
| parent | 391b5b359a346aff490103da7dddc85047f83830 (diff) | |
gentoo resync : 08.10.2021
Diffstat (limited to 'sys-libs/zlib')
| -rw-r--r-- | sys-libs/zlib/Manifest | 2 | ||||
| -rw-r--r-- | sys-libs/zlib/zlib-1.2.11-r4.ebuild | 9 |
2 files changed, 9 insertions, 2 deletions
diff --git a/sys-libs/zlib/Manifest b/sys-libs/zlib/Manifest index f5010a98b91c..6ef409c1d327 100644 --- a/sys-libs/zlib/Manifest +++ b/sys-libs/zlib/Manifest @@ -3,5 +3,5 @@ AUX zlib-1.2.11-minizip-drop-crypt-header.patch 997 BLAKE2B a964dfb26d05045507cb DIST zlib-1.2.11-cygwin-gzopen_w.patch 1170 BLAKE2B fe351436716634bd823da8c2811d332327d335d450d89bee85d7713b09dd454fe6aee264b044a41bf3be603aa36d67943ba6c7d8b46470e180e9b639728b5274 SHA512 14cc63a17fbf6afb6c8a8dd0b92df9807b48e0faf09c88f952083f10716ae62be8de2a0e1424b77fb538605b88898b381160521f2872afdda59e12bd27535c5a DIST zlib-1.2.11.tar.gz 607698 BLAKE2B 6bfc4bca5dcadba8a0d4121a2b3ed0bfe440c261003521862c8e6381f1a6f0a72d3fc037351d30afd7ef321e8e8d2ec817c046ac749f2ca0c97fbdc2f7e840b7 SHA512 73fd3fff4adeccd4894084c15ddac89890cd10ef105dd5e1835e1e9bbb6a49ff229713bd197d203edfa17c2727700fce65a2a235f07568212d820dca88b528ae DIST zlib-1.2.7-cygwin-minizip.patch 2626 BLAKE2B 885f1fda877c0b783618b163702fb46126b7db572767cd4edb86bd92db1f432c887ef1724e70c8319c26886368dba3a962af5284ec0875c20ec8ad2245fd100a SHA512 e372f1e06311e843eca2092e182c41abb009b5e9880b60292d708e4bc0de5a9e4c43d49b25b0c09df4784bc46a1254472bc5cdbdd8d6c762a9f6a145a555bfe7 -EBUILD zlib-1.2.11-r4.ebuild 4204 BLAKE2B ec6dbf321e9cfcfd555387469f0513b3ce13fef99b0a3710beff97621edd61568da20656eb8f8fee0b152d2928d60bca32e63fff090dbf492e237b6470a8e9b0 SHA512 53969ab5f1d09798445176e103abc9b1d58f72072caed38adf09db94cd692b9841cd39f4c19400d1873e07dc024cc6a5aa7e220ecc0e831bcd148857607cd383 +EBUILD zlib-1.2.11-r4.ebuild 4376 BLAKE2B 80381188e72cf38e6207c661d021caa3bc99f03fc93d5fedccaf208f9f265f6d1299991864c54b03ebcda215c8cb8a09b8f280119d1f30de62b72d525a629ae9 SHA512 3a5dc0b7742c63a83e5b5d4251eaf6c38bdfe740a32633066897f6eaad843c26aecafadd84ef4390d963cea60fb9e0fa3ebf35d4a0fbeba3f967ea0584414f1e MISC metadata.xml 494 BLAKE2B a4a57a4153aefc189e407bcb8ce84f7c94581cc66967f69097087da7e6ff48d2de683b919fb00445d095c47ef39d31e01590f8c989ce0e5e01474e73ee2a0565 SHA512 a7e0160c127b3c2a6afe99e95992d9dbd017061303759c299ec38800efd6a9e11a35ae850c23c77c09c8833cd9d61ac1267f6becadf9c22437ee35e4304400c9 diff --git a/sys-libs/zlib/zlib-1.2.11-r4.ebuild b/sys-libs/zlib/zlib-1.2.11-r4.ebuild index 5dfe56381a95..bc2fe9834ee2 100644 --- a/sys-libs/zlib/zlib-1.2.11-r4.ebuild +++ b/sys-libs/zlib/zlib-1.2.11-r4.ebuild @@ -149,8 +149,15 @@ multilib_src_install() { sed_macros "${ED}"/usr/include/minizip/*.h fi + if use minizip; then + # This might not exist if slibtool is used. + # https://bugs.gentoo.org/816756 + rm -f "${ED}"/usr/$(get_libdir)/libminizip.la || die + fi + if ! use static-libs ; then - rm -f "${ED}"/usr/$(get_libdir)/lib{z,minizip}.{a,la} || die #419645 + # https://bugs.gentoo.org/419645 + rm "${ED}"/usr/$(get_libdir)/libz.a || die fi } |