[gentoo-commits] repo/gentoo:master commit in: app-arch/7zip/

["Arthur Zamarin" <arthurzam@gentoo.org>]

commit:     227192b52d91f7167e2ce8e22d54bcbacfc24162
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Wed Aug  6 17:26:08 2025 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Wed Aug  6 17:26:08 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=227192b5

app-arch/7zip: add 25.01

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

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

diff --git a/app-arch/7zip/7zip-25.01.ebuild b/app-arch/7zip/7zip-25.01.ebuild
new file mode 100644
index 000000000000..7fc662ee9568
--- /dev/null
+++ b/app-arch/7zip/7zip-25.01.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 a2bfd6eed151..0b4e11cf0700 100644
--- a/app-arch/7zip/Manifest
+++ b/app-arch/7zip/Manifest
@@ -2,3 +2,5 @@ DIST 7z2409-linux-x64.tar.xz 1565344 BLAKE2B 4ded059fe85073405b4a1510378ed473bca
 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
+DIST 7z2501-linux-x64.tar.xz 1571044 BLAKE2B ec260b50da5781ad547cbb506bc8ab51250acdfa63ca0b03ad43c4ae475ea181f4b102959cf4470943e43d910f97eb29c387af3512b80ecbcf43535d99f22e09 SHA512 3f80196dd053456993e5f6585768b863b8c06a77e3c14c61b818ef8cedfbf07c162e95d76b26ecc1926951c56ee54db8f5b6842e52f84d4b4db5bcbfaf9f1319
+DIST 7z2501-src.tar.xz 1533240 BLAKE2B 4625869325d2f73553a79c5da59b0c5924a6e744a23d62d108edeeb15c164c812b38c25d386dab73917be1be0daf2701c60adf6fcdffe853ea946525915bbcf7 SHA512 5ee146ce993c6d12ad19333dc3545e6c3429212260c22d456390e49ca150e6fcbfc6eae45b5ec61138ae1598d7b4a79d6f2e3ff02929af38039c0ca59823e729