diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2024-10-14 04:04:03 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2024-10-14 04:04:03 +0100 |
| commit | 2916cf6049cf9d3092021e247d56c580df6029a7 (patch) | |
| tree | c796a6fc8b6fd0e4fd5ac06b009000b438fed7d9 /app-arch/p7zip | |
| parent | 7b5306e0d287565138e8b051e32f57e6af6ae0ed (diff) | |
gentoo auto-resync : 14:10:2024 - 04:04:03
Diffstat (limited to 'app-arch/p7zip')
| -rw-r--r-- | app-arch/p7zip/Manifest | 2 | ||||
| -rw-r--r-- | app-arch/p7zip/p7zip-17.05-r1.ebuild | 24 |
2 files changed, 11 insertions, 15 deletions
diff --git a/app-arch/p7zip/Manifest b/app-arch/p7zip/Manifest index 7cf903c006c8..b033d4087446 100644 --- a/app-arch/p7zip/Manifest +++ b/app-arch/p7zip/Manifest @@ -9,5 +9,5 @@ AUX p7zip-17.05-unit64.patch 470 BLAKE2B 63969d319e3fcc624dc0b0b4b5580887d23259d DIST p7zip-17.05.tar.gz 6722154 BLAKE2B 0bcba638d3acaf2aa270e02693ad4295dfcc6b388037bdb446e25f3f4e1cb34f1b05bbc9a845364ca770625c32b2d7f55f63f504ad8e0863fff4bf940ae1fddd SHA512 97a7cfd15287998eb049c320548477be496c4ddf6b45c833c42adca4ab88719b07a442ae2e71cf2dc3b30a0777a3acab0a1a30f01fd85bacffa3fa9bd22c3f7d DIST p7zip_16.02_src_all.tar.bz2 4239909 BLAKE2B 075356fba5284cbb124e30c36364a910ae5a7ac6bee8a8fb682c5a7ce2f1870ef83d3160c84f8dabad1d616c13d642cba1f19fb9384160d21590cf678dd8f1a6 SHA512 d2c4d53817f96bb4c7683f42045198d4cd509cfc9c3e2cb85c8d9dc4ab6dfa7496449edeac4e300ecf986a9cbbc90bd8f8feef8156895d94617c04e507add55f EBUILD p7zip-16.02-r8.ebuild 4084 BLAKE2B 751bd46aafa907e01442c53a81e599c1877be619ad7b99ba3bc30a6af8a184e6d346f7d466b0b5c42bfbb25345263ef9057e13b0785b361498a0ff86ab2f906a SHA512 6984a246c1f55b36a5345f37945bb8930d3b6c7f6fe717d26d4bc81ecaa0ecaedd667ad277651ee01f941d9e512df94f8d89161ea7a29805667fcb357b716e2d -EBUILD p7zip-17.05-r1.ebuild 3249 BLAKE2B 56400800496ba7a6fd4fc3d4adf399e5e49502a136fa06aeac2e899645a5c89514c0615cafecdfd08ad1ac4d8e843361c264f01806ccc5067dcd260160badd18 SHA512 e28afadd07b5ba011d5d94cd744ddf798f7ea98a1d5441bcf9ebe9fb54c1878778a88d5b00b4da3b4e3ab3cd5401f90a5b8aee23925928fe23a466058d1daea5 +EBUILD p7zip-17.05-r1.ebuild 3173 BLAKE2B 4f9e0f89bad44688c219bebfa70fc792c5ad81b355944b5d73e9fe79bd60b4733d81f26093f4a771130852be328511b7bff8587c0e1a49139fcf07d2b6af6d54 SHA512 17fc1729299c54fc8a7a3ab59beb9cd4bdb28d02e2bf0eb4b5d26e8fa21844e03880c69e5d67ba7197ca2eef8e5a094b4dd42b315886a56ac874ece7aab428b3 MISC metadata.xml 532 BLAKE2B 9ffdc29d8d8f6a82e7a55f4448870a4dd019468a440ade6df10ad1336617d14c1d975a7db032fce3397358132cee15bb317c9bed554de57e8f3ecbb284931a32 SHA512 807a53919ad3b19c280be0033ae264d89ad438b9d51763c7a27be3576ca496af9966d2f62594a707a1242c0b813298b01da6c2a55469af777e47944a80b00f25 diff --git a/app-arch/p7zip/p7zip-17.05-r1.ebuild b/app-arch/p7zip/p7zip-17.05-r1.ebuild index eb2947239d72..991d216d8027 100644 --- a/app-arch/p7zip/p7zip-17.05-r1.ebuild +++ b/app-arch/p7zip/p7zip-17.05-r1.ebuild @@ -1,19 +1,21 @@ # Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit multilib toolchain-funcs wrapper xdg DESCRIPTION="Port of 7-Zip archiver for Unix" HOMEPAGE="https://github.com/p7zip-project/p7zip" SRC_URI="https://github.com/p7zip-project/p7zip/archive/v${PV}.tar.gz -> ${P}.tar.gz" -#S="${WORKDIR}/${PN}-${PV}" LICENSE="LGPL-2.1 rar? ( unRAR )" SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos" -IUSE="abi_x86_x32 natspec +pch rar static" +IUSE="abi_x86_x32 natspec +pch rar test" + +REQUIRED_USE="test? ( rar )" # bug 907221 +RESTRICT="!test? ( test )" RDEPEND="natspec? ( dev-libs/libnatspec )" DEPEND="${RDEPEND}" @@ -22,9 +24,7 @@ BDEPEND=" amd64? ( dev-lang/yasm ) x86? ( dev-lang/nasm )" -PATCHES=( - "${FILESDIR}/p7zip-17.05-unit64.patch" -) +PATCHES=( "${FILESDIR}/p7zip-17.05-unit64.patch" ) src_prepare() { default @@ -58,16 +58,16 @@ src_prepare() { if use abi_x86_x32; then sed -i -e "/^ASM=/s:amd64:x32:" makefile* || die - cp -f makefile.linux_amd64_asm makefile.machine || die + cp makefile.linux_amd64_asm makefile.machine || die elif use amd64; then - cp -f makefile.linux_amd64_asm makefile.machine || die + cp makefile.linux_amd64_asm makefile.machine || die elif use x86; then - cp -f makefile.linux_x86_asm_gcc_4.X makefile.machine || die + cp makefile.linux_x86_asm_gcc_4.X makefile.machine || die elif [[ ${CHOST} == *-darwin* ]] ; then # Mac OS X needs this special makefile, because it has a non-GNU # linker, it doesn't matter so much for bitwidth, for it doesn't # do anything with it - cp -f makefile.macosx_llvm_64bits makefile.machine || die + cp makefile.macosx_llvm_64bits makefile.machine || die # bundles have extension .bundle but don't die because USE=-rar # removes the Rar directory sed -i -e '/strcpy(name/s/\.so/.bundle/' \ @@ -76,10 +76,6 @@ src_prepare() { CPP/7zip/Bundles/Format7zFree/makefile.list \ $(use rar && echo CPP/7zip/Compress/Rar/makefile.list) || die fi - - if use static; then - sed -i -e '/^LOCAL_LIBS=/s/LOCAL_LIBS=/&-static /' makefile.machine || die - fi } src_compile() { |