gentoo auto-resync : 14:08:2024 - 11:06:13

8 files changed, 186 insertions, 8 deletions

diff --git a/app-arch/7zip/7zip-24.08.ebuild b/app-arch/7zip/7zip-24.08.ebuild
new file mode 100644
index 000000000000..59e13dc0c5e5
--- /dev/null
+++ b/app-arch/7zip/7zip-24.08.ebuild
@@ -0,0 +1,110 @@
+# Copyright 2023-2024 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="~amd64 ~arm64"
+IUSE="uasm jwasm rar"
+REQUIRED_USE="?? ( uasm jwasm )"
+
+DOCS=( readme.txt History.txt License.txt )
+HTML_DOCS=( MANUAL )
+
+DEPEND="${RDEPEND}"
+BDEPEND="
+	uasm? ( dev-lang/uasm )
+	jwasm? ( dev-lang/jwasm )
+"
+
+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"
+	einstalldocs
+}
diff --git a/app-arch/7zip/Manifest b/app-arch/7zip/Manifest
index 97c3471c5d93..9e152fa8e3a4 100644
--- a/app-arch/7zip/Manifest
+++ b/app-arch/7zip/Manifest
@@ -2,5 +2,8 @@ AUX 7zip-23.01-respect-build-env.patch 1556 BLAKE2B fdc1993dbcdc1bac28420d82ae19
 AUX 7zip-24.05-respect-build-env.patch 1428 BLAKE2B 00a6da925ca0236a423e1f82426ae81976358c30ba8b6d30b8af368aeb8e4271c443d3e401f7ea32ef6743b21c730f2ecaf78319e0bdf8c76d6a45baa8f9c1e3 SHA512 0aabff2930325553de08314bd161d2132f5c6fd3ed0363c37c961b04e16ae8b906053c0f8f9132c55760acf3ec1dbdb47f0677d618cf82d8ce8cfe6d52cb6e8d
 DIST 7z2407-linux-x64.tar.xz 1554932 BLAKE2B 9229fdac09148c50032656743aba0f8ce1ec06b7fd2dad2c693dc299c5f83fc093ba047e9c3c3971bf4cc9387b0db52c84167202ed7fcecfcc6f5bc508d04ada SHA512 31b5bb832e73f3c2fd0437873fe6130b8d1bd1bea8320d1b27d06bf40dd737758732eb3664fab2c36417b96ffc5daca6607b6f1aefdaa9e697122da60e37a728
 DIST 7z2407-src.tar.xz 1488556 BLAKE2B 42b4f9553aaa4797e80a2d50073ff0e77b5261e50766f8c596a632fb013ac1514a2963f27b924485f07728d13a4536c69911867e3728e8f8604ec25fc4c6824e SHA512 0299e5c1e1dfd33ecf22077f812da1f25bf2146a713c7a7e2498d639520f21f029e853914e66a84d1edfc5d721e1f3d914a3171ab336a406a94bc82d5b2d8e5d
+DIST 7z2408-linux-x64.tar.xz 1556956 BLAKE2B 177b355830201e48d314667c1936e3ca0b624b3fd47b8696df78cc27bb559fd239c1ab2146a88111c3bd1ef1396e694d235babb9b8391fc55cac89c97d7990bd SHA512 00b8d2b89e1410e360cf034c44a43cb88927d76317ee291519ef1f39e3cab68b5549de66f0f6b867f0367d50e7661f484e0a0f7afdd2ecb963804e44c789d7ce
+DIST 7z2408-src.tar.xz 1493700 BLAKE2B fd22a302044ca8655187573173fdc13ae93efaf907cb60076600013e3f463912b876cc3764853ce9d1850fc10dc264cd96917ef6dca9332541db292aee3f1ab4 SHA512 889e9aeaa629d6474a609a15066b2fa7b1353fa5e7255e044297591f565b08b16b885d44f4c4a046f2f9da189599ace300cf61fd9ac0e7bc316fb9d96a18a039
 EBUILD 7zip-24.07.ebuild 2965 BLAKE2B d6ed142847bc95eac5d209cc03cc3ecfaeddce00fc7762af2fe6a664e73bb3ccc8cbbe62c9c9c3bd4806de28865a57ab6389e053dc6b801d447ca63488d56d41 SHA512 e09bc90a699912c4d8693b716da524cafcfa42a7aababead9a0d44a19dbee8b2076a393256c2dd18716b265a426cbcc30cf21ab24fe90c14aaec6baed7eaea48
+EBUILD 7zip-24.08.ebuild 2967 BLAKE2B f94c9ea2760fe533c5d2e5435f82297220d9257c09880e44ba94b1160c7de4bece261e278d9c53b8669d096cd9b0adb916d6b0dc368131d02266c97bc71415d6 SHA512 4738a2b71e36968d9c0f39d685d2da168781f0e5b38ca35c0db37bc5bd9465597a47b818f777520189fad5546d53137b667ebc18d030b2eb7d75e7bfb361ea56
 MISC metadata.xml 968 BLAKE2B cc816cf086d296a591c2ae494022f35102570c8823ccdc5ada3dde2a83d515060b703d283d74ebd00738f28a0fb4dd8fdeaea10ae9168423dcf146034561f213 SHA512 e4d71bc79b0e6d4435442e74256550f93815b68142cdac763fed9a22bd5e92c25ba288d94738316d726c2073f4f86dcf00f3d77c65a02b0e06ea3c1dc7699cbb
diff --git a/app-arch/Manifest.gz b/app-arch/Manifest.gz
index 7c61fa8d4b91..1c6b6710bd06 100644
--- a/app-arch/Manifest.gz
+++ b/app-arch/Manifest.gz
diff --git a/app-arch/alien/Manifest b/app-arch/alien/Manifest
index 06ecaa5e2f0f..e9d01c38d88f 100644
--- a/app-arch/alien/Manifest
+++ b/app-arch/alien/Manifest
@@ -1,6 +1,9 @@
-AUX alien-8.95-tar-extensions.patch 733 BLAKE2B 75aa07b9c3b4b3e48d381309caeef41ad312c7d71c81958eb74193752276240dcf6ca91fbf5a4dc6279a35cf6a6c90e77a11ee8ec7f5b087a50bfd6ba089710f SHA512 6bcaea2b8a0dd5bd5a493aaf6f0b19edb691e49fc7684486da2331621619745baeaa30d88889d8aa345f989016a096745b875aca2c01c5b8127e93903f4e8b10
+AUX alien-8.95-rpm-zstd.patch 1363 BLAKE2B 2af86faa3aff7b926d67a7594001183d471f9a4367756f24b0e9be6aaeaf1c230138e1c89d1e6b477dbb3d8c1b92e1f17f7650e04abf718db2bb27a44fe7826c SHA512 96a936c5e83f851e0922fcf887ca33690ace881f67d4898870dd1b557359a9cc6087231650353b58ba407800399205dcc57238d069647b2fd13c6e5d526b9de0
+AUX alien-8.95-tar-extensions.patch 565 BLAKE2B 6530e085d73b15ed128545475a84961de8a85912e3b05d6e8ddd3784fdda17664760f83d239026a691aa3ded62f2b8263ed906c8941e09d930c4165cd70de3b6 SHA512 b483fe233c3ee51a2d73c11d6fa75f54025bd9339aac384c4084410fd40f6645d54fe5cd8372a7ed9c11472784a4fa6679651ab3befc37cbb572261106f44dbd
 DIST alien-8.95.6.tar.xz 58088 BLAKE2B 5b7467552856d809fc1b43af7de905d7f52629799bfd01dfb7ab61dfbd1c27e0f6f6b8364aa03a925cc6bea74616bf497f4fd195c637d6d1bcd7847a17ab5ccd SHA512 29ed80f249b38b47a26ee9d058d057be8728d18d771c1f847919f296d2c8359fcc33a32912749f2ed77b1214e61f101b75960a82cbd3d76bbb7f205acfd4f152
+DIST alien-8.95.7.tar.xz 58236 BLAKE2B 18728dfc63f08ca78e3063f2b68bcdbdc516015a8c55c13e29999934830308440907d7a1298acd4c41aa2a601d9a8cd3148880a51235769012dbafb8e91e9c82 SHA512 5528ee66117d5429b2021350c11fcaa1e831c8f46dfb661c7ec42e2840c67d7fa488dabb7361e91fc034ba6b8a970938ec08e74ab619747e03acb577213d27f8
 DIST alien-8.95.tar.xz 56940 BLAKE2B c2f6b71d39800a7bc4ab00bcd50d165855bad4eb1a17fe217aeb302c6b7af701bcd9445276d7e522db7e6c81f1e8d7e9e2ada99f9d7505e6ec958ae87df7c9f7 SHA512 c46d3c82542dc3d96eeabea0f0c7ab5b572acaf67d15e2064ea01df32d69a2cf6e083754be49269df6cd7431ec5b3e09ddcb83fbe2ee17843b22e9cd3e73073c
 EBUILD alien-8.95-r2.ebuild 644 BLAKE2B f561334d659dcb77306df0dd6d0fdc4821c6feb2bb7e74662ec7226bfb4d9fce94d86e26f4b0e617306558e80373f975858db0e590ffff4a19184bdb85e1dd6f SHA512 2c2356fd40f5555addd43e93ba5a1f34e9c32bced938ae95e53ed59a532941b2d14d2dbd0dca018e2ca98b9c51468385d527d545ae8f671e6be81cb88c67ff30
 EBUILD alien-8.95.6.ebuild 654 BLAKE2B a86fe687136c14623a33125ea0c984fbe68ffa767c6dc8d4f78baf9f0875925637e5beeec97db13f7bc2674c45a8501b4a0249a701102d3e7bc73ab8e3db1369 SHA512 631750d14aa83842a4f65005f2a47e4a689ab232c5437962024318d2bc8a2d84427326ae5d28598c7c13473ee43801b39e9ddf9a38d7f3a4e4c0056f4dcbe832
-MISC metadata.xml 259 BLAKE2B 3d6e2c71a67eb6eec74e229e746e4ca8c32878d251276044aeacfc21afb48be29752d2257e41ab4ffefbd061fb05929b17237905dd4fd01c65c24e61e464a681 SHA512 ceb54d3784d2abce86137f25059dba4f90ebba03e31dae56d2b8acbc515d9c0d7ed909f46c569a73e929cbe9dac2caef440e9c52b0518d37c081e03be471fa4c
+EBUILD alien-8.95.7.ebuild 697 BLAKE2B 669a533cf6bf37c23aefd00afe6504d075ce8c10b450195a964d86f142d24f33fbb9392b474ac86cefc55232213a369bd703fa682e50755592c69e5c00dc68f6 SHA512 fb09742fad26032de61a8c9ca133eb1742e1bf98280649624efd00adcf9b5ebb9eed8ae0c4fadcdf2866a949acbe6c3266b1449a9f2c320aa9c5d18d04317234
+MISC metadata.xml 350 BLAKE2B 95ce466ebf13d29ce3654f63df671e12b24998af207ed8d6ebc78f62e2fc7e73a7a2d6d79eb8bf3b2ad59eaa48513002864c8783a38710dfd7f202e8ed293de1 SHA512 5bca5b288f5cc1aa6a7ee4ce5a9bfdbe67de8b4b1ea092793254d918c9a923d4c9942ca6e08e951d620920b6551729c1e5fc6e1ce1a5efe7f0b1c992cc40c8f0
diff --git a/app-arch/alien/alien-8.95.7.ebuild b/app-arch/alien/alien-8.95.7.ebuild
new file mode 100644
index 000000000000..653dba8fe3d1
--- /dev/null
+++ b/app-arch/alien/alien-8.95.7.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit perl-module
+
+DESCRIPTION="Converts between the rpm, dpkg, stampede slp, and slackware tgz file formats"
+HOMEPAGE="https://sourceforge.net/projects/alien-pkg-convert/"
+SRC_URI="mirror://debian/pool/main/a/${PN}/${PN}_${PV}.tar.xz -> ${P}.tar.xz"
+S=${WORKDIR}/${PN}
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
+IUSE="+bzip2"
+
+RDEPEND="
+	app-arch/rpm
+	app-arch/dpkg
+	dev-util/debhelper
+	>=app-arch/tar-1.14.91
+	bzip2? ( app-arch/bzip2 )
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-8.95-tar-extensions.patch"
+	"${FILESDIR}/${PN}-8.95-rpm-zstd.patch"
+)
diff --git a/app-arch/alien/files/alien-8.95-rpm-zstd.patch b/app-arch/alien/files/alien-8.95-rpm-zstd.patch
new file mode 100644
index 000000000000..89e2ce31e57b
--- /dev/null
+++ b/app-arch/alien/files/alien-8.95-rpm-zstd.patch
@@ -0,0 +1,36 @@
+From 08e8768b07065b32e1aa9ccb3adae79a157bbfbc Mon Sep 17 00:00:00 2001
+From: Lars Kellogg-Stedman <lars@oddbit.com>
+Date: Tue, 13 Aug 2024 22:02:30 +0300
+Subject: [PATCH] Add support for decompressing zstd rpm payloads
+
+Recent (Fedora 32 and later) versions of Fedora have switched to
+using zstd to compress rpm payloads.
+
+https://bugs.debian.org/518348
+--- a/Alien/Package/Rpm.pm
++++ b/Alien/Package/Rpm.pm
+@@ -159,9 +159,19 @@ sub unpack {
+ 	$this->SUPER::unpack(@_);
+ 	my $workdir=$this->unpacked_tree;
+ 	
+-	# Check if we need to use lzma to uncompress the cpio archive
++	# Check if we need to uncompress the cpio archive
+ 	my $decomp='';
+-	if ($this->do("rpm2cpio '".$this->filename."' | lzma -t -q > /dev/null 2>&1")) {
++	if ($this->do("rpm2cpio '".$this->filename."' | xz -t -q > /dev/null 2>&1")) {
++		# we first check xz (previously lzma) because this is the
++		# most common compression type at the moment.
++		$decomp = 'xz -d -q |';
++	} elsif ($this->do("rpm2cpio '".$this->filename."' | zstd -t -q > /dev/null 2>&1")) {
++		# we next check zstd, which is used by newer (Fedora 32 and later)
++		# rpms.
++		$decomp = 'zstd -d -q |';
++	} elsif ($this->do("rpm2cpio '".$this->filename."' | lzma -t -q > /dev/null 2>&1")) {
++		# We check lzma last in case we're on an older system with
++		# only lzma and no xz
+ 		$decomp = 'lzma -d -q |';
+ 	}
+ 
+-- 
+2.45.2
+
diff --git a/app-arch/alien/files/alien-8.95-tar-extensions.patch b/app-arch/alien/files/alien-8.95-tar-extensions.patch
index 4709fcc1c4f8..29ec9a72f94a 100644
--- a/app-arch/alien/files/alien-8.95-tar-extensions.patch
+++ b/app-arch/alien/files/alien-8.95-tar-extensions.patch
@@ -4,12 +4,6 @@ Date: Fri, 1 Sep 2017 02:20:37 -0500
 Subject: [PATCH] add more tar extensions
 
 Signed-off-by: Austin English <austinenglish@gmail.com>
----
- Alien/Package/Tgz.pm | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Alien/Package/Tgz.pm b/Alien/Package/Tgz.pm
-index 7ab6e8b..65a3d2d 100644
 --- a/Alien/Package/Tgz.pm
 +++ b/Alien/Package/Tgz.pm
 @@ -11,7 +11,7 @@ use strict;
diff --git a/app-arch/alien/metadata.xml b/app-arch/alien/metadata.xml
index 6cab649acb8d..d166271b76d4 100644
--- a/app-arch/alien/metadata.xml
+++ b/app-arch/alien/metadata.xml
@@ -5,4 +5,7 @@
     <email>lordvan@gentoo.org</email>
     <name>Thomas Raschbacher</name>
   </maintainer>
+  <upstream>
+    <remote-id type="sourceforge">alien-pkg-convert</remote-id>
+  </upstream>
 </pkgmetadata>