4 files changed, 102 insertions, 0 deletions
diff --git a/app-arch/Manifest.gz b/app-arch/Manifest.gz
index a39a9804ca62..1613f4300e91 100644
--- a/app-arch/Manifest.gz
+++ b/app-arch/Manifest.gz
diff --git a/app-arch/stormlib/Manifest b/app-arch/stormlib/Manifest
index 33a2a54f4029..926d034780de 100644
--- a/app-arch/stormlib/Manifest
+++ b/app-arch/stormlib/Manifest
@@ -1,4 +1,7 @@
 AUX stormlib-9.23-gnuinstalldirs.patch 1923 BLAKE2B ddc6edea1ba991b66a4a15625bdf08aeb0ab4ac356345551b0c35cfa69c2045ed68b3d27d0475cab728480a029df301048d2859652234602f63d32479c582daa SHA512 f266baabb6b5f92465139bfa14e9db83cf30831848f7d97e9ace96bded84768cea4bdf3dc1437b8b85fd86efaec13bc9f833a25854123310037ed80b514592fb
+AUX stormlib-9.24-gnuinstalldirs.patch 1921 BLAKE2B 15948e171de29e1623706fb0c7681e3ff7823a0fb64a1df6a7721d1a887a7da5e6c5ad6ba9c7c7aaf26bead7e706d64f234f02da9ee2d8c49fade799606d3ebc SHA512 07db327e04b2d5540c9c625e9821acf7b77c6b36eebffcf7a36661d55cea944701c83c3e4ffcd2b41686661fe26ccf7ba52e825cd228f497b46ec917a1c6632f
 DIST StormLib-9.23.tar.gz 605295 BLAKE2B 2489e309f218f3e5c5069b56856415cc5985efb2352f36a33530442d539c786262b7c55d134dd67db3098981b1ad98ce8bfa77a16f86d28f326831b09752b705 SHA512 c851159596e252b42facdbac9c52f7477c61de35b44054ab608a22b42e7dc3b4179f50ba9d8cbd30448ed7787cc74e7efd2e08faafdd91289136cd91399d4f09
+DIST StormLib-9.24.tar.gz 625374 BLAKE2B 3647580b1b048e284ade2fb23aed53cac76a89a0180908f48fc99d571e702d876de37e42a47b3d351c72e6fa905fc02f4b8fa691a6840013637e1560e9acafcb SHA512 38694685edfc9c53ff1e303109831b6a791200b9db275043bca8b3bbe7cc928cf0ce9cf554c6758f693da453b85e6385d277ae9add7af867c13488d77432cde5
 EBUILD stormlib-9.23-r1.ebuild 814 BLAKE2B 6a0e6369892809b7a0e5f50a1fdf645dd38a50d2889cefc9d37275cc6be57bad048ab75021b30857588b55a349e14af98d0956bd618cdfee6c21279eca1c67f3 SHA512 701b12cf8efb292390038ca5d80c04af5ecd8fb99b8eb462c9477a52073628313e8b570136c49b6964960d7f98b03edc00c12400f6d04422944f16874d9d297f
+EBUILD stormlib-9.24.ebuild 823 BLAKE2B 03b14e0d081e786e8ee168cf248d6eee795a601880aff9fa7d4a6525a7a21c48c5250101fd921ef23c01bb8fb0bc16f21824ff0e1aa3907010bfa462e0b07a41 SHA512 60267568b0f258c2931125fec901332f3271e594a8d5a05c9e32b5c0f40bfcf7f334f0debbad6f73ed2cd759fac598d81b1737219dbdda59f64396e1344001f9
 MISC metadata.xml 248 BLAKE2B f308d2aa052d11e427850af58bbebf95e7773f5562ed221f39043474b4c3827d724d49667edf1874272a5586a13201159f40e8f5eafb7e400e79c6566e1a6ac2 SHA512 b875c838394523483ae7d93585207eb3c642a345bbb08e1dcef3ceb737c813fa779e2f5479d48cdcc30732b8a0a9e6ecc648df940def6731e4dff43b23786e6d
diff --git a/app-arch/stormlib/files/stormlib-9.24-gnuinstalldirs.patch b/app-arch/stormlib/files/stormlib-9.24-gnuinstalldirs.patch
new file mode 100644
index 000000000000..f50dcaa82601
--- /dev/null
+++ b/app-arch/stormlib/files/stormlib-9.24-gnuinstalldirs.patch
@@ -0,0 +1,55 @@
+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.24.ebuild b/app-arch/stormlib/stormlib-9.24.ebuild
new file mode 100644
index 000000000000..fa8ef965a8f1
--- /dev/null
+++ b/app-arch/stormlib/stormlib-9.24.ebuild
@@ -0,0 +1,44 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+MY_P=StormLib-${PV}
+DESCRIPTION="Library to read and write MPQ archives (Diablo, StarCraft)"
+HOMEPAGE="
+	http://www.zezula.net/en/mpq/stormlib.html
+	https://github.com/ladislav-zezula/StormLib/
+"
+SRC_URI="
+	https://github.com/ladislav-zezula/StormLib/archive/v${PV}.tar.gz
+		-> ${MY_P}.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	app-arch/bzip2:=
+	dev-libs/libtomcrypt:=[libtommath]
+	sys-libs/zlib:=
+"
+DEPEND=${RDEPEND}
+
+PATCHES=(
+	"${FILESDIR}"/stormlib-9.24-gnuinstalldirs.patch
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_SHARED_LIBS=ON
+		# interactive test app
+		-DSTORM_BUILD_TESTS=OFF
+		-DWITH_LIBTOMCRYPT=ON
+	)
+
+	cmake_src_configure
+}