[gentoo-commits] repo/proj/guru:master commit in: games-roguelike/cataclysm-dda/

[Julien Roy]

commit:     6a5369addbb5c8f786795e4da5ddd826f7aae1ba
Author:     strategictraveler <strategictraveler <AT> proton <DOT> me>
AuthorDate: Tue Dec 24 19:23:18 2024 +0000
Commit:     Julien Roy <julien <AT> jroy <DOT> ca>
CommitDate: Tue Dec 24 19:23:18 2024 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=6a5369ad

games-roguelike/cataclysm-dda: Pass PCH=0 to make install

Avoid unnecessary recompilation in src_install.

Signed-off-by: strategictraveler <strategictraveler <AT> proton.me>

 games-roguelike/cataclysm-dda/cataclysm-dda-0h.ebuild   | 5 ++---
 games-roguelike/cataclysm-dda/cataclysm-dda-9999.ebuild | 4 ++--
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/games-roguelike/cataclysm-dda/cataclysm-dda-0h.ebuild 
b/games-roguelike/cataclysm-dda/cataclysm-dda-0h.ebuild
index aa956edaa..329892c97 100644
--- a/games-roguelike/cataclysm-dda/cataclysm-dda-0h.ebuild
+++ b/games-roguelike/cataclysm-dda/cataclysm-dda-0h.ebuild
@@ -107,9 +107,9 @@ src_prepare() {
 
 src_compile() {
        myemakeargs=(
-               ASTYLE=0
                BACKTRACE=$(usex debug 1 0)
                CXX="$(tc-getCXX)"
+               DESTDIR="${D}"
                LINTJSON=0
                PCH=0
                PREFIX="${EPREFIX}/usr"
@@ -143,8 +143,7 @@ src_install() {
        emake \
                "TILES=$(usex tiles 1 0)" \
                "SOUND=$(usex sound 1 0)" \
-               DESTDIR="${D}" \
-               PREFIX="${EPREFIX}/usr" \
+               "${myemakeargs[@]}" \
                install
 
        [[ -e "${WORKDIR}/cataclysm-${SLOT}" ]] && dobin 
"${WORKDIR}/cataclysm-${SLOT}"

diff --git a/games-roguelike/cataclysm-dda/cataclysm-dda-9999.ebuild 
b/games-roguelike/cataclysm-dda/cataclysm-dda-9999.ebuild
index fa04fdaf0..258c57605 100644
--- a/games-roguelike/cataclysm-dda/cataclysm-dda-9999.ebuild
+++ b/games-roguelike/cataclysm-dda/cataclysm-dda-9999.ebuild
@@ -103,6 +103,7 @@ src_compile() {
        myemakeargs=(
                BACKTRACE=$(usex debug 1 0)
                CXX="$(tc-getCXX)"
+               DESTDIR="${D}"
                LINTJSON=0
                PCH=0
                PREFIX="${EPREFIX}/usr"
@@ -136,8 +137,7 @@ src_install() {
        emake \
                "TILES=$(usex tiles 1 0)" \
                "SOUND=$(usex sound 1 0)" \
-               DESTDIR="${D}" \
-               PREFIX="${EPREFIX}/usr" \
+               "${myemakeargs[@]}" \
                install
 
        [[ -e "${WORKDIR}/cataclysm-${SLOT}" ]] && dobin 
"${WORKDIR}/cataclysm-${SLOT}"