From c3a75de3af1310217f2b30a49a704bee9008cd85 Mon Sep 17 00:00:00 2001
From: Sam James <sam@gentoo.org>
Date: Tue, 6 Apr 2021 03:07:43 +0100
Subject: games-arcade/cavezofphear: port to EAPI 7, games.eclass--, respect
 PKG_CONFIG

Signed-off-by: Sam James <sam@gentoo.org>
---
 .../cavezofphear/cavezofphear-0.5.1-r1.ebuild      | 44 ++++++++++++++++++++++
 .../cavezofphear/cavezofphear-0.5.1.ebuild         | 36 ------------------
 .../files/cavezofphear-0.5.1-gentoo.patch          | 12 +++---
 3 files changed, 49 insertions(+), 43 deletions(-)
 create mode 100644 games-arcade/cavezofphear/cavezofphear-0.5.1-r1.ebuild
 delete mode 100644 games-arcade/cavezofphear/cavezofphear-0.5.1.ebuild

diff --git a/games-arcade/cavezofphear/cavezofphear-0.5.1-r1.ebuild b/games-arcade/cavezofphear/cavezofphear-0.5.1-r1.ebuild
new file mode 100644
index 000000000000..714985d68031
--- /dev/null
+++ b/games-arcade/cavezofphear/cavezofphear-0.5.1-r1.ebuild
@@ -0,0 +1,44 @@
+# 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 ~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/cavezofphear-0.5.1.ebuild b/games-arcade/cavezofphear/cavezofphear-0.5.1.ebuild
deleted file mode 100644
index 1069f5a9ce3c..000000000000
--- a/games-arcade/cavezofphear/cavezofphear-0.5.1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils games
-
-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"
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-IUSE=""
-
-RDEPEND=">=sys-libs/ncurses-5:0"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-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} \
-		|| die
-}
-
-src_install() {
-	dogamesbin src/phear
-	insinto "${GAMES_DATADIR}"/${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 fbf79af44519..e3cb92c17a01 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
  
-- 
cgit v1.2.3-65-gdbad