gentoo auto-resync : 02:01:2024 - 08:48:32

8 files changed, 56 insertions, 104 deletions

diff --git a/sys-libs/Manifest.gz b/sys-libs/Manifest.gz
index ae4eed661476..ce414e6c7d18 100644
--- a/sys-libs/Manifest.gz
+++ b/sys-libs/Manifest.gz
diff --git a/sys-libs/libunwind/Manifest b/sys-libs/libunwind/Manifest
index aa42054f4213..2398654ffae8 100644
--- a/sys-libs/libunwind/Manifest
+++ b/sys-libs/libunwind/Manifest
@@ -1,3 +1,4 @@
+AUX libunwind-1.7.2-backport-pr521.patch 1415 BLAKE2B 696e075318574e40b3a583526cb8fbbdcff0ccd4357c6cd4f10655222b1a13c79402f40c3887c9c07ec68819f02451685875c88af5c28cbb17ce926abb716a8f SHA512 4d50a36e214f927cc85f7d03424b0a06358a403f82dfb7f4148a668cf745c85876e2f8c4a49a71f868b1bd1e818fda8d9c85b75d8a5e4a9cd3499d0fc0cbd13d
 AUX libunwind-1.8.0_rc1-configure-bashism.patch 808 BLAKE2B 2469cc6bc3e492c0d7afa20dbc0cdb80b45f53192b09ff93e69c3f3c5118552e1b0bc293ebbd15c3fd32a0fba0c0a06fc46065563a8f9af2abe14d8edc69dcc6 SHA512 05bb5c6af301f1500012533284eddd11c9e2e755a68154debf25d4c2e5796e706673e277030a99a5f39e4e115f7cddeb8c64d96d177840c591d4fb5d1ca97b9d
 DIST libunwind-1.6.2-docs.tar.xz 25372 BLAKE2B d16562b29c49070f0cd6ad9211c7c3283b527bd88677d9ce50b15f27254bac504ea79b807e01f4f2bdb05649ff8980f94346ef9737bf5b5bd7c313e547222f10 SHA512 71bcb781cc37ccbef7b349225b1b3b4cd6ba4ce5a48d8478cea17f8245614b672d8e14b5a088e2d998ea717670a371925d4fbe407dde636611f7c2f2901065d8
 DIST libunwind-1.6.2-loong.patch.xz 122756 BLAKE2B 1d369d18e71c4b9faa79a31a917a0f42a7bb394acd3bf8dc9ef181f2ca55bee04bef070c57ea04853b756efd561cb60409770b1f6fa9095d0e14565eb0bfc621 SHA512 46c8a6022dbf099965cf121d91691aae0a38fb31901730f47f712a7078b323e04f278e6751a7d169ed7e87792f321b15471b253668541598b82edb6626b9518f
@@ -6,7 +7,7 @@ DIST libunwind-1.7.1-docs.tar.xz 27248 BLAKE2B 0905f49ce72e6cafbb185828a4adf7eb5
 DIST libunwind-1.7.2.tar.gz 912590 BLAKE2B 519570a02d06ce4a174ca226941e493499054112de1c92938434e9fb56fabc8446f699a886ea8beee672ac5e28acd03d16169257a43e2ee1bab084fb331ef4cf SHA512 903f7e26c7d4c22e6ef4fe8954ca0f153fdf346cec40e1e8f7ab966d251110f4deb0a84d1fd150aee194ed966b5c1e01ee27c821cd043859852da33a94faae1f
 DIST libunwind-1.8.0-rc1.tar.gz 977482 BLAKE2B 0cf4dde187b68a2ba642fc588fcb020bf3e631584d4cac888972f714e7c4ce7a88e10a4c816eadec2051f318a196c61f6c3b4ba5e8ebf17ce4e10ff61e6cd0c5 SHA512 0d9cd896a90ea6e36a9a8aeb049ce71ec3a893fcf991533a79bb663c54b0f4b1f04c7b306c06c56e809f829a42284655d52c9fec3d88c60c37f06681dd99d9e3
 EBUILD libunwind-1.6.2-r1.ebuild 3839 BLAKE2B 79586bb73b80e070fd92559e08d5f9edc79907906002ad41c5701069653586742e7bd996e1524c85a3bc908ba144be71b73b3dd37c2c83dc74f648e080458283 SHA512 4e46c59e9c8f123786c5b56713bb75db5d24c84d2b2234f8be3ea5d51bd0fb9688e0f787755f31ff13ce611f2558977b0636210fd528a04c89a977599d7035ff
-EBUILD libunwind-1.7.2.ebuild 3848 BLAKE2B 24626adfafacd90b5016e18c49853b8c8bd91e42c250e493763d415e96509bd1b2375bec14eea33060736c439498d805c3c561d5a71bb46e42766e85ceaae974 SHA512 96cbe0ba2a71bfb2ccf1174eb45830ca5fecf4413678b3f99d16b85ca0da612e08b27f430be67c5af27f698a700a7c4c985c0c7fe607fddd6e061716cb87cc58
+EBUILD libunwind-1.7.2.ebuild 3908 BLAKE2B 3dc745165f8ca0ab8022b1969c85fd1bd4d706da1d6b7ccb80f6d2b5c3e47d5d434cc253b30de37dd862a623dae66240e3c715b699fd04e2ccf54f3c39875a86 SHA512 c5a2948b7fd336f280723f4afce421d51ba4c00d8b40dd745d53900d1742be8d33034d88ae959183e1dbea109736a9c4e480e3e99edc86899ec278ba2ebb7488
 EBUILD libunwind-1.8.0_rc1.ebuild 4064 BLAKE2B d3999aea03746b04ca126f16a6ac03a46f6c8549d0ff3c015b6c8611037e96f0dd2db890c5460d1c0dd03471d0bacf32aa04b296ec6ba6073bb3cdfe6b8a7527 SHA512 9d41447a1d49dd1b949e73fdedaeef45548f00e4e1d83a6d141eb616035d17826a2aeaab15966014caa2948a83eb61b7b362b5084612d46e697c57a9ac4e9bba
 EBUILD libunwind-9999.ebuild 3936 BLAKE2B 1b81cce3bc54e418e8683c00fd76aa9da1553e292601ce42cf3e58ec62c1bc4dcfff9a29a5872588ca0c3baad3752c73f25909ce38ebbad1d7845ce63f5287fc SHA512 cf65bd6c21794e1c236d5b30133258759be5100c177070b950db60000a9a34fcc71fa8b6f3e51ede6c760a4d696f23c0e64ab94f00e232581445ec63e7cd686c
 MISC metadata.xml 632 BLAKE2B 89e326bf82b001cbf4fc665315af12062c0afda7a4ebdc6da5b966b9f918e769a516767f6b054b9915ddfe397edc98c4a4f8e6c238d5accf122d3ceb76b92faa SHA512 3677c9c0a6ea3bc90dddf8501209601bdf0b4ea188ec164c39aa6e21ce2f6fa3ce5c672fe7e8ef0ad5c344debf26f8679bc0a126860eb2862832792de9f7d94b
diff --git a/sys-libs/libunwind/files/libunwind-1.7.2-backport-pr521.patch b/sys-libs/libunwind/files/libunwind-1.7.2-backport-pr521.patch
new file mode 100644
index 000000000000..addfc0a60a03
--- /dev/null
+++ b/sys-libs/libunwind/files/libunwind-1.7.2-backport-pr521.patch
@@ -0,0 +1,31 @@
+https://bugs.gentoo.org/913817
+https://github.com/libunwind/libunwind/issues/520
+https://github.com/libunwind/libunwind/pull/521
+
+From aaf9909c91f1fa875907df8d437bff689e00172e Mon Sep 17 00:00:00 2001
+From: Stephen Webb <swebb@blackberry.com>
+Date: Fri, 26 May 2023 16:22:08 -0400
+Subject: [PATCH] Fix FTBFS on Linux ppc32
+
+Looks like the Linux ucontext structure has changed for PPC at some
+point. This probably needs some kind of version check, or else ancient
+kernels will need to stick with 1.6 or earlier.
+---
+ src/ppc32/ucontext_i.h | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/ppc32/ucontext_i.h b/src/ppc32/ucontext_i.h
+index 64f8ed878..ee93c6979 100644
+--- a/src/ppc32/ucontext_i.h
++++ b/src/ppc32/ucontext_i.h
+@@ -44,8 +44,8 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.  */
+ //#define MQ_IDX                36
+ #define LINK_IDX        36
+ 
+-#define _UC_MCONTEXT_GPR(x) ( (void *)&dmy_ctxt.uc_mcontext.gregs[x] - (void *)&dmy_ctxt) )
+-#define _UC_MCONTEXT_FPR(x) ( ((void *)&dmy_ctxt.uc_mcontext.fpregs[x] - (void *)&dmy_ctxt) )
++#define _UC_MCONTEXT_GPR(x) ( ((void *)&dmy_ctxt.uc_mcontext.uc_regs->gregs[x] - (void *)&dmy_ctxt) )
++#define _UC_MCONTEXT_FPR(x) ( ((void *)&dmy_ctxt.uc_mcontext.uc_regs->fpregs.fpregs[x] - (void *)&dmy_ctxt) )
+ 
+ /* These are dummy structures used only for obtaining the offsets of the
+    various structure members. */
diff --git a/sys-libs/libunwind/libunwind-1.7.2.ebuild b/sys-libs/libunwind/libunwind-1.7.2.ebuild
index e5cd9a5f96e9..4f420b007d09 100644
--- a/sys-libs/libunwind/libunwind-1.7.2.ebuild
+++ b/sys-libs/libunwind/libunwind-1.7.2.ebuild
@@ -53,6 +53,8 @@ DEPEND="
 	libatomic? ( dev-libs/libatomic_ops[${MULTILIB_USEDEP}] )
 "
 
+PATCHES=( "${FILESDIR}/${PN}-1.7.2-backport-pr521.patch" )
+
 MULTILIB_WRAPPED_HEADERS=(
 	/usr/include/libunwind.h
 
diff --git a/sys-libs/minizip-ng/Manifest b/sys-libs/minizip-ng/Manifest
index bc9fbaccd679..dcdefd9892ad 100644
--- a/sys-libs/minizip-ng/Manifest
+++ b/sys-libs/minizip-ng/Manifest
@@ -1,9 +1,8 @@
 AUX minizip-ng-4.0.1-libbsd-overlay.patch 699 BLAKE2B 6c14c0421dda1f3f879f727a77018335119ec21b0ad1e988148c11451ae9e68986bcbb46eb9e6b775825333f07b9309269f7810b90d8af61618bb037309413e5 SHA512 dc9cceca7009e48e6a7a2ecee0f96497fb15b0a6eb16a50f0689e001874558c37f9fd8303bd3e983c9286698cd7f79e99ccdf53f2bad5f503c041ad1fccae199
 AUX minizip-ng-4.0.3-libbsd-overlay.patch 709 BLAKE2B 4d389a65558e991bb73d847d97576baa8156c29d612f35c24ceeba571c25257bdd8b6fba12b5f9cf0d5781a36bb20583eb89c77f55d5b5497595994e11ccff81 SHA512 8a4dd2b040c9e3fe37d9907d4f66197956751043271bce422f0a32e55b1866e3bb69a701468645ebca56dae46fbcaaa03fd25b894278c2e7dbd286b6dbbc3826
-DIST minizip-ng-4.0.1.tar.gz 769661 BLAKE2B 30147d8643844d9ea10f3f860d41e5025b2c8a5e3bb197722cf3e9ea3d30f40d78974a437425df660db777d9593db9e39b2293db7733ccfaf50c5eba4982a6fe SHA512 857450c3a51a75269afdffdcbaaa6d05894913dd98a91e307129b5e61766f6e3d20bca5841afa41bbe6ca88ad0666c462079a5e1fe73718c2dffd05219c8f258
-DIST minizip-ng-4.0.2.tar.gz 769745 BLAKE2B 7e983169d637e0b94ad6f0c7ceca743fcc54fe1c2f98bae9cb4e9050fe85cb2d46d36cb185d5eb7c0b577d606d9eedfecc3817048b3e7006287fa5e001bed4a5 SHA512 4e626a312c35e5f003e4f365261ef3e1bf33488f8698ec31b1b33d32f6a34ed0b54f0e3ffdae658e5b441532dde3cee45c3822532f52e68ea588e809e8f4081c
+AUX minizip-ng-4.0.4-libbsd-overlay.patch 699 BLAKE2B b176f2fa2186a7d1b9bc276f56e4fd92c6a3548f298931049f6edc6635ea1d8639054d80915f33b4e86213c344e9613bf0d0a34cafa37dbdd3f1e9f12d01f051 SHA512 26b89d4c434d162a42d66e70ab8eb455c18eb6c45fffd36a6fb898a3f47f495c32d066d68a9837a143e84453a476700eaf59b65622cb50ca2006cf72f2ef1486
 DIST minizip-ng-4.0.3.tar.gz 770041 BLAKE2B a5772de8a372738fc1736a5ba307928ebf50ce9de26c845beb0798b2593662a0d990b8ad305238086eea11ad4aba2d7db2a5386d6ca65968bfd40f1fa573e693 SHA512 96d1a5ac1106f737f4db161867a440c272b65c617add30aa0224215abba8098ece9f2bde5c4e407932d0fa5d3ca8696a1db82b5a19ce7ffd8019dba83ab5fd01
-EBUILD minizip-ng-4.0.1-r1.ebuild 2769 BLAKE2B 11f93fe40f6fc0a3e0a55f9d2305980c1eac2488178d771c2e1122aa9a19464715006496cc08823030e2e0154386ef955314a2dad4c8d17f34609a028d7845db SHA512 364018f8ce20e0eb224725a5b2465403d7cf91cc83eeffe6ac90931143f1726fc8a7d69aca460d2aa5cfb423e9d4d0bfca828c4a54d0d87f938598f8c4f0f9e2
-EBUILD minizip-ng-4.0.2.ebuild 2769 BLAKE2B 11f93fe40f6fc0a3e0a55f9d2305980c1eac2488178d771c2e1122aa9a19464715006496cc08823030e2e0154386ef955314a2dad4c8d17f34609a028d7845db SHA512 364018f8ce20e0eb224725a5b2465403d7cf91cc83eeffe6ac90931143f1726fc8a7d69aca460d2aa5cfb423e9d4d0bfca828c4a54d0d87f938598f8c4f0f9e2
+DIST minizip-ng-4.0.4.tar.gz 770202 BLAKE2B 5b9f4a66325de4298db0f7cdb8830050fe55c46c3914f51d7e7c4fe4cd9e080ab9658739dc936da602d67199333b6eca71218ad155244b9c04f50944486a02b1 SHA512 2662ddf90666babe73474f6fc48f5a64f276d555b7a0f04f790b9edef570cb958356e900632c3795fb2053f4813c449240ff101d32b063eca4ad869bef0546fd
 EBUILD minizip-ng-4.0.3.ebuild 2769 BLAKE2B e72a3e6fd39da07abd44f720ca43b8155c00874191a403b2624f0747d9d25db38796bfb1abc32fe2c107ef4eb11a2fcb24c8301d52ce9e676e45fb37793c8bee SHA512 fab998d86f2ab9ab59707ade52a5d605315eaa5ee12e46c62918d8afb2cb5215835391167965234ec0844ad05bbf22b9f715f68ff8f40d8608e904202c2b2290
+EBUILD minizip-ng-4.0.4.ebuild 2769 BLAKE2B 3e3085874620d53e73e92a173302dfd6a008085ab61ac58d31c701236ed2e87c8f6fc55a3a69ec8aec14030f62cc2e1fecea2d1f153b0d232f737a57297703a8 SHA512 b49025536e202810067801a0ea95fcbbc1862c3e49c0441a1e0c26099c59dfea2b96994596c77082643993540296274ad996a4a131ccfdd37251fa3908357145
 MISC metadata.xml 548 BLAKE2B 1373f3096881bc3c5bf4f1864528f399f84c17dab1c9f9ea88db5ad2da1d82cd48f89b9aaa4837f808a45f6783ac833415f1633a9eeaee70748f753fc392be7f SHA512 cf600135681af26f27b611663d426f9a9e83848289f3e184cd4ed6eaec4404226e8737945453a3a12d4bcdc6ef3a623336e514f9bb0c566eb5e8110ade4a1e63
diff --git a/sys-libs/minizip-ng/files/minizip-ng-4.0.4-libbsd-overlay.patch b/sys-libs/minizip-ng/files/minizip-ng-4.0.4-libbsd-overlay.patch
new file mode 100644
index 000000000000..2a62f96f1413
--- /dev/null
+++ b/sys-libs/minizip-ng/files/minizip-ng-4.0.4-libbsd-overlay.patch
@@ -0,0 +1,16 @@
+https://bugs.gentoo.org/889266
+https://gitlab.freedesktop.org/libbsd/libbsd/-/issues/15
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -538,10 +538,10 @@ else()
+ 
+                     if(HAVE_LIBBSD_ARC4RANDOM_BUF)
+                         list(APPEND MINIZIP_DEF -DHAVE_LIBBSD -DHAVE_ARC4RANDOM_BUF)
+-                        list(APPEND MINIZIP_INC ${LIBBSD_INCLUDE_DIRS})
+                         list(APPEND MINIZIP_LIB ${LIBBSD_LIBRARIES})
+                         list(APPEND MINIZIP_LBD ${LIBBSD_LIBRARY_DIRS})
+ 
++                        add_compile_options(${LIBBSD_CFLAGS})
+                         link_directories(${LIBBSD_LIBRARY_DIRS})
+                     endif()
+                 else()
diff --git a/sys-libs/minizip-ng/minizip-ng-4.0.2.ebuild b/sys-libs/minizip-ng/minizip-ng-4.0.2.ebuild
deleted file mode 100644
index 4f3a48149147..000000000000
--- a/sys-libs/minizip-ng/minizip-ng-4.0.2.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# Worth keeping an eye on 'develop' branch upstream for possible backports,
-# as they copied this practice from sys-libs/zlib upstream.
-
-inherit cmake-multilib
-
-DESCRIPTION="Fork of the popular zip manipulation library found in the zlib distribution"
-HOMEPAGE="https://github.com/zlib-ng/minizip-ng"
-SRC_URI="https://github.com/zlib-ng/minizip-ng/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="ZLIB"
-SLOT="0/4"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-IUSE="compat openssl test zstd"
-RESTRICT="!test? ( test )"
-
-# Automagically prefers sys-libs/zlib-ng if installed, so let's
-# just depend on it as presumably it's better tested anyway.
-RDEPEND="
-	app-arch/bzip2[${MULTILIB_USEDEP}]
-	app-arch/xz-utils
-	dev-libs/libbsd[${MULTILIB_USEDEP}]
-	sys-libs/zlib-ng[${MULTILIB_USEDEP}]
-	virtual/libiconv
-	compat? ( !sys-libs/zlib[minizip] )
-	openssl? ( dev-libs/openssl:=[${MULTILIB_USEDEP}] )
-	zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] )
-"
-DEPEND="
-	${RDEPEND}
-	test? ( dev-cpp/gtest )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.0.1-libbsd-overlay.patch
-)
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DMZ_COMPAT=$(usex compat)
-
-		-DMZ_BUILD_TESTS=$(usex test)
-		-DMZ_BUILD_UNIT_TESTS=$(usex test)
-
-		-DMZ_FETCH_LIBS=OFF
-		-DMZ_FORCE_FETCH_LIBS=OFF
-
-		# Compression library options
-		-DMZ_ZLIB=ON
-		-DMZ_BZIP2=ON
-		-DMZ_LZMA=ON
-		-DMZ_ZSTD=$(usex zstd)
-		-DMZ_LIBCOMP=OFF
-
-		# Encryption support options
-		-DMZ_PKCRYPT=ON
-		-DMZ_WZAES=ON
-		-DMZ_OPENSSL=$(usex openssl)
-		-DMZ_LIBBSD=ON
-
-		# Character conversion options
-		-DMZ_ICONV=ON
-	)
-
-	cmake_src_configure
-}
-
-multilib_src_test() {
-	local myctestargs=(
-		# TODO: investigate
-		-E "(raw-unzip-pkcrypt|raw-append-unzip-pkcrypt|raw-erase-unzip-pkcrypt|deflate-unzip-pkcrypt|deflate-append-unzip-pkcrypt|deflate-erase-unzip-pkcrypt|bzip2-unzip-pkcrypt|bzip2-append-unzip-pkcrypt|bzip2-erase-unzip-pkcrypt|lzma-unzip-pkcrypt|lzma-append-unzip-pkcrypt|lzma-erase-unzip-pkcrypt|xz-unzip-pkcrypt|xz-append-unzip-pkcrypt|xz-erase-unzip-pkcrypt|zstd-unzip-pkcrypt|zstd-append-unzip-pkcrypt|zstd-erase-unzip-pkcrypt)"
-	)
-
-	# TODO: A bunch of tests end up looping and writing over each other's files
-	# It gets better with a patch applied (see https://github.com/zlib-ng/minizip-ng/issues/623#issuecomment-1264518994)
-	# but still hangs.
-	cmake_src_test -j1
-}
-
-multilib_src_install_all() {
-	if ! use compat && use test ; then
-		# Test binaries, bug #874591
-		rm "${ED}"/usr/bin/minigzip || die
-		rm "${ED}"/usr/bin/minizip-ng || die
-	fi
-}
-
-pkg_postinst() {
-	if use compat ; then
-		ewarn "minizip-ng is experimental and replacing the system zlib[minizip] is dangerous"
-		ewarn "Please be careful!"
-	fi
-}
diff --git a/sys-libs/minizip-ng/minizip-ng-4.0.1-r1.ebuild b/sys-libs/minizip-ng/minizip-ng-4.0.4.ebuild
index 4f3a48149147..d23ad9d63cb9 100644
--- a/sys-libs/minizip-ng/minizip-ng-4.0.1-r1.ebuild
+++ b/sys-libs/minizip-ng/minizip-ng-4.0.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -36,7 +36,7 @@ DEPEND="
 "
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-4.0.1-libbsd-overlay.patch
+	"${FILESDIR}"/${PN}-4.0.4-libbsd-overlay.patch
 )
 
 multilib_src_configure() {