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 B15FA138334 for ; Thu, 18 Jul 2019 14:46:38 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 02D91E0823; Thu, 18 Jul 2019 14:46:38 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 C92B1E0823 for ; Thu, 18 Jul 2019 14:46:37 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 CBC7B347E63 for ; Thu, 18 Jul 2019 14:46:35 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 4823E6DF for ; Thu, 18 Jul 2019 14:46:34 +0000 (UTC) From: "Lars Wendler" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Lars Wendler" Message-ID: <1563461187.8d2041da5a9efea1e9b2a4e9d741cb8d30082df6.polynomial-c@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: games-arcade/nibbles/files/, games-arcade/nibbles/ X-VCS-Repository: repo/gentoo X-VCS-Files: games-arcade/nibbles/files/nibbles-0.0.4-as-needed.patch games-arcade/nibbles/nibbles-0.0.4-r1.ebuild games-arcade/nibbles/nibbles-0.0.4.ebuild X-VCS-Directories: games-arcade/nibbles/files/ games-arcade/nibbles/ X-VCS-Committer: polynomial-c X-VCS-Committer-Name: Lars Wendler X-VCS-Revision: 8d2041da5a9efea1e9b2a4e9d741cb8d30082df6 X-VCS-Branch: master Date: Thu, 18 Jul 2019 14:46:34 +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: 02009e37-2857-4796-9913-85f0c6380432 X-Archives-Hash: 2ef306dd64ad8d778fefad48ed1dec18 commit: 8d2041da5a9efea1e9b2a4e9d741cb8d30082df6 Author: Lars Wendler gentoo org> AuthorDate: Thu Jul 18 14:45:39 2019 +0000 Commit: Lars Wendler gentoo org> CommitDate: Thu Jul 18 14:46:27 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8d2041da games-arcade/nibbles: Fixed build with sys-libs/ncurses[tinfo] Closes: https://bugs.gentoo.org/690104 Package-Manager: Portage-2.3.69, Repoman-2.3.16 Signed-off-by: Lars Wendler gentoo.org> .../nibbles/files/nibbles-0.0.4-as-needed.patch | 6 ++-- ...ibbles-0.0.4.ebuild => nibbles-0.0.4-r1.ebuild} | 35 ++++++++++++++-------- 2 files changed, 26 insertions(+), 15 deletions(-) diff --git a/games-arcade/nibbles/files/nibbles-0.0.4-as-needed.patch b/games-arcade/nibbles/files/nibbles-0.0.4-as-needed.patch index 7e27d1fb9ca..0f1a587a41d 100644 --- a/games-arcade/nibbles/files/nibbles-0.0.4-as-needed.patch +++ b/games-arcade/nibbles/files/nibbles-0.0.4-as-needed.patch @@ -1,12 +1,12 @@ ---- Makefile.old 2009-02-02 12:40:36.000000000 +0100 -+++ Makefile 2009-02-02 12:41:22.000000000 +0100 +--- a/Makefile ++++ b/Makefile @@ -1,19 +1,14 @@ -CC = gcc -Wall -g - SRCS = player.c main.c loadMap.c cmdline.c ncdrawlib.c scoring.c OBJS = $(SRCS:.c=.o) -LIBS = -lncurses -+LDLIBS = -lncurses ++LDLIBS = $(shell $(PKGCONFIG) --libs ncurses) INSTALL=/usr/bin/install -c INSTALL_FOLDER=/usr/games diff --git a/games-arcade/nibbles/nibbles-0.0.4.ebuild b/games-arcade/nibbles/nibbles-0.0.4-r1.ebuild similarity index 63% rename from games-arcade/nibbles/nibbles-0.0.4.ebuild rename to games-arcade/nibbles/nibbles-0.0.4-r1.ebuild index fe523f359b3..419c9d24ae6 100644 --- a/games-arcade/nibbles/nibbles-0.0.4.ebuild +++ b/games-arcade/nibbles/nibbles-0.0.4-r1.ebuild @@ -1,10 +1,11 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 -inherit eutils games +EAPI=7 -MY_P=${PN}-v${PV} +inherit toolchain-funcs + +MY_P="${PN}-v${PV}" DESCRIPTION="An ncurses-based Nibbles clone" HOMEPAGE="http://www.earth.li/projectpurple/progs/nibbles.html" SRC_URI="http://www.earth.li/projectpurple/files/${MY_P}.tar.gz" @@ -14,12 +15,22 @@ SLOT="0" KEYWORDS="~amd64 ~ppc64 ~x86 ~x86-fbsd ~x86-linux ~ppc-macos" IUSE="" -DEPEND="sys-libs/ncurses:0" -RDEPEND=${DEPEND} +DEPEND="sys-libs/ncurses:0=" +RDEPEND="${DEPEND}" +BDEPEND="virtual/pkgconfig" + +GAMES_DATADIR="/usr/share" +GAMES_STATEDIR="/var/games/${PN}" + +PATCHES=( + "${FILESDIR}"/${P}-as-needed.patch +) -S=${WORKDIR}/${MY_P} +S="${WORKDIR}/${MY_P}" src_prepare() { + default + sed -i \ -e "s#/usr/local/games/nibbles.levels#${GAMES_DATADIR}/${PN}#" \ nibbles.h || die @@ -27,22 +38,22 @@ src_prepare() { sed -i \ -e "s#/var/lib/games/nibbles.score#${GAMES_STATEDIR}/nibbles.scores#" \ scoring.h || die +} - epatch "${FILESDIR}"/${P}-as-needed.patch +src_compile() { + PKGCONFIG="$(tc-getPKG_CONFIG)" emake } src_install() { - dogamesbin nibbles + dobin nibbles insinto "${GAMES_DATADIR}/${PN}" doins nibbles.levels/* dodir "${GAMES_STATEDIR}" - touch "${D}${GAMES_STATEDIR}/nibbles.scores" + touch "${ED}${GAMES_STATEDIR}/nibbles.scores" dodoc HISTORY CREDITS TODO README - prepgamesdirs - fperms 664 "${GAMES_STATEDIR}/nibbles.scores" }