gentoo auto-resync : 04:11:2024 - 03:03:54

6 files changed, 5 insertions, 65 deletions

diff --git a/app-arch/Manifest.gz b/app-arch/Manifest.gz
index ce7f36cbdeda..83e98e04994e 100644
--- a/app-arch/Manifest.gz
+++ b/app-arch/Manifest.gz
diff --git a/app-arch/libarchive/Manifest b/app-arch/libarchive/Manifest
index 737600f2908d..1ae598c1a883 100644
--- a/app-arch/libarchive/Manifest
+++ b/app-arch/libarchive/Manifest
@@ -4,5 +4,5 @@ DIST libarchive-3.7.6.tar.xz.asc 659 BLAKE2B 9f6a621dd4aa20f06dff71225723e60a6ce
 DIST libarchive-3.7.7.tar.xz 5480580 BLAKE2B e118c693f7a78e86ab868fc6c2c77beba539cf5c7d5999e270cdceb225e9f85c68c938ec6ce3a33f75b2a44a6f7debe2c280d2573c1bcf05806300e8dce1a4f0 SHA512 2524f71f4c2ebc254a1927279be3394e820d0a0c6dec7ef835a862aa08c35756edaa4208bcdc710dd092872b59c200b555b78670372e2830822e278ff1ec4e4a
 DIST libarchive-3.7.7.tar.xz.asc 659 BLAKE2B 066d97312ded566e2c96ffc4603477fc829bcf17dcc057249dad51a0abea7aa5559691c0c25b581212168f8442db028a2dcc34148c648e973450fcb9dd5e35af SHA512 9f532df76bc381b40d7454a7bbbab85e34a646167ee7ca197fae45c713002e32f40e2b2871bc4a0d7149df19e69e2079efd9ab2f22eccf959b203604293d6094
 EBUILD libarchive-3.7.6.ebuild 4617 BLAKE2B b50a720bd43687ccc3a4d78284ffc7848c149e20fdc65ca3102e26e7234ae3c3739c5f3d36f8027fc4ff6bd0e7c0bbdd0d0e41848a229f9d5814cf73c7ead846 SHA512 bc274e264d64f612ab46187aa236ef9a876f4c9a4b897a64667fc378c17e5445827136ef8a17aee47e08a8ede2736617fa1ec33adc2b9e6e812bf95a6be5e090
-EBUILD libarchive-3.7.7.ebuild 4619 BLAKE2B 63ed8608ab1e1b129557b13c464d926dcdeeef05ed5088b98869db6b6372f8669e40f5b98a7b518f69ead255d1c2af0a7d6564214855309219c0530f676de178 SHA512 4160a5396789c851ed5c0487669602a81a110dd9decf29f0bac82bc40b9edea141f17d09ccfa45cf2cf28b2480c2b7f8fe0c227d5196715e025d7d5d536b1fa0
+EBUILD libarchive-3.7.7.ebuild 4618 BLAKE2B d6b2f05c42fbdc044ad5521335524f17fb085e173ea2cdf5afcd0c4951da886bc40c731779a927594f3ffa062ca560ef204085d9859faa7ce807196ab76ff456 SHA512 20b69f3a59f0732addf7277de5d9031205ed83df86fdaf022103cee8f5ef7fba30d92b2d7398b58916fe2e4fe125fd899092014b1eed67fb34682f5182b61704
 MISC metadata.xml 1224 BLAKE2B 538433528de5543ad8e912ce0d072340be3f6eeefe16320ef48b3c30a35ebdff4a32055edf89f36e4479ab1468c620871fcb5ba91bd66e81798093b4d0345949 SHA512 9f53d623a02334f675c06edea2829ce52e78d85e3894e684ae920a678eb47046393b7a93808c7e1761d30a69faa5986cd4922ae7ef8f1e2ef221de39869bd12b
diff --git a/app-arch/libarchive/libarchive-3.7.7.ebuild b/app-arch/libarchive/libarchive-3.7.7.ebuild
index f90c0cab6762..8ba743b21dc8 100644
--- a/app-arch/libarchive/libarchive-3.7.7.ebuild
+++ b/app-arch/libarchive/libarchive-3.7.7.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="BSD BSD-2 BSD-4 public-domain"
 SLOT="0/13"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="
 	acl blake2 +bzip2 +e2fsprogs expat +iconv lz4 +lzma lzo nettle
 	static-libs test xattr +zstd
diff --git a/app-arch/stormlib/Manifest b/app-arch/stormlib/Manifest
index d991c89c7930..72a52b17203a 100644
--- a/app-arch/stormlib/Manifest
+++ b/app-arch/stormlib/Manifest
@@ -1,7 +1,6 @@
-AUX stormlib-9.24-gnuinstalldirs.patch 1921 BLAKE2B 15948e171de29e1623706fb0c7681e3ff7823a0fb64a1df6a7721d1a887a7da5e6c5ad6ba9c7c7aaf26bead7e706d64f234f02da9ee2d8c49fade799606d3ebc SHA512 07db327e04b2d5540c9c625e9821acf7b77c6b36eebffcf7a36661d55cea944701c83c3e4ffcd2b41686661fe26ccf7ba52e825cd228f497b46ec917a1c6632f
 AUX stormlib-9.26-gnuinstalldirs.patch 2279 BLAKE2B 25ba39c7e41ac3e5ddd23821b13b6bd53493b41b79693a86d72af464a8973a2208b96b43783522ed83aed0207a1a7c60bf37c693d4e1efeadf6532e383080b47 SHA512 fbfa21a6c7bfbccda5084aadf8829103b9cf3a49ef1ef3b4eec316bcbce0601933074437808c9c1629a90f6802510bbf6f28084a5216a41a17f2d1dbf603acb4
-DIST StormLib-9.25.tar.gz 603875 BLAKE2B c7da242d039f5a49e8abd295b42e639fc540c77ee4bf8f210610d56940d1d35f19ea267dccde89e50f744218527f4c521e1d320f24e8fe3a0e0739ee899aa023 SHA512 0da78bda4bb89637da892fc73a0673b8a5f852ede4fdceba1029431d24dd1e59db9bfceafab1c5fb642e4b5d0d15d9865f7a138bfb190ce0c2d3601b22dd3023
 DIST StormLib-9.26.tar.gz 610223 BLAKE2B 670296e5d1f9d2b22d5f6cad214ff7076fdc5078c7aa6d13458e06b4b44b62acf2bd68689a05c630db024ea3d54bbc5be14855d757a1b31475664a593fb5db60 SHA512 5f0ce75019cfbe3a2dfc07ea312825e2babf226dbf8aa77ed60456862ae739ac4689cbe7d4a185cdc148ad9910fd8137d3f11c04ffe6c532bbdacb08838ecfba
-EBUILD stormlib-9.25.ebuild 823 BLAKE2B 9dacf9b5f3877a0ed53a4e86150380217da043651afd95d3d7e9771c439e8855e3db4565286d992c8883cd1d5dd40b407bd7db51589bab164433de88e3194ad1 SHA512 1aa700a528c19c87411052049584d6d93c01ce58eabc24ad519a4c47d018a707aa7e37bbc150b58ad8d315bae0bc3561feb4ce293c0126b407c3a0c3d317a43b
+DIST StormLib-9.30.tar.gz 617848 BLAKE2B 214289082ad65007d8222663d64a65d55eac32d9aa56d3cd341bbfd16a8e2df748b8dd1d0244e3f12750bd6793ad014031ff91bb630f7445d1d2ebee26769249 SHA512 11da94507661c949fd402d06d303323af9964bfa1121226a3fde8858f18aa827b13375ab08e4751f7b4baef01464417898bcd3f29da1aa94083710dcafa1d1f9
 EBUILD stormlib-9.26.ebuild 870 BLAKE2B 3aeaf4c561a98146d8954bd78f21412997e0e7788ba0d5e9e434d78ad1c2f9c255a03cb46a31c1f6839dc842d2964a5e9abea6326a20896202c2753b0387a134 SHA512 2146628d40917373cf955d90a72e0df3e5a83a7d5749471c2744477e93da7b803358da12110cdf649cb1ad0016ebf6f4fd335e546e9a5de48d00fce73beffaa8
+EBUILD stormlib-9.30.ebuild 760 BLAKE2B 171b9b929c42df4dd25bf4910184ca44c1773a977ebf5e9269ddb7d61d7d088441831b7332f4e246025cb87004a8a0fd63873992ceff06dd6930fadbbb22fd83 SHA512 a96a7f3c2b82f8c903cc7db0c69f335cd77510790cd4b8c084cbe34cf03c61353670b5b6ec02d5b7ca60e505d5117ae7c80d1abe39ffea40c120ca01a8d4f8b0
 MISC metadata.xml 337 BLAKE2B f130035745eb53970f69fb6a68adc0ce2db207651fa175937e0f36bf7631318ae601ccdb20330fad0b0c78ae89b7854e148151d0dde1eb22f1b02d0d33273c49 SHA512 faec140194ce8770c2eb0adb57f19452850ac5ed598f1bcce0c3c93a843b0aedc5f0590509582f6724d9d70a1747d2b50859b25db908702a03f224381a5afe64
diff --git a/app-arch/stormlib/files/stormlib-9.24-gnuinstalldirs.patch b/app-arch/stormlib/files/stormlib-9.24-gnuinstalldirs.patch
deleted file mode 100644
index f50dcaa82601..000000000000
--- a/app-arch/stormlib/files/stormlib-9.24-gnuinstalldirs.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From 8cb9b76a5e85ffab436f7b01ecfc0a0dea7547af Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Mon, 3 Oct 2022 20:49:31 +0200
-Subject: [PATCH] cmake: Use GNUInstallDirs for configurable install
- directories
-
-Use the standard GNUInstallDirs CMake module to provide configurable
-install directories rather than hardcoding 'bin', 'lib', etc.  Most
-importantly, this fixes install on modern amd64 systems that use 'lib64'
-rather than 'lib'.
----
- CMakeLists.txt | 13 +++++++------
- 1 file changed, 7 insertions(+), 6 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 9cf1050..b10c2c5 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -7,6 +7,7 @@ set(CMAKE_CXX_EXTENSIONS OFF)
- set(CMAKE_CXX_STANDARD_REQUIRED ON)
- 
- include(CMakeDependentOption)
-+include(GNUInstallDirs)
- 
- option(BUILD_SHARED_LIBS "Compile shared libraries" OFF)
- option(STORM_SKIP_INSTALL "Skip installing files" OFF)
-@@ -357,12 +358,12 @@ endif()
- 
- if (NOT STORM_SKIP_INSTALL)
-     install(TARGETS ${LIBRARY_NAME}
--	    RUNTIME DESTINATION bin
--	    LIBRARY DESTINATION lib
--	    ARCHIVE DESTINATION lib
-+	    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
-+	    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
-+	    ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
- 	    FRAMEWORK DESTINATION /Library/Frameworks
--	    PUBLIC_HEADER DESTINATION include
--	    INCLUDES DESTINATION include)
-+	    PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
-+	    INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
- 
-         #CPack configurtion
-         SET(CPACK_GENERATOR "DEB" "RPM")
-@@ -395,6 +396,6 @@ endif()
- if(STORM_BUILD_TESTS)
-     add_executable(StormLib_test ${TEST_SRC_FILES})
-     target_link_libraries(StormLib_test ${LIBRARY_NAME})
--    install(TARGETS StormLib_test RUNTIME DESTINATION bin)
-+    install(TARGETS StormLib_test RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
- endif()
- 
--- 
-2.37.3
-
diff --git a/app-arch/stormlib/stormlib-9.25.ebuild b/app-arch/stormlib/stormlib-9.30.ebuild
index dbb04664be09..7aed4f097953 100644
--- a/app-arch/stormlib/stormlib-9.25.ebuild
+++ b/app-arch/stormlib/stormlib-9.30.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2020-2023 Gentoo Authors
+# Copyright 2020-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -28,10 +28,6 @@ RDEPEND="
 "
 DEPEND=${RDEPEND}
 
-PATCHES=(
-	"${FILESDIR}"/stormlib-9.24-gnuinstalldirs.patch
-)
-
 src_configure() {
 	local mycmakeargs=(
 		-DBUILD_SHARED_LIBS=ON