diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2021-07-24 02:11:45 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2021-07-24 02:11:45 +0100 |
| commit | b49088575eb777ced2551f484da86317332d6087 (patch) | |
| tree | bf9a151cf2d61956340d555659ffc098ee1da466 /dev-libs/libnest2d | |
| parent | 514d1bbe260df2521fe60f1a3ec87cfcfde1a829 (diff) | |
gentoo resync : 24.07.2021
Diffstat (limited to 'dev-libs/libnest2d')
| -rw-r--r-- | dev-libs/libnest2d/Manifest | 3 | ||||
| -rw-r--r-- | dev-libs/libnest2d/files/libnest2d-0.4-gnu-install-dirs.patch | 25 | ||||
| -rw-r--r-- | dev-libs/libnest2d/libnest2d-0.4-r2.ebuild (renamed from dev-libs/libnest2d/libnest2d-0.4-r1.ebuild) | 2 |
3 files changed, 29 insertions, 1 deletions
diff --git a/dev-libs/libnest2d/Manifest b/dev-libs/libnest2d/Manifest index cf13b9cfd8cc..6a662e920023 100644 --- a/dev-libs/libnest2d/Manifest +++ b/dev-libs/libnest2d/Manifest @@ -1,6 +1,7 @@ AUX libnest2d-0.4-add-disallowed-areas.patch 4671 BLAKE2B 1b57d9a00f9ad5df3d0396d039bcf64570dedb0da939ad60a6eeca199de280a413fa80c4fb6edf976b920634243ce1f8da6a7c00cf08930a6309c4955f48f7e4 SHA512 1915a937b91c1e3d06d4a0b5914d706f84da171cfd2ebf161b0017e67a5a28bbefd80d7a290348735b4143e4b67f421c5d611831af1b89b76371327d74d11508 AUX libnest2d-0.4-add-soversion-to-shared-library.patch 901 BLAKE2B 32d77c3c07059f4b2b9d58715a799395943560ebd7a738f585f43907bd21115e3f297fe6df7f0b3b1801c5b04d7e2e16eb09aff642a26edb5b35339dc2440eb9 SHA512 1d367a09a9f0ac51347c3a3dc440eb772b877abf00acd92a9ce166ecc4a9b537dbdbbab254c3b742c20b48fc5bee58b79811504921ec15a19700d8bcacee0d4b AUX libnest2d-0.4-fix-cpp-version.patch 205 BLAKE2B 3fb0503ec974b00af5d9f48a87be245bb1ed560034bee1ac6ee045074762e4d51a903ece3a15969a3f5d50ddd8c0d3b771cff97196bf25c056058b8cb4edad44 SHA512 c05cdf4fa075b16c694fd7279e25d4f9533f339318650db55d486528def6c697529a51135eafa7bb2a2de07bc8d7bbd520565b356316c135d3814484bfadd855 +AUX libnest2d-0.4-gnu-install-dirs.patch 812 BLAKE2B 98072c6fd6547ed138a23a8aa0d48df17d588b773d7ef16ac382da18fa1328c975c843d897829db4a1d043b4845a453ab86cd5d2d9686444422e651c996bee35 SHA512 4f0785271dd62d241ff38954daa77603121ae0f434fdd1644823caecdcc794202f11608527ed27f4d63815dc5ff435aefb98cbbbba79cdce6ed0ce2f2805fbb8 DIST libnest2d-0.4.tar.gz 365065 BLAKE2B 74a4aef18be22d24e4e73288dd3e330b2f5baa3b2c705683c22767dfb0394a7b332bad957321f57ec7eaaf4740cff9ca1ed86f9d552be65df1b2af76ceba61e9 SHA512 fadce18986b844eed13a581f84055df909a17407a0980deb6c7c24248a969a537a8840650bcfc673e61973810ce9a008acb599e3b8e00c9bff6b566ca41cd62c -EBUILD libnest2d-0.4-r1.ebuild 990 BLAKE2B e90a03cff6a4404503bf34f0e75427de49df2791079bc31f3861f1a5e08121495d92cf28873b053aa35cbf23895c20c222d79a9104a64ef88e561c1382d20564 SHA512 0e7c2be102f24169570fbabbb0ae28fc9caba371f60a85e65244dc8dc36f0355402e28848e413a2807cff3c6d27f2bb6fbb31b893c2fa73856be96cf8a2c803e +EBUILD libnest2d-0.4-r2.ebuild 1072 BLAKE2B e11178120bf9d91b67fa81079be0b0f697e9a834a3c8488d926003ec741ce58413279b6633b6518571e8c6239f0d36ebfabaabc323014ca21827a5eab0938fe8 SHA512 3348f9019b95f7537ec4aa38e8620ff0baff53c6603159ba63c21f3741eda445800738ecee855500245672b1e14ea503a9ece140bd7589e40c2f85f70996c362 MISC metadata.xml 1406 BLAKE2B 013e0c6f04e1ebe734d744f1d31924404c43523e73697f9897a9e3b2eed6cf7e8e82722e98eadb7e7416b9a58823c3879ae51190ff211dbad13a295eb209b170 SHA512 36b1316bead34cdf259a8de5834f9d95b6b1fd4a7b65fc979da51a0f725762c5ebe1b9300a7c7826a6dd2ce30affb4b42f10f59e7d590b31fcfa49c6e375ffe9 diff --git a/dev-libs/libnest2d/files/libnest2d-0.4-gnu-install-dirs.patch b/dev-libs/libnest2d/files/libnest2d-0.4-gnu-install-dirs.patch new file mode 100644 index 000000000000..34484426f302 --- /dev/null +++ b/dev-libs/libnest2d/files/libnest2d-0.4-gnu-install-dirs.patch @@ -0,0 +1,25 @@ +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -114,6 +114,7 @@ + endif() + + include(CMakePackageConfigHelpers) ++include(GNUInstallDirs) + + write_basic_package_version_file( + "${CMAKE_CURRENT_BINARY_DIR}/cmakeexports/${PROJECT_NAME}ConfigVersion.cmake" +@@ -123,10 +124,10 @@ + + install(TARGETS libnest2d libnest2d_headeronly ${LIBNAME} + EXPORT ${PROJECT_NAME}Targets +- RUNTIME DESTINATION bin +- ARCHIVE DESTINATION lib +- LIBRARY DESTINATION lib +- INCLUDES DESTINATION include) ++ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} ++ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} ++ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ++ INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) + + export(EXPORT ${PROJECT_NAME}Targets + FILE "${CMAKE_CURRENT_BINARY_DIR}/cmakeexports/${PROJECT_NAME}Targets.cmake" diff --git a/dev-libs/libnest2d/libnest2d-0.4-r1.ebuild b/dev-libs/libnest2d/libnest2d-0.4-r2.ebuild index 721bfa9f47c3..88a93621c9d5 100644 --- a/dev-libs/libnest2d/libnest2d-0.4-r1.ebuild +++ b/dev-libs/libnest2d/libnest2d-0.4-r2.ebuild @@ -30,6 +30,7 @@ PATCHES=( "${FILESDIR}"/${P}-add-disallowed-areas.patch "${FILESDIR}"/${P}-add-soversion-to-shared-library.patch "${FILESDIR}"/${P}-fix-cpp-version.patch + "${FILESDIR}"/${P}-gnu-install-dirs.patch ) src_configure() { @@ -38,6 +39,7 @@ src_configure() { -DLIBNEST2D_BUILD_EXAMPLES=$(usex examples) -DLIBNEST2D_HEADER_ONLY=$(usex static-libs OFF ON) -DLIBNEST2D_BUILD_UNITTESTS=$(usex test) + -DCMAKE_INSTALL_LIBDIR=$(get_libdir) ) cmake_src_configure } |