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 (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id E64AF15812D for ; Fri, 03 Jan 2025 19:42:55 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 73456E0830; Fri, 03 Jan 2025 19:42:54 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 069EBE0830 for ; Fri, 03 Jan 2025 19:42:54 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 7F68933FD3F for ; Fri, 03 Jan 2025 19:42:52 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A21D919A0 for ; Fri, 03 Jan 2025 19:42:49 +0000 (UTC) From: "Julien Roy" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Julien Roy" Message-ID: <1735926549.4b5b48c3a8e21cc97511749370dcdfe2c065aff4.julien@gentoo> Subject: [gentoo-commits] repo/proj/guru:master commit in: games-roguelike/cataclysm-dda/ X-VCS-Repository: repo/proj/guru X-VCS-Files: games-roguelike/cataclysm-dda/cataclysm-dda-0h.ebuild games-roguelike/cataclysm-dda/cataclysm-dda-9999.ebuild X-VCS-Directories: games-roguelike/cataclysm-dda/ X-VCS-Committer: julien X-VCS-Committer-Name: Julien Roy X-VCS-Revision: 4b5b48c3a8e21cc97511749370dcdfe2c065aff4 X-VCS-Branch: master Date: Fri, 03 Jan 2025 19:42:49 +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: d04428a3-4b3b-4d6d-864e-a8e51e77be14 X-Archives-Hash: 3c081be21964113642eee851b7c258eb commit: 4b5b48c3a8e21cc97511749370dcdfe2c065aff4 Author: strategictraveler proton me> AuthorDate: Fri Jan 3 17:49:09 2025 +0000 Commit: Julien Roy jroy ca> 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 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