gentoo auto-resync : 20:06:2023 - 07:15:40

3 files changed, 38 insertions, 5 deletions

diff --git a/sci-libs/libsc/Manifest b/sci-libs/libsc/Manifest
index 189fca1b716e..8a12140b556d 100644
--- a/sci-libs/libsc/Manifest
+++ b/sci-libs/libsc/Manifest
@@ -2,11 +2,12 @@ AUX libsc-2.8.3-fix_build_system.patch 1192 BLAKE2B aab3161036987ad1027266c03730
 AUX libsc-2.8.3-set_version.patch 1514 BLAKE2B 59e06b4f4d33a641e66ff862ca212b4106dd98214b411a95340c8069ec0cef6c70ac467fa01b94e61a16cd0222cfa5e50c56f6ed088958bfbaeaea2272c1c477 SHA512 20723ffda489e249ed2af124f4ca13b6f477dfc09d7bdc07e8c36f55fd0d168807543b6573b3e1d86fd1200b6982d7a755d7b9b04c39097f39f38aeba5b67e2d
 AUX libsc-2.8.5-do_not_compile_zlib-ng.patch 1866 BLAKE2B 1c9bfc20a1e62fd1cdd51393db6b2419f0e3f04dfc05e1af64a3cb42bc5bbf032b35e2bcc435cbe9800e53f2011906d22a26287ab7a6a4c85f44a2bddf839903 SHA512 c2041844d47308fa0d17b74f20fd9408bca2fe458674cdf7f4180700b0c9407451c48d5bb7a8bd3ff90f8958d9fc8a1007cc6164d1eb4f9d016fd4102a862250
 AUX libsc-2.8.5-fix_build_system.patch 696 BLAKE2B fee1ddbd18c2e7155d22e862802479ccc0435fde2678e6c7b9ff59d11ba84751186fe2576b8ea9a6a08739680407d37c2e5b764084324383dd2f1d5b6d2bf9c3 SHA512 1ec73af77dcd467c0b00069cb96f594f422c631421b5d48b4225d8fe6b237bc388ff3e2f1a76007e15b3a228662d2630366149ba438f1c2b332c0e419419ab1c
+AUX libsc-2.8.5-fix_cmake_path.patch 918 BLAKE2B 0c9a2a228e204f7255ca74418d44903357186898fac65e45fdf49e4f25d3985e0f7e51a11d80f4f3baaca2d9b8a1524e09a3cc75f66ec0837151b04c34ec6ab2 SHA512 c40db6baa1e440fb6ce37e24471a25dcd0ae020481991924ef57c4e980734359107bcb1d858d29f15d8c8d4da8d67b353e309276ec1103332697c92cb3401aea
 AUX libsc-2.8.5-set_version.patch 1794 BLAKE2B 6cdf62143d846cb40868916c2d11a290a5179f3ff2782ff60b381a2aa00ee12995762ab8b7847468776cadc062296b79b45c2c5ddb3bf49655511700186d2abc SHA512 eec7d0fb9daf4559e3ad70f1d3fc8fa422239886f293ed876552151cde8cd80d015f0672703131f28fb9009e7cfb0045b33c23abcfe477922a57c56f9d2abb2c
 AUX libsc-2.8.5-use_zlib-ng_symbols.patch 5332 BLAKE2B 6fdd57182822985c23ac3d45ad8008553973ceb76ad285cc6302812765fe1d82d3454bed2268dd0e628a09d582f66e866511d109a898880423603264d3f40f60 SHA512 f58ad84abac25b5462a5bd1b64dcc79f1154b1971bf6ced6d59fdb0933380fa936c55262e449f3d7f9722c5b57c05a60949864e4f7373d1f86848734a58842e5
 AUX libsc-9999-set_version.patch 1517 BLAKE2B 64fecf32b07b37616ec6f80fbed0203df5a7291930aa246f35c3f4080cfc6bea0737e2caa63d85459e76d759fdab64713e01f9c2445e88c63cc1f1ab34616740 SHA512 e083574cdcfade51b9185617939ffb7e47b0cf415c215fee3452b9e5eb3234bf30ed2cc2217f5e019d00b21d98bc031974be06be2db3fad0806daed024d11845
 DIST libsc-2.8.3.tar.gz 360755 BLAKE2B 2d7e3a16b97de551678ebb33f362e1ef7ebb0bcbf8d00b1a5317bfbf6732cf7bb9be2d215c79395809f3c616c23da5236c4f0f436a7b8bb07171141aaf08bbb3 SHA512 9def8850898f2d7d7a6ffaffd0872bc18af28026407356a1fe10f2b4f6d4a32ae6febe59c91cfa8817969624f995d48f64e0d5424b475e3a4c501338f4de70de
 DIST libsc-2.8.5.tar.gz 401520 BLAKE2B 28f74c03dc9a6238c254683585e3a6e372718bbf147f1a1bfe051d9a9079491650eca645bb695ce4c36920dda459904be6f9d41fb53163952d9076302072e181 SHA512 d7854a77cb574531d410c978af5768782d6201c730a3248371a822172cb99fe0b2efc8c2e4f495160924fb867ed77ab1b9ac17a1db349d8a6495228698cf970b
 EBUILD libsc-2.8.3.ebuild 1410 BLAKE2B f4654f5c21f62903c0a41e101acf83963972d3d4c243991c909930b8ea85bf601d5b879875bc736ece50bf0fc9ba15140de6cd960ac42532e3866b7c2cd3e388 SHA512 bc4edc505cbee1411027ea8869c8d4feab0006e8fb873cea02f9db59bb4a82f55c7d1391e4dca153e80e5292864120d7baa96f63c83290d0167492e43c381c33
-EBUILD libsc-2.8.5.ebuild 1553 BLAKE2B e3c3fe30bca48ac74c1c8814899a8aa0ca62817d6dc5c3c64d5d05d7ca417d5a8523c4eea3d6f999d83f9f2a07b042745e3deca768c2a5283a5bdadbfe17d344 SHA512 330117234019065cc86f00bf258ac8f826b9b8f133727382e1bfc27d0fa56d5b1ad832ee2ddb8444752dab27a0731372b86099199173e28e61423c85acf16e28
+EBUILD libsc-2.8.5-r2.ebuild 1550 BLAKE2B 7fcc6491e9aae212d23a21b80df180f8db97fe67cc91837eb609e68d5a1f2c13acbbe279aca0cbaa45082692b53882164821563beecd2c478e2d926c6bb8bed9 SHA512 518ced91237581c049edac4eaffecc5aa128126f76915a4c6ce0801fbed3468671e6fa93fca6c7912e6af40fad5efebbc3b8f02bbe44c6f8fb46436ca99d13f6
 MISC metadata.xml 631 BLAKE2B 190ee7659d372a9152c32e63d436d460a4c2755b4ad42805e400c337430c7031382fdbbc0acf52eb8f5463ef57166d7605f122b0d1884a07aac09d6e878f11bb SHA512 22e5ae0f31b8b6a0ce8df978b473d22d1bed1da057511a58d421b4b6f60e195fc5de71c5ece88ab518ae2d36b7fd96ecd70f61e934b0352cea204990a011a052
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.ebuild b/sci-libs/libsc/libsc-2.8.5-r2.ebuild
index e6f5712f4c17..786ecf6012b8 100644
--- a/sci-libs/libsc/libsc-2.8.5.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
 
-	rm -r "${ED}"/usr/cmake || die "rm 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"
 }