commit: 91016d3668de9ce1a9da58f9668db756d1197c63 Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> AuthorDate: Mon Sep 5 15:04:17 2022 +0000 Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> CommitDate: Mon Sep 5 21:32:01 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=91016d36
app-arch/bzip2: add blocker against lbzip2 Closes: https://bugs.gentoo.org/868318 Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org> .../bzip2/{bzip2-1.0.8-r1.ebuild => bzip2-1.0.8-r2.ebuild} | 12 +----------- app-arch/bzip2/bzip2-9999.ebuild | 4 +++- 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/app-arch/bzip2/bzip2-1.0.8-r1.ebuild b/app-arch/bzip2/bzip2-1.0.8-r2.ebuild similarity index 89% rename from app-arch/bzip2/bzip2-1.0.8-r1.ebuild rename to app-arch/bzip2/bzip2-1.0.8-r2.ebuild index 62a13959bff9..b2e7d764d2eb 100644 --- a/app-arch/bzip2/bzip2-1.0.8-r1.ebuild +++ b/app-arch/bzip2/bzip2-1.0.8-r2.ebuild @@ -9,10 +9,6 @@ EAPI=7 VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/bzip2.gpg inherit toolchain-funcs multilib-minimal usr-ldscript verify-sig -if [[ ${PVR} != 1.0.8-r1 ]]; then - die "Please remove libbz2.so.1.0 logic from multilib_src_install" -fi - DESCRIPTION="A high-quality data compressor used extensively by Gentoo Linux" HOMEPAGE="https://sourceware.org/bzip2/"; SRC_URI="https://sourceware.org/pub/${PN}/${P}.tar.gz"; @@ -24,6 +20,7 @@ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv IUSE="static static-libs" BDEPEND="verify-sig? ( sec-keys/openpgp-keys-bzip2 )" +RDEPEND="!app-arch/lbzip2[symlink(-)]" PATCHES=( "${FILESDIR}"/${PN}-1.0.4-makefile-CFLAGS.patch @@ -85,13 +82,6 @@ multilib_src_install() { 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 a5f4b823c2f1..80435914e091 100644 --- a/app-arch/bzip2/bzip2-9999.ebuild +++ b/app-arch/bzip2/bzip2-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -19,6 +19,8 @@ SLOT="0/1" # subslot = SONAME IUSE="static-libs" +RDEPEND="!app-arch/lbzip2[symlink(-)]" + multilib_src_configure() { local emesonargs=( -Ddefault_library=$(usex static-libs both shared)
