[gentoo-commits] repo/gentoo:master commit in: games-arcade/cavezofphear/files/, games-arcade/cavezofphear/

[gentoo-commits] repo/gentoo:master commit in: games-arcade/cavezofphear/files/, games-arcade/cavezofphear/

[Sergei Trofimovich]

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)
+ {

[gentoo-commits] repo/gentoo:master commit in: games-arcade/cavezofphear/files/, games-arcade/cavezofphear/

[Sam James]

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