diff options
Diffstat (limited to 'app-arch/p7zip')
| -rw-r--r-- | app-arch/p7zip/Manifest | 4 | ||||
| -rw-r--r-- | app-arch/p7zip/p7zip-16.02-r8.ebuild | 2 | ||||
| -rw-r--r-- | app-arch/p7zip/p7zip-17.05-r1.ebuild | 26 |
3 files changed, 14 insertions, 18 deletions
diff --git a/app-arch/p7zip/Manifest b/app-arch/p7zip/Manifest index 11ed4e926495..c5d77aa6e0a6 100644 --- a/app-arch/p7zip/Manifest +++ b/app-arch/p7zip/Manifest @@ -8,6 +8,6 @@ AUX p7zip-17.05-natspec.patch 5172 BLAKE2B 03a2895b5f30ab373ea8b3a358dcdcdefe0cb AUX p7zip-17.05-unit64.patch 470 BLAKE2B 63969d319e3fcc624dc0b0b4b5580887d23259da71727f0b5272edb4834c01ac6bcd791f31e8eb3832f066d04098c647554aed74953f71f7d90c6ed5470b3582 SHA512 eb5fc888dfd0d484a886c2a78ea4bb95ca100e14032603c68ed0dd2d6617754e45b5e466419536941b1d015dbcd931fe2a740b4c12950222c7afabdd82c0dc03 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 4090 BLAKE2B fe02bc81fa3e90a9dea5308ed8ffdca1b1c78c88443e6204e649e031d4a6d585fd990a25be29ebaf3065b12e326271387bfe68cd4c4894d6a487c3b624774d67 SHA512 31a7379f882669d03e2b384090eb286b63fc901d037f04dad9754816946c25b22c1c0166b2a426d850cf43897a011a627ea28f269370311297a0258cff31113e -EBUILD p7zip-17.05-r1.ebuild 3255 BLAKE2B c072aa22dd320d0a27cc5b7b0e3fdab6997c7e76982ec91b657c35402a1e65cb33e3a2d397e0d64c0be247a5e13473b7d8a2732f723f1f7fe35b3e5e1ba2819c SHA512 a237ac6f56edbc7e277d6cbd87602dd03386f28eba0dc53bdc954a96e2ac995344157f7a0835cd46e7d663faf03a8a89d823fbc74d05673997d8b309f12b839b +EBUILD p7zip-16.02-r8.ebuild 4084 BLAKE2B 751bd46aafa907e01442c53a81e599c1877be619ad7b99ba3bc30a6af8a184e6d346f7d466b0b5c42bfbb25345263ef9057e13b0785b361498a0ff86ab2f906a SHA512 6984a246c1f55b36a5345f37945bb8930d3b6c7f6fe717d26d4bc81ecaa0ecaedd667ad277651ee01f941d9e512df94f8d89161ea7a29805667fcb357b716e2d +EBUILD p7zip-17.05-r1.ebuild 3170 BLAKE2B 0eb02445b86b76b7bf587a1966675c7de5d2d28ef7b398a770fe2e153af566c2a49313c98b7e6033a31d1a948b8eb5ac14756c1e3bcaaebd32dfecd98eb96fc6 SHA512 50f57303a2a129ac5a51e619f5049a4d2f5c4c292e5e2757620e35eeb98bceb8cf7ce1b086db7edf9223e14b00e2f262492880a6a2d9ccc031c5005d8450f3c4 MISC metadata.xml 532 BLAKE2B 9ffdc29d8d8f6a82e7a55f4448870a4dd019468a440ade6df10ad1336617d14c1d975a7db032fce3397358132cee15bb317c9bed554de57e8f3ecbb284931a32 SHA512 807a53919ad3b19c280be0033ae264d89ad438b9d51763c7a27be3576ca496af9966d2f62594a707a1242c0b813298b01da6c2a55469af777e47944a80b00f25 diff --git a/app-arch/p7zip/p7zip-16.02-r8.ebuild b/app-arch/p7zip/p7zip-16.02-r8.ebuild index 6cba1cb6085c..d8d3ab7c0146 100644 --- a/app-arch/p7zip/p7zip-16.02-r8.ebuild +++ b/app-arch/p7zip/p7zip-16.02-r8.ebuild @@ -13,7 +13,7 @@ S="${WORKDIR}/${PN}_${PV}" LICENSE="LGPL-2.1 rar? ( unRAR )" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" IUSE="abi_x86_x32 kde +pch rar static wxwidgets" REQUIRED_USE="kde? ( wxwidgets )" diff --git a/app-arch/p7zip/p7zip-17.05-r1.ebuild b/app-arch/p7zip/p7zip-17.05-r1.ebuild index 324ae0051c52..1f66ce63a7a3 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 ~ia64 ~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" +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 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() { |