gentoo auto-resync : 17:06:2023 - 07:43:56

4 files changed, 8 insertions, 40 deletions

diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz
index b2c5cc2dc89a..667bbeb049a2 100644
--- a/sci-libs/Manifest.gz
+++ b/sci-libs/Manifest.gz
diff --git a/sci-libs/arborx/Manifest b/sci-libs/arborx/Manifest
index a1dac6907a05..401a07ae2185 100644
--- a/sci-libs/arborx/Manifest
+++ b/sci-libs/arborx/Manifest
@@ -1,5 +1,3 @@
-DIST arborx-1.2.tar.gz 380705 BLAKE2B eb0006e69edb6cfd1d402dfe5a58db76954c34f847ce8acd1c0f2bd2044a29a434fc01df67829fce4ec911f5c882c1625aa7a50bc39a5d33dfb2c26d6a4cbb4f SHA512 d48650b11fc26770c43f4821999647acb0c7675367e416ad025ab21eb50da66c732f03bc6decf840d25dac26ff7f1f5dca77b7514dffc619cef8d401e83a8795
 DIST arborx-1.4.1.tar.gz 408999 BLAKE2B 83e172f89ac8ff82d4add40fd036457d9c563b44c11b15d86aa884dc03742f3e22a13cc4b6f068ef377fcd8e63d239f704dd1821772079d2f9f8c169b1f31fae SHA512 3799deed5eae1e6092c19a62894207ac0ccd81ba84c8d42734fa3d0e5a3fc9d6a8f7b1442d2203b06f4e251970569f67506d419fb6695039c11e78dfd740e565
-EBUILD arborx-1.2.ebuild 695 BLAKE2B 62fb238c7a17acea04504f84e7538e38231661c7b00567ff1bb448c5c4478ce3a3cca6a01944bdc01790090953a241a14478fa439b4b7273672d4259d9c10b01 SHA512 245bd0312e60faf5ab15c90eb58aa7c4742ec4f8ac45888f0474b5b06494cb6da5b8eeda92cc19f9e6479ef7c4e9eb39a0287575f3c0b65a9076f38578bae057
-EBUILD arborx-1.4.1.ebuild 695 BLAKE2B 00a1d58905fb5c021c109bead4c41828f3d743f9e98604a6801c84be41f122e0a29aeffadb9a6871102a6e74f8f277030dc4d404a57a51a879c10208a86a28f0 SHA512 f724da8754921ed76ae0cc039c3916fd90dc77fb38f91f2cce783d0109316cf3112144535e867ef4661af9676e30bcd0dc6248a763f9391a244eeaddda106ca6
+EBUILD arborx-1.4.1-r1.ebuild 845 BLAKE2B d0061660d675f729745d2466ad15dc647ea8c9a551b2fc0bb6f711c732597c8b31d5977ee7280703c82c9791302e0a647eab08427607c68c2192e77fa41c4235 SHA512 0773cbaba6627998e3c0ef369adb2fb54d02e8dc7b0013997d353b5f06e9fe58bdcded3b36322326068d2c928d6da2a49d903b7347a3bc2905c392ba05a7a206
 MISC metadata.xml 645 BLAKE2B 6dcc46ed6bd5b10596436f09667e159530d359fdc768350751cf3376ecfe1e0ff30477895ce367c0f0a8e35b531b8f2e42a8517992553b6cec6a16def3fc2b32 SHA512 c5bba621b5f13c28774f413d64542d2e35fbfe11b18a3f5b98799bcdc1e25dd0a258e583842f24e3b8d1ad359d8ff068a141db448af2cef04e772a82df9e1ec6
diff --git a/sci-libs/arborx/arborx-1.2.ebuild b/sci-libs/arborx/arborx-1.2.ebuild
deleted file mode 100644
index 68330b8a5df7..000000000000
--- a/sci-libs/arborx/arborx-1.2.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake
-
-DESCRIPTION="Library for performance portable algorithms for geometric search"
-HOMEPAGE="https://github.com/arborx/ArborX"
-
-SRC_URI="https://github.com/${PN}/ArborX/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-IUSE="mpi"
-
-RDEPEND="dev-libs/boost:=
-	mpi? ( virtual/mpi[cxx] )
-	sci-libs/trilinos"
-
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}"/ArborX-${PV}
-
-src_configure() {
-	local mycmakeargs=(
-		-DARBORX_ENABLE_MPI="$(usex mpi)"
-	)
-
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-}
diff --git a/sci-libs/arborx/arborx-1.4.1.ebuild b/sci-libs/arborx/arborx-1.4.1-r1.ebuild
index c27f694b4071..84b2bc0e85a4 100644
--- a/sci-libs/arborx/arborx-1.4.1.ebuild
+++ b/sci-libs/arborx/arborx-1.4.1-r1.ebuild
@@ -24,6 +24,13 @@ DEPEND="${RDEPEND}"
 
 S="${WORKDIR}"/ArborX-${PV}
 
+src_prepare() {
+	cmake_src_prepare
+
+	# replace hardcoded "lib/" directory:
+	sed -i -e "s#lib/#$(get_libdir)/#g" CMakeLists.txt || die "sed failed"
+}
+
 src_configure() {
 	local mycmakeargs=(
 		-DARBORX_ENABLE_MPI="$(usex mpi)"