From bf10c2f0b894033ac258f7c3966aa5507d100ae1 Mon Sep 17 00:00:00 2001 From: "Alex Xu (Hello71)" Date: Wed, 22 Jun 2022 09:02:46 -0400 Subject: app-arch/7-zip: upgrade to 22.00 --- app-arch/7-zip/7-zip-21.07-r2.ebuild | 59 ------------------------------------ app-arch/7-zip/7-zip-22.00.ebuild | 59 ++++++++++++++++++++++++++++++++++++ app-arch/7-zip/Manifest | 2 +- 3 files changed, 60 insertions(+), 60 deletions(-) delete mode 100644 app-arch/7-zip/7-zip-21.07-r2.ebuild create mode 100644 app-arch/7-zip/7-zip-22.00.ebuild diff --git a/app-arch/7-zip/7-zip-21.07-r2.ebuild b/app-arch/7-zip/7-zip-21.07-r2.ebuild deleted file mode 100644 index 81229fc..0000000 --- a/app-arch/7-zip/7-zip-21.07-r2.ebuild +++ /dev/null @@ -1,59 +0,0 @@ -# Copyright 2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit toolchain-funcs - -MY_PV=${PV%%_*} -MY_PV=${MY_PV//./} - -DESCRIPTION="File archiver with a high compression ratio" -HOMEPAGE="https://7-zip.org/" -SRC_URI="https://7-zip.org/a/7z${MY_PV}-src.tar.xz" - -LICENSE="LGPL-2.1+ BSD rar? ( unRAR )" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="+asm rar" - -BDEPEND=" - asm? ( dev-lang/jwasm ) -" -RDEPEND="!app-arch/p7zip" - -S=${WORKDIR} - -PATCHES=( - "${FILESDIR}/7-zip-flags.patch" - "${FILESDIR}/7-zip-less-asm.patch" -) - -src_compile() { - cd CPP/7zip/Bundles/Alone2 || die - local myemakeargs=( - CC="$(tc-getCC) ${CFLAGS} -fno-strict-aliasing ${LDFLAGS}" - CXX="$(tc-getCXX) ${CXXFLAGS} -fno-strict-aliasing ${LDFLAGS}" - ) - if use asm; then - myemakeargs+=(USE_ASM=1 USE_JWASM=1) - if use amd64; then - myemakeargs+=(IS_X64=1) - elif use arm64; then - myemakeargs+=(IS_ARM64=1) - elif use x86; then - myemakeargs+=(IS_X86=1) - else - einfo "asm is not supported on this arch, ignoring" - fi - fi - use rar || myemakeargs+=(DISABLE_RAR=1) - mkdir -p b/g || die - emake -f ../../cmpl_gcc.mak "${myemakeargs[@]}" -} - -src_install() { - dobin CPP/7zip/Bundles/Alone2/b/g/7zz - dosym 7zz /usr/bin/7z - dodoc DOC/* -} diff --git a/app-arch/7-zip/7-zip-22.00.ebuild b/app-arch/7-zip/7-zip-22.00.ebuild new file mode 100644 index 0000000..81229fc --- /dev/null +++ b/app-arch/7-zip/7-zip-22.00.ebuild @@ -0,0 +1,59 @@ +# Copyright 2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit toolchain-funcs + +MY_PV=${PV%%_*} +MY_PV=${MY_PV//./} + +DESCRIPTION="File archiver with a high compression ratio" +HOMEPAGE="https://7-zip.org/" +SRC_URI="https://7-zip.org/a/7z${MY_PV}-src.tar.xz" + +LICENSE="LGPL-2.1+ BSD rar? ( unRAR )" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="+asm rar" + +BDEPEND=" + asm? ( dev-lang/jwasm ) +" +RDEPEND="!app-arch/p7zip" + +S=${WORKDIR} + +PATCHES=( + "${FILESDIR}/7-zip-flags.patch" + "${FILESDIR}/7-zip-less-asm.patch" +) + +src_compile() { + cd CPP/7zip/Bundles/Alone2 || die + local myemakeargs=( + CC="$(tc-getCC) ${CFLAGS} -fno-strict-aliasing ${LDFLAGS}" + CXX="$(tc-getCXX) ${CXXFLAGS} -fno-strict-aliasing ${LDFLAGS}" + ) + if use asm; then + myemakeargs+=(USE_ASM=1 USE_JWASM=1) + if use amd64; then + myemakeargs+=(IS_X64=1) + elif use arm64; then + myemakeargs+=(IS_ARM64=1) + elif use x86; then + myemakeargs+=(IS_X86=1) + else + einfo "asm is not supported on this arch, ignoring" + fi + fi + use rar || myemakeargs+=(DISABLE_RAR=1) + mkdir -p b/g || die + emake -f ../../cmpl_gcc.mak "${myemakeargs[@]}" +} + +src_install() { + dobin CPP/7zip/Bundles/Alone2/b/g/7zz + dosym 7zz /usr/bin/7z + dodoc DOC/* +} diff --git a/app-arch/7-zip/Manifest b/app-arch/7-zip/Manifest index 1dc3b00..2405209 100644 --- a/app-arch/7-zip/Manifest +++ b/app-arch/7-zip/Manifest @@ -1 +1 @@ -DIST 7z2107-src.tar.xz 1230388 BLAKE2B 59e460cdf5a0d78669decee2578a1f7ad398de66e99eb556f9af574b2a7957d1e67b949e240af56c7cbdbaca8d35c6a9256f4153b71de170590e13c47f314510 SHA512 c964e3f1193adb72adc338416ab3226ee2655b9a953f0ec7dafc83adafdfa6b89e32752bd23d521086d96164fca1795064f888e0c37b13e7160fdb37e61d2018 +DIST 7z2200-src.tar.xz 1285632 BLAKE2B c738382a55af91ec62842b68aaef0e7dfb331e92929d410b3f615156bf4157d6cc4e35c0614b0f6323ae98e8406b33d3ef78c9449615912530bf1d1b20d63ec1 SHA512 0c3660bb2ccb945db6f6aaecffff956d1b346eec8f40e68a3a5d6cdeb2301e34a61bd6cbb7365138ff5b7eebbbc2925a873fffe7dc9d76afa616eb184f9f3960 -- cgit v1.2.3-54-g00ecf