gentoo resync : 19.07.2019

6 files changed, 33 insertions, 25 deletions

diff --git a/games-arcade/Manifest.gz b/games-arcade/Manifest.gz
index 6cead75b51f5..d656d95895c9 100644
--- a/games-arcade/Manifest.gz
+++ b/games-arcade/Manifest.gz
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.ebuild b/games-arcade/nibbles/nibbles-0.0.4-r1.ebuild
index fe523f359b3d..419c9d24ae6f 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"
 }
diff --git a/games-arcade/xboing/Manifest b/games-arcade/xboing/Manifest
index 993ec6a26b0d..adf227a3e85e 100644
--- a/games-arcade/xboing/Manifest
+++ b/games-arcade/xboing/Manifest
@@ -2,5 +2,5 @@ AUX xboing-2.4-buffer.patch 356 BLAKE2B 7a027064739bf3fe51f4ecad262c5461877186de
 AUX xboing-2.4-sleep.patch 397 BLAKE2B cb872777d74f62474c24e58c6cd84888620a761b55904763cb8d1d7efc5ce72596904798a526713129121bcb867b581292cb74c1e9f98c64d5c5b30b3d5e6423 SHA512 3d77c9ac4502c34e3a004b260e01a14f34115dfff7a73bcef0fcfe8e7bcc94cbb959e408d4c6ccc5329f1fb2b2b90500b5c8e51d4e8899a202754645e599f8c0
 DIST xboing-2.4-debian.patch.bz2 7740 BLAKE2B 284aedee90ca6bca940be405c10e5440d9df9237d6cc6f11c51204f3c1e2f383589a918997461c0399747d33e9f7142016323e101c4b48b1c3e35704cab20902 SHA512 bffd9b747b1e8840aef872988f9ef8b341a56e63d390e386a8ca71358318ba9c0b37bebd91b1f036b52c56e70acf98ec35f92f4c0fa1e19e2f8c4fcc83c1e7d9
 DIST xboing2.4.tar.gz 588811 BLAKE2B 1d29c457108c70608ec2c2ea7d4856553e3e174e7a8852f3da671c64e9e6a6349ee511841facc937bf6252cdd0e094ece7fe09e548835b7a288514aa7ece82d2 SHA512 4b6987329bfe79b3b9709ca02974d0043c6e35210aa73903940efbd09e94b1873ce09b1bea014646029b77e9bd063279935843adceb6635817f15c8025a0c454
-EBUILD xboing-2.4-r3.ebuild 1394 BLAKE2B a3027d506e00a68d4de1ef939fc9046b494c4e6a1fff60520422574ca8cdfc826c58711cd25023610fc1f91504f01c236fab3f3f9477635d5bf30830283382f7 SHA512 4150f4ad241b3504a7b3959189a7bd26f9d9b782cfa96202ee1ebcadef3757152c334078b819cc830ec5a662000bd0f2380a65d9d2e9a20c64d5f7dd95c25c3d
+EBUILD xboing-2.4-r3.ebuild 1368 BLAKE2B 64093b3ba968f7caa10a5d81dd6b233ba81aa8271d2d8f618bf63e79de28a9764221d908803dbc08de30da81f15bf4ce0f25702e6ca6db48a2b7a5ee9c2be96f SHA512 1d914efbb76454c230f8328083f9d351dfe866d19bd406d0ef59a4322b5baeb54d009735536bf20981bdb82301ac411c1e0d66cce0e378b0b8ecde590473b1ce
 MISC metadata.xml 214 BLAKE2B 86c649fbb74ec8627ccee25d0b0d3cbac3b6f9ba8e164327c15faf02abca8583969e3e2a35bb629643500d079e873cdb8093c5ed3d7bb5c4348269d485088ae2 SHA512 eb9f85ca2fca14bf2aae5fe6001c2d7d1cf93e00bd4de8dac2f71f23ad3c7a7c8fcd65593b1adf77a07260cc546339846f4b33ec99032e353da07d1b3bff8f08
diff --git a/games-arcade/xboing/xboing-2.4-r3.ebuild b/games-arcade/xboing/xboing-2.4-r3.ebuild
index 2d0088210afb..50f62a16acc8 100644
--- a/games-arcade/xboing/xboing-2.4-r3.ebuild
+++ b/games-arcade/xboing/xboing-2.4-r3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit eutils user
+inherit eutils
 
 DESCRIPTION="Blockout type game where you bounce a ball trying to destroy blocks"
 HOMEPAGE="http://www.techrescue.org/xboing/"
@@ -15,7 +15,8 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-RDEPEND="x11-libs/libXpm"
+RDEPEND="acct-group/gamestat
+	x11-libs/libXpm"
 DEPEND="${RDEPEND}
 	app-text/rman
 	x11-misc/gccmakedep
@@ -24,10 +25,6 @@ DEPEND="${RDEPEND}
 
 S=${WORKDIR}/${PN}
 
-pkg_setup(){
-	enewgroup gamestat 36
-}
-
 src_prepare() {
 	epatch "${WORKDIR}"/xboing-${PV}-debian.patch
 	epatch "${FILESDIR}"/xboing-${PV}-buffer.patch