commit:     5b8bfcabe121239494b2b23c7bb1eaa2f9c5885b
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Sun Jul  6 04:11:21 2025 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Sun Jul  6 04:11:49 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5b8bfcab

app-arch/7zip: add 25.00, make [symlink] default

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 app-arch/7zip/7zip-25.00.ebuild | 118 ++++++++++++++++++++++++++++++++++++++++
 app-arch/7zip/Manifest          |   2 +
 2 files changed, 120 insertions(+)

diff --git a/app-arch/7zip/7zip-25.00.ebuild b/app-arch/7zip/7zip-25.00.ebuild
new file mode 100644
index 000000000000..7fc662ee9568
--- /dev/null
+++ b/app-arch/7zip/7zip-25.00.ebuild
@@ -0,0 +1,118 @@
+# Copyright 2023-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit edos2unix flag-o-matic toolchain-funcs
+
+NO_DOT_PV=$(ver_rs 1- '')
+DESCRIPTION="Free file archiver for extremely high compression"
+HOMEPAGE="https://www.7-zip.org/ https://sourceforge.net/projects/sevenzip/";
+# linux-x64 tarball is only used for docs
+SRC_URI="
+       
https://downloads.sourceforge.net/sevenzip/7-Zip/${PV}/7z${NO_DOT_PV}-src.tar.xz
+       
https://downloads.sourceforge.net/sevenzip/7-Zip/${PV}/7z${NO_DOT_PV}-linux-x64.tar.xz
+"
+S="${WORKDIR}"
+
+LICENSE="LGPL-2 BSD rar? ( unRAR )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="uasm jwasm rar +symlink"
+REQUIRED_USE="?? ( uasm jwasm )"
+
+DOCS=( readme.txt History.txt License.txt )
+HTML_DOCS=( MANUAL )
+
+BDEPEND="
+       app-arch/xz-utils[extra-filters(+)]
+       uasm? ( dev-lang/uasm )
+       jwasm? ( dev-lang/jwasm )
+"
+RDEPEND="
+       symlink? ( !app-arch/p7zip )
+"
+
+PATCHES=(
+       "${FILESDIR}/${PN}-24.05-respect-build-env.patch"
+)
+
+# TODO(NRK): also build and install the library
+# TODO(NRK): make it so this package can be used as a drop-in replacement
+# for app-arch/p7zip ??
+
+pkg_setup() {
+       # instructions in DOC/readme.txt, Compiling 7-Zip for Unix/Linux
+       # TLDR; every combination of options (clang|gcc)+(asm/noasm)
+       # has a dedicated makefile & builddir
+       mfile="cmpl"
+       if tc-is-clang; then
+               mfile="${mfile}_clang"
+               bdir=c
+       elif tc-is-gcc; then
+               mfile="${mfile}_gcc"
+               bdir=g
+       else
+               die "Unsupported compiler: $(tc-getCC)"
+       fi
+       if use jwasm || use uasm ; then
+               mfile="${mfile}_x64"
+               bdir="${bdir}_x64"
+       fi
+       export mfile="${mfile}.mak"
+       export bdir
+}
+
+src_prepare() {
+       # patch doesn't deal with CRLF even if file+patch match
+       # not even with --ignore-whitespace, --binary or --force
+       pushd "./CPP/7zip" || die "Unable to switch directory"
+       edos2unix ./7zip_gcc.mak ./var_gcc{,_x64}.mak ./var_clang{,_x64}.mak
+       sed -i -e 's/-Werror //g' ./7zip_gcc.mak || die "Error removing -Werror"
+       popd >/dev/null || die "Unable to switch directory"
+
+       default
+}
+
+src_compile() {
+       pushd "./CPP/7zip/Bundles/Alone2" || die "Unable to switch directory"
+
+       # avoid executable stack when using uasm/jwasm, harmless otherwise
+       append-ldflags -Wl,-z,noexecstack
+       export G_CFLAGS=${CFLAGS}
+       export G_CXXFLAGS=${CXXFLAGS}
+       export G_LDFLAGS=${LDFLAGS}
+
+       local args=(
+               -f "../../${mfile}"
+               CC=$(tc-getCC)
+               CXX=$(tc-getCXX)
+       )
+       # NOTE: makefile doesn't check the value of DISABLE_RAR_COMPRESS, only
+       # whether it's defined or not. so in case user has `rar` enabled
+       # DISABLE_RAR_COMPRESS (and DISABLE_RAR) needs to stay undefined.
+       if ! use rar; then
+               # disables non-free rar code but allows listing and extracting
+               # non-compressed rar archives
+               args+=( DISABLE_RAR_COMPRESS=1 )
+       fi
+       if use jwasm; then
+               args+=( USE_JWASM=1 )
+       elif use uasm; then
+               args+=( MY_ASM=uasm )
+       fi
+
+       mkdir -p "${bdir}" || die  # Bug: https://bugs.gentoo.org/933619
+       emake ${args[@]}
+       popd > /dev/null || die "Unable to switch directory"
+}
+
+src_install() {
+       dobin "./CPP/7zip/Bundles/Alone2/b/${bdir}/7zz"
+       if use symlink; then
+               dosym 7zz /usr/bin/7z
+               dosym 7zz /usr/bin/7za
+               dosym 7zz /usr/bin/7zr
+       fi
+       einstalldocs
+}

diff --git a/app-arch/7zip/Manifest b/app-arch/7zip/Manifest
index b551b3c3e9cd..2f691fbc211c 100644
--- a/app-arch/7zip/Manifest
+++ b/app-arch/7zip/Manifest
@@ -2,3 +2,5 @@ DIST 7z2408-linux-x64.tar.xz 1556956 BLAKE2B 
177b355830201e48d314667c1936e3ca0b6
 DIST 7z2408-src.tar.xz 1493700 BLAKE2B 
fd22a302044ca8655187573173fdc13ae93efaf907cb60076600013e3f463912b876cc3764853ce9d1850fc10dc264cd96917ef6dca9332541db292aee3f1ab4
 SHA512 
889e9aeaa629d6474a609a15066b2fa7b1353fa5e7255e044297591f565b08b16b885d44f4c4a046f2f9da189599ace300cf61fd9ac0e7bc316fb9d96a18a039
 DIST 7z2409-linux-x64.tar.xz 1565344 BLAKE2B 
4ded059fe85073405b4a1510378ed473bca6de2792d313fc3dcb77850dc2531b06866bb4d9de4d4dbc848be5a98b2e4cf5bbe191248f0ae53a279b48b586c169
 SHA512 
aebf18d861944e2b52d91434b1d59d80a5aadf3b2e80ab3d248357bcaf3c429442caf4ad3297057a559f2719cae9ce5b0aa391963570ffa75b6dcdf1f3c25603
 DIST 7z2409-src.tar.xz 1511288 BLAKE2B 
5fcb39acc282b7dafbd1900eaf77e15e634adda5eff5d630b9d0821aa0d1e8569856cf99503ab7ffe69a82cec82a1a890772d6cff86cdb0af01dd462a94c0908
 SHA512 
461b702eb275655ebda70e128a5e184d15d2b0556f11ab1b409c0ff8a1e9c5d64761bdfb1685c5a0278534024a1e4ce46e4443d55cae373e487dc9ae180ef310
+DIST 7z2500-linux-x64.tar.xz 1568496 BLAKE2B 
ea9b4ae565c38347b21c6c98169970c8cd4c401b022aa43c60463122240ca78b8279b331668373af1bec5c1fdb5472008a1dc52923e52b594ec27d3aa09368da
 SHA512 
5acb1b46e0fc9c16c3b5af2aa0a799072b2887d5ac1e13c8b9faba89e55d5784e2ebbfc23805f19a0463fbf98d0233ecbf9709784d67a0a12241ececa454c1bc
+DIST 7z2500-src.tar.xz 1531036 BLAKE2B 
7dcadb2de06de975ef95af571c7e93cc7af785e06ee7e5c77a35894e5def21772e25cda54e3ff9dfafaca0e6e0fe71ffb4611a43cd45c78357f124fe8fa657f3
 SHA512 
586723f6fe149645db1eb8d1d27a26977e591e222663073a59e320e432881adaf4bc4067682be2b7ad5443ab0fea9e16b99b12d4ae40ae0f40ae7b23a31b0396

Reply via email to