gentoo resync : 16.09.2021

5 files changed, 100 insertions, 120 deletions

diff --git a/games-action/transcend/Manifest b/games-action/transcend/Manifest
index 481b47bc745b..11a92ec4c106 100644
--- a/games-action/transcend/Manifest
+++ b/games-action/transcend/Manifest
@@ -1,4 +1,4 @@
-AUX transcend-0.3-sound.patch 3101 BLAKE2B d110ec774487b1f1cf5a794fd9c675ad3dcbcc474cf55f79efde2946626da97d301c580b91089000bc1f0791e1bc98fdd35f2da12b66ba1afd3cf1d96cb15c66 SHA512 aa51287cb46fd55db9d7d213b135a099dd1d2cdf07f033143356571d06ad16dd8ba7dcd71b78e98430c9126ddcb5484fa63c82c9e26e1ca2d6de855cc55a293f
+AUX transcend-0.3-system-portaudio.patch 2610 BLAKE2B 932d9deb295bb1d9c06e0600c7ef78f29d65b99821fbf87314e424e9e1221c7e30858d7d0c4a57c19275bfaf814186e7cb25fb2392fdd6e145188c617aaab76f SHA512 c5c4906cacc4a9f11cf8eee485552a71a355d69a37355a5108f37be78bc5918d51ffef23be682ad775b61eedc04902c7271bf17396702a79c32743052fe2ac50
 DIST Transcend_0.3_UnixSource.tar.gz 1847261 BLAKE2B 7efeb33dc96744f20e53985f6704398f21c3a018272b743bb49305f966fb5e6a11c3d138383979fe4d85cd28aee6854971b0723aa106fec7b64fffe64d5d7b78 SHA512 5a2d21256c202ee045f8e2c926705f79885f6efbb5f44d3129e5b05cb1e28f909a32a5d873a9673d5fa48cbe4e79766c44947f147089e988e2fa3f83cde1b91d
-EBUILD transcend-0.3-r1.ebuild 1362 BLAKE2B 628711575d84ec80dcc55b7385a4cbb6a31e203d6fc59542a3d0099bc39b3e482d65842c466bf19eb2218f7bc839abec91c41d84033a1ceed55a514654385462 SHA512 8722c677a10cd80677ffaa938f738800e7ec45f48185426a45232c415f6db489eb05237c974ead23e94c81f177d6983854201d57200f49f706b0155b6f494b48
-MISC metadata.xml 332 BLAKE2B eb4915a0b90e86986fde6d552bc1a132d5998ddb97bc37f8b597617bc234372797cdf1394dfbf68913fe002daea792108b97b637e1da51cb71f64d1d54814b2e SHA512 3af008eea1264d7db9571d88c2e63b767afb43881ab456844c448eedf9bf68577c4c0a27bb2559691b8c92482af38ead48036c8bd429df7489048053054ccdf9
+EBUILD transcend-0.3-r2.ebuild 1237 BLAKE2B 7b89a7ac1c4c75a90743ef79a2f4d41470fe38513fdf5df8ac23d38bf865dfbfa548ffb8176ef303883cc1133223a554901de43c87466588b5d267053f454ea7 SHA512 9747a7b4d8b5f9b79b9a0f046f0764499bf6d9cbb5ad7db8bbfac363d298147879d6e5a331223d17e71b0f2b4cbe442caa267e40e3db1ea65cb9b40ca92e8848
+MISC metadata.xml 333 BLAKE2B b199da11daf23c98ca3ab6034b2398c1f97cb6385f4bfdff63da4d92e208e74d350a71d081ca97691bf4c45c6052fdf17fa2a6014ade867cf36922cdb660112f SHA512 fe3296eec55d19cebf45e9986cbef01cbcc8660ed02520a9caf82965a8c2563f0f99d36cc6b140ca803cbd996716301fbf499b9ca647de5631e93f00e5e8f735
diff --git a/games-action/transcend/files/transcend-0.3-sound.patch b/games-action/transcend/files/transcend-0.3-system-portaudio.patch
index 836cd03754ad..6fb6566ff848 100644
--- a/games-action/transcend/files/transcend-0.3-sound.patch
+++ b/games-action/transcend/files/transcend-0.3-system-portaudio.patch
@@ -1,21 +1,23 @@
-Author: Barry deFreese <bdefreese@debian.org>
-Description: Build with portaudio19.
---- a/game/SoundPlayer.h
-+++ b/game/SoundPlayer.h
-@@ -204,7 +204,7 @@
-         double mMusicLoudness;
-         
-         
--        PortAudioStream *mAudioStream;
-+        PaStream *mAudioStream;
- 
-         // realtime sounds that should be mixed into the next to-speaker call
-         SimpleVector<PlayableSound *> *mRealtimeSounds;
---- a/game/SoundPlayer.cpp
-+++ b/game/SoundPlayer.cpp
-@@ -47,9 +47,11 @@
- 
+https://bugs.gentoo.org/372413
+Based on debian patch by: Barry deFreese <bdefreese@debian.org>
+
+While adding pkg-config for portaudio, also use it for the rest
+and remove unused X libraries.
+--- a/Transcend/Makefile.GnuLinuxX86
++++ b/Transcend/Makefile.GnuLinuxX86
+@@ -20,3 +20,3 @@
+ 
+-PLATFORM_COMPILE_FLAGS = -DLINUX
++PLATFORM_COMPILE_FLAGS = $(shell $(PKG_CONFIG) --cflags gl glut glu portaudio-2.0)
+ 
+@@ -24,3 +24,3 @@
+ # also need portaudio library (which in turn needs pthreads)
+-PLATFORM_LINK_FLAGS = -L/usr/X11R6/lib -lGL -lglut -lGLU -lX11 -lXi -lXext -lXmu ${ROOT_PATH}/Transcend/portaudio/lib/libportaudio.a -lpthread
++PLATFORM_LINK_FLAGS = $(shell $(PKG_CONFIG) --libs gl glut glu portaudio-2.0)
  
+--- a/Transcend/game/SoundPlayer.cpp
++++ b/Transcend/game/SoundPlayer.cpp
+@@ -49,5 +49,7 @@
  // callback passed into portaudio
 -static int portaudioCallback( void *inputBuffer, void *outputBuffer,
 +int portaudioCallback( const void *inputBuffer, void *outputBuffer,
@@ -25,11 +27,7 @@ Description: Build with portaudio19.
 +                              PaStreamCallbackFlags statusFlags,
 +                              void *userData ) {
  
- 
-     SoundPlayer *player = (SoundPlayer *)userData;
-@@ -147,21 +149,13 @@
- 
-     if( error == paNoError ) {
+@@ -149,17 +151,9 @@
      
 -        error = Pa_OpenStream(
 +        error = Pa_OpenDefaultStream(
@@ -48,42 +46,24 @@ Description: Build with portaudio19.
 -            paClipOff, // we won't output out of range samples so
 -                       // don't bother clipping them 
              portaudioCallback,
-             (void *)this );  // pass self-pointer to callback function
-         
-Description: Link to dynamic portaudio instead of static.
-Author: Miriam Ruiz <miriam@debian.org>
---- a/Makefile.GnuLinuxX86
-+++ b/Makefile.GnuLinuxX86
-@@ -22,7 +22,7 @@
- 
- # pthread library needed for linux
- # also need portaudio library (which in turn needs pthreads)
--PLATFORM_LINK_FLAGS = -L/usr/X11R6/lib -lGL -lglut -lGLU -lX11 -lXi -lXext -lXmu ${ROOT_PATH}/Transcend/portaudio/lib/libportaudio.a -lpthread
-+PLATFORM_LINK_FLAGS = -L/usr/X11R6/lib -lGL -lglut -lGLU -lX11 -lXi -lXext -lXmu $(shell pkg-config portaudio-2.0 --libs)
- 
- 
- # All platforms but OSX support g++ and need no linker hacks
---- a/game/SoundPlayer.h
-+++ b/game/SoundPlayer.h
-@@ -46,8 +46,7 @@
- #include "SoundFilter.h"
- #include "PlayableSound.h"
+--- a/Transcend/game/SoundPlayer.h
++++ b/Transcend/game/SoundPlayer.h
+@@ -48,4 +48,3 @@
  
 -#include "Transcend/portaudio/pa_common/portaudio.h"
 -#include "Transcend/portaudio/pablio/pablio.h"
 +#include <portaudio.h>
  
+@@ -207,3 +206,3 @@
+         
+-        PortAudioStream *mAudioStream;
++        PaStream *mAudioStream;
  
- #include "minorGems/util/SimpleVector.h"
---- a/game/SoundPlayerActive.h
-+++ b/game/SoundPlayerActive.h
-@@ -16,8 +16,7 @@
- 
- #include "SoundSamples.h"
+--- a/Transcend/game/SoundPlayerActive.h
++++ b/Transcend/game/SoundPlayerActive.h
+@@ -18,4 +18,3 @@
  
 -#include "Transcend/portaudio/pa_common/portaudio.h"
 -#include "Transcend/portaudio/pablio/pablio.h"
 +#include <portaudio.h>
  
- 
- #include "minorGems/util/SimpleVector.h"
diff --git a/games-action/transcend/metadata.xml b/games-action/transcend/metadata.xml
index af830ea1122e..70f28be84545 100644
--- a/games-action/transcend/metadata.xml
+++ b/games-action/transcend/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>games@gentoo.org</email>
diff --git a/games-action/transcend/transcend-0.3-r1.ebuild b/games-action/transcend/transcend-0.3-r1.ebuild
deleted file mode 100644
index 5e44612b5d38..000000000000
--- a/games-action/transcend/transcend-0.3-r1.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit desktop
-
-DESCRIPTION="Retro-style, abstract, 2D shooter"
-HOMEPAGE="http://transcend.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/Transcend_${PV}_UnixSource.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	media-libs/freeglut
-	media-libs/portaudio
-	x11-libs/libXi
-	x11-libs/libXmu
-	virtual/glu
-	virtual/opengl"
-RDEPEND=${DEPEND}
-
-S=${WORKDIR}/Transcend_${PV}_UnixSource/Transcend
-
-# Apply patch from Debian in order to get sound working. bug #372413
-PATCHES=(
-	"${FILESDIR}"/${P}-sound.patch
-)
-
-src_prepare() {
-	default
-
-	rm -rf game/Makefile portaudio/ || die
-	sed \
-		-e '/^GXX=/d' \
-		-e 's/GXX/CXX/' \
-		-e '/^COMPILE_FLAGS =/ s/OPTIMIZE_FLAG/CXXFLAGS/' \
-		-e '/^EXE_LINK =/ s/LINK_FLAGS/LDFLAGS/' \
-		Makefile.GnuLinuxX86 \
-		Makefile.common \
-		Makefile.minorGems \
-		game/Makefile.all \
-		Makefile.minorGems_targets \
-		> game/Makefile || die
-	sed -i \
-		-e "s:\"levels\":\"/usr/share/${PN}/levels\":" \
-		game/LevelDirectoryManager.cpp \
-		game/game.cpp || die
-}
-
-src_configure() { :; }
-
-src_compile() {
-	emake -C game
-}
-
-src_install() {
-	newbin game/Transcend ${PN}
-	insinto /usr/share/${PN}
-	doins -r levels/
-	dodoc doc/{how_to_play.txt,changeLog.txt}
-	make_desktop_entry ${PN} "Transcend"
-}
diff --git a/games-action/transcend/transcend-0.3-r2.ebuild b/games-action/transcend/transcend-0.3-r2.ebuild
new file mode 100644
index 000000000000..b3f2a9b7a91c
--- /dev/null
+++ b/games-action/transcend/transcend-0.3-r2.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit desktop toolchain-funcs
+
+DESCRIPTION="Retro-style, abstract, 2D shooter"
+HOMEPAGE="http://transcend.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/Transcend_${PV}_UnixSource.tar.gz"
+S="${WORKDIR}/Transcend_${PV}_UnixSource"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	media-libs/freeglut
+	media-libs/portaudio
+	virtual/glu
+	virtual/opengl"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-system-portaudio.patch
+)
+
+src_prepare() {
+	default
+
+	rm -r ${PN^}/portaudio || die
+
+	sed -e "s|\"levels\"|\"${EPREFIX}/usr/share/${PN}/levels\"|" \
+		-i ${PN^}/game/{LevelDirectoryManager,game}.cpp || die
+}
+
+src_configure() {
+	cd ${PN^} || die
+	platformSelection=1 ./configure || die
+}
+
+src_compile() {
+	tc-export PKG_CONFIG
+
+	local emakeargs=(
+		GXX="$(tc-getCXX)"
+		OPTIMIZE_FLAG="${CXXFLAGS}"
+		LINK_FLAGS="${LDFLAGS}"
+	)
+
+	emake -C ${PN^}/game "${emakeargs[@]}"
+}
+
+src_install() {
+	cd ${PN^} || die
+
+	newbin game/${PN^} ${PN}
+
+	insinto /usr/share/${PN}
+	doins -r levels
+
+	dodoc doc/{how_to_play.txt,changeLog.txt}
+
+	make_desktop_entry ${PN} ${PN^} applications-games
+}