gentoo resync : 28.04.2021

3 files changed, 64 insertions, 24 deletions

diff --git a/games-action/wordwarvi/Manifest b/games-action/wordwarvi/Manifest
index cf9c26889563..edeb15964179 100644
--- a/games-action/wordwarvi/Manifest
+++ b/games-action/wordwarvi/Manifest
@@ -1,4 +1,4 @@
-AUX wordwarvi-1.00-sound.patch 2869 BLAKE2B e7319854f5b4bf8adfe2a121d64a928467012959f4cfe869dfc1196424219445abeddd9ed21d8367a3818fa4e04b4d8757c4d6a44d3d23b74ca9d2f420e3c5bc SHA512 df90b18dedb7280e3789c276411e3d11c7b5096906d53ba3f16cbc297f939116a030898d00c87f8e8b5d3dcf08910ab249f62d7b99feeb881960f8742a4c1878
+AUX wordwarvi-1.00-sound.patch 3734 BLAKE2B f491ec5e2f1f1e3edbb5cf33e5a15bc376d9fd97d2922bd9d2747f72c2dad3a100b7c5e3d2a1c85c112a7266d7d382d53d7d8275de20c6b524f2ca3f739f426a SHA512 4044720f6b36149c7385c6a5fdd98f0496a766dbe08cdb706c47562a0c8b1082abda98007c89308c2d66402b614cfc26f46397590bdb7210580e2f36e276cb88
 DIST wordwarvi-1.00.tar.gz 8828099 BLAKE2B 769b0e86ba6ac1956862e7375141f31fde20e99710a0719a57062334cfd24064c89b2b50c477ff9272efa2471ed4c768add2148c00cc6f91619b46eef54d23ad SHA512 e8f8609300fa2f9bd2ff763fee11699c5f30e96ccb3a5d531456134e983148227bb12fb6421b4ad00bcac46cddcdb5a036d416b8e55aedf037d1c3f0b5e04fa9
-EBUILD wordwarvi-1.00-r1.ebuild 1241 BLAKE2B dfe61bb10dbdb273e1cfe51585a7e3b7fe6c1d79ddab8ead50459ad80a81a4d235bfbae8a04268adc5aaef9b8e1c18245b47c20cd5406aab8c2598f75fb902d2 SHA512 d14ff38f4b939754d3f241b4dd4dd2f756e9302bb658a5c83d91816726dd008ac310d5bfce3038bac9e0d373ef382e632d6eee81cbfd6b194a0f2247fb5900c1
+EBUILD wordwarvi-1.00-r1.ebuild 1296 BLAKE2B 288dd505c2994add16023b1e1a68b5dcfc2815eba4ebe3714f01ede8985d80656cc1fb15032a24d7e357312baba5eadae83f565e9faea22342d07fc960614c77 SHA512 38bb91a18c1a82eca3a1d198fb7a3398ff508ffb7efa98195a80d08203334ee307b6178c6bc029acdf5fdd1d5e01afe976ac07b408eed973dd81bfe3813f376c
 MISC metadata.xml 332 BLAKE2B cef889355232bef91e44638d32fbfd52f95b5d5e79b288f87146f7668f1248734bacb97fffb3076b215ced5981a7bd2d14982b8bc9c02d1b237b5605f77b5c92 SHA512 50b4b9f74a0629d49db7c041b965ae31b425803b667be69e5304ce8df2e49dca66d923f44df209ca02299ac088728d059724ff1ea325a2bb249a49a520037efe
diff --git a/games-action/wordwarvi/files/wordwarvi-1.00-sound.patch b/games-action/wordwarvi/files/wordwarvi-1.00-sound.patch
index 5ad7bc8440b9..1f0fdb255d33 100644
--- a/games-action/wordwarvi/files/wordwarvi-1.00-sound.patch
+++ b/games-action/wordwarvi/files/wordwarvi-1.00-sound.patch
@@ -1,6 +1,7 @@
-diff -ru wordwarvi-1.00.orig/Makefile wordwarvi-1.00/Makefile
---- wordwarvi-1.00.orig/Makefile	2011-06-09 00:06:22.000000000 -0400
-+++ wordwarvi-1.00/Makefile	2011-06-11 19:57:55.609619777 -0400
+diff --git a/Makefile b/Makefile
+index faf7e8f..2c06010 100644
+--- a/Makefile
++++ b/Makefile
 @@ -1,5 +1,5 @@
  PREFIX=/usr
 -DATADIR=${PREFIX}/share/wordwarvi
@@ -8,7 +9,18 @@ diff -ru wordwarvi-1.00.orig/Makefile wordwarvi-1.00/Makefile
  MANDIR?=${PREFIX}/share/man
  MANPAGEDIR=${MANDIR}/man6
  
-@@ -24,18 +24,6 @@
+@@ -12,8 +12,8 @@ WITHAUDIO=yes
+ # WITHAUDIO=no
+ 
+ ifeq (${WITHAUDIO},yes)
+-SNDLIBS=`pkg-config --libs portaudio-2.0 vorbisfile`
+-SNDFLAGS=-DWITHAUDIOSUPPORT `pkg-config --cflags portaudio-2.0`
++SNDLIBS=`${PKG_CONFIG} --libs portaudio-2.0 vorbisfile`
++SNDFLAGS=-DWITHAUDIOSUPPORT `${PKG_CONFIG} --cflags portaudio-2.0`
+ OGGOBJ=ogg_to_pcm.o
+ else
+ SNDLIBS=
+@@ -24,53 +24,41 @@ endif
  CC ?= gcc
  BUILD_CC ?= gcc
  
@@ -27,7 +39,19 @@ diff -ru wordwarvi-1.00.orig/Makefile wordwarvi-1.00/Makefile
  DEFINES=${SNDFLAGS} -DDATADIR=\"${DATADIR}/\"
  
  all:	wordwarvi wordwarvi.6.gz
-@@ -53,24 +41,24 @@
+ 
+ HAS_PORTAUDIO_2_0:
+ ifeq (${WITHAUDIO},yes)
+-	pkg-config --print-errors --exists portaudio-2.0
++	${PKG_CONFIG} --print-errors --exists portaudio-2.0
+ else
+ endif
+ 
+ HAS_VORBISFILE:
+ ifeq (${WITHAUDIO},yes)
+-	pkg-config --print-errors --exists vorbisfile
++	${PKG_CONFIG} --print-errors --exists vorbisfile
+ else
  endif
  
  joystick.o:	joystick.c joystick.h Makefile
@@ -36,19 +60,20 @@ diff -ru wordwarvi-1.00.orig/Makefile wordwarvi-1.00/Makefile
  
  ogg_to_pcm.o:	ogg_to_pcm.c ogg_to_pcm.h Makefile
 -	$(CC) ${DEBUG} ${PROFILE_FLAG} ${OPTIMIZE_FLAG} `pkg-config --cflags vorbisfile` \
-+	$(CC) ${DEBUG} ${PROFILE_FLAG} ${CFLAGS} `pkg-config --cflags vorbisfile` \
++	$(CC) ${DEBUG} ${PROFILE_FLAG} ${CFLAGS} `${PKG_CONFIG} --cflags vorbisfile` \
  		-pthread -Wall -c ogg_to_pcm.c
  
  wwviaudio.o:	wwviaudio.c wwviaudio.h ogg_to_pcm.h my_point.h Makefile
 -	$(CC) -Wall ${DEBUG} ${PROFILE_FLAG} ${OPTIMIZE_FLAG} \
 +	$(CC) -Wall ${DEBUG} ${PROFILE_FLAG} ${CFLAGS} \
  		${DEFINES} \
- 		-pthread `pkg-config --cflags vorbisfile` \
+-		-pthread `pkg-config --cflags vorbisfile` \
++		-pthread `${PKG_CONFIG} --cflags vorbisfile` \
  		-c wwviaudio.c
  
  rumble.o:	rumble.c rumble.h Makefile
 -	$(CC) ${DEBUG} ${PROFILE_FLAG} ${OPTIMIZE_FLAG} `pkg-config --cflags vorbisfile` \
-+	$(CC) ${DEBUG} ${PROFILE_FLAG} ${CFLAGS} `pkg-config --cflags vorbisfile` \
++	$(CC) ${DEBUG} ${PROFILE_FLAG} ${CFLAGS} `${PKG_CONFIG} --cflags vorbisfile` \
  		-pthread -Wall -c rumble.c
  
  wwvi_font.o:	wwvi_font.c wwvi_font.h my_point.h Makefile
@@ -57,7 +82,7 @@ diff -ru wordwarvi-1.00.orig/Makefile wordwarvi-1.00/Makefile
  
  stamp:	stamp.c
  	$(BUILD_CC) -o stamp stamp.c
-@@ -78,7 +66,7 @@
+@@ -78,14 +66,14 @@ stamp:	stamp.c
  wordwarvi:	wordwarvi.c joystick.o rumble.o ${OGGOBJ} wwviaudio.o wwvi_font.o \
  		Makefile version.h stamp levels.h rumble.h
  	./stamp > stamp.h
@@ -66,10 +91,19 @@ diff -ru wordwarvi-1.00.orig/Makefile wordwarvi-1.00/Makefile
  		joystick.o \
  		rumble.o \
  		wwvi_font.o \
-diff -ru wordwarvi-1.00.orig/wwviaudio.c wordwarvi-1.00/wwviaudio.c
---- wordwarvi-1.00.orig/wwviaudio.c	2011-06-09 00:06:22.000000000 -0400
-+++ wordwarvi-1.00/wwviaudio.c	2011-06-11 19:57:17.394274660 -0400
-@@ -121,7 +121,7 @@
+ 		${OGGOBJ} \
+ 		wwviaudio.o \
+ 		wordwarvi.c -o wordwarvi -lm ${SNDLIBS} \
+-		`pkg-config --cflags gtk+-2.0` `pkg-config --libs gtk+-2.0 gthread-2.0`
++		`${PKG_CONFIG} --cflags gtk+-2.0` `${PKG_CONFIG} --libs gtk+-2.0 gthread-2.0`
+ 	/bin/rm stamp.h
+ 
+ wordwarvi.6.gz:	wordwarvi.6
+diff --git a/wwviaudio.c b/wwviaudio.c
+index ad79d96..dca0cb4 100644
+--- a/wwviaudio.c
++++ b/wwviaudio.c
+@@ -121,7 +121,7 @@ int wwviaudio_read_ogg_clip(int clipnum, char *filename)
  	if (clipnum >= max_sound_clips || clipnum < 0)
  		return -1;
  
diff --git a/games-action/wordwarvi/wordwarvi-1.00-r1.ebuild b/games-action/wordwarvi/wordwarvi-1.00-r1.ebuild
index 096c489f0c65..c1a147a7c015 100644
--- a/games-action/wordwarvi/wordwarvi-1.00-r1.ebuild
+++ b/games-action/wordwarvi/wordwarvi-1.00-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit desktop
+inherit desktop toolchain-funcs
 
 DESCRIPTION="A retro side-scrolling shoot'em up based on the editor war story"
 HOMEPAGE="http://wordwarvi.sourceforge.net"
@@ -14,11 +14,15 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="portaudio"
 
-RDEPEND="x11-libs/gtk+:2
-	portaudio? ( media-libs/libvorbis
-		>=media-libs/portaudio-19_pre1 )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+RDEPEND="
+	x11-libs/gtk+:2
+	portaudio? (
+		media-libs/libvorbis
+		>=media-libs/portaudio-19_pre1
+	)
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
 
 PATCHES=(
 	"${FILESDIR}"/${P}-sound.patch
@@ -36,6 +40,8 @@ src_prepare() {
 }
 
 src_compile() {
+	tc-export CC PKG_CONFIG
+
 	emake \
 		PREFIX="/usr" \
 		DATADIR="/usr/share/${PN}" \
@@ -51,7 +57,7 @@ src_install() {
 		install
 
 	if ! use portaudio ; then
-		rm -rf "${D}/usr/share" || die
+		rm -rf "${ED}/usr/share" || die
 	fi
 
 	dodoc README AUTHORS changelog.txt AAA_HOW_TO_MAKE_NEW_LEVELS.txt