From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 58477158086 for ; Thu, 7 Oct 2021 14:49:44 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id AD69AE0827; Thu, 7 Oct 2021 14:49:43 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-CHACHA20-POLY1305 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 92530E0827 for ; Thu, 7 Oct 2021 14:49:43 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-CHACHA20-POLY1305 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 46D0A3432AE for ; Thu, 7 Oct 2021 14:49:42 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id BB28E89 for ; Thu, 7 Oct 2021 14:49:40 +0000 (UTC) From: "Mike Gilbert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Gilbert" Message-ID: <1633618133.f15136a2f35d977155da3f9e01fdf5678fea5408.floppym@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-libs/zlib/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-libs/zlib/zlib-1.2.11-r4.ebuild X-VCS-Directories: sys-libs/zlib/ X-VCS-Committer: floppym X-VCS-Committer-Name: Mike Gilbert X-VCS-Revision: f15136a2f35d977155da3f9e01fdf5678fea5408 X-VCS-Branch: master Date: Thu, 7 Oct 2021 14:49:40 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: e7ba86c8-bda0-469f-b73a-e47501f31978 X-Archives-Hash: 69a38c3dfc87f2ed5008414d2c6c5828 commit: f15136a2f35d977155da3f9e01fdf5678fea5408 Author: Mike Gilbert gentoo org> AuthorDate: Thu Oct 7 14:48:53 2021 +0000 Commit: Mike Gilbert gentoo org> CommitDate: Thu Oct 7 14:48:53 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f15136a2 sys-libs/zlib: fix install with slibtool Closes: https://bugs.gentoo.org/816756 Signed-off-by: Mike Gilbert gentoo.org> sys-libs/zlib/zlib-1.2.11-r4.ebuild | 4 +++- 1 file changed, 3 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 6af7187084d..bc2fe9834ee 100644 --- a/sys-libs/zlib/zlib-1.2.11-r4.ebuild +++ b/sys-libs/zlib/zlib-1.2.11-r4.ebuild @@ -150,7 +150,9 @@ multilib_src_install() { fi if use minizip; then - rm "${ED}"/usr/$(get_libdir)/libminizip.la || die + # 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