commit: 855ca211b2c2c0f4e7382345d5153c151e3b22aa Author: Michał Górny <mgorny <AT> gentoo <DOT> org> AuthorDate: Sun Nov 3 03:38:30 2024 +0000 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> CommitDate: Sun Nov 3 03:41:48 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=855ca211
app-arch/stormlib: Remove old Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> app-arch/stormlib/Manifest | 1 - .../files/stormlib-9.24-gnuinstalldirs.patch | 55 ---------------------- app-arch/stormlib/stormlib-9.25.ebuild | 44 ----------------- 3 files changed, 100 deletions(-) diff --git a/app-arch/stormlib/Manifest b/app-arch/stormlib/Manifest index fbcc9dd070d8..cd551303840f 100644 --- a/app-arch/stormlib/Manifest +++ b/app-arch/stormlib/Manifest @@ -1,2 +1 @@ -DIST StormLib-9.25.tar.gz 603875 BLAKE2B c7da242d039f5a49e8abd295b42e639fc540c77ee4bf8f210610d56940d1d35f19ea267dccde89e50f744218527f4c521e1d320f24e8fe3a0e0739ee899aa023 SHA512 0da78bda4bb89637da892fc73a0673b8a5f852ede4fdceba1029431d24dd1e59db9bfceafab1c5fb642e4b5d0d15d9865f7a138bfb190ce0c2d3601b22dd3023 DIST StormLib-9.26.tar.gz 610223 BLAKE2B 670296e5d1f9d2b22d5f6cad214ff7076fdc5078c7aa6d13458e06b4b44b62acf2bd68689a05c630db024ea3d54bbc5be14855d757a1b31475664a593fb5db60 SHA512 5f0ce75019cfbe3a2dfc07ea312825e2babf226dbf8aa77ed60456862ae739ac4689cbe7d4a185cdc148ad9910fd8137d3f11c04ffe6c532bbdacb08838ecfba 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?= <mgo...@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.25.ebuild deleted file mode 100644 index dbb04664be09..000000000000 --- a/app-arch/stormlib/stormlib-9.25.ebuild +++ /dev/null @@ -1,44 +0,0 @@ -# Copyright 2020-2023 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 -}