commit:     0b1e869a53495976f18a1d4501b29538578b0a7b
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 10 00:43:42 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Mar 10 00:43:42 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0b1e869a

dev-util/icmake: fix invalid EROOT usage

Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-util/icmake/icmake-9.02.09.ebuild | 9 ++++-----
 dev-util/icmake/icmake-9.03.01.ebuild | 9 ++++-----
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/dev-util/icmake/icmake-9.02.09.ebuild 
b/dev-util/icmake/icmake-9.02.09.ebuild
index 4eea0292ebf..c24170a062f 100644
--- a/dev-util/icmake/icmake-9.02.09.ebuild
+++ b/dev-util/icmake/icmake-9.02.09.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -8,13 +8,12 @@ inherit toolchain-funcs flag-o-matic
 DESCRIPTION="Hybrid between a make utility and a shell scripting language"
 HOMEPAGE="https://fbb-git.gitlab.io/icmake/ https://gitlab.com/fbb-git/icmake";
 SRC_URI="https://gitlab.com/fbb-git/${PN}/-/archive/${PV}/${P}.tar.gz";
+S="${WORKDIR}/${P}/${PN}"
 
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
-S=${WORKDIR}/${P}/${PN}
-
 PATCHES=(
        "${FILESDIR}"/${PN}-9.00.00-ar.patch
        "${FILESDIR}"/${PN}-9.02.02-verbose-build.patch
@@ -35,11 +34,11 @@ src_prepare() {
 }
 
 src_configure() {
-       ./icm_prepare "${EROOT}" || die
+       ./icm_prepare "${EPREFIX}" || die
 }
 
 src_compile() {
-       ./icm_bootstrap "${EROOT}" || die
+       ./icm_bootstrap "${EPREFIX}" || die
 }
 
 src_install() {

diff --git a/dev-util/icmake/icmake-9.03.01.ebuild 
b/dev-util/icmake/icmake-9.03.01.ebuild
index e6bd5c26d8b..c24170a062f 100644
--- a/dev-util/icmake/icmake-9.03.01.ebuild
+++ b/dev-util/icmake/icmake-9.03.01.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -8,13 +8,12 @@ inherit toolchain-funcs flag-o-matic
 DESCRIPTION="Hybrid between a make utility and a shell scripting language"
 HOMEPAGE="https://fbb-git.gitlab.io/icmake/ https://gitlab.com/fbb-git/icmake";
 SRC_URI="https://gitlab.com/fbb-git/${PN}/-/archive/${PV}/${P}.tar.gz";
+S="${WORKDIR}/${P}/${PN}"
 
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
-S=${WORKDIR}/${P}/${PN}
-
 PATCHES=(
        "${FILESDIR}"/${PN}-9.00.00-ar.patch
        "${FILESDIR}"/${PN}-9.02.02-verbose-build.patch
@@ -35,11 +34,11 @@ src_prepare() {
 }
 
 src_configure() {
-       ./icm_prepare "${EROOT}" || die
+       ./icm_prepare "${EPREFIX}" || die
 }
 
 src_compile() {
-       ./icm_bootstrap "${EROOT}" || die
+       ./icm_bootstrap "${EPREFIX}" || die
 }
 
 src_install() {

Reply via email to