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 2F92E158009 for ; Tue, 20 Jun 2023 00:46:02 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 63CFBE07E2; Tue, 20 Jun 2023 00:46:01 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (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 4156FE07E2 for ; Tue, 20 Jun 2023 00:46:01 +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 300B333BEF5 for ; Tue, 20 Jun 2023 00:46:00 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 65E16A8B for ; Tue, 20 Jun 2023 00:45:58 +0000 (UTC) From: "Matthias Maier" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matthias Maier" Message-ID: <1687221953.c5fa4cd54e6ce9ecb1d40b444587763d0507abd5.tamiko@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sci-libs/libsc/files/, sci-libs/libsc/ X-VCS-Repository: repo/gentoo X-VCS-Files: sci-libs/libsc/files/libsc-2.8.5-fix_cmake_path.patch sci-libs/libsc/libsc-2.8.5-r1.ebuild sci-libs/libsc/libsc-2.8.5-r2.ebuild X-VCS-Directories: sci-libs/libsc/files/ sci-libs/libsc/ X-VCS-Committer: tamiko X-VCS-Committer-Name: Matthias Maier X-VCS-Revision: c5fa4cd54e6ce9ecb1d40b444587763d0507abd5 X-VCS-Branch: master Date: Tue, 20 Jun 2023 00:45:58 +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: 1e2bd9b3-dd2d-4a4a-ae38-035791cd00bf X-Archives-Hash: 0a7af7c5e099ac3dad3725fea1173379 commit: c5fa4cd54e6ce9ecb1d40b444587763d0507abd5 Author: Matthias Maier gentoo org> AuthorDate: Tue Jun 20 00:17:41 2023 +0000 Commit: Matthias Maier gentoo org> CommitDate: Tue Jun 20 00:45:53 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c5fa4cd5 sci-libs/libsc: QA: fix install locations, EAPI bump Signed-off-by: Matthias Maier gentoo.org> .../libsc/files/libsc-2.8.5-fix_cmake_path.patch | 33 ++++++++++++++++++++++ ...libsc-2.8.5-r1.ebuild => libsc-2.8.5-r2.ebuild} | 7 ++--- 2 files changed, 36 insertions(+), 4 deletions(-) diff --git a/sci-libs/libsc/files/libsc-2.8.5-fix_cmake_path.patch b/sci-libs/libsc/files/libsc-2.8.5-fix_cmake_path.patch new file mode 100644 index 000000000000..d36f9151901c --- /dev/null +++ b/sci-libs/libsc/files/libsc-2.8.5-fix_cmake_path.patch @@ -0,0 +1,33 @@ +diff --git a/cmake/install.cmake b/cmake/install.cmake +index f093fa9..c281f66 100644 +--- a/cmake/install.cmake ++++ b/cmake/install.cmake +@@ -14,13 +14,13 @@ COMPATIBILITY SameMajorVersion + + install(EXPORT ${PROJECT_NAME}-targets + NAMESPACE ${PROJECT_NAME}:: +-DESTINATION cmake ++DESTINATION ${library_reldir}/cmake/SC + ) + + install(FILES + ${CMAKE_CURRENT_BINARY_DIR}/cmake/${PROJECT_NAME}Config.cmake + ${CMAKE_CURRENT_BINARY_DIR}/cmake/${PROJECT_NAME}ConfigVersion.cmake +-DESTINATION cmake ++DESTINATION ${library_reldir}/cmake/SC + ) + + export(EXPORT ${PROJECT_NAME}-targets +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 800937f..9de0cfe 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -75,7 +75,7 @@ endif(BUILD_TESTING) + + install(FILES + ${CMAKE_CURRENT_SOURCE_DIR}/cmake/FindSC.cmake +-DESTINATION cmake) ++DESTINATION ${library_reldir}/cmake/SC) + + include(cmake/pkgconf.cmake) + include(cmake/install.cmake) diff --git a/sci-libs/libsc/libsc-2.8.5-r1.ebuild b/sci-libs/libsc/libsc-2.8.5-r2.ebuild similarity index 90% rename from sci-libs/libsc/libsc-2.8.5-r1.ebuild rename to sci-libs/libsc/libsc-2.8.5-r2.ebuild index 33d78e6073fe..786ecf6012b8 100644 --- a/sci-libs/libsc/libsc-2.8.5-r1.ebuild +++ b/sci-libs/libsc/libsc-2.8.5-r2.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit cmake toolchain-funcs @@ -35,6 +35,7 @@ PATCHES=( "${FILESDIR}"/${P}-fix_build_system.patch "${FILESDIR}"/${P}-do_not_compile_zlib-ng.patch "${FILESDIR}"/${P}-use_zlib-ng_symbols.patch + "${FILESDIR}"/${P}-fix_cmake_path.patch ) pkg_pretend() { @@ -58,12 +59,10 @@ src_configure() { src_install() { cmake_src_install - mv "${ED}"/usr/cmake "${ED}"/usr/$(get_libdir)/ || die "mv failed" - rm -r "${ED}"/usr/include/getopt.h \ "${ED}"/usr/include/getopt_int.h \ "${ED}"/usr/include/sc_builtin || die "rm failed" - mv "${ED}"/usr/share/docs/SC/* "${ED}"/usr/share/doc/${P}/ || die "mv failed" + mv "${ED}"/usr/share/docs/SC/* "${ED}"/usr/share/doc/${PF}/ || die "mv failed" rm -r "${ED}"/usr/share/docs || die "rm failed" }