* [gentoo-commits] repo/proj/guru:dev commit in: games-roguelike/cataclysm-dda/
@ 2024-12-11 12:13 Takuya Wakazono
0 siblings, 0 replies; 13+ messages in thread
From: Takuya Wakazono @ 2024-12-11 12:13 UTC (permalink / raw
To: gentoo-commits
commit: 42644b05dafa82197e8cdb211d558d1bdfcf8f76
Author: Takuya Wakazono <pastalian46 <AT> gmail <DOT> com>
AuthorDate: Wed Dec 11 12:10:24 2024 +0000
Commit: Takuya Wakazono <pastalian46 <AT> gmail <DOT> com>
CommitDate: Wed Dec 11 12:10:24 2024 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=42644b05
games-roguelike/cataclysm-dda: drop to maintainer-needed
Drop it untile they register ac account on buzilla.
Signed-off-by: Takuya Wakazono <pastalian46 <AT> gmail.com>
games-roguelike/cataclysm-dda/metadata.xml | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/games-roguelike/cataclysm-dda/metadata.xml b/games-roguelike/cataclysm-dda/metadata.xml
index 3945bc293..620dd048c 100644
--- a/games-roguelike/cataclysm-dda/metadata.xml
+++ b/games-roguelike/cataclysm-dda/metadata.xml
@@ -1,10 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
- <email>strategictraveler@proton.me</email>
- <name>strategictraveler</name>
- </maintainer>
+ <!-- maintainer-needed -->
<upstream>
<maintainer>
<email>kevin.granade@gmail.com</email>
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [gentoo-commits] repo/proj/guru:dev commit in: games-roguelike/cataclysm-dda/
@ 2024-12-11 13:23 Takuya Wakazono
0 siblings, 0 replies; 13+ messages in thread
From: Takuya Wakazono @ 2024-12-11 13:23 UTC (permalink / raw
To: gentoo-commits
commit: e3d041a8382f8435e3f1cfe8a761ae3d24404953
Author: Takuya Wakazono <pastalian46 <AT> gmail <DOT> com>
AuthorDate: Wed Dec 11 13:22:31 2024 +0000
Commit: Takuya Wakazono <pastalian46 <AT> gmail <DOT> com>
CommitDate: Wed Dec 11 13:22:31 2024 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=e3d041a8
games-roguelike/cataclysm-dda: add myself as a maintainer
Signed-off-by: Takuya Wakazono <pastalian46 <AT> gmail.com>
games-roguelike/cataclysm-dda/metadata.xml | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/games-roguelike/cataclysm-dda/metadata.xml b/games-roguelike/cataclysm-dda/metadata.xml
index 620dd048c..7ef52eda5 100644
--- a/games-roguelike/cataclysm-dda/metadata.xml
+++ b/games-roguelike/cataclysm-dda/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <!-- maintainer-needed -->
+ <maintainer type="person">
+ <email>pastalian46@gmail.com</email>
+ <name>Takuya Wakazono</name>
+ </maintainer>
<upstream>
<maintainer>
<email>kevin.granade@gmail.com</email>
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [gentoo-commits] repo/proj/guru:dev commit in: games-roguelike/cataclysm-dda/
@ 2024-12-13 14:15 Takuya Wakazono
0 siblings, 0 replies; 13+ messages in thread
From: Takuya Wakazono @ 2024-12-13 14:15 UTC (permalink / raw
To: gentoo-commits
commit: 0fabcbdec2defee7e7e5f2f8f93b3fbf598e8ada
Author: Takuya Wakazono <pastalian46 <AT> gmail <DOT> com>
AuthorDate: Fri Dec 13 14:14:33 2024 +0000
Commit: Takuya Wakazono <pastalian46 <AT> gmail <DOT> com>
CommitDate: Fri Dec 13 14:14:33 2024 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=0fabcbde
games-roguelike/cataclysm-dda: update maintainers
This reverts commit 42644b05dafa82197e8cdb211d558d1bdfcf8f76.
Signed-off-by: Takuya Wakazono <pastalian46 <AT> gmail.com>
games-roguelike/cataclysm-dda/metadata.xml | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/games-roguelike/cataclysm-dda/metadata.xml b/games-roguelike/cataclysm-dda/metadata.xml
index 7ef52eda5..0e02eed2a 100644
--- a/games-roguelike/cataclysm-dda/metadata.xml
+++ b/games-roguelike/cataclysm-dda/metadata.xml
@@ -1,6 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
+ <maintainer type="person">
+ <email>strategictraveler@proton.me</email>
+ <name>strategictraveler</name>
+ </maintainer>
<maintainer type="person">
<email>pastalian46@gmail.com</email>
<name>Takuya Wakazono</name>
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [gentoo-commits] repo/proj/guru:dev commit in: games-roguelike/cataclysm-dda/
@ 2024-12-22 13:57 Takuya Wakazono
0 siblings, 0 replies; 13+ messages in thread
From: Takuya Wakazono @ 2024-12-22 13:57 UTC (permalink / raw
To: gentoo-commits
commit: f79ed05fad7131325687907256b0224ba61a3431
Author: Takuya Wakazono <pastalian46 <AT> gmail <DOT> com>
AuthorDate: Sun Dec 22 13:57:13 2024 +0000
Commit: Takuya Wakazono <pastalian46 <AT> gmail <DOT> com>
CommitDate: Sun Dec 22 13:57:13 2024 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=f79ed05f
games-roguelike/cataclysm-dda: simplify debug USE flag
Enable only backtrace with USE=debug.
Closes: https://bugs.gentoo.org/946357
Signed-off-by: Takuya Wakazono <pastalian46 <AT> gmail.com>
.../cataclysm-dda/cataclysm-dda-0h.ebuild | 22 +++++++++------------
.../cataclysm-dda/cataclysm-dda-9999.ebuild | 23 +++++++++-------------
2 files changed, 18 insertions(+), 27 deletions(-)
diff --git a/games-roguelike/cataclysm-dda/cataclysm-dda-0h.ebuild b/games-roguelike/cataclysm-dda/cataclysm-dda-0h.ebuild
index 512cec6e6..0f5301af3 100644
--- a/games-roguelike/cataclysm-dda/cataclysm-dda-0h.ebuild
+++ b/games-roguelike/cataclysm-dda/cataclysm-dda-0h.ebuild
@@ -3,7 +3,7 @@
EAPI=8
-inherit xdg toolchain-funcs flag-o-matic
+inherit xdg toolchain-funcs
SP_VER="2024-10-27"
@@ -18,8 +18,12 @@ else
v2="$(ver_cut 2)"
MY_PV="$(ver_cut 1).${v2^^}"
unset v2
- SRC_URI="https://github.com/CleverRaven/Cataclysm-DDA/archive/${MY_PV}-RELEASE.tar.gz -> ${P}.tar.gz \
- soundpack? ( https://github.com/Fris0uman/CDDA-Soundpacks/releases/download/${SP_VER}/CC-Sounds.zip -> ${P}-soundpack.zip )"
+ SRC_URI="
+ https://github.com/CleverRaven/Cataclysm-DDA/archive/${MY_PV}-RELEASE.tar.gz -> ${P}.tar.gz
+ soundpack? (
+ https://github.com/Fris0uman/CDDA-Soundpacks/releases/download/${SP_VER}/CC-Sounds.zip -> ${P}-soundpack.zip
+ )
+ "
SLOT="${MY_PV}"
S="${WORKDIR}/Cataclysm-DDA-${MY_PV}-RELEASE"
KEYWORDS="~amd64"
@@ -104,22 +108,14 @@ src_prepare() {
src_compile() {
myemakeargs=(
ASTYLE=0
+ BACKTRACE=$(usex debug 1 0)
CXX="$(tc-getCXX)"
LINTJSON=0
+ PCH=0
PREFIX="${EPREFIX}/usr"
USE_XDG_DIR=1
)
- if use debug; then
- append-ldflags "-rdynamic"
- DEFINES+="-DENABLE_LOGGING"
- DEFINES+="$(echo -DDEBUG_{INFO,WARNING,ERROR,PEDANTIC_INFO})"
- DEFINES+="$(echo -DDEBUG_ENABLE_{MAIN,MAP,MAP_GEN,GAME})"
- export DEFINES
- else
- export BACKTRACE=0
- fi
-
if use ncurses; then
# don't build tests twice
if ! use tiles; then
diff --git a/games-roguelike/cataclysm-dda/cataclysm-dda-9999.ebuild b/games-roguelike/cataclysm-dda/cataclysm-dda-9999.ebuild
index cb0c90029..679c8f450 100644
--- a/games-roguelike/cataclysm-dda/cataclysm-dda-9999.ebuild
+++ b/games-roguelike/cataclysm-dda/cataclysm-dda-9999.ebuild
@@ -3,7 +3,7 @@
EAPI=8
-inherit xdg toolchain-funcs flag-o-matic
+inherit xdg toolchain-funcs
SP_VER="2024-10-27"
@@ -18,8 +18,12 @@ else
v2="$(ver_cut 2)"
MY_PV="$(ver_cut 1).${v2^^}"
unset v2
- SRC_URI="https://github.com/CleverRaven/Cataclysm-DDA/archive/${MY_PV}-RELEASE.tar.gz -> ${P}.tar.gz \
- soundpack? ( https://github.com/Fris0uman/CDDA-Soundpacks/releases/download/${SP_VER}/CC-Sounds.zip -> ${P}-soundpack.zip )"
+ SRC_URI="
+ https://github.com/CleverRaven/Cataclysm-DDA/archive/${MY_PV}-RELEASE.tar.gz -> ${P}.tar.gz
+ soundpack? (
+ https://github.com/Fris0uman/CDDA-Soundpacks/releases/download/${SP_VER}/CC-Sounds.zip -> ${P}-soundpack.zip
+ )
+ "
SLOT="${MY_PV}"
S="${WORKDIR}/Cataclysm-DDA-${MY_PV}-RELEASE"
KEYWORDS="~amd64"
@@ -97,23 +101,14 @@ src_prepare() {
src_compile() {
myemakeargs=(
- ASTYLE=0
+ BACKTRACE=$(usex debug 1 0)
CXX="$(tc-getCXX)"
LINTJSON=0
+ PCH=0
PREFIX="${EPREFIX}/usr"
USE_XDG_DIR=1
)
- if use debug; then
- append-ldflags "-rdynamic"
- DEFINES+="-DENABLE_LOGGING"
- DEFINES+="$(echo -DDEBUG_{INFO,WARNING,ERROR,PEDANTIC_INFO})"
- DEFINES+="$(echo -DDEBUG_ENABLE_{MAIN,MAP,MAP_GEN,GAME})"
- export DEFINES
- else
- export BACKTRACE=0
- fi
-
if use ncurses; then
# don't build tests twice
if ! use tiles; then
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [gentoo-commits] repo/proj/guru:dev commit in: games-roguelike/cataclysm-dda/
@ 2024-12-24 10:10 strategictraveler
0 siblings, 0 replies; 13+ messages in thread
From: strategictraveler @ 2024-12-24 10:10 UTC (permalink / raw
To: gentoo-commits
commit: 6c9d2edd5ff54e250bebd615f70487a9dac31d34
Author: strategictraveler <strategictraveler <AT> proton <DOT> me>
AuthorDate: Tue Dec 24 10:06:19 2024 +0000
Commit: strategictraveler <strategictraveler <AT> proton <DOT> me>
CommitDate: Tue Dec 24 10:06:19 2024 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=6c9d2edd
games-roguelike/cataclysm-dda: Fix locales not installing
Signed-off-by: strategictraveler <strategictraveler <AT> proton.me>
games-roguelike/cataclysm-dda/cataclysm-dda-0h.ebuild | 6 ++----
games-roguelike/cataclysm-dda/cataclysm-dda-9999.ebuild | 6 ++----
2 files changed, 4 insertions(+), 8 deletions(-)
diff --git a/games-roguelike/cataclysm-dda/cataclysm-dda-0h.ebuild b/games-roguelike/cataclysm-dda/cataclysm-dda-0h.ebuild
index 0f5301af3..aa956edaa 100644
--- a/games-roguelike/cataclysm-dda/cataclysm-dda-0h.ebuild
+++ b/games-roguelike/cataclysm-dda/cataclysm-dda-0h.ebuild
@@ -116,6 +116,8 @@ src_compile() {
USE_XDG_DIR=1
)
+ use nls && export LANGUAGES="all"
+
if use ncurses; then
# don't build tests twice
if ! use tiles; then
@@ -135,10 +137,6 @@ src_compile() {
"TESTS=$(usex test 1 0)" \
"TILES=$(usex tiles 1 0)"
fi
-
- if use nls; then
- emake localization
- fi
}
src_install() {
diff --git a/games-roguelike/cataclysm-dda/cataclysm-dda-9999.ebuild b/games-roguelike/cataclysm-dda/cataclysm-dda-9999.ebuild
index 679c8f450..fa04fdaf0 100644
--- a/games-roguelike/cataclysm-dda/cataclysm-dda-9999.ebuild
+++ b/games-roguelike/cataclysm-dda/cataclysm-dda-9999.ebuild
@@ -109,6 +109,8 @@ src_compile() {
USE_XDG_DIR=1
)
+ use nls && export LANGUAGES="all"
+
if use ncurses; then
# don't build tests twice
if ! use tiles; then
@@ -128,10 +130,6 @@ src_compile() {
"TESTS=$(usex test 1 0)" \
"TILES=$(usex tiles 1 0)"
fi
-
- if use nls; then
- emake localization
- fi
}
src_install() {
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [gentoo-commits] repo/proj/guru:dev commit in: games-roguelike/cataclysm-dda/
@ 2024-12-24 19:27 strategictraveler
0 siblings, 0 replies; 13+ messages in thread
From: strategictraveler @ 2024-12-24 19:27 UTC (permalink / raw
To: gentoo-commits
commit: 6a5369addbb5c8f786795e4da5ddd826f7aae1ba
Author: strategictraveler <strategictraveler <AT> proton <DOT> me>
AuthorDate: Tue Dec 24 19:23:18 2024 +0000
Commit: strategictraveler <strategictraveler <AT> proton <DOT> me>
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}"
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [gentoo-commits] repo/proj/guru:dev commit in: games-roguelike/cataclysm-dda/
@ 2025-01-03 17:49 strategictraveler
0 siblings, 0 replies; 13+ messages in thread
From: strategictraveler @ 2025-01-03 17:49 UTC (permalink / raw
To: gentoo-commits
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
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [gentoo-commits] repo/proj/guru:dev commit in: games-roguelike/cataclysm-dda/
@ 2025-01-14 11:58 strategictraveler
0 siblings, 0 replies; 13+ messages in thread
From: strategictraveler @ 2025-01-14 11:58 UTC (permalink / raw
To: gentoo-commits
commit: d6e86fdd73e4edffe0334eccb6b336620561efed
Author: strategictraveler <strategictraveler <AT> proton <DOT> me>
AuthorDate: Tue Jan 14 11:54:00 2025 +0000
Commit: strategictraveler <strategictraveler <AT> proton <DOT> me>
CommitDate: Tue Jan 14 11:54:00 2025 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=d6e86fdd
games-roguelike/cataclysm-dda: Add doc USE flag and install man pages
Signed-off-by: strategictraveler <strategictraveler <AT> proton.me>
games-roguelike/cataclysm-dda/cataclysm-dda-0h.ebuild | 12 ++++++++++--
games-roguelike/cataclysm-dda/cataclysm-dda-9999.ebuild | 12 ++++++++++--
2 files changed, 20 insertions(+), 4 deletions(-)
diff --git a/games-roguelike/cataclysm-dda/cataclysm-dda-0h.ebuild b/games-roguelike/cataclysm-dda/cataclysm-dda-0h.ebuild
index e14d0d9b0..eb07fc880 100644
--- a/games-roguelike/cataclysm-dda/cataclysm-dda-0h.ebuild
+++ b/games-roguelike/cataclysm-dda/cataclysm-dda-0h.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2024 Gentoo Authors
+# Copyright 2024-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -31,7 +31,7 @@ fi
# CC-BY-SA-4.0 for soundpack
LICENSE="Apache-2.0 CC-BY-SA-3.0 CC-BY-SA-4.0 MIT OFL-1.1 Unicode-3.0"
-IUSE="debug ncurses nls +sound +soundpack test +tiles"
+IUSE="debug doc ncurses nls +sound +soundpack test +tiles"
REQUIRED_USE="soundpack? ( sound ) sound? ( tiles ) \
|| ( tiles ncurses )"
RESTRICT="!test? ( test )"
@@ -50,6 +50,7 @@ RDEPEND="
)"
DEPEND="${RDEPEND}"
BDEPEND="
+ doc? ( app-text/doxygen[dot] )
soundpack? ( app-arch/unzip )
nls? ( sys-devel/gettext )
"
@@ -121,6 +122,8 @@ src_compile() {
use nls && export LANGUAGES="all"
+ use doc && doxygen doxygen_doc/doxygen_conf.txt || die "Failed to generate docs"
+
if use ncurses; then
# don't build tests twice
if ! use tiles; then
@@ -151,6 +154,11 @@ src_install() {
[[ -e "${WORKDIR}/cataclysm-${SLOT}" ]] && dobin "${WORKDIR}/cataclysm-${SLOT}"
+ use doc && dodoc -r doxygen_doc/html
+
+ use tiles && newman "doc/cataclysm-tiles.6" "cataclysm-tiles-${SLOT}.6"
+ use ncurses && newman "doc/cataclysm.6" "cataclysm-${SLOT}.6"
+
if use soundpack; then
insinto "/usr/share/${PN}-${SLOT}/sound"
doins -r "${WORKDIR}/CC-Sounds"
diff --git a/games-roguelike/cataclysm-dda/cataclysm-dda-9999.ebuild b/games-roguelike/cataclysm-dda/cataclysm-dda-9999.ebuild
index 1b614c23b..b8428c2f5 100644
--- a/games-roguelike/cataclysm-dda/cataclysm-dda-9999.ebuild
+++ b/games-roguelike/cataclysm-dda/cataclysm-dda-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2024 Gentoo Authors
+# Copyright 2024-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -31,7 +31,7 @@ fi
# CC-BY-SA-4.0 for soundpack
LICENSE="Apache-2.0 CC-BY-SA-3.0 CC-BY-SA-4.0 MIT OFL-1.1 Unicode-3.0"
-IUSE="debug ncurses nls +sound +soundpack test +tiles"
+IUSE="debug doc ncurses nls +sound +soundpack test +tiles"
REQUIRED_USE="soundpack? ( sound ) sound? ( tiles ) \
|| ( tiles ncurses )"
RESTRICT="!test? ( test )"
@@ -50,6 +50,7 @@ RDEPEND="
)"
DEPEND="${RDEPEND}"
BDEPEND="
+ doc? ( app-text/doxygen[dot] )
nls? ( sys-devel/gettext )
"
@@ -115,6 +116,8 @@ src_compile() {
use nls && export LANGUAGES="all"
+ use doc && doxygen doxygen_doc/doxygen_conf.txt || die "Failed to generate docs"
+
if use ncurses; then
# don't build tests twice
if ! use tiles; then
@@ -145,6 +148,11 @@ src_install() {
[[ -e "${WORKDIR}/cataclysm-${SLOT}" ]] && dobin "${WORKDIR}/cataclysm-${SLOT}"
+ use doc && dodoc -r doxygen_doc/html
+
+ use tiles && newman "doc/cataclysm-tiles.6" "cataclysm-tiles-${SLOT}.6"
+ use ncurses && newman "doc/cataclysm.6" "cataclysm-${SLOT}.6"
+
if use soundpack; then
insinto "/usr/share/${PN}-${SLOT}/sound"
doins -r "${WORKDIR}/CC-Sounds"
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [gentoo-commits] repo/proj/guru:dev commit in: games-roguelike/cataclysm-dda/
@ 2025-01-15 13:54 Takuya Wakazono
0 siblings, 0 replies; 13+ messages in thread
From: Takuya Wakazono @ 2025-01-15 13:54 UTC (permalink / raw
To: gentoo-commits
commit: 6b48c03d3cdad7c3d3854ac8548b76096ad16c91
Author: Takuya Wakazono <pastalian46 <AT> gmail <DOT> com>
AuthorDate: Wed Jan 15 13:53:46 2025 +0000
Commit: Takuya Wakazono <pastalian46 <AT> gmail <DOT> com>
CommitDate: Wed Jan 15 13:53:46 2025 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=6b48c03d
games-roguelike/cataclysm-dda: fix build without USE=doc
`use doc && something || die` fails when doc flag is disabled.
Closes: https://bugs.gentoo.org/948137
Signed-off-by: Takuya Wakazono <pastalian46 <AT> gmail.com>
games-roguelike/cataclysm-dda/cataclysm-dda-0h.ebuild | 4 +++-
games-roguelike/cataclysm-dda/cataclysm-dda-9999.ebuild | 4 +++-
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/games-roguelike/cataclysm-dda/cataclysm-dda-0h.ebuild b/games-roguelike/cataclysm-dda/cataclysm-dda-0h.ebuild
index eb07fc880..231250609 100644
--- a/games-roguelike/cataclysm-dda/cataclysm-dda-0h.ebuild
+++ b/games-roguelike/cataclysm-dda/cataclysm-dda-0h.ebuild
@@ -122,7 +122,9 @@ src_compile() {
use nls && export LANGUAGES="all"
- use doc && doxygen doxygen_doc/doxygen_conf.txt || die "Failed to generate docs"
+ if use doc; then
+ doxygen doxygen_doc/doxygen_conf.txt || die "Failed to generate docs"
+ fi
if use ncurses; then
# don't build tests twice
diff --git a/games-roguelike/cataclysm-dda/cataclysm-dda-9999.ebuild b/games-roguelike/cataclysm-dda/cataclysm-dda-9999.ebuild
index b8428c2f5..7d79bbd73 100644
--- a/games-roguelike/cataclysm-dda/cataclysm-dda-9999.ebuild
+++ b/games-roguelike/cataclysm-dda/cataclysm-dda-9999.ebuild
@@ -116,7 +116,9 @@ src_compile() {
use nls && export LANGUAGES="all"
- use doc && doxygen doxygen_doc/doxygen_conf.txt || die "Failed to generate docs"
+ if use doc; then
+ doxygen doxygen_doc/doxygen_conf.txt || die "Failed to generate docs"
+ fi
if use ncurses; then
# don't build tests twice
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [gentoo-commits] repo/proj/guru:dev commit in: games-roguelike/cataclysm-dda/
@ 2025-02-01 20:07 strategictraveler
0 siblings, 0 replies; 13+ messages in thread
From: strategictraveler @ 2025-02-01 20:07 UTC (permalink / raw
To: gentoo-commits
commit: 1a6a9e4925f81c9d6a7fe875e20b8f6c1111b000
Author: strategictraveler <strategictraveler <AT> proton <DOT> me>
AuthorDate: Sat Feb 1 19:59:26 2025 +0000
Commit: strategictraveler <strategictraveler <AT> proton <DOT> me>
CommitDate: Sat Feb 1 20:06:56 2025 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=1a6a9e49
games-roguelike/cataclysm-dda: Fix VariableScope issue
Signed-off-by: strategictraveler <strategictraveler <AT> proton.me>
games-roguelike/cataclysm-dda/cataclysm-dda-0h.ebuild | 2 +-
games-roguelike/cataclysm-dda/cataclysm-dda-9999.ebuild | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/games-roguelike/cataclysm-dda/cataclysm-dda-0h.ebuild b/games-roguelike/cataclysm-dda/cataclysm-dda-0h.ebuild
index 35db97b99..1e5149d87 100644
--- a/games-roguelike/cataclysm-dda/cataclysm-dda-0h.ebuild
+++ b/games-roguelike/cataclysm-dda/cataclysm-dda-0h.ebuild
@@ -115,7 +115,6 @@ src_compile() {
myemakeargs=(
BACKTRACE=$(usex debug 1 0)
CXX="$(tc-getCXX)"
- DESTDIR="${D}"
LINTJSON=0
PCH=0
PREFIX="${EPREFIX}/usr"
@@ -154,6 +153,7 @@ src_install() {
"TILES=$(usex tiles 1 0)" \
"SOUND=$(usex sound 1 0)" \
"${myemakeargs[@]}" \
+ DESTDIR="${D}" \
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 7c2566e5d..0b04fe840 100644
--- a/games-roguelike/cataclysm-dda/cataclysm-dda-9999.ebuild
+++ b/games-roguelike/cataclysm-dda/cataclysm-dda-9999.ebuild
@@ -109,7 +109,6 @@ src_compile() {
myemakeargs=(
BACKTRACE=$(usex debug 1 0)
CXX="$(tc-getCXX)"
- DESTDIR="${D}"
LINTJSON=0
PCH=0
PREFIX="${EPREFIX}/usr"
@@ -148,6 +147,7 @@ src_install() {
"TILES=$(usex tiles 1 0)" \
"SOUND=$(usex sound 1 0)" \
"${myemakeargs[@]}" \
+ DESTDIR="${D}" \
install
[[ -e "${WORKDIR}/cataclysm-${SLOT}" ]] && dobin "${WORKDIR}/cataclysm-${SLOT}"
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [gentoo-commits] repo/proj/guru:dev commit in: games-roguelike/cataclysm-dda/
@ 2025-02-01 20:07 strategictraveler
0 siblings, 0 replies; 13+ messages in thread
From: strategictraveler @ 2025-02-01 20:07 UTC (permalink / raw
To: gentoo-commits
commit: 11d3671efe81ed8697c006f438dc917d566c1bcb
Author: strategictraveler <strategictraveler <AT> proton <DOT> me>
AuthorDate: Sat Feb 1 19:55:43 2025 +0000
Commit: strategictraveler <strategictraveler <AT> proton <DOT> me>
CommitDate: Sat Feb 1 20:06:53 2025 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=11d3671e
games-roguelike/cataclysm-dda: update LICENSE
Show main license first, make soundpack license USE-conditional.
Add BSD license as per upstream d7e135a.
Signed-off-by: strategictraveler <strategictraveler <AT> proton.me>
games-roguelike/cataclysm-dda/cataclysm-dda-0h.ebuild | 3 +--
games-roguelike/cataclysm-dda/cataclysm-dda-9999.ebuild | 3 +--
2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/games-roguelike/cataclysm-dda/cataclysm-dda-0h.ebuild b/games-roguelike/cataclysm-dda/cataclysm-dda-0h.ebuild
index 231250609..94a7b52cc 100644
--- a/games-roguelike/cataclysm-dda/cataclysm-dda-0h.ebuild
+++ b/games-roguelike/cataclysm-dda/cataclysm-dda-0h.ebuild
@@ -29,8 +29,7 @@ else
KEYWORDS="~amd64"
fi
-# CC-BY-SA-4.0 for soundpack
-LICENSE="Apache-2.0 CC-BY-SA-3.0 CC-BY-SA-4.0 MIT OFL-1.1 Unicode-3.0"
+LICENSE="CC-BY-SA-3.0 Apache-2.0 soundpack? ( CC-BY-SA-4.0 ) MIT OFL-1.1 Unicode-3.0"
IUSE="debug doc ncurses nls +sound +soundpack test +tiles"
REQUIRED_USE="soundpack? ( sound ) sound? ( tiles ) \
|| ( tiles ncurses )"
diff --git a/games-roguelike/cataclysm-dda/cataclysm-dda-9999.ebuild b/games-roguelike/cataclysm-dda/cataclysm-dda-9999.ebuild
index 7d79bbd73..7ab9d3db1 100644
--- a/games-roguelike/cataclysm-dda/cataclysm-dda-9999.ebuild
+++ b/games-roguelike/cataclysm-dda/cataclysm-dda-9999.ebuild
@@ -29,8 +29,7 @@ else
KEYWORDS="~amd64"
fi
-# CC-BY-SA-4.0 for soundpack
-LICENSE="Apache-2.0 CC-BY-SA-3.0 CC-BY-SA-4.0 MIT OFL-1.1 Unicode-3.0"
+LICENSE="CC-BY-SA-3.0 Apache-2.0 BSD soundpack? ( CC-BY-SA-4.0 ) MIT OFL-1.1 Unicode-3.0"
IUSE="debug doc ncurses nls +sound +soundpack test +tiles"
REQUIRED_USE="soundpack? ( sound ) sound? ( tiles ) \
|| ( tiles ncurses )"
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [gentoo-commits] repo/proj/guru:dev commit in: games-roguelike/cataclysm-dda/
@ 2025-02-01 20:07 strategictraveler
0 siblings, 0 replies; 13+ messages in thread
From: strategictraveler @ 2025-02-01 20:07 UTC (permalink / raw
To: gentoo-commits
commit: 4ea7c172cc881a89518f087735cc36b784d9ae75
Author: strategictraveler <strategictraveler <AT> proton <DOT> me>
AuthorDate: Sat Feb 1 19:58:32 2025 +0000
Commit: strategictraveler <strategictraveler <AT> proton <DOT> me>
CommitDate: Sat Feb 1 20:06:55 2025 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=4ea7c172
games-roguelike/cataclysm-dda: Fix font paths & revise sed args
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 | 5 ++++-
2 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/games-roguelike/cataclysm-dda/cataclysm-dda-0h.ebuild b/games-roguelike/cataclysm-dda/cataclysm-dda-0h.ebuild
index 94a7b52cc..35db97b99 100644
--- a/games-roguelike/cataclysm-dda/cataclysm-dda-0h.ebuild
+++ b/games-roguelike/cataclysm-dda/cataclysm-dda-0h.ebuild
@@ -91,12 +91,15 @@ src_prepare() {
"src/translation_manager_impl.cpp" \
"tests/translation_system_test.cpp" || die
+ sed -i "s#data#${EPREFIX}/usr/share/${PN}-${SLOT}#" \
+ "data/fontdata.json" || die
+
# from upstream 1ab7d17
# NOTE: remove when bumping
- sed -i -e "s/const size_type/size_type/" \
+ sed -i "s/const size_type/size_type/" \
"src/third-party/flatbuffers/stl_emulation.h" || die
- sed -i -e "s/cataclysm-tiles/cataclysm-tiles-${SLOT}/g" \
+ sed -i "s/cataclysm-tiles/cataclysm-tiles-${SLOT}/g" \
"data/xdg/org.cataclysmdda.CataclysmDDA.desktop" || die
local f="org.cataclysmdda.CataclysmDDA"
diff --git a/games-roguelike/cataclysm-dda/cataclysm-dda-9999.ebuild b/games-roguelike/cataclysm-dda/cataclysm-dda-9999.ebuild
index 7ab9d3db1..7c2566e5d 100644
--- a/games-roguelike/cataclysm-dda/cataclysm-dda-9999.ebuild
+++ b/games-roguelike/cataclysm-dda/cataclysm-dda-9999.ebuild
@@ -90,7 +90,10 @@ src_prepare() {
"src/translation_manager_impl.cpp" \
"tests/translation_system_test.cpp" || die
- sed -i -e "s/cataclysm-tiles/cataclysm-tiles-${SLOT}/g" \
+ sed -i "s#data#${EPREFIX}/usr/share/${PN}-${SLOT}#" \
+ "data/fontdata.json" || die
+
+ sed -i "s/cataclysm-tiles/cataclysm-tiles-${SLOT}/g" \
"data/xdg/org.cataclysmdda.CataclysmDDA.desktop" || die
local f="org.cataclysmdda.CataclysmDDA"
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [gentoo-commits] repo/proj/guru:dev commit in: games-roguelike/cataclysm-dda/
@ 2025-02-02 11:42 strategictraveler
0 siblings, 0 replies; 13+ messages in thread
From: strategictraveler @ 2025-02-02 11:42 UTC (permalink / raw
To: gentoo-commits
commit: edcdb2677a0afd134846622e91dbd748fd7f31c4
Author: strategictraveler <strategictraveler <AT> proton <DOT> me>
AuthorDate: Sun Feb 2 11:28:08 2025 +0000
Commit: strategictraveler <strategictraveler <AT> proton <DOT> me>
CommitDate: Sun Feb 2 11:38:00 2025 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=edcdb267
games-roguelike/cataclysm-dda: Remove ebuild-specific bdep, add note
- only depend on app-arch/unzip if not live
- add license note for bump
Signed-off-by: strategictraveler <strategictraveler <AT> proton.me>
games-roguelike/cataclysm-dda/cataclysm-dda-0h.ebuild | 4 +++-
games-roguelike/cataclysm-dda/cataclysm-dda-9999.ebuild | 2 ++
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/games-roguelike/cataclysm-dda/cataclysm-dda-0h.ebuild b/games-roguelike/cataclysm-dda/cataclysm-dda-0h.ebuild
index 1e5149d87..d61890171 100644
--- a/games-roguelike/cataclysm-dda/cataclysm-dda-0h.ebuild
+++ b/games-roguelike/cataclysm-dda/cataclysm-dda-0h.ebuild
@@ -29,6 +29,7 @@ else
KEYWORDS="~amd64"
fi
+# NOTE: Add BSD license on bump
LICENSE="CC-BY-SA-3.0 Apache-2.0 soundpack? ( CC-BY-SA-4.0 ) MIT OFL-1.1 Unicode-3.0"
IUSE="debug doc ncurses nls +sound +soundpack test +tiles"
REQUIRED_USE="soundpack? ( sound ) sound? ( tiles ) \
@@ -50,10 +51,11 @@ RDEPEND="
DEPEND="${RDEPEND}"
BDEPEND="
doc? ( app-text/doxygen[dot] )
- soundpack? ( app-arch/unzip )
nls? ( sys-devel/gettext )
"
+[[ ${PV} != 9999 ]] && BDEPEND+=" soundpack? ( app-arch/unzip )"
+
src_unpack() {
if [[ ${PV} == 9999 ]]; then
git-r3_src_unpack
diff --git a/games-roguelike/cataclysm-dda/cataclysm-dda-9999.ebuild b/games-roguelike/cataclysm-dda/cataclysm-dda-9999.ebuild
index 0b04fe840..943792391 100644
--- a/games-roguelike/cataclysm-dda/cataclysm-dda-9999.ebuild
+++ b/games-roguelike/cataclysm-dda/cataclysm-dda-9999.ebuild
@@ -53,6 +53,8 @@ BDEPEND="
nls? ( sys-devel/gettext )
"
+[[ ${PV} != 9999 ]] && BDEPEND+=" soundpack? ( app-arch/unzip )"
+
src_unpack() {
if [[ ${PV} == 9999 ]]; then
git-r3_src_unpack
^ permalink raw reply related [flat|nested] 13+ messages in thread
end of thread, other threads:[~2025-02-02 11:42 UTC | newest]
Thread overview: 13+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-02-01 20:07 [gentoo-commits] repo/proj/guru:dev commit in: games-roguelike/cataclysm-dda/ strategictraveler
-- strict thread matches above, loose matches on Subject: below --
2025-02-02 11:42 strategictraveler
2025-02-01 20:07 strategictraveler
2025-02-01 20:07 strategictraveler
2025-01-15 13:54 Takuya Wakazono
2025-01-14 11:58 strategictraveler
2025-01-03 17:49 strategictraveler
2024-12-24 19:27 strategictraveler
2024-12-24 10:10 strategictraveler
2024-12-22 13:57 Takuya Wakazono
2024-12-13 14:15 Takuya Wakazono
2024-12-11 13:23 Takuya Wakazono
2024-12-11 12:13 Takuya Wakazono
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox