From 65ff3cc3bd9c3f8e718a67dfecf1f8215bf5d1d4 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 11 Jun 2024 00:08:05 +0100 Subject: gentoo auto-resync : 11:06:2024 - 00:08:04 --- app-arch/Manifest.gz | Bin 18261 -> 18257 bytes app-arch/stormlib/Manifest | 5 +- .../files/stormlib-9.26-gnuinstalldirs.patch | 58 +++++++++++++++++++++ app-arch/stormlib/stormlib-9.24.ebuild | 44 ---------------- app-arch/stormlib/stormlib-9.26.ebuild | 45 ++++++++++++++++ 5 files changed, 106 insertions(+), 46 deletions(-) create mode 100644 app-arch/stormlib/files/stormlib-9.26-gnuinstalldirs.patch delete mode 100644 app-arch/stormlib/stormlib-9.24.ebuild create mode 100644 app-arch/stormlib/stormlib-9.26.ebuild (limited to 'app-arch') diff --git a/app-arch/Manifest.gz b/app-arch/Manifest.gz index 0024bc84b18d..5eba3798089e 100644 Binary files a/app-arch/Manifest.gz and b/app-arch/Manifest.gz differ diff --git a/app-arch/stormlib/Manifest b/app-arch/stormlib/Manifest index f76599d928a4..d991c89c7930 100644 --- a/app-arch/stormlib/Manifest +++ b/app-arch/stormlib/Manifest @@ -1,6 +1,7 @@ AUX stormlib-9.24-gnuinstalldirs.patch 1921 BLAKE2B 15948e171de29e1623706fb0c7681e3ff7823a0fb64a1df6a7721d1a887a7da5e6c5ad6ba9c7c7aaf26bead7e706d64f234f02da9ee2d8c49fade799606d3ebc SHA512 07db327e04b2d5540c9c625e9821acf7b77c6b36eebffcf7a36661d55cea944701c83c3e4ffcd2b41686661fe26ccf7ba52e825cd228f497b46ec917a1c6632f -DIST StormLib-9.24.tar.gz 625374 BLAKE2B 3647580b1b048e284ade2fb23aed53cac76a89a0180908f48fc99d571e702d876de37e42a47b3d351c72e6fa905fc02f4b8fa691a6840013637e1560e9acafcb SHA512 38694685edfc9c53ff1e303109831b6a791200b9db275043bca8b3bbe7cc928cf0ce9cf554c6758f693da453b85e6385d277ae9add7af867c13488d77432cde5 +AUX stormlib-9.26-gnuinstalldirs.patch 2279 BLAKE2B 25ba39c7e41ac3e5ddd23821b13b6bd53493b41b79693a86d72af464a8973a2208b96b43783522ed83aed0207a1a7c60bf37c693d4e1efeadf6532e383080b47 SHA512 fbfa21a6c7bfbccda5084aadf8829103b9cf3a49ef1ef3b4eec316bcbce0601933074437808c9c1629a90f6802510bbf6f28084a5216a41a17f2d1dbf603acb4 DIST StormLib-9.25.tar.gz 603875 BLAKE2B c7da242d039f5a49e8abd295b42e639fc540c77ee4bf8f210610d56940d1d35f19ea267dccde89e50f744218527f4c521e1d320f24e8fe3a0e0739ee899aa023 SHA512 0da78bda4bb89637da892fc73a0673b8a5f852ede4fdceba1029431d24dd1e59db9bfceafab1c5fb642e4b5d0d15d9865f7a138bfb190ce0c2d3601b22dd3023 -EBUILD stormlib-9.24.ebuild 823 BLAKE2B 03b14e0d081e786e8ee168cf248d6eee795a601880aff9fa7d4a6525a7a21c48c5250101fd921ef23c01bb8fb0bc16f21824ff0e1aa3907010bfa462e0b07a41 SHA512 60267568b0f258c2931125fec901332f3271e594a8d5a05c9e32b5c0f40bfcf7f334f0debbad6f73ed2cd759fac598d81b1737219dbdda59f64396e1344001f9 +DIST StormLib-9.26.tar.gz 610223 BLAKE2B 670296e5d1f9d2b22d5f6cad214ff7076fdc5078c7aa6d13458e06b4b44b62acf2bd68689a05c630db024ea3d54bbc5be14855d757a1b31475664a593fb5db60 SHA512 5f0ce75019cfbe3a2dfc07ea312825e2babf226dbf8aa77ed60456862ae739ac4689cbe7d4a185cdc148ad9910fd8137d3f11c04ffe6c532bbdacb08838ecfba EBUILD stormlib-9.25.ebuild 823 BLAKE2B 9dacf9b5f3877a0ed53a4e86150380217da043651afd95d3d7e9771c439e8855e3db4565286d992c8883cd1d5dd40b407bd7db51589bab164433de88e3194ad1 SHA512 1aa700a528c19c87411052049584d6d93c01ce58eabc24ad519a4c47d018a707aa7e37bbc150b58ad8d315bae0bc3561feb4ce293c0126b407c3a0c3d317a43b +EBUILD stormlib-9.26.ebuild 870 BLAKE2B 3aeaf4c561a98146d8954bd78f21412997e0e7788ba0d5e9e434d78ad1c2f9c255a03cb46a31c1f6839dc842d2964a5e9abea6326a20896202c2753b0387a134 SHA512 2146628d40917373cf955d90a72e0df3e5a83a7d5749471c2744477e93da7b803358da12110cdf649cb1ad0016ebf6f4fd335e546e9a5de48d00fce73beffaa8 MISC metadata.xml 337 BLAKE2B f130035745eb53970f69fb6a68adc0ce2db207651fa175937e0f36bf7631318ae601ccdb20330fad0b0c78ae89b7854e148151d0dde1eb22f1b02d0d33273c49 SHA512 faec140194ce8770c2eb0adb57f19452850ac5ed598f1bcce0c3c93a843b0aedc5f0590509582f6724d9d70a1747d2b50859b25db908702a03f224381a5afe64 diff --git a/app-arch/stormlib/files/stormlib-9.26-gnuinstalldirs.patch b/app-arch/stormlib/files/stormlib-9.26-gnuinstalldirs.patch new file mode 100644 index 000000000000..95c46221fece --- /dev/null +++ b/app-arch/stormlib/files/stormlib-9.26-gnuinstalldirs.patch @@ -0,0 +1,58 @@ +From 2e1e371c0a9eeaa015615b5a9f6826ec071a2e4a Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= +Date: Mon, 10 Jun 2024 14:41:37 +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 64-bit systems that use +`lib64` rather than `lib`. +--- + CMakeLists.txt | 15 ++++++++------- + 1 file changed, 8 insertions(+), 7 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 4758091..6546b69 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) +@@ -360,14 +361,14 @@ endif() + if (NOT STORM_SKIP_INSTALL) + install(TARGETS ${LIBRARY_NAME} + EXPORT ${PROJECT_NAME}Config +- 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}) + +- install(EXPORT ${PROJECT_NAME}Config NAMESPACE ${PROJECT_NAME}:: DESTINATION share/${PROJECT_NAME}) ++ install(EXPORT ${PROJECT_NAME}Config NAMESPACE ${PROJECT_NAME}:: DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/${PROJECT_NAME}) + + #CPack configurtion + SET(CPACK_GENERATOR "DEB" "RPM") +@@ -401,6 +402,6 @@ if(STORM_BUILD_TESTS) + find_package(ALSA REQUIRED) + add_executable(StormLib_test ${TEST_SRC_FILES}) + target_link_libraries(StormLib_test ${LIBRARY_NAME} ${ALSA_LIBRARIES}) +- install(TARGETS StormLib_test RUNTIME DESTINATION bin) ++ install(TARGETS StormLib_test RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) + endif() + +-- +2.45.2 + diff --git a/app-arch/stormlib/stormlib-9.24.ebuild b/app-arch/stormlib/stormlib-9.24.ebuild deleted file mode 100644 index fa8ef965a8f1..000000000000 --- a/app-arch/stormlib/stormlib-9.24.ebuild +++ /dev/null @@ -1,44 +0,0 @@ -# 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 -} diff --git a/app-arch/stormlib/stormlib-9.26.ebuild b/app-arch/stormlib/stormlib-9.26.ebuild new file mode 100644 index 000000000000..4987b7dfdfc8 --- /dev/null +++ b/app-arch/stormlib/stormlib-9.26.ebuild @@ -0,0 +1,45 @@ +# Copyright 2020-2024 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=( + # https://github.com/ladislav-zezula/StormLib/pull/352 + "${FILESDIR}/${P}-gnuinstalldirs.patch" +) + +src_configure() { + local mycmakeargs=( + -DBUILD_SHARED_LIBS=ON + # interactive test app + -DSTORM_BUILD_TESTS=OFF + -DWITH_LIBTOMCRYPT=ON + ) + + cmake_src_configure +} -- cgit v1.2.3