gentoo auto-resync : 12:04:2024 - 00:33:28

11 files changed, 132 insertions, 88 deletions

diff --git a/app-arch/Manifest.gz b/app-arch/Manifest.gz
index f24613ae814a..ea79f6ce0fdb 100644
--- a/app-arch/Manifest.gz
+++ b/app-arch/Manifest.gz
diff --git a/app-arch/snappy/Manifest b/app-arch/snappy/Manifest
index 6e39594f1845..c70cd30c8c77 100644
--- a/app-arch/snappy/Manifest
+++ b/app-arch/snappy/Manifest
@@ -1,9 +1,11 @@
 AUX snappy-1.1.9-clang-werror.patch 662 BLAKE2B 232e844f269658a757fbb904744b778d1f4c0f5127fb5596143463056238d8e0c1e448bfa0223cf061c2175e397c11965f1db9899434e8777fbc1bf310f0805b SHA512 82424729bbc8698fb0ff3827dfc5cbda9000cb5a80b6f668e30bcea38f1022a7008c60a56fc9b52dc57e771cf59766e4a43f60e04e0f750001c510e71f4263cc
 AUX snappy-1.1.9_external_gtest.patch 1092 BLAKE2B 392ee98254749dbf65ae8317dd2c26dfc140b768a08fe265cca26a0dce0eb43a1283eb55659c1fbf8e36e7037e65ec3f5ef970eb6436822fb6af212981f1facb SHA512 0b867b60b6e90551ab3c1ce4990775f2b0085d68fae72c4b63925f772b565cd86e9ad36659dae3a5cfb621ee628a0a547c82356f0f44d67ca2cc4ad9bfe16333
-AUX snappy-1.1.9_gcc_inline.patch 3166 BLAKE2B b4d05035647a97709ba43ee9673fbdaf1a160cc5859fd7401a8cdb67e04ba49bdfe98a9801257356841326b26759eff1022af3d5253628a87b0035af122a8fdd SHA512 5e8389e31a8d6e092843a3456f4a75d1f5f26af25d9d7ddfec283573a423522ce779b9ed4da5d2e3b6346153b5d137070611f88ebc907cfec64748afd29759f2
 AUX snappy-1.1.9_remove-no-rtti.patch 1420 BLAKE2B de5194681f365e8d34ac9f56fb3951caad18f1f8af9c3fd65e0ce21de0dd45e8b5fa28c831d04bedc88c8a9fd3b3745c6bacd696b407bb23be766e259ec05aea SHA512 96e16b453ee5e7718930227c8203a5e814e5c0183cf3e13a310d232551dff32bae08dd88552acd714cf373cf7f052630d9c4091776c72d3f451dd395f8bba1b2
+AUX snappy-1.2.0_external-gtest.patch 1586 BLAKE2B 0517d2664cb523f9b07c4250b1092e84775277ddcea3793a4847e5001b931e29b95598463a97208300aa96d184c6d39d8d3266f54a963e58b3612c2ab66a9815 SHA512 886d63c65ec8c8504571e844df26e0a0400d32525685778053acae7591a87fdf46556be87327d01dd03f3bc73fd09687ff1935470b924e3bccfab73624ec5b24
+AUX snappy-1.2.0_no-werror.patch 897 BLAKE2B f7899dc4b92231443c2f0caffd05657de9eaaaaeb765b198024e5216bd2cd63d4c5cee499967ac540f2d4a4a36fa48b88c51c6353510d38a2fa30d739fe8d32b SHA512 c5c734926bc3cdfeb9d52fab5dc04128e45eef7c8708272ca1629e13792e6a8b384a76f561715cf1474b04095d4fb4e4fb09a6d6e08073710d65009340c6e1d7
+AUX snappy-1.2.0_remove-no-rtti.patch 1267 BLAKE2B 1612abae4e0cff9ad219f6271aaaf21b798c131d08b517f9a343855cbb361ec6e9c50b6f33cbdc37640d1ea4548149c8212ca228aa8e307800176c34e66880d8 SHA512 a37fcc5329a067c640bff92649bfc61747a59a3080fc60457972effe5b1f84408cebd1d03841b21a4a1fb0667acd2e6799d7e0df496b457a767be17c40deed70
 DIST snappy-1.1.10.tar.gz 1105312 BLAKE2B 5195335fb1883974d290e7dca2b6d928bde2b183f3f61bca9da28855b39fd9a4ee1c24014322d238d2ec94f3a3a55fd43110c88283e85865272226e11cbb4834 SHA512 3578597f1d4ec09104ce0296b825b013590351230dfe56c635081fd282ce7a13a34caf2c283ac77bd24065e2d27af6db068d1f84b98cec2fd39a0e37a0d77070
-DIST snappy-1.1.9.tar.gz 1102382 BLAKE2B 926d03156168e3d4800dc17144db3de2c182c6eb9970d87a00b94fb09b67e403479a64cbed75833b83fd03173c1bb8caaf248a55627e89fe2a34456f12ff3b42 SHA512 f1f8a90f5f7f23310423574b1d8c9acb84c66ea620f3999d1060395205e5760883476837aba02f0aa913af60819e34c625d8308c18a5d7a9c4e190f35968b024
+DIST snappy-1.2.0.tar.gz 1107265 BLAKE2B 327b60ea032ceb004c5f5e36a0013dc2a44258ec303d0701cf23446904b83e72a66b7e59866a7331c7751a08ce6ec6b871bc056efa6eeb86733d4640569d8072 SHA512 5b3b4e73ff24295885ff9f3d75ccb090e6c7dba40d4965f0892163aa9876296e61590d62023a32d750949268af8ce89df93273b02179d5b3a55de00966a3ae0a
 EBUILD snappy-1.1.10-r1.ebuild 1496 BLAKE2B 43e6e9d29cb153100086ec377a1b494beb70303d872dd3c21fceba7a22cdf03717652e1f14deb0ef4b853442706fdc690367995866161325d8604c04ea3b0488 SHA512 ac2d9c78ec6e08bc1060137ba4a2568bf69e28bf724c68ce0648e024195098aedc84dbe961b7615a07817f5c87da7204a6a996649855e3e39ee82acbb91af805
-EBUILD snappy-1.1.9-r1.ebuild 1259 BLAKE2B 9678bcc5829074ffeb2bdf2e05f028c10d2d5a58611242ca6dafcd83b11087ea754b72a2eb4e77e9dddd6b6d36f0606ca5ad4137881b51642f8a4dbd97b72b73 SHA512 f7ae64ae9963d2605c1be080b55b973d59666d8a50821c8e5e5d33acf7718baa0a815037adc41ac8735561e2b4e5fb613aa915ca6e1c4bcb029c61e4012935f4
+EBUILD snappy-1.2.0.ebuild 1499 BLAKE2B 3286a4074cc8cfeef16855b416fb30f2ee1b033d34b5267561e74e0de8c8ef0e11691432c6567bedc7abba9e12336f3eccacf7f25db894db017f8f08e94bedbc SHA512 50981979fb4885c28019ae01c1824ab2f290beffe78fa4e074b87bc0ecaf6faf7f673d3f27c70b34acdfcfbed6fec7ee3f087cfd0de6bf838063365792f4d7cf
 MISC metadata.xml 801 BLAKE2B dd35b7d1e7c5113cdf16e4ca002c07bd433f47265486a5f1710c3908d7d494b5c6dde77ef1ede60cab913b74b8ff645dcd89cf2c59b21f313e6cd4f4b4740dfa SHA512 13d13dc4efa03efdded3c8e9313753315a132a05d4b53471f7268715c80a95faea18df466eb9b3a756a018fc21e5f5b31cf10b024652b94cd7cfd40f44d56cc7
diff --git a/app-arch/snappy/files/snappy-1.1.9_gcc_inline.patch b/app-arch/snappy/files/snappy-1.1.9_gcc_inline.patch
deleted file mode 100644
index 04d35f56ee98..000000000000
--- a/app-arch/snappy/files/snappy-1.1.9_gcc_inline.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-From 0c716d435abe65250100c2caea0e5126ac4e14bd Mon Sep 17 00:00:00 2001
-From: "Georgi D. Sotirov" <gdsotirov@gmail.com>
-Date: Wed, 5 May 2021 14:16:46 +0300
-Subject: [PATCH] Add inline with SNAPPY_ATTRIBUTE_ALWAYS_INLINE
-
-Add inline with SNAPPY_ATTRIBUTE_ALWAYS_INLINE on AdvanceToNextTag to
-fix the following compilation errors and a warning with GCC:
-
-[  2%] Building CXX object CMakeFiles/snappy.dir/snappy.cc.o
-/usr/bin/c++   -DHAVE_CONFIG_H -Dsnappy_EXPORTS
--I/tmp/snappy-1.1.9/build -I/tmp/snappy-1.1.9  -O3
--march=i586 -mtune=i686 -Wall -Wextra -fno-exceptions -fno-rtti -O3
--DNDEBUG -fPIC   -std=c++11 -o CMakeFiles/snappy.dir/snappy.cc.o -c
-/tmp/snappy-1.1.9/snappy.cc
-/tmp/snappy-1.1.9/snappy.cc:1017:8: warning: always_inline
-function might not be inlinable [-Wattributes]
- size_t AdvanceToNextTag(const uint8_t** ip_p, size_t* tag) {
-        ^
-/tmp/snappy-1.1.9/snappy.cc: In function 'std::pair<const
-unsigned char*, int> snappy::DecompressBranchless(const uint8_t*, const
-uint8_t*, ptrdiff_t, T, ptrdiff_t) [with T = char*; uint8_t = unsigned
-char; ptrdiff_t = int]':
-/tmp/snappy-1.1.9/snappy.cc:1017:8: error: inlining failed in
-call to always_inline 'size_t snappy::AdvanceToNextTag(const uint8_t**,
-size_t*)': function body can be overwritten at link time
-/tmp/snappy-1.1.9/snappy.cc:1097:53: error: called from here
-         size_t tag_type = AdvanceToNextTag(&ip, &tag);
-                                                     ^
-/tmp/snappy-1.1.9/snappy.cc:1017:8: error: inlining failed in
-call to always_inline 'size_t snappy::AdvanceToNextTag(const uint8_t**,
-size_t*)': function body can be overwritten at link time
- size_t AdvanceToNextTag(const uint8_t** ip_p, size_t* tag) {
-        ^
-/tmp/snappy-1.1.9/snappy.cc:1097:53: error: called from here
-         size_t tag_type = AdvanceToNextTag(&ip, &tag);
-                                                     ^
-/tmp/snappy-1.1.9/snappy.cc:1017:8: error: inlining failed in
-call to always_inline 'size_t snappy::AdvanceToNextTag(const uint8_t**,
-size_t*)': function body can be overwritten at link time
- size_t AdvanceToNextTag(const uint8_t** ip_p, size_t* tag) {
-        ^
-/tmp/snappy-1.1.9/snappy.cc:1097:53: error: called from here
-         size_t tag_type = AdvanceToNextTag(&ip, &tag);
-                                                     ^
-CMakeFiles/snappy.dir/build.make:137: recipe for target
-'CMakeFiles/snappy.dir/snappy.cc.o' failed
-
-Just like with other functions using SNAPPY_ATTRIBUTE_ALWAYS_INLINE
-macro (i.e. __attribute__((always_inline)) ) it is necessary to use C++
-inline specifier.
----
- snappy.cc | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/snappy.cc b/snappy.cc
-index 79dc0e8..51157be 100644
---- a/snappy.cc
-+++ b/snappy.cc
-@@ -1014,7 +1014,7 @@ void MemMove(ptrdiff_t dst, const void* src, size_t size) {
- }
- 
- SNAPPY_ATTRIBUTE_ALWAYS_INLINE
--size_t AdvanceToNextTag(const uint8_t** ip_p, size_t* tag) {
-+inline size_t AdvanceToNextTag(const uint8_t** ip_p, size_t* tag) {
-   const uint8_t*& ip = *ip_p;
-   // This section is crucial for the throughput of the decompression loop.
-   // The latency of an iteration is fundamentally constrained by the
diff --git a/app-arch/snappy/files/snappy-1.2.0_external-gtest.patch b/app-arch/snappy/files/snappy-1.2.0_external-gtest.patch
new file mode 100644
index 000000000000..6d929821ba0b
--- /dev/null
+++ b/app-arch/snappy/files/snappy-1.2.0_external-gtest.patch
@@ -0,0 +1,46 @@
+From 4e6c67832f53b126d1e54b9398b88f23e75846f3 Mon Sep 17 00:00:00 2001
+From: "Azamat H. Hackimov" <azamat.hackimov@gmail.com>
+Date: Thu, 11 Apr 2024 10:05:30 +0300
+Subject: [PATCH 1/3] Use external GTest suite
+
+---
+ CMakeLists.txt | 22 ++--------------------
+ 1 file changed, 2 insertions(+), 20 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 85afe58..e23d2ca 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -319,27 +319,9 @@ endif(SNAPPY_BUILD_TESTS OR SNAPPY_BUILD_BENCHMARKS)
+ if(SNAPPY_BUILD_TESTS)
+   enable_testing()
+ 
+-  # Prevent overriding the parent project's compiler/linker settings on Windows.
+-  set(gtest_force_shared_crt ON CACHE BOOL "" FORCE)
+-  set(install_gtest OFF)
+-  set(install_gmock OFF)
+-  set(build_gmock ON)
+-
+   # This project is tested using GoogleTest.
+-  add_subdirectory("third_party/googletest")
+-
+-  # GoogleTest triggers a missing field initializers warning.
+-  if(SNAPPY_HAVE_NO_MISSING_FIELD_INITIALIZERS)
+-    set_property(TARGET gtest
+-        APPEND PROPERTY COMPILE_OPTIONS -Wno-missing-field-initializers)
+-    set_property(TARGET gmock
+-        APPEND PROPERTY COMPILE_OPTIONS -Wno-missing-field-initializers)
+-  endif(SNAPPY_HAVE_NO_MISSING_FIELD_INITIALIZERS)
+-
+-  if(SNAPPY_HAVE_NO_IMPLICIT_INT_FLOAT_CONVERSION)
+-    set_property(TARGET gtest
+-        APPEND PROPERTY COMPILE_OPTIONS -Wno-implicit-int-float-conversion)
+-  endif(SNAPPY_HAVE_NO_IMPLICIT_INT_FLOAT_CONVERSION)
++  find_package(GTest REQUIRED)
++  include(GoogleTest)
+ 
+   add_executable(snappy_unittest "")
+   target_sources(snappy_unittest
+-- 
+2.43.2
+
diff --git a/app-arch/snappy/files/snappy-1.2.0_no-werror.patch b/app-arch/snappy/files/snappy-1.2.0_no-werror.patch
new file mode 100644
index 000000000000..813ff7a59136
--- /dev/null
+++ b/app-arch/snappy/files/snappy-1.2.0_no-werror.patch
@@ -0,0 +1,24 @@
+From 8a262c4de10c4a7e07db41779fd7ca1565d92631 Mon Sep 17 00:00:00 2001
+From: "Azamat H. Hackimov" <azamat.hackimov@gmail.com>
+Date: Thu, 11 Apr 2024 10:06:47 +0300
+Subject: [PATCH 2/3] Don't use -Werror
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -66,13 +66,6 @@ else(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
+     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wextra")
+   endif(NOT CMAKE_CXX_FLAGS MATCHES "-Wextra")
+ 
+-  # Use -Werror for clang only.
+-  if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+-    if(NOT CMAKE_CXX_FLAGS MATCHES "-Werror")
+-      set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror")
+-    endif(NOT CMAKE_CXX_FLAGS MATCHES "-Werror")
+-  endif(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+-
+   # Disable sign comparison warnings. Matches upcoming Bazel setup.
+   if(NOT CMAKE_CXX_FLAGS MATCHES "-Wno-sign-compare")
+     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-sign-compare")
+-- 
+2.43.2
+
diff --git a/app-arch/snappy/files/snappy-1.2.0_remove-no-rtti.patch b/app-arch/snappy/files/snappy-1.2.0_remove-no-rtti.patch
new file mode 100644
index 000000000000..dcfeae45cfbb
--- /dev/null
+++ b/app-arch/snappy/files/snappy-1.2.0_remove-no-rtti.patch
@@ -0,0 +1,32 @@
+From 012ff3ef652027abd1a422268cf9f164b386f340 Mon Sep 17 00:00:00 2001
+From: "Azamat H. Hackimov" <azamat.hackimov@gmail.com>
+Date: Thu, 11 Apr 2024 10:07:45 +0300
+Subject: [PATCH 3/3] Don't disable RTTI
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -51,10 +51,6 @@ if(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
+   string(REGEX REPLACE "/EH[a-z]+" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
+   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /EHs-c-")
+   add_definitions(-D_HAS_EXCEPTIONS=0)
+-
+-  # Disable RTTI.
+-  string(REGEX REPLACE "/GR" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
+-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /GR-")
+ else(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
+   # Use -Wall for clang and gcc.
+   if(NOT CMAKE_CXX_FLAGS MATCHES "-Wall")
+@@ -88,10 +84,6 @@ else(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
+   # Disable C++ exceptions.
+   string(REGEX REPLACE "-fexceptions" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
+   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-exceptions")
+-
+-  # Disable RTTI.
+-  string(REGEX REPLACE "-frtti" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
+-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-rtti")
+ endif(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
+ 
+ # BUILD_SHARED_LIBS is a standard CMake variable, but we declare it here to make
+-- 
+2.43.2
+
diff --git a/app-arch/snappy/snappy-1.1.9-r1.ebuild b/app-arch/snappy/snappy-1.2.0.ebuild
index b6cbd7792108..c1a06ba97416 100644
--- a/app-arch/snappy/snappy-1.1.9-r1.ebuild
+++ b/app-arch/snappy/snappy-1.2.0.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
@@ -10,9 +10,11 @@ HOMEPAGE="https://github.com/google/snappy"
 SRC_URI="https://github.com/google/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
-SLOT="0/${PV%%.*}"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
-IUSE="test"
+# ${PV%%.*}.FUDGE where FUDGE is incremented if ABI is broken without a new SONAME
+# Please use abidiff on bumps.
+SLOT="0/${PV%%.*}.1"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+IUSE="cpu_flags_x86_avx cpu_flags_x86_avx2 test"
 RESTRICT="!test? ( test )"
 
 DEPEND="test? ( dev-cpp/gtest )"
@@ -20,16 +22,17 @@ DEPEND="test? ( dev-cpp/gtest )"
 DOCS=( format_description.txt framing_format.txt NEWS README.md )
 
 PATCHES=(
-	"${FILESDIR}/${P}_gcc_inline.patch"
-	"${FILESDIR}/${P}_external_gtest.patch"
-	"${FILESDIR}/${P}-clang-werror.patch"
-	"${FILESDIR}/${P}_remove-no-rtti.patch"
+	"${FILESDIR}/${PN}-1.2.0_external-gtest.patch"
+	"${FILESDIR}/${PN}-1.2.0_no-werror.patch"
+	"${FILESDIR}/${PN}-1.2.0_remove-no-rtti.patch"
 )
 
 multilib_src_configure() {
 	local mycmakeargs=(
 		-DCMAKE_CXX_STANDARD=14 # Latest gtest needs -std=c++14 or newer
 		-DSNAPPY_BUILD_TESTS=$(usex test)
+		-DSNAPPY_REQUIRE_AVX=$(usex cpu_flags_x86_avx)
+		-DSNAPPY_REQUIRE_AVX2=$(usex cpu_flags_x86_avx2)
 		-DSNAPPY_BUILD_BENCHMARKS=OFF
 		# Options below are related to benchmarking, that we disable.
 		-DHAVE_LIBZ=NO
diff --git a/app-arch/upx-bin/Manifest b/app-arch/upx-bin/Manifest
index 7469c1a96340..4f18e5542cc8 100644
--- a/app-arch/upx-bin/Manifest
+++ b/app-arch/upx-bin/Manifest
@@ -5,13 +5,13 @@ DIST upx-4.1.0-i386_linux.tar.xz 620220 BLAKE2B db56d61ae8abe1e0a776f994bcd855f9
 DIST upx-4.1.0-mipsel_linux.tar.xz 678296 BLAKE2B 6c7601405b66c25ea7d5a902d137a737ea9f88c92ab152cd322db03fff2f4166802d41321aedac33ef31f903362ef7f6896998916a417a97a5fd539250fb1914 SHA512 23c0fc515bfd1cad35ad1241ecedfc938b8061e63311abeee3eb0c01f9dc502ce9d4be68e0f19354893b0936c1bd9e6795e40c458255e18df63edf0f42424157
 DIST upx-4.1.0-powerpc64le_linux.tar.xz 674196 BLAKE2B cf6dfeea30f5054d8c9f69d88b8ff8c3d6f5e50e0ceab8fef8b51b403b96e571f2d73411d214743baedd7c12711047e0595349ca466373871a433035ca6cde30 SHA512 0f19ea1e04e7e226d2cd864e556170c7324f15bd3163458be1316ff9366b670eafe8a2d781220308efdb930941cb841a9a33702db7df61fec4b0521835a54bc7
 DIST upx-4.1.0-powerpc_linux.tar.xz 675776 BLAKE2B 1ba5df26208c5781c33b18b7a1036a83bd9409a49fb30e54c64f04f16ec7a99bb83bbbc89dfdd9aff42acc866976803cc81706d077cab8275887999462ed44d0 SHA512 91584f0b3d257bc4b29631bf45313f9d226cd53e8629b0655bbb7d2b4c7a5450cfbf2b52c108bb7c727a17ffdb4afcb4baa9cb029c30dae057bf2d717d8ffea6
-DIST upx-4.2.2-amd64_linux.tar.xz 590172 BLAKE2B 6cb00856799b3568b3340509c142057292bda68a293e2fc0e6f20fbb89ac96649bb2523a1bc7728179516f5ba529fc1df0a6a99e7d671094fcd872fa527e3bc6 SHA512 f7d906ebb0bab74bf7dfe1f87fb700dd86e040b2f451d97233477fa13c67c98e845e34fd7828c5d7756e39634e128f2e7dedffc0b9b03b32b4bc36bca01117d8
-DIST upx-4.2.2-arm64_linux.tar.xz 600664 BLAKE2B 9dd992d2212d3eebea7ad743a3faa6c69b2c713539f4f486f7a88fb16c1f81382b767669fb1b38ff46037f2b2b6311edf2423dc345c9409dc07f1bcc2c11525b SHA512 a9f028c09f75ec01bded128c9aea9f29ae47ab24146d04aa50d9cd4be7a467899257776510e654fe38ff443d4dbe64916975583ecb94068a2c98ef40393bcae9
-DIST upx-4.2.2-armeb_linux.tar.xz 601780 BLAKE2B 1159fead612b13d7f758be95eab212b269f9a3d521af7db03b6698f5131779a8c72f6731032d4d49c373d6d15cadc77ebc56010f5b50390d7e96be75a60a8654 SHA512 9363f2aef07eaa2bf1ed0342810c0144d837473f00b2a75903b4a57bd9cd9110ccc2b5971e7f85a6f0f3b3eb4723a8e0ee7b191e9cb231a58b421ca83416e264
-DIST upx-4.2.2-i386_linux.tar.xz 640812 BLAKE2B 2767dfbccafb97603598c590784c30ebed3625121367c1faa464558fc76a52f62a7a3e3c1a0624cd0c5ca96e2df1debfef54408a09355b52f1889d409fa7207b SHA512 ca6558d7246315d482f08d80ab3003b2352f610ea1080704d30d3386970013516700329435a32577f97e6fb6eafb4547013e251d2f70bd1a7fa2e36de1a58bd9
-DIST upx-4.2.2-mipsel_linux.tar.xz 683044 BLAKE2B 6bc1884f3f8e5a55a7e73da3733493f3f4e8a5391f070c97d112197224d2ba38a1fac9aac7cb28a245b7fcd3cf053f3eae8052046351e3db993bf23a1e36c962 SHA512 582fe445064f7a57ab855b3295b9fe249c18f54925f2374e7d2fefd4dd24e228e5a8551019d389d8ebff53b30636a428018751ebf575d7436b873376140587a9
-DIST upx-4.2.2-powerpc64le_linux.tar.xz 678552 BLAKE2B 1334b7096b46ab2f2cb1226c3c6ad2c9523c58df08d12357cecb7d4bd8f27186f0cced5e85010e95fe3547dfcc4441dd3f08aa38fb4980aff4f8305c9ef50213 SHA512 0e1813751247c309bcdd8fed0f8266776b054b68492c229aeebb1cad0e68bd7218929f70714647d6398dad30ce6e69cc41dde5511af2ec623cb1722c2c135322
-DIST upx-4.2.2-powerpc_linux.tar.xz 679340 BLAKE2B e48f5310265c2c7f5829bf8206e172752cd9c22cbad6344da748083c90f7e5d614d59509db71f89b2259a98c61579289f376231c6a4af2d833bc840044d0efde SHA512 f9e3212e34f95c8370ec3b7eab179a91456b5d98e063c03777a6bb4fd0713e8490fc008c0e2c373ebe309997efce0fc9a29719df126a164449af9c91eec6b3e7
+DIST upx-4.2.3-amd64_linux.tar.xz 589416 BLAKE2B 88eb4f85477c589e7682b13faee4f9df8cb2021782e88cdde7f82c49dd77cfede269bef8f476e994749fcbadae459de8192a38aa0e17928a33156c54c032f8ae SHA512 0ec084ba2049cd283e5a14124bc130b69b55d1cafb19bb342516cf0a45ace4f247a0f11aaf0c302224998372222853768fcd8a50fd1c7828cdf9f1b0edfd47f9
+DIST upx-4.2.3-arm64_linux.tar.xz 600184 BLAKE2B 7d80b0eba5cef383af1cf8b31b22cd7e51002292f250f84313609338a2878b5a88c9caea8e8df4936bbd00ffc326b806e6dff897651f2219305e7abb56702a15 SHA512 1c7ac30057b564a9ae5ee4835f0662b203e1915931d82dad9369dd4d80565959f32afff07898b7a59630ec883cb215b6f41356abf35e5b400dde7ab4e9f88541
+DIST upx-4.2.3-armeb_linux.tar.xz 601892 BLAKE2B 5770139392ca379be96a7181420557d964ece2766e0dad0a315d0629b3e49b543cc8fbb3387e17cc92d26fdad65ff628341ef53e256c8ae910a744409d47d492 SHA512 bed641247a73b78cddb22940655691f60d87d7bcf3050d5ad14b3abc569c83f824433697a6790e3dd5fe029d6df2aad6878da13bb6fc8979d8a5e224d04a5504
+DIST upx-4.2.3-i386_linux.tar.xz 640800 BLAKE2B 995b9814ac25acbb10559f1b7594352cf80c104b554f0033391b7972b741cf35eed89cba6208f09298e08b861f4be17f567151793e504a7b8310da663faf7670 SHA512 bba0ca8f8438e01259ed2a3a30127777ea7cce3674b03eb5d7a96c32ed0028d3b06ab199973644d70e09aa405dec303434b4e318d99e1aa8d9db1c12c1deeb81
+DIST upx-4.2.3-mipsel_linux.tar.xz 684724 BLAKE2B e540b8b0ee7365a8b64ace9370f4f8c182995218eb1b4230ae094baddb75178e7eab06bd693f663c5e1f38f96ce66aa036f6792fcc6cedd9c8554a85b23a9027 SHA512 70e5fd35d36a6118afe10594ec17076ea0f4ba954edf7a15dd91a7dad1ca3ee9ed717fd31865fcd5611cb551d4f53b946daa14ce84d7a33f74b4d3ee85f7512b
+DIST upx-4.2.3-powerpc64le_linux.tar.xz 673892 BLAKE2B cb48edf50219d1abe2524661dae7f0d3e5adbcf84db5d913c13a392b0ce6dc9d6c3c5589a2898d1d192d596ade52aa32d612849de21edba46eb807e2d01b76c0 SHA512 016ef2ed437bedd8c3c7d26be268d5a183a32b0290968bbf84318d32d0bc7187171d14d2be717c18b00bdefcfd4d068257780d1fd34dbcd300c9d4f759f05e34
+DIST upx-4.2.3-powerpc_linux.tar.xz 677584 BLAKE2B cb3a835fccf7e233e7dc8bbd4bee226901bbd8c82c5210199ce713cab1c03fa2ab6ada5825f7052d01688db571e1466acee963b4e09787cc65ec07791981f33c SHA512 deb0a6f088a62642142b02f2fc73790dc7c5b60cf6189fe9cde2aa259b9ec777ac5007c9168c4e5d71beb24d268d18b04c4c3e326a693edcb80d487dc3915145
 EBUILD upx-bin-4.1.0.ebuild 1319 BLAKE2B 083846b9f4d68a16d5f99956627bd2ed902ed85b3fb18a5a33709059c6a6f416d35a625b691f95b018654fd8bc020704854b961cfb0b9eda8f6107bd02ddc095 SHA512 0c40408243652dea0dd8517ba8d2563e9cf55d93f02b7535b3d5a160ed2673eb5313db7da9c7f483632443a8528fe641b2a4d60b96e28747bbb0932445dc63ed
-EBUILD upx-bin-4.2.2.ebuild 1321 BLAKE2B afa5e95ef654893d59655e6620eb2b75cab6bf80d7edcf557ff0e278be5cfa8cdbcefe3c9f678cc0f5fad80c48796e4cec14708bf3d0ccdbc24fa5a724cf8e6e SHA512 f327e8635b4f5dec47f7b85c3b6673ccc4fbb6b2d90187dabb15368be353684e92b13d0c6dffb0afecf6fcb66ee9121bba1a6cae65b83b89600ec8454bac7df9
+EBUILD upx-bin-4.2.3.ebuild 1321 BLAKE2B afa5e95ef654893d59655e6620eb2b75cab6bf80d7edcf557ff0e278be5cfa8cdbcefe3c9f678cc0f5fad80c48796e4cec14708bf3d0ccdbc24fa5a724cf8e6e SHA512 f327e8635b4f5dec47f7b85c3b6673ccc4fbb6b2d90187dabb15368be353684e92b13d0c6dffb0afecf6fcb66ee9121bba1a6cae65b83b89600ec8454bac7df9
 MISC metadata.xml 479 BLAKE2B fafbeeb827ba16ec14c3682982e7cbb1ef9264b637086d58aca32a632b1f273f1cc7ede069d61439a498f04e09368e4095829de7dd95b17afafc80f7ceb15695 SHA512 956e31235fec93e773f9bdbe62de739e3994d92b3a56ea97f65db5b20f182f4fbeed62370a28bf98447fddfa89efec4b8b4d63daf9020210810bd8bb201534e4
diff --git a/app-arch/upx-bin/upx-bin-4.2.2.ebuild b/app-arch/upx-bin/upx-bin-4.2.3.ebuild
index 1014c4fbaab6..1014c4fbaab6 100644
--- a/app-arch/upx-bin/upx-bin-4.2.2.ebuild
+++ b/app-arch/upx-bin/upx-bin-4.2.3.ebuild
diff --git a/app-arch/upx/Manifest b/app-arch/upx/Manifest
index c2d7fc5ac67d..b2e09bb3b7f2 100644
--- a/app-arch/upx/Manifest
+++ b/app-arch/upx/Manifest
@@ -1,5 +1,5 @@
 DIST upx-4.1.0-src.tar.xz 1267708 BLAKE2B ef7884028a97b1d7e542fc27756b705582786a22d193b1eef40d0db16580958baddc3baa44429b5ba2c0f7b5d4d0f4f79fdeb777af016b962b07c7639a319090 SHA512 de8306e833198d7f470c050b05c6111a50ea94f2e757c1006433742871ccd93fd7412f942cd776e9eac6c91e379545d72f070f3fe928e75e5d5092b766474f8c
-DIST upx-4.2.2-src.tar.xz 1275320 BLAKE2B 747d8e9543325cafd368d5b47e7a90bfef042a80a58ad0fc1eba798716cebe16ef91645e436fd9506a3c8fe58aa28852437a81e4058afbb213284a4a2475c828 SHA512 03885abfd1db899ea21e9469068dbe046e4817de461e36a6c8a77f6a98f8ccaf00c95846ad3b13e59a5e037ce2f2bed7bea599396968e0aeb7ba5fce1b374a9b
+DIST upx-4.2.3-src.tar.xz 1283824 BLAKE2B 2b53bf68196c35c05eb930760ad20446fbcde9b15e1e9261e2eb7553dc1c8ede48db952cd7c5bc6de5861ac98f9f62bb1d348806731fea7dad1e532fc7e1e636 SHA512 b9ebda5d3372132bb861e0dd035829b16e4c06900f68af182895f17975493707d78cbabc63060e581de1ce149bb5129d883f6e6abcde0413c0bf474db919f5fd
 EBUILD upx-4.1.0.ebuild 748 BLAKE2B e4562c894bd26240bb21dc4e579aa56c9c6bf27ef1fd00b6c30da6739cea4458a9de9154a7b1bcf5efa4f5fbd01fe595126f48f593ea2c8b336cc1cec84b3343 SHA512 93e947ff8f3794c0e61637e2587dc9acba3ce6f27024c8f1e9729fa4f915eec7467a62a70694c3d23fb2dbc10e9f5f115cbe9831899df2b77ecc8d4fffec15a6
-EBUILD upx-4.2.2.ebuild 750 BLAKE2B 679a7941fc332863a5f4bd5b1b6ade14949bf889dd4a8bbe65e68ce77b0b838c54ac871316b0d2c09bab15b6ed218bd4c048384783caf7e2aed249b549f88c0d SHA512 04dd6edffe85a210c5dd239c490df03ff2b7e70ab80b64ac6652ab041210e47d8ea6dfcfe66367103aab78e365658238966e4df606e46b78bf0aba070d76e22a
+EBUILD upx-4.2.3.ebuild 870 BLAKE2B e06fa1cc1aeb2f333501136f46d9a1bb2b77943a15a9fadb21db9542457a6b9cb26c8bd077a39bcfc224b21100ce26542b1efa155e112d8b81a411afe3372968 SHA512 1301bfad51b12e15aff03cb74c05a3194a69c82992cd5b24844513adc494b934e8ab6dc8070529f5674ff33803c1dc592868957eaed6dd7dece75d4714369fb6
 MISC metadata.xml 479 BLAKE2B fafbeeb827ba16ec14c3682982e7cbb1ef9264b637086d58aca32a632b1f273f1cc7ede069d61439a498f04e09368e4095829de7dd95b17afafc80f7ceb15695 SHA512 956e31235fec93e773f9bdbe62de739e3994d92b3a56ea97f65db5b20f182f4fbeed62370a28bf98447fddfa89efec4b8b4d63daf9020210810bd8bb201534e4
diff --git a/app-arch/upx/upx-4.2.2.ebuild b/app-arch/upx/upx-4.2.3.ebuild
index df37e7e83714..83d85276513a 100644
--- a/app-arch/upx/upx-4.2.2.ebuild
+++ b/app-arch/upx/upx-4.2.3.ebuild
@@ -13,13 +13,17 @@ S="${WORKDIR}/${P}-src"
 LICENSE="GPL-2+ UPX-exception" # Read the exception before applying any patches
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="!app-arch/upx-bin"
 BDEPEND="app-arch/xz-utils[extra-filters]"
 
 src_configure() {
 	local mycmakeargs=(
+		-DUPX_CONFIG_DISABLE_GITREV=ON
 		-DUPX_CONFIG_DISABLE_WERROR=ON
+		-DUPX_CONFIG_CMAKE_DISABLE_TEST=$(usex !test)
 	)
 	cmake_src_configure
 }