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 3C6AE15808F 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 395DBE08FF; Wed, 9 Feb 2022 13:12:47 +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)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 1DD85E08FF 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 2AA67343025 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 700A82D4 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.b1a05a38da86f25de5427125947629fe84381356.cybertailor@gentoo> Subject: [gentoo-commits] repo/proj/guru:dev commit in: dev-R/RcppEnsmallen/ X-VCS-Repository: repo/proj/guru X-VCS-Files: dev-R/RcppEnsmallen/RcppEnsmallen-0.2.17.0.1.ebuild X-VCS-Directories: dev-R/RcppEnsmallen/ X-VCS-Committer: cybertailor X-VCS-Committer-Name: Anna Vyalkova X-VCS-Revision: b1a05a38da86f25de5427125947629fe84381356 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: 56123196-fe55-441a-bf57-b0ade5b10834 X-Archives-Hash: 626d524713e3cc2c56b3bf5daf1c83fa commit: b1a05a38da86f25de5427125947629fe84381356 Author: Anna (cybertailor) Vyalkova sysrq in> AuthorDate: Wed Feb 9 06:12:49 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=b1a05a38 dev-R/RcppEnsmallen: fix symlinks Signed-off-by: Anna (cybertailor) Vyalkova sysrq.in> .../RcppEnsmallen/RcppEnsmallen-0.2.17.0.1.ebuild | 26 +++++++++++----------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/dev-R/RcppEnsmallen/RcppEnsmallen-0.2.17.0.1.ebuild b/dev-R/RcppEnsmallen/RcppEnsmallen-0.2.17.0.1.ebuild index 4a00cf0af..08436d0db 100644 --- a/dev-R/RcppEnsmallen/RcppEnsmallen-0.2.17.0.1.ebuild +++ b/dev-R/RcppEnsmallen/RcppEnsmallen-0.2.17.0.1.ebuild @@ -3,10 +3,9 @@ EAPI=7 -MYPV="$(ver_cut 2-4 ${PV})" - -inherit R-packages +inherit R-packages eapi8-dosym +MY_PV="$(ver_cut 2-4 ${PV})" DESCRIPTION='Header-Only C++ Mathematical Optimization library for armadillo' #SRC_URI="mirror://cran/src/contrib/RcppEnsmallen/RcppEnsmallen_${PV}.tar.gz" KEYWORDS="~amd64" @@ -15,26 +14,27 @@ LICENSE='GPL-2+' DEPEND=" >=dev-lang/R-3.3.0 dev-R/Rcpp - =sci-libs/ensmallen-${MYPV}* + =sci-libs/ensmallen-${MY_PV}* " -RDEPEND=" - ${DEPEND} - dev-R/Rcpp +RDEPEND="${DEPEND} >=dev-R/RcppArmadillo-0.8.400.0.0 " src_prepare() { default - #remove bundled + + # remove bundled rm -r inst/include/ensmallen_bits || die rm inst/include/ensmallen.hpp || die - #link to sci-libs/ensmallen - dosym /usr/include/ensmallen_bits inst/include/ensmallen_bits - dosym /usr/include/ensmallen.hpp inst/include/ensmallen.hpp + + # link to sci-libs/ensmallen + ln -s "${ESYSROOT}"/usr/include/ensmallen_bits inst/include/ensmallen_bits || die + ln -s "${ESYSROOT}"/usr/include/ensmallen.hpp inst/include/ensmallen.hpp || die } src_install() { R-packages_src_install - dosym /usr/include/ensmallen_bits "/usr/$(get_libdir)/R/site-library/${PN}/include/ensmallen_bits" - dosym /usr/include/ensmallen.hpp "/usr/$(get_libdir)/R/site-library/${PN}/include/ensmallen.hpp" + + dosym8 -r /usr/include/ensmallen_bits "/usr/$(get_libdir)/R/site-library/${PN}/include/ensmallen_bits" + dosym8 -r /usr/include/ensmallen.hpp "/usr/$(get_libdir)/R/site-library/${PN}/include/ensmallen.hpp" }