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 11BCA138350 for ; Sat, 11 Apr 2020 17:46:56 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4943EE0924; Sat, 11 Apr 2020 17:46:55 +0000 (UTC) Received: from smtp.gentoo.org (mail.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 35A60E0924 for ; Sat, 11 Apr 2020 17:46:55 +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 5FD2A34F08C for ; Sat, 11 Apr 2020 17:46:54 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 160E41CD for ; Sat, 11 Apr 2020 17:46:52 +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: <1586627208.970736fe78dc0c25b1497ff8e5f153c8d2dcc5ff.floppym@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-arch/bzip2/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-arch/bzip2/bzip2-1.0.8-r1.ebuild app-arch/bzip2/bzip2-9999.ebuild X-VCS-Directories: app-arch/bzip2/ X-VCS-Committer: floppym X-VCS-Committer-Name: Mike Gilbert X-VCS-Revision: 970736fe78dc0c25b1497ff8e5f153c8d2dcc5ff X-VCS-Branch: master Date: Sat, 11 Apr 2020 17:46:52 +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: 5e586090-1d19-499c-b051-256360094d99 X-Archives-Hash: 81f8b07607caa842f9b7c13d0484a404 commit: 970736fe78dc0c25b1497ff8e5f153c8d2dcc5ff Author: Mike Gilbert gentoo org> AuthorDate: Sat Apr 11 17:46:09 2020 +0000 Commit: Mike Gilbert gentoo org> CommitDate: Sat Apr 11 17:46:48 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=970736fe app-arch/bzip2: ensure libbz2.so.1.0 gets installed Package-Manager: Portage-2.3.96_p4, Repoman-2.3.22_p1 Signed-off-by: Mike Gilbert gentoo.org> app-arch/bzip2/bzip2-1.0.8-r1.ebuild | 8 ++++++++ app-arch/bzip2/bzip2-9999.ebuild | 7 +++++++ 2 files changed, 15 insertions(+) diff --git a/app-arch/bzip2/bzip2-1.0.8-r1.ebuild b/app-arch/bzip2/bzip2-1.0.8-r1.ebuild index e1e25b90ee4..34b92d2ea54 100644 --- a/app-arch/bzip2/bzip2-1.0.8-r1.ebuild +++ b/app-arch/bzip2/bzip2-1.0.8-r1.ebuild @@ -71,6 +71,14 @@ multilib_src_install() { for v in libbz2.so{,.{${PV%%.*},${PV%.*}}} ; do dosym libbz2.so.${PV} /usr/$(get_libdir)/${v} done + + # Install libbz2.so.1.0 due to accidental soname change in 1.0.7. + # Reference: 98da0ad82192d21ad74ae52366ea8466e2acea24. + # OK to remove one year after 2020-04-11. + if [[ ! -L "${ED}/usr/$(get_libdir)/libbz2.so.1.0" ]]; then + dosym libbz2.so.${PV} "/usr/$(get_libdir)/libbz2.so.1.0" + fi + use static-libs && dolib.a libbz2.a if multilib_is_native_abi ; then diff --git a/app-arch/bzip2/bzip2-9999.ebuild b/app-arch/bzip2/bzip2-9999.ebuild index a0c9cd7a462..579f0b8f44d 100644 --- a/app-arch/bzip2/bzip2-9999.ebuild +++ b/app-arch/bzip2/bzip2-9999.ebuild @@ -36,6 +36,13 @@ multilib_src_compile() { multilib_src_install() { meson_src_install + # Install libbz2.so.1.0 due to accidental soname change in 1.0.7. + # Reference: 98da0ad82192d21ad74ae52366ea8466e2acea24. + # OK to remove one year after 2020-04-11. + if [[ ! -L "${ED}/usr/$(get_libdir)/libbz2.so.1.0" ]]; then + dosym libbz2.so.1 "/usr/$(get_libdir)/libbz2.so.1.0" + fi + if multilib_is_native_abi ; then gen_usr_ldscript -a bz2