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

["strategictraveler" <strategictraveler@proton.me>]

commit:     4b5b48c3a8e21cc97511749370dcdfe2c065aff4
Author:     strategictraveler <strategictraveler <AT> proton <DOT> me>
AuthorDate: Fri Jan  3 17:49:09 2025 +0000
Commit:     strategictraveler <strategictraveler <AT> proton <DOT> me>
CommitDate: Fri Jan  3 17:49:09 2025 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=4b5b48c3

games-roguelike/cataclysm-dda: Fix locale file collisions

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

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

diff --git a/games-roguelike/cataclysm-dda/cataclysm-dda-0h.ebuild b/games-roguelike/cataclysm-dda/cataclysm-dda-0h.ebuild
index 329892c97..e14d0d9b0 100644
--- a/games-roguelike/cataclysm-dda/cataclysm-dda-0h.ebuild
+++ b/games-roguelike/cataclysm-dda/cataclysm-dda-0h.ebuild
@@ -85,8 +85,11 @@ src_prepare() {
 		-e "s/cataclysm.a/cataclysm-${SLOT}.a/g" \
 		-e "s/\$(BUILD_PREFIX)//g" || die # BUILD_PREFIX is also used by portage
 
-	sed -i -e "/${PN}.mo/"'!'"s/${PN}/${PN}-${SLOT}/" \
-		"src/path_info.cpp" || die
+	sed -i -e "s/${PN}/${PN}-${SLOT}/" \
+		"lang/Makefile" \
+		"src/path_info.cpp" \
+		"src/translation_manager_impl.cpp" \
+		"tests/translation_system_test.cpp" || die
 
 	# from upstream 1ab7d17
 	# NOTE: remove when bumping

diff --git a/games-roguelike/cataclysm-dda/cataclysm-dda-9999.ebuild b/games-roguelike/cataclysm-dda/cataclysm-dda-9999.ebuild
index 258c57605..1b614c23b 100644
--- a/games-roguelike/cataclysm-dda/cataclysm-dda-9999.ebuild
+++ b/games-roguelike/cataclysm-dda/cataclysm-dda-9999.ebuild
@@ -84,8 +84,11 @@ src_prepare() {
 		-e "s/cataclysm.a/cataclysm-${SLOT}.a/g" \
 		-e "s/\$(BUILD_PREFIX)//g" || die # BUILD_PREFIX is also used by portage
 
-	sed -i -e "/${PN}.mo/"'!'"s/${PN}/${PN}-${SLOT}/" \
-		"src/path_info.cpp" || die
+	sed -i -e "s/${PN}/${PN}-${SLOT}/" \
+		"lang/Makefile" \
+		"src/path_info.cpp" \
+		"src/translation_manager_impl.cpp" \
+		"tests/translation_system_test.cpp" || die
 
 	sed -i -e "s/cataclysm-tiles/cataclysm-tiles-${SLOT}/g" \
 		"data/xdg/org.cataclysmdda.CataclysmDDA.desktop" || die