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

[Mike Gilbert]

commit:     f8fdcbb7421355945fc895231fa3da30645ef81b
Author:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Fri Oct  1 18:38:29 2021 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Fri Oct  1 19:41:12 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f8fdcbb7

sys-libs/zlib: fix .a and .la removal logic

minizip uses automake/libtool, and its static lib is disabled at
configure time. We just need to remove the .la file.

libz uses a homegrown Makefile, and we need to remove libz.a after
installation. There is no .la file.

Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>

 sys-libs/zlib/zlib-1.2.11-r4.ebuild | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/sys-libs/zlib/zlib-1.2.11-r4.ebuild b/sys-libs/zlib/zlib-1.2.11-r4.ebuild
index 5dfe56381a9..6af7187084d 100644
--- a/sys-libs/zlib/zlib-1.2.11-r4.ebuild
+++ b/sys-libs/zlib/zlib-1.2.11-r4.ebuild
@@ -149,8 +149,13 @@ multilib_src_install() {
 		sed_macros "${ED}"/usr/include/minizip/*.h
 	fi
 
+	if use minizip; then
+		rm "${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
 }