* [gentoo-commits] repo/gentoo:master commit in: games-arcade/cavezofphear/files/, games-arcade/cavezofphear/
@ 2020-10-18 14:06 Sergei Trofimovich
0 siblings, 0 replies; 4+ messages in thread
From: Sergei Trofimovich @ 2020-10-18 14:06 UTC (permalink / raw
To: gentoo-commits
commit: 5d8bf83756a2536d0b445f49066de3708fa93fee
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 18 14:05:50 2020 +0000
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Sun Oct 18 14:06:03 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5d8bf837
games-arcade/cavezofphear: tweak for -fno-common
Reported-by: Toralf Förster
Closes: https://bugs.gentoo.org/706880
Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>
.../cavezofphear/cavezofphear-0.5.1.ebuild | 3 ++-
.../files/cavezofphear-0.5.1-no-common.patch | 23 ++++++++++++++++++++++
2 files changed, 25 insertions(+), 1 deletion(-)
diff --git a/games-arcade/cavezofphear/cavezofphear-0.5.1.ebuild b/games-arcade/cavezofphear/cavezofphear-0.5.1.ebuild
index 459bd6d3f2a..1069f5a9ce3 100644
--- a/games-arcade/cavezofphear/cavezofphear-0.5.1.ebuild
+++ b/games-arcade/cavezofphear/cavezofphear-0.5.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -20,6 +20,7 @@ S=${WORKDIR}/${P/cavezof/}
src_prepare() {
epatch "${FILESDIR}"/${P}-gentoo.patch
+ epatch "${FILESDIR}"/${P}-no-common.patch
sed -i \
-e "s:get_data_dir(.):\"${GAMES_DATADIR}/${PN}/\":" \
src/{chk.c,main.c,gplot.c} \
diff --git a/games-arcade/cavezofphear/files/cavezofphear-0.5.1-no-common.patch b/games-arcade/cavezofphear/files/cavezofphear-0.5.1-no-common.patch
new file mode 100644
index 00000000000..4cc9bb5be02
--- /dev/null
+++ b/games-arcade/cavezofphear/files/cavezofphear-0.5.1-no-common.patch
@@ -0,0 +1,23 @@
+https://bugs.gentoo.org/706880
+--- a/src/editor.c
++++ b/src/editor.c
+@@ -24,7 +24,7 @@
+ #include "common.h"
+ #include "proto.h"
+
+-char map[MAP_YSIZE][MAP_XSIZE];
++extern char map[MAP_YSIZE][MAP_XSIZE];
+ int lock;
+ int last_obj;
+
+--- a/src/frame.c
++++ b/src/frame.c
+@@ -26,7 +26,7 @@ void bail(char *message);
+ void sigint_handler();
+ void sigwinch_handler();
+
+-int need_refresh;
++extern int need_refresh;
+
+ void curses_start(void)
+ {
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-arcade/cavezofphear/files/, games-arcade/cavezofphear/
@ 2021-04-06 18:18 Sam James
0 siblings, 0 replies; 4+ messages in thread
From: Sam James @ 2021-04-06 18:18 UTC (permalink / raw
To: gentoo-commits
commit: c3a75de3af1310217f2b30a49a704bee9008cd85
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 6 02:07:43 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Apr 6 18:18:14 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c3a75de3
games-arcade/cavezofphear: port to EAPI 7, games.eclass--, respect PKG_CONFIG
Signed-off-by: Sam James <sam <AT> gentoo.org>
...r-0.5.1.ebuild => cavezofphear-0.5.1-r1.ebuild} | 36 +++++++++++++---------
.../files/cavezofphear-0.5.1-gentoo.patch | 12 +++-----
2 files changed, 27 insertions(+), 21 deletions(-)
diff --git a/games-arcade/cavezofphear/cavezofphear-0.5.1.ebuild b/games-arcade/cavezofphear/cavezofphear-0.5.1-r1.ebuild
similarity index 50%
rename from games-arcade/cavezofphear/cavezofphear-0.5.1.ebuild
rename to games-arcade/cavezofphear/cavezofphear-0.5.1-r1.ebuild
index 1069f5a9ce3..714985d6803 100644
--- a/games-arcade/cavezofphear/cavezofphear-0.5.1.ebuild
+++ b/games-arcade/cavezofphear/cavezofphear-0.5.1-r1.ebuild
@@ -1,36 +1,44 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
-inherit eutils games
+EAPI=7
+
+inherit toolchain-funcs
DESCRIPTION="A boulder dash / digger-like game for console using ncurses"
HOMEPAGE="http://www.x86.no/cavezofphear/"
SRC_URI="mirror://gentoo/phear-${PV}.tar.bz2"
+S="${WORKDIR}"/${P/cavezof/}
+
LICENSE="GPL-3"
SLOT="0"
KEYWORDS="~amd64 ~ppc64 ~x86"
-IUSE=""
-RDEPEND=">=sys-libs/ncurses-5:0"
-DEPEND="${RDEPEND}
- virtual/pkgconfig"
+RDEPEND=">=sys-libs/ncurses-5:0="
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
-S=${WORKDIR}/${P/cavezof/}
+PATCHES=(
+ "${FILESDIR}"/${P}-gentoo.patch
+ "${FILESDIR}"/${P}-no-common.patch
+)
src_prepare() {
- epatch "${FILESDIR}"/${P}-gentoo.patch
- epatch "${FILESDIR}"/${P}-no-common.patch
+ default
+
sed -i \
- -e "s:get_data_dir(.):\"${GAMES_DATADIR}/${PN}/\":" \
+ -e "s:get_data_dir(.):\"/usr/share/${PN}/\":" \
src/{chk.c,main.c,gplot.c} \
|| die
}
+src_configure() {
+ tc-export CC PKG_CONFIG
+}
+
src_install() {
- dogamesbin src/phear
- insinto "${GAMES_DATADIR}"/${PN}
+ dobin src/phear
+ insinto /usr/share/${PN}
doins -r data/*
dodoc ChangeLog README* TODO
- prepgamesdirs
}
diff --git a/games-arcade/cavezofphear/files/cavezofphear-0.5.1-gentoo.patch b/games-arcade/cavezofphear/files/cavezofphear-0.5.1-gentoo.patch
index fbf79af4451..e3cb92c17a0 100644
--- a/games-arcade/cavezofphear/files/cavezofphear-0.5.1-gentoo.patch
+++ b/games-arcade/cavezofphear/files/cavezofphear-0.5.1-gentoo.patch
@@ -1,6 +1,5 @@
-diff -ru phear-0.5.1.orig/Makefile phear-0.5.1/Makefile
---- phear-0.5.1.orig/Makefile 2007-02-27 06:21:55.000000000 -0500
-+++ phear-0.5.1/Makefile 2013-01-18 02:09:56.403224104 -0500
+--- a/Makefile
++++ b/Makefile
@@ -2,7 +2,7 @@
DESTDIR_DATA = /usr/local/share
@@ -10,9 +9,8 @@ diff -ru phear-0.5.1.orig/Makefile phear-0.5.1/Makefile
clean:
rm -f phear editor
install:
-diff -ru phear-0.5.1.orig/src/Makefile phear-0.5.1/src/Makefile
---- phear-0.5.1.orig/src/Makefile 2011-12-12 07:26:03.000000000 -0500
-+++ phear-0.5.1/src/Makefile 2013-01-18 02:10:48.218423433 -0500
+--- a/src/Makefile
++++ b/src/Makefile
@@ -2,10 +2,8 @@
DESTDIR = ..
@@ -21,7 +19,7 @@ diff -ru phear-0.5.1.orig/src/Makefile phear-0.5.1/src/Makefile
INSTALL = install
-CFLAGS ?= -s -Wall -O2
-LDFLAGS += -lncurses
-+LDLIBS = `pkg-config ncurses --libs`
++LDLIBS = `${PKG_CONFIG} ncurses --libs`
all: phear install clean
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-arcade/cavezofphear/files/, games-arcade/cavezofphear/
@ 2025-10-03 0:41 Sam James
0 siblings, 0 replies; 4+ messages in thread
From: Sam James @ 2025-10-03 0:41 UTC (permalink / raw
To: gentoo-commits
commit: 7f759c4201619ce9dc4f45e4ef31bb3382280a53
Author: Alexey Sokolov <alexey+gentoo <AT> asokolov <DOT> org>
AuthorDate: Sun Sep 28 21:50:59 2025 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Oct 3 00:38:15 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7f759c42
games-arcade/cavezofphear: drop 0.5.1-r1
Signed-off-by: Alexey Sokolov <alexey+gentoo <AT> asokolov.org>
Part-of: https://github.com/gentoo/gentoo/pull/43979
Closes: https://github.com/gentoo/gentoo/pull/43979
Signed-off-by: Sam James <sam <AT> gentoo.org>
games-arcade/cavezofphear/Manifest | 1 -
.../cavezofphear/cavezofphear-0.5.1-r1.ebuild | 44 ----------------------
.../files/cavezofphear-0.5.1-gentoo.patch | 34 -----------------
.../files/cavezofphear-0.5.1-no-common.patch | 23 -----------
4 files changed, 102 deletions(-)
diff --git a/games-arcade/cavezofphear/Manifest b/games-arcade/cavezofphear/Manifest
index e2a8edcfe1fb..6de7991532b2 100644
--- a/games-arcade/cavezofphear/Manifest
+++ b/games-arcade/cavezofphear/Manifest
@@ -1,2 +1 @@
DIST cavezofphear-0.6.1.tar.gz 46968 BLAKE2B 7391c55fdbb90f6f4756b58281058b9adbf72730d002f89fe033d8440eb006f62f9a065efc71945e70c3ce1c0ab8f42c9873646f3b880ce5c5e0970d9bf86c65 SHA512 a97c37d8fc68b8028cc1cb5bbc0db0b98a042b375ac7ecc126cf87845e8423a07015b4b706ccec10de8e177b1cc6984c7c809b56507a1784c23a1a0fe135bc5e
-DIST phear-0.5.1.tar.bz2 25750 BLAKE2B 0b2c4a6f51fadd48a1e01dd5ac2072984368b3314fd3df01d4ad8adfdc0d031d443ac5f950651d4fff4ff5019b61868532eff0ed3d31bd6b2ba0f97893391d6a SHA512 23326a63acc06e77a1dd3505345940f8ef31b671282e00f623b181fe1cdbdf1b7e4b37a6e91ea430348a02239ed1450736dc075ea3af3eee0e8acb115aa89f3b
diff --git a/games-arcade/cavezofphear/cavezofphear-0.5.1-r1.ebuild b/games-arcade/cavezofphear/cavezofphear-0.5.1-r1.ebuild
deleted file mode 100644
index d9356a2052b6..000000000000
--- a/games-arcade/cavezofphear/cavezofphear-0.5.1-r1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="A boulder dash / digger-like game for console using ncurses"
-HOMEPAGE="http://www.x86.no/cavezofphear/"
-SRC_URI="mirror://gentoo/phear-${PV}.tar.bz2"
-S="${WORKDIR}"/${P/cavezof/}
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-
-RDEPEND=">=sys-libs/ncurses-5:0="
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
- "${FILESDIR}"/${P}-gentoo.patch
- "${FILESDIR}"/${P}-no-common.patch
-)
-
-src_prepare() {
- default
-
- sed -i \
- -e "s:get_data_dir(.):\"/usr/share/${PN}/\":" \
- src/{chk.c,main.c,gplot.c} \
- || die
-}
-
-src_configure() {
- tc-export CC PKG_CONFIG
-}
-
-src_install() {
- dobin src/phear
- insinto /usr/share/${PN}
- doins -r data/*
- dodoc ChangeLog README* TODO
-}
diff --git a/games-arcade/cavezofphear/files/cavezofphear-0.5.1-gentoo.patch b/games-arcade/cavezofphear/files/cavezofphear-0.5.1-gentoo.patch
deleted file mode 100644
index e3cb92c17a01..000000000000
--- a/games-arcade/cavezofphear/files/cavezofphear-0.5.1-gentoo.patch
+++ /dev/null
@@ -1,34 +0,0 @@
---- a/Makefile
-+++ b/Makefile
-@@ -2,7 +2,7 @@
- DESTDIR_DATA = /usr/local/share
-
- make:
-- cd src && make
-+ $(MAKE) -C src phear
- clean:
- rm -f phear editor
- install:
---- a/src/Makefile
-+++ b/src/Makefile
-@@ -2,10 +2,8 @@
-
- DESTDIR = ..
-
--CC = gcc
- INSTALL = install
--CFLAGS ?= -s -Wall -O2
--LDFLAGS += -lncurses
-+LDLIBS = `${PKG_CONFIG} ncurses --libs`
-
- all: phear install clean
-
-@@ -13,7 +11,7 @@
- $(CC) $(CFLAGS) -c $^ -o $@
-
- phear: $(OBJS)
-- $(CC) $(CFLAGS) -o $@ $^ ${LDFLAGS}
-+ $(CC) $(CFLAGS) -o $@ $^ ${LDFLAGS} $(LDLIBS)
-
- install: install-game
-
diff --git a/games-arcade/cavezofphear/files/cavezofphear-0.5.1-no-common.patch b/games-arcade/cavezofphear/files/cavezofphear-0.5.1-no-common.patch
deleted file mode 100644
index 4cc9bb5be02c..000000000000
--- a/games-arcade/cavezofphear/files/cavezofphear-0.5.1-no-common.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-https://bugs.gentoo.org/706880
---- a/src/editor.c
-+++ b/src/editor.c
-@@ -24,7 +24,7 @@
- #include "common.h"
- #include "proto.h"
-
--char map[MAP_YSIZE][MAP_XSIZE];
-+extern char map[MAP_YSIZE][MAP_XSIZE];
- int lock;
- int last_obj;
-
---- a/src/frame.c
-+++ b/src/frame.c
-@@ -26,7 +26,7 @@ void bail(char *message);
- void sigint_handler();
- void sigwinch_handler();
-
--int need_refresh;
-+extern int need_refresh;
-
- void curses_start(void)
- {
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-arcade/cavezofphear/files/, games-arcade/cavezofphear/
@ 2025-10-03 0:41 Sam James
0 siblings, 0 replies; 4+ messages in thread
From: Sam James @ 2025-10-03 0:41 UTC (permalink / raw
To: gentoo-commits
commit: 676c44ddd36d18c33ab97b6dcf8bb77777e6704e
Author: Alexey Sokolov <alexey+gentoo <AT> asokolov <DOT> org>
AuthorDate: Sun Sep 28 21:48:26 2025 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Oct 3 00:38:15 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=676c44dd
games-arcade/cavezofphear: add 0.6.1
Closes: https://bugs.gentoo.org/943818
Signed-off-by: Alexey Sokolov <alexey+gentoo <AT> asokolov.org>
Part-of: https://github.com/gentoo/gentoo/pull/43979
Signed-off-by: Sam James <sam <AT> gentoo.org>
games-arcade/cavezofphear/Manifest | 1 +
.../cavezofphear/cavezofphear-0.6.1.ebuild | 30 ++++++++++++++++++++
.../files/cavezofphear-0.6.1-gcc15.patch | 32 ++++++++++++++++++++++
games-arcade/cavezofphear/metadata.xml | 11 +++++---
4 files changed, 70 insertions(+), 4 deletions(-)
diff --git a/games-arcade/cavezofphear/Manifest b/games-arcade/cavezofphear/Manifest
index b83142b399c9..e2a8edcfe1fb 100644
--- a/games-arcade/cavezofphear/Manifest
+++ b/games-arcade/cavezofphear/Manifest
@@ -1 +1,2 @@
+DIST cavezofphear-0.6.1.tar.gz 46968 BLAKE2B 7391c55fdbb90f6f4756b58281058b9adbf72730d002f89fe033d8440eb006f62f9a065efc71945e70c3ce1c0ab8f42c9873646f3b880ce5c5e0970d9bf86c65 SHA512 a97c37d8fc68b8028cc1cb5bbc0db0b98a042b375ac7ecc126cf87845e8423a07015b4b706ccec10de8e177b1cc6984c7c809b56507a1784c23a1a0fe135bc5e
DIST phear-0.5.1.tar.bz2 25750 BLAKE2B 0b2c4a6f51fadd48a1e01dd5ac2072984368b3314fd3df01d4ad8adfdc0d031d443ac5f950651d4fff4ff5019b61868532eff0ed3d31bd6b2ba0f97893391d6a SHA512 23326a63acc06e77a1dd3505345940f8ef31b671282e00f623b181fe1cdbdf1b7e4b37a6e91ea430348a02239ed1450736dc075ea3af3eee0e8acb115aa89f3b
diff --git a/games-arcade/cavezofphear/cavezofphear-0.6.1.ebuild b/games-arcade/cavezofphear/cavezofphear-0.6.1.ebuild
new file mode 100644
index 000000000000..1958a4635008
--- /dev/null
+++ b/games-arcade/cavezofphear/cavezofphear-0.6.1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="A boulder dash / digger-like game for console using ncurses"
+HOMEPAGE="https://github.com/AMDmi3/cavezofphear"
+SRC_URI="https://github.com/AMDmi3/cavezofphear/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+
+RDEPEND=">=sys-libs/ncurses-5:0="
+DEPEND="${RDEPEND}"
+BDEPEND="sys-apps/help2man"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-gcc15.patch
+)
+
+src_configure() {
+ local mycmakeargs=(
+ -DSYSTEMWIDE=yes
+ )
+
+ cmake_src_configure
+}
diff --git a/games-arcade/cavezofphear/files/cavezofphear-0.6.1-gcc15.patch b/games-arcade/cavezofphear/files/cavezofphear-0.6.1-gcc15.patch
new file mode 100644
index 000000000000..bd532e90c00d
--- /dev/null
+++ b/games-arcade/cavezofphear/files/cavezofphear-0.6.1-gcc15.patch
@@ -0,0 +1,32 @@
+https://bugs.gentoo.org/943818
+https://github.com/AMDmi3/cavezofphear/pull/2
+
+--- a/src/frame.c
++++ b/src/frame.c
+@@ -60,12 +60,12 @@ void bail(const char* message) {
+ exit(EXIT_FAILURE);
+ }
+
+-void sigint_handler() {
++void sigint_handler(int arg) {
+ curses_stop();
+ bail("got SIGINT, cleaning up");
+ }
+
+-void sigwinch_handler() {
++void sigwinch_handler(int arg) {
+ /*
+ curses_stop();
+ bail("got SIGWINCH, cleaning up");
+--- a/src/frame.h
++++ b/src/frame.h
+@@ -21,7 +21,7 @@
+ void curses_start(void);
+ void curses_stop(void);
+ void bail(const char* message);
+-void sigint_handler();
+-void sigwinch_handler();
++void sigint_handler(int arg);
++void sigwinch_handler(int arg);
+
+ #endif
diff --git a/games-arcade/cavezofphear/metadata.xml b/games-arcade/cavezofphear/metadata.xml
index 1c3ba213c494..a4718709c871 100644
--- a/games-arcade/cavezofphear/metadata.xml
+++ b/games-arcade/cavezofphear/metadata.xml
@@ -1,8 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer type="project">
- <email>games@gentoo.org</email>
- <name>Gentoo Games Project</name>
-</maintainer>
+ <maintainer type="project">
+ <email>games@gentoo.org</email>
+ <name>Gentoo Games Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">AMDmi3/cavezofphear</remote-id>
+ </upstream>
</pkgmetadata>
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2025-10-03 1:09 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-10-03 0:41 [gentoo-commits] repo/gentoo:master commit in: games-arcade/cavezofphear/files/, games-arcade/cavezofphear/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2025-10-03 0:41 Sam James
2021-04-06 18:18 Sam James
2020-10-18 14:06 Sergei Trofimovich
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox