From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 23F54158F57 for ; Mon, 16 Aug 2021 20:48:06 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1B894E0DA9; Mon, 16 Aug 2021 06:58:38 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id E85E9E0DA9 for ; Mon, 16 Aug 2021 06:58:37 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id D4AD93462C9 for ; Mon, 16 Aug 2021 06:58:36 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 8B9308B3 for ; Mon, 16 Aug 2021 06:58:35 +0000 (UTC) From: "Joonas Niilola" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Joonas Niilola" Message-ID: <1629097106.c813626ffa5a15c38562bcb793e4a107a66fe95f.juippis@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-cpp/yaml-cpp/files/, dev-cpp/yaml-cpp/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-cpp/yaml-cpp/files/yaml-cpp-0.7.0-pkg-config.patch dev-cpp/yaml-cpp/yaml-cpp-0.7.0-r1.ebuild dev-cpp/yaml-cpp/yaml-cpp-0.7.0.ebuild X-VCS-Directories: dev-cpp/yaml-cpp/ dev-cpp/yaml-cpp/files/ X-VCS-Committer: juippis X-VCS-Committer-Name: Joonas Niilola X-VCS-Revision: c813626ffa5a15c38562bcb793e4a107a66fe95f X-VCS-Branch: master Date: Mon, 16 Aug 2021 06:58:35 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 616cec33-bbe9-457b-afa2-84b02c719a5f X-Archives-Hash: cb8f9873a0c232ce102358ab0eeb4681 commit: c813626ffa5a15c38562bcb793e4a107a66fe95f Author: Alexey Sokolov asokolov org> AuthorDate: Wed Aug 11 22:47:34 2021 +0000 Commit: Joonas Niilola gentoo 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 asokolov.org> Closes: https://github.com/gentoo/gentoo/pull/21953 Signed-off-by: Joonas Niilola 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() {