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 2286F15808C for ; Wed, 9 Feb 2022 13:12:49 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2BD5FE08FB; Wed, 9 Feb 2022 13:12:47 +0000 (UTC) Received: from smtp.gentoo.org (dev.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)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 0BB82E08FB for ; Wed, 9 Feb 2022 13:12:47 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 3EC1F34301E for ; Wed, 9 Feb 2022 13:12:46 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 81D752D6 for ; Wed, 9 Feb 2022 13:12:43 +0000 (UTC) From: "Anna Vyalkova" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Anna Vyalkova" Message-ID: <1644412326.b4c64697ef4aaa8329190f3e5af463f5306e688f.cybertailor@gentoo> Subject: [gentoo-commits] repo/proj/guru:dev commit in: dev-R/RcppArmadillo/ X-VCS-Repository: repo/proj/guru X-VCS-Files: dev-R/RcppArmadillo/RcppArmadillo-0.10.2.2.0.ebuild X-VCS-Directories: dev-R/RcppArmadillo/ X-VCS-Committer: cybertailor X-VCS-Committer-Name: Anna Vyalkova X-VCS-Revision: b4c64697ef4aaa8329190f3e5af463f5306e688f X-VCS-Branch: dev Date: Wed, 9 Feb 2022 13:12:43 +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: 0f403a96-7e0a-4dd0-a83d-cf296e37d161 X-Archives-Hash: 77ce9729bba0190f0cd66622bb66a660 commit: b4c64697ef4aaa8329190f3e5af463f5306e688f Author: Anna (cybertailor) Vyalkova sysrq in> AuthorDate: Wed Feb 9 06:17:48 2022 +0000 Commit: Anna Vyalkova sysrq in> CommitDate: Wed Feb 9 13:12:06 2022 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=b4c64697 dev-R/RcppArmadillo: fix symlinks Signed-off-by: Anna (cybertailor) Vyalkova sysrq.in> dev-R/RcppArmadillo/RcppArmadillo-0.10.2.2.0.ebuild | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/dev-R/RcppArmadillo/RcppArmadillo-0.10.2.2.0.ebuild b/dev-R/RcppArmadillo/RcppArmadillo-0.10.2.2.0.ebuild index 2bd5ac434..9c33fe313 100644 --- a/dev-R/RcppArmadillo/RcppArmadillo-0.10.2.2.0.ebuild +++ b/dev-R/RcppArmadillo/RcppArmadillo-0.10.2.2.0.ebuild @@ -3,10 +3,9 @@ EAPI=7 -inherit R-packages - -MYPV="$(ver_cut 2-3 ${PV})" +inherit R-packages eapi8-dosym +MY_PV="$(ver_cut 2-3 ${PV})" DESCRIPTION='Rcpp Integration for the Armadillo templated linear algebra library' SRC_URI="mirror://cran/src/contrib/Archive/${PN}/${PN}_${PV}.tar.gz" KEYWORDS="~amd64" @@ -15,7 +14,7 @@ LICENSE='GPL-2+' DEPEND=" >=dev-lang/R-3.3.0 >=dev-R/Rcpp-0.11.0 - =sci-libs/armadillo-${MYPV}*:=[lapack] + =sci-libs/armadillo-${MY_PV}*:=[lapack] " RDEPEND="${DEPEND}" @@ -23,16 +22,19 @@ RDEPEND="${DEPEND}" src_prepare() { default + #remove bundled rm -r inst/include/armadillo_bits || die rm inst/include/armadillo || die + #link to sci-libs/armadillo - dosym /usr/include/armadillo_bits inst/include/armadillo_bits - dosym /usr/include/armadillo inst/include/armadillo + ln -s "${ESYSROOT}"/usr/include/armadillo_bits inst/include/armadillo_bits || die + ln -s "${ESYSROOT}"/usr/include/armadillo inst/include/armadillo || die } src_install() { R-packages_src_install - dosym /usr/include/armadillo_bits "/usr/$(get_libdir)/R/site-library/${PN}/include/armadillo_bits" - dosym /usr/include/armadillo "/usr/$(get_libdir)/R/site-library/${PN}/include/armadillo" + + dosym8 -r /usr/include/armadillo_bits "/usr/$(get_libdir)/R/site-library/${PN}/include/armadillo_bits" + dosym8 -r /usr/include/armadillo "/usr/$(get_libdir)/R/site-library/${PN}/include/armadillo" }