commit: c813626ffa5a15c38562bcb793e4a107a66fe95f Author: Alexey Sokolov <alexey+gentoo <AT> asokolov <DOT> org> AuthorDate: Wed Aug 11 22:47:34 2021 +0000 Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org> CommitDate: Mon Aug 16 06:58:26 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c813626f
dev-cpp/yaml-cpp: install cmake and .pc files to lib/ Closes: https://bugs.gentoo.org/807745 Package-Manager: Portage-3.0.20, Repoman-3.0.2 Signed-off-by: Alexey Sokolov <alexey+gentoo <AT> asokolov.org> Closes: https://github.com/gentoo/gentoo/pull/21953 Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org> .../yaml-cpp/files/yaml-cpp-0.7.0-pkg-config.patch | 21 +++++++++++++++++++++ ...ml-cpp-0.7.0.ebuild => yaml-cpp-0.7.0-r1.ebuild} | 1 + 2 files changed, 22 insertions(+) diff --git a/dev-cpp/yaml-cpp/files/yaml-cpp-0.7.0-pkg-config.patch b/dev-cpp/yaml-cpp/files/yaml-cpp-0.7.0-pkg-config.patch new file mode 100644 index 00000000000..3e7bc7bae93 --- /dev/null +++ b/dev-cpp/yaml-cpp/files/yaml-cpp-0.7.0-pkg-config.patch @@ -0,0 +1,21 @@ +https://bugs.gentoo.org/807745 + +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -148,13 +148,13 @@ if (YAML_CPP_INSTALL) + DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} + FILES_MATCHING PATTERN "*.h") + install(EXPORT yaml-cpp-targets +- DESTINATION "${CMAKE_INSTALL_DATADIR}/cmake/yaml-cpp") ++ DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/yaml-cpp") + install(FILES + "${PROJECT_BINARY_DIR}/yaml-cpp-config.cmake" + "${PROJECT_BINARY_DIR}/yaml-cpp-config-version.cmake" +- DESTINATION "${CMAKE_INSTALL_DATADIR}/cmake/yaml-cpp") ++ DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/yaml-cpp") + install(FILES "${PROJECT_BINARY_DIR}/yaml-cpp.pc" +- DESTINATION ${CMAKE_INSTALL_DATADIR}/pkgconfig) ++ DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) + endif() + + if(YAML_CPP_BUILD_TESTS) diff --git a/dev-cpp/yaml-cpp/yaml-cpp-0.7.0.ebuild b/dev-cpp/yaml-cpp/yaml-cpp-0.7.0-r1.ebuild similarity index 95% rename from dev-cpp/yaml-cpp/yaml-cpp-0.7.0.ebuild rename to dev-cpp/yaml-cpp/yaml-cpp-0.7.0-r1.ebuild index c35d82cd5f2..dec50f0fe46 100644 --- a/dev-cpp/yaml-cpp/yaml-cpp-0.7.0.ebuild +++ b/dev-cpp/yaml-cpp/yaml-cpp-0.7.0-r1.ebuild @@ -21,6 +21,7 @@ DEPEND="test? ( dev-cpp/gtest[${MULTILIB_USEDEP}] )" PATCHES=( "${FILESDIR}/${P}-gtest.patch" + "${FILESDIR}/${P}-pkg-config.patch" ) src_prepare() {
