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 9ED601382C5 for ; Sun, 27 Dec 2020 10:25:23 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id DA92F2BC008; Sun, 27 Dec 2020 10:25:22 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id BF7AE2BC008 for ; Sun, 27 Dec 2020 10:25:22 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C4FD0340E94 for ; Sun, 27 Dec 2020 10:25:21 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 34A594B for ; Sun, 27 Dec 2020 10:25:20 +0000 (UTC) From: "Fabian Groffen" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Fabian Groffen" Message-ID: <1609064711.19b5e7f05524f7788c35cc0e13f437358ca43f1c.grobian@gentoo> Subject: [gentoo-commits] repo/proj/prefix:master commit in: app-arch/bzip2/ X-VCS-Repository: repo/proj/prefix X-VCS-Files: app-arch/bzip2/bzip2-1.0.6-r10.ebuild X-VCS-Directories: app-arch/bzip2/ X-VCS-Committer: grobian X-VCS-Committer-Name: Fabian Groffen X-VCS-Revision: 19b5e7f05524f7788c35cc0e13f437358ca43f1c X-VCS-Branch: master Date: Sun, 27 Dec 2020 10:25:20 +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: 6247041e-7857-4786-9ff7-537727fed793 X-Archives-Hash: c32e74fced1e872de683fea9aa813b08 commit: 19b5e7f05524f7788c35cc0e13f437358ca43f1c Author: Fabian Groffen gentoo org> AuthorDate: Sun Dec 27 10:25:11 2020 +0000 Commit: Fabian Groffen gentoo org> CommitDate: Sun Dec 27 10:25:11 2020 +0000 URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=19b5e7f0 app-arch/bzip2: drop one more mint remnant Package-Manager: Portage-3.0.12-prefix, Repoman-3.0.2 Signed-off-by: Fabian Groffen gentoo.org> app-arch/bzip2/bzip2-1.0.6-r10.ebuild | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/app-arch/bzip2/bzip2-1.0.6-r10.ebuild b/app-arch/bzip2/bzip2-1.0.6-r10.ebuild index 7a3d83fdd5..c41ed39dff 100644 --- a/app-arch/bzip2/bzip2-1.0.6-r10.ebuild +++ b/app-arch/bzip2/bzip2-1.0.6-r10.ebuild @@ -71,16 +71,13 @@ multilib_src_compile() { case "${CHOST}" in *-darwin*) bemake PREFIX="${EPREFIX}"/usr -f "${S}"/Makefile-libbz2_dylib all - # FWIW, #504648 like for .so below - ln -sf libbz2.${PV}.dylib libbz2.dylib ;; *) bemake -f "${S}"/Makefile-libbz2_so all - # Make sure we link against the shared lib #504648 - [[ $(get_libname) != $(get_libname ${PV}) ]] && - ln -sf libbz2$(get_libname ${PV}) libbz2$(get_libname) ;; esac + # Make sure we link against the shared lib #504648 + ln -sf libbz2$(get_libname ${PV}) libbz2$(get_libname) bemake -f "${S}"/Makefile all LDFLAGS="${LDFLAGS} $(usex static -static '')" } @@ -94,7 +91,6 @@ multilib_src_install() { dolib.so libbz2$(get_libname ${PV}) [[ ${CHOST} == *-cygwin* ]] && dobin cygbz2-${PV%%.*}.dll local v - [[ $(get_libname) != $(get_libname ${PV}) ]] && for v in libbz2$(get_libname) libbz2$(get_libname ${PV%%.*}) libbz2$(get_libname ${PV%.*}) ; do dosym libbz2$(get_libname ${PV}) /usr/$(get_libdir)/${v} done