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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id CF0F6158012 for ; Mon, 12 Sep 2022 08:41:13 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 22880E0935; Mon, 12 Sep 2022 08:41:13 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 082C2E0935 for ; Mon, 12 Sep 2022 08:41:13 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 398AF340D46 for ; Mon, 12 Sep 2022 08:41:12 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 7BCAB59F for ; Mon, 12 Sep 2022 08:41:10 +0000 (UTC) From: "Benda XU" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Benda XU" Message-ID: <1662972056.0a35da712cb2262ea945f6ef66e03866579b9d14.heroxbd@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/hip/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-util/hip/hip-5.0.2-r2.ebuild dev-util/hip/hip-5.0.2-r3.ebuild dev-util/hip/hip-5.1.3-r1.ebuild dev-util/hip/hip-5.1.3.ebuild X-VCS-Directories: dev-util/hip/ X-VCS-Committer: heroxbd X-VCS-Committer-Name: Benda XU X-VCS-Revision: 0a35da712cb2262ea945f6ef66e03866579b9d14 X-VCS-Branch: master Date: Mon, 12 Sep 2022 08:41:10 +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: 7ed069fd-f6a9-4598-be16-f6d7d9ebb61c X-Archives-Hash: b40c19f16b36662aeae737018c8ee69b commit: 0a35da712cb2262ea945f6ef66e03866579b9d14 Author: Yiyang Wu gmail com> AuthorDate: Sun Aug 28 05:38:41 2022 +0000 Commit: Benda XU gentoo org> CommitDate: Mon Sep 12 08:40:56 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0a35da71 dev-util/hip: Fix cmake module and install location ${HIP_COMMON_DIR}/cmake, containing FindHIP.cmake, should be installed into /usr/share/cmake/Modules. ${S}/CMakeLists.txt (both 5.{0,1})and ${S}/packaging/CMakeLists.txt (only 5.1) is installing it into /usr/lib/cmake. Cancel installation in packaging/CMakeLists.txt, correct CMakeLists.txt. Signed-off-by: Yiyang Wu gmail.com> Signed-off-by: Benda Xu gentoo.org> dev-util/hip/{hip-5.0.2-r2.ebuild => hip-5.0.2-r3.ebuild} | 2 +- dev-util/hip/{hip-5.1.3.ebuild => hip-5.1.3-r1.ebuild} | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dev-util/hip/hip-5.0.2-r2.ebuild b/dev-util/hip/hip-5.0.2-r3.ebuild similarity index 97% rename from dev-util/hip/hip-5.0.2-r2.ebuild rename to dev-util/hip/hip-5.0.2-r3.ebuild index fd069acfe4b4..15ea58b0895c 100644 --- a/dev-util/hip/hip-5.0.2-r2.ebuild +++ b/dev-util/hip/hip-5.0.2-r3.ebuild @@ -74,7 +74,7 @@ src_prepare() { # correct libs and cmake install dir sed -e "/LIB_INSTALL_DIR/s:PREFIX}/lib:PREFIX}/$(get_libdir):" \ - -e "/${HIP_COMMON_DIR}\/cmake DESTINATION/s: .): $(get_libdir)):" -i CMakeLists.txt || die + -e "/\${HIP_COMMON_DIR}/s:cmake DESTINATION .):cmake/ DESTINATION share/cmake/Modules):" -i CMakeLists.txt || die sed -e "/LIBRARY DESTINATION/s:lib:$(get_libdir):" -i src/CMakeLists.txt || die cd ${HIP_S} || die diff --git a/dev-util/hip/hip-5.1.3.ebuild b/dev-util/hip/hip-5.1.3-r1.ebuild similarity index 97% rename from dev-util/hip/hip-5.1.3.ebuild rename to dev-util/hip/hip-5.1.3-r1.ebuild index a9e9844fdcc2..634351aead1f 100644 --- a/dev-util/hip/hip-5.1.3.ebuild +++ b/dev-util/hip/hip-5.1.3-r1.ebuild @@ -81,12 +81,12 @@ src_prepare() { # correct libs and cmake install dir sed -e "/LIB_INSTALL_DIR/s:PREFIX}/lib:PREFIX}/$(get_libdir):" \ - -e "/${HIP_COMMON_DIR}\/cmake DESTINATION/s: .): $(get_libdir)):" -i CMakeLists.txt || die + -e "/\${HIP_COMMON_DIR}/s:cmake DESTINATION .):cmake/ DESTINATION share/cmake/Modules):" -i CMakeLists.txt || die sed -e "/LIBRARY DESTINATION/s:lib:$(get_libdir):" -i src/CMakeLists.txt || die sed -e "/\.hip/d" \ -e "s,DESTINATION lib,DESTINATION $(get_libdir),g" \ - -e "/\(cmake\|samples\)/s,DESTINATION \.,DESTINATION share,g" \ + -e "/cmake DESTINATION/d" \ -e "/CPACK_RESOURCE_FILE_LICENSE/d" -i packaging/CMakeLists.txt || die pushd ${HIP_S} || die