[gentoo-commits] repo/proj/guru:dev commit in: dev-libs/unordered_dense/files/, dev-libs/unordered_dense/

[Rui Huang]

commit:     9174842be92f3840dfb5124f38758c2694a90401
Author:     Huang Rui <vowstar <AT> gmail <DOT> com>
AuthorDate: Thu Nov  3 03:55:43 2022 +0000
Commit:     Rui Huang <vowstar <AT> gmail <DOT> com>
CommitDate: Thu Nov  3 03:55:43 2022 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=9174842b

dev-libs/unordered_dense: use patch to fix cmake install path

Signed-off-by: Huang Rui <vowstar <AT> gmail.com>

 ...rdered_dense-2.0.0-fix-cmake-install-path.patch | 26 ++++++++++++++++++++++
 .../unordered_dense/unordered_dense-2.0.0.ebuild   | 12 ++++------
 .../unordered_dense/unordered_dense-9999.ebuild    | 12 ++++------
 3 files changed, 34 insertions(+), 16 deletions(-)

diff --git 
a/dev-libs/unordered_dense/files/unordered_dense-2.0.0-fix-cmake-install-path.patch
 
b/dev-libs/unordered_dense/files/unordered_dense-2.0.0-fix-cmake-install-path.patch
new file mode 100644
index 000000000..bc7e4b153
--- /dev/null
+++ 
b/dev-libs/unordered_dense/files/unordered_dense-2.0.0-fix-cmake-install-path.patch
@@ -0,0 +1,26 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index e2991bc..16096fc 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -42,18 +42,18 @@ if(_unordered_dense_is_toplevel_project)
+     configure_package_config_file(
+         "${PROJECT_SOURCE_DIR}/cmake/unordered_denseConfig.cmake.in"
+         "${PROJECT_BINARY_DIR}/unordered_denseConfig.cmake"
+-        INSTALL_DESTINATION 
${CMAKE_INSTALL_DATAROOTDIR}/unordered_dense/cmake)
++        INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME})
+ 
+     install(
+         EXPORT unordered_dense_Targets
+         FILE unordered_denseTargets.cmake
+         NAMESPACE unordered_dense::
+-        DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/unordered_dense/cmake)
++        DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME})
+ 
+     install(
+         FILES "${PROJECT_BINARY_DIR}/unordered_denseConfig.cmake"
+         "${PROJECT_BINARY_DIR}/unordered_denseConfigVersion.cmake"
+-        DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/unordered_dense/cmake)
++        DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME})
+ 
+     install(
+         DIRECTORY ${PROJECT_SOURCE_DIR}/include/ankerl

diff --git a/dev-libs/unordered_dense/unordered_dense-2.0.0.ebuild 
b/dev-libs/unordered_dense/unordered_dense-2.0.0.ebuild
index 96d0837de..fedb51b2f 100644
--- a/dev-libs/unordered_dense/unordered_dense-2.0.0.ebuild
+++ b/dev-libs/unordered_dense/unordered_dense-2.0.0.ebuild
@@ -28,6 +28,10 @@ DEPEND="
        ${RDEPEND}
 "
 
+PATCHES=(
+       "${FILESDIR}/${PN}-2.0.0-fix-cmake-install-path.patch"
+)
+
 src_configure() {
        local mycmakeargs=(
                -D CMAKE_INSTALL_LIBDIR="${EPREFIX}/usr/$(get_libdir)"
@@ -35,11 +39,3 @@ src_configure() {
        )
        cmake_src_configure
 }
-
-src_install() {
-       cmake_src_install
-       # fix cmake module file install path
-       mkdir -p "${D}"/usr/"$(get_libdir)"/cmake/"${PN}" || die
-       mv "${D}"/usr/share/${PN}/cmake/* 
"${D}"/usr/"$(get_libdir)"/cmake/"${PN}"/ || die
-       rm -r "${D}"/usr/share/${PN} || die
-}

diff --git a/dev-libs/unordered_dense/unordered_dense-9999.ebuild 
b/dev-libs/unordered_dense/unordered_dense-9999.ebuild
index 96d0837de..fedb51b2f 100644
--- a/dev-libs/unordered_dense/unordered_dense-9999.ebuild
+++ b/dev-libs/unordered_dense/unordered_dense-9999.ebuild
@@ -28,6 +28,10 @@ DEPEND="
        ${RDEPEND}
 "
 
+PATCHES=(
+       "${FILESDIR}/${PN}-2.0.0-fix-cmake-install-path.patch"
+)
+
 src_configure() {
        local mycmakeargs=(
                -D CMAKE_INSTALL_LIBDIR="${EPREFIX}/usr/$(get_libdir)"
@@ -35,11 +39,3 @@ src_configure() {
        )
        cmake_src_configure
 }
-
-src_install() {
-       cmake_src_install
-       # fix cmake module file install path
-       mkdir -p "${D}"/usr/"$(get_libdir)"/cmake/"${PN}" || die
-       mv "${D}"/usr/share/${PN}/cmake/* 
"${D}"/usr/"$(get_libdir)"/cmake/"${PN}"/ || die
-       rm -r "${D}"/usr/share/${PN} || die
-}