From 121ed4eec41fbf03e1998d09eede1bf449da63b9 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Fri, 19 Jul 2019 22:05:27 +0100
Subject: gentoo resync : 19.07.2019

---
 games-arcade/nibbles/Manifest                      |  4 +-
 .../nibbles/files/nibbles-0.0.4-as-needed.patch    |  6 +--
 games-arcade/nibbles/nibbles-0.0.4-r1.ebuild       | 59 ++++++++++++++++++++++
 games-arcade/nibbles/nibbles-0.0.4.ebuild          | 48 ------------------
 4 files changed, 64 insertions(+), 53 deletions(-)
 create mode 100644 games-arcade/nibbles/nibbles-0.0.4-r1.ebuild
 delete mode 100644 games-arcade/nibbles/nibbles-0.0.4.ebuild

(limited to 'games-arcade/nibbles')

diff --git a/games-arcade/nibbles/Manifest b/games-arcade/nibbles/Manifest
index e2b4724f2cf1..686cdb7404ea 100644
--- a/games-arcade/nibbles/Manifest
+++ b/games-arcade/nibbles/Manifest
@@ -1,4 +1,4 @@
-AUX nibbles-0.0.4-as-needed.patch 503 BLAKE2B 3d026b46844c1555a7df9516846b8ba2ea048a3a06ba017f9461930254fdcf7480abffedf8b94da095cb8fd50bda8f73756f06b26d10b41564de9eada7745254 SHA512 3cda4a99fe731cc5c860ec914f78cbcf3dbe6438e9d8d973037b252652a8fe257227809fef64829e07bf49e6cfeda5557575b22c602cc0f0c39882354f1b3181
+AUX nibbles-0.0.4-as-needed.patch 458 BLAKE2B 665d1d6ec0bf57b10c23d7e4a027aac113cebd3ef72fc4b976f1d15250556335f9ab4796e7dc5b639eea85e93f0e61eee1ba185fe40c45de7d18535331716c8d SHA512 9b875d674a9ae6c7fb7d1f8fe99b243d34ed3ad096cbf2ffdef8522512cee4dd3915c138941d8d898b319759cd5a62086b9984ba32230bee7b6b3c9d32d0dae4
 DIST nibbles-v0.0.4.tar.gz 18610 BLAKE2B 264331c2ef612d1421c370df601da3d8bd5b04c34f7a41e8a8b78480a308d9e8b24177db3666785603efefabd873af04b24bf31d1b320e3fac7698b1b98e2ee0 SHA512 a10af4f20af371c2a8ab4cf69c4a73120670815467177d3bc2a05aa198e9edf80cc1d47edf40d06059baf6e51cf7018ed4830a3a5bda6a35868548403f5f414b
-EBUILD nibbles-0.0.4.ebuild 1029 BLAKE2B 374f3849f7fe6a69170f794ef83cfec94fe5ccf49be744dfe6d898ae63689413b4327a3260d47d50458fb2bfe0b71c07a9884ae3893dcc0c279d9cccf0c1eb20 SHA512 dc88a354455ddc2bb79737ef07f482252f032bce8af3443790418eb858973e195992b30fadd215b68f916930ab120da80156eccb29f8f766670d01e758e6aaf0
+EBUILD nibbles-0.0.4-r1.ebuild 1180 BLAKE2B 4e4a99a38b794987eafa277b0be520bb840c7416fd00dc8c0a488e5217dc3481605bb9c91b24969f637099ca4f2178f2548e2817750bd7897ebc8068dfeab897 SHA512 8b1d085860c5b3fdbac9b299bf4fa564d42f5db88b83f5766865a475ca7c1748e5743ca89d92aac80a53bf15a918edf62cf85611b09c2f743e9d14a924cbe4df
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
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 7e27d1fb9cac..0f1a587a41db 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-r1.ebuild b/games-arcade/nibbles/nibbles-0.0.4-r1.ebuild
new file mode 100644
index 000000000000..419c9d24ae6f
--- /dev/null
+++ b/games-arcade/nibbles/nibbles-0.0.4-r1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86 ~x86-fbsd ~x86-linux ~ppc-macos"
+IUSE=""
+
+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}"
+
+src_prepare() {
+	default
+
+	sed -i \
+		-e "s#/usr/local/games/nibbles.levels#${GAMES_DATADIR}/${PN}#" \
+		nibbles.h || die
+
+	sed -i \
+		-e "s#/var/lib/games/nibbles.score#${GAMES_STATEDIR}/nibbles.scores#" \
+		scoring.h || die
+}
+
+src_compile() {
+	PKGCONFIG="$(tc-getPKG_CONFIG)" emake
+}
+
+src_install() {
+	dobin nibbles
+
+	insinto "${GAMES_DATADIR}/${PN}"
+	doins nibbles.levels/*
+
+	dodir "${GAMES_STATEDIR}"
+	touch "${ED}${GAMES_STATEDIR}/nibbles.scores"
+
+	dodoc HISTORY CREDITS TODO README
+
+	fperms 664 "${GAMES_STATEDIR}/nibbles.scores"
+}
diff --git a/games-arcade/nibbles/nibbles-0.0.4.ebuild b/games-arcade/nibbles/nibbles-0.0.4.ebuild
deleted file mode 100644
index fe523f359b3d..000000000000
--- a/games-arcade/nibbles/nibbles-0.0.4.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils games
-
-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"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86 ~x86-fbsd ~x86-linux ~ppc-macos"
-IUSE=""
-
-DEPEND="sys-libs/ncurses:0"
-RDEPEND=${DEPEND}
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	sed -i \
-		-e "s#/usr/local/games/nibbles.levels#${GAMES_DATADIR}/${PN}#" \
-		nibbles.h || die
-
-	sed -i \
-		-e "s#/var/lib/games/nibbles.score#${GAMES_STATEDIR}/nibbles.scores#" \
-		scoring.h || die
-
-	epatch "${FILESDIR}"/${P}-as-needed.patch
-}
-
-src_install() {
-	dogamesbin nibbles
-
-	insinto "${GAMES_DATADIR}/${PN}"
-	doins nibbles.levels/*
-
-	dodir "${GAMES_STATEDIR}"
-	touch "${D}${GAMES_STATEDIR}/nibbles.scores"
-
-	dodoc HISTORY CREDITS TODO README
-
-	prepgamesdirs
-
-	fperms 664 "${GAMES_STATEDIR}/nibbles.scores"
-}
-- 
cgit v1.2.3