diff --git a/sdk_container/src/third_party/portage-stable/app-arch/pbzip2/metadata.xml b/sdk_container/src/third_party/portage-stable/app-arch/pbzip2/metadata.xml index 7c03138eba..58c362b73a 100644 --- a/sdk_container/src/third_party/portage-stable/app-arch/pbzip2/metadata.xml +++ b/sdk_container/src/third_party/portage-stable/app-arch/pbzip2/metadata.xml @@ -1,13 +1,7 @@ - - polynomial-c@gentoo.org - Lars Wendler - - - Install symlinks which override app-arch/bzip2 implementation - + pbzip2 diff --git a/sdk_container/src/third_party/portage-stable/app-arch/pbzip2/pbzip2-1.1.13.ebuild b/sdk_container/src/third_party/portage-stable/app-arch/pbzip2/pbzip2-1.1.13.ebuild index 2cf98bba0e..45b38f64b9 100644 --- a/sdk_container/src/third_party/portage-stable/app-arch/pbzip2/pbzip2-1.1.13.ebuild +++ b/sdk_container/src/third_party/portage-stable/app-arch/pbzip2/pbzip2-1.1.13.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" @@ -11,13 +11,11 @@ SRC_URI="https://launchpad.net/pbzip2/${PV:0:3}/${PV}/+download/${P}.tar.gz" LICENSE="BZIP2" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" -IUSE="static symlink" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" +IUSE="static" LIB_DEPEND="app-arch/bzip2[static-libs(+)]" -RDEPEND=" - !static? ( ${LIB_DEPEND//\[static-libs(+)]} ) - symlink? ( !app-arch/lbzip2[symlink] )" +RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )" DEPEND="${RDEPEND} static? ( ${LIB_DEPEND} )" @@ -39,11 +37,4 @@ src_configure() { src_install() { emake DESTDIR="${ED}" install dodoc AUTHORS ChangeLog README - - if use symlink ; then - local s - for s in bzip2 bunzip2 bzcat ; do - dosym pbzip2 /usr/bin/${s} - done - fi }