commit: 4a5c6828cffc8b2e140410439b9045b5a60a5e71 Author: David Seifert <soap <AT> gentoo <DOT> org> AuthorDate: Tue Aug 23 10:15:24 2022 +0000 Commit: David Seifert <soap <AT> gentoo <DOT> org> CommitDate: Tue Aug 23 10:15:24 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4a5c6828
dev-lang/julia-bin: fix VariableScope (EROOT) Signed-off-by: David Seifert <soap <AT> gentoo.org> dev-lang/julia-bin/julia-bin-1.6.5.ebuild | 9 ++++----- dev-lang/julia-bin/julia-bin-1.7.1.ebuild | 9 ++++----- dev-lang/julia-bin/julia-bin-1.7.3.ebuild | 9 ++++----- dev-lang/julia-bin/julia-bin-9999.ebuild | 7 +++---- 4 files changed, 15 insertions(+), 19 deletions(-) diff --git a/dev-lang/julia-bin/julia-bin-1.6.5.ebuild b/dev-lang/julia-bin/julia-bin-1.6.5.ebuild index 0901e3d69124..693dc424a913 100644 --- a/dev-lang/julia-bin/julia-bin-1.6.5.ebuild +++ b/dev-lang/julia-bin/julia-bin-1.6.5.ebuild @@ -2,6 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=7 + MY_PN=${PN/-bin/} MY_P=${MY_PN}-${PV/_/-} MY_PV=$(ver_cut 1-2) @@ -17,21 +18,19 @@ SRC_URI=" ) arm64? ( ${BASE_SRC_URI}/linux/aarch64/${MY_PV}/${MY_P}-linux-aarch64.tar.gz ) " +S="${WORKDIR}/${MY_P}" LICENSE="MIT" SLOT="${MY_PV}" KEYWORDS="-* ~amd64 ~x86" +RESTRICT="strip" RDEPEND="app-arch/p7zip" DEPEND="${RDEPEND}" -RESTRICT="strip" - QA_PREBUILT="*" QA_SONAME="*" -S="${WORKDIR}/${MY_P}" - src_install() { insinto "/usr/$(get_libdir)/${MY_P}/" doins -r ./etc @@ -45,6 +44,6 @@ src_install() { local revord=$(( 9999 - $(ver_cut 1) * 100 - $(ver_cut 2) )) # 1.6 -> 106 newenvd - 99${MY_PN}${revord} <<-EOF - PATH="${EROOT}/usr/$(get_libdir)/${MY_P}/bin" + PATH="${EPREFIX}/usr/$(get_libdir)/${MY_P}/bin" EOF } diff --git a/dev-lang/julia-bin/julia-bin-1.7.1.ebuild b/dev-lang/julia-bin/julia-bin-1.7.1.ebuild index e729beeff5e5..a5facfea6337 100644 --- a/dev-lang/julia-bin/julia-bin-1.7.1.ebuild +++ b/dev-lang/julia-bin/julia-bin-1.7.1.ebuild @@ -2,6 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=7 + MY_PN=${PN/-bin/} MY_P=${MY_PN}-${PV/_/-} MY_PV=$(ver_cut 1-2) @@ -17,21 +18,19 @@ SRC_URI=" ) arm64? ( ${BASE_SRC_URI}/linux/aarch64/${MY_PV}/${MY_P}-linux-aarch64.tar.gz ) " +S="${WORKDIR}/${MY_P}" LICENSE="MIT" SLOT="${MY_PV}" KEYWORDS="-* ~amd64 ~arm64 ~x86" +RESTRICT="strip" RDEPEND="app-arch/p7zip" DEPEND="${RDEPEND}" -RESTRICT="strip" - QA_PREBUILT="*" QA_SONAME="*" -S="${WORKDIR}/${MY_P}" - src_install() { insinto "/usr/$(get_libdir)/${MY_P}/" doins -r ./etc @@ -45,6 +44,6 @@ src_install() { local revord=$(( 9999 - $(ver_cut 1) * 100 - $(ver_cut 2) )) # 1.6 -> 106 newenvd - 99${MY_PN}${revord} <<-EOF - PATH="${EROOT}/usr/$(get_libdir)/${MY_P}/bin" + PATH="${EPREFIX}/usr/$(get_libdir)/${MY_P}/bin" EOF } diff --git a/dev-lang/julia-bin/julia-bin-1.7.3.ebuild b/dev-lang/julia-bin/julia-bin-1.7.3.ebuild index e729beeff5e5..a5facfea6337 100644 --- a/dev-lang/julia-bin/julia-bin-1.7.3.ebuild +++ b/dev-lang/julia-bin/julia-bin-1.7.3.ebuild @@ -2,6 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=7 + MY_PN=${PN/-bin/} MY_P=${MY_PN}-${PV/_/-} MY_PV=$(ver_cut 1-2) @@ -17,21 +18,19 @@ SRC_URI=" ) arm64? ( ${BASE_SRC_URI}/linux/aarch64/${MY_PV}/${MY_P}-linux-aarch64.tar.gz ) " +S="${WORKDIR}/${MY_P}" LICENSE="MIT" SLOT="${MY_PV}" KEYWORDS="-* ~amd64 ~arm64 ~x86" +RESTRICT="strip" RDEPEND="app-arch/p7zip" DEPEND="${RDEPEND}" -RESTRICT="strip" - QA_PREBUILT="*" QA_SONAME="*" -S="${WORKDIR}/${MY_P}" - src_install() { insinto "/usr/$(get_libdir)/${MY_P}/" doins -r ./etc @@ -45,6 +44,6 @@ src_install() { local revord=$(( 9999 - $(ver_cut 1) * 100 - $(ver_cut 2) )) # 1.6 -> 106 newenvd - 99${MY_PN}${revord} <<-EOF - PATH="${EROOT}/usr/$(get_libdir)/${MY_P}/bin" + PATH="${EPREFIX}/usr/$(get_libdir)/${MY_P}/bin" EOF } diff --git a/dev-lang/julia-bin/julia-bin-9999.ebuild b/dev-lang/julia-bin/julia-bin-9999.ebuild index 6bbced1a966e..def85bee0129 100644 --- a/dev-lang/julia-bin/julia-bin-9999.ebuild +++ b/dev-lang/julia-bin/julia-bin-9999.ebuild @@ -2,10 +2,12 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=7 + MY_PN=${PN/-bin/} DESCRIPTION="High-performance programming language for technical computing" HOMEPAGE="https://julialang.org/" +S="${WORKDIR}/" PROPERTIES="live" MY_P=${MY_PN}-latest @@ -13,16 +15,13 @@ SRC_URI="" LICENSE="MIT" SLOT="9999" +RESTRICT="strip" RDEPEND="app-arch/p7zip" DEPEND="${RDEPEND}" -RESTRICT="strip" - QA_PREBUILT="*" -S="${WORKDIR}/" - src_unpack() { NIGHTLIES_S3="https://julialangnightlies-s3.julialang.org/bin" if use x86; then