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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id DBA931382C5 for ; Tue, 6 Apr 2021 18:18:41 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id F23B3E096E; Tue, 6 Apr 2021 18:18:40 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id C0A1FE096E for ; Tue, 6 Apr 2021 18:18:40 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 6797A335D95 for ; Tue, 6 Apr 2021 18:18:39 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 99536649 for ; Tue, 6 Apr 2021 18:18:36 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1617733094.c3a75de3af1310217f2b30a49a704bee9008cd85.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: games-arcade/cavezofphear/files/, games-arcade/cavezofphear/ X-VCS-Repository: repo/gentoo X-VCS-Files: games-arcade/cavezofphear/cavezofphear-0.5.1-r1.ebuild games-arcade/cavezofphear/cavezofphear-0.5.1.ebuild games-arcade/cavezofphear/files/cavezofphear-0.5.1-gentoo.patch X-VCS-Directories: games-arcade/cavezofphear/ games-arcade/cavezofphear/files/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: c3a75de3af1310217f2b30a49a704bee9008cd85 X-VCS-Branch: master Date: Tue, 6 Apr 2021 18:18:36 +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: 59f1ae3a-8f50-41c9-bb97-b84a56791162 X-Archives-Hash: 412f52f24096f43c650ebbad54aca496 commit: c3a75de3af1310217f2b30a49a704bee9008cd85 Author: Sam James gentoo org> AuthorDate: Tue Apr 6 02:07:43 2021 +0000 Commit: Sam James gentoo 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 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