gentoo resync : 28.04.2021

2 files changed, 24 insertions, 17 deletions

diff --git a/media-sound/tapestrea/Manifest b/media-sound/tapestrea/Manifest
index f9589b229102..31b6328b85e0 100644
--- a/media-sound/tapestrea/Manifest
+++ b/media-sound/tapestrea/Manifest
@@ -1,5 +1,5 @@
 AUX tapestrea-0.1.0.5-gcc44.patch 1301 BLAKE2B 09c05cdfef6860013d84a2833a77b3b693871770caad7e450191fd32c08039397a66b2e8891919d88fb57daa26e8413d47cd3d7145f49769a76c444450bf886a SHA512 d55c5fec518fc79686720a1c5b9fa01483aaaf22141e2a10de541a1cbf63daf37bebf8b653172990f34bc188f4064af9d3e266e0d103e0fef4fbd557c406b5a7
 AUX tapestrea-0.1.0.5-r1-underlinking-alsa-pthread.patch 1280 BLAKE2B 3910c1de8ad0fe14c80b9e347350924e71d1f2c10068287474a0262060d26d5f24558c51483af912dbd8fef4c0436e84af7108379955458d5b50619a9a8a8616 SHA512 de4ff80ba5ca256d794ceff80fe956459e16261b1d786a87691d2736835839e177056ab9e4732c78ec0381c01324c483b27de310f8168269ebc04dd6e39af344
 DIST tapestrea-0.1.0.5.tgz 21987831 BLAKE2B 30ee2574acbb1a4577b0e952f9c474304ce6248bb6c4329c2788c0e640c6d82b35f3898e293a1e91ec38ca332bb4f910fd35278edf5c703dde456a6c006d14f4 SHA512 8df64cb31e85167afb78e4891192dde7d5476c637241e53f6218b013bb8c40e43a626cc2a2c1368498491f00451a719e1126a90ca2d67aa52137a9e1cd034656
-EBUILD tapestrea-0.1.0.5-r1.ebuild 2757 BLAKE2B 864dc8a0f04d5dc6c1f8e273c4adb554bd80b70282642f6bdfbe464fe5bb7dd372b6ebf8fddd1407795fed7b81d6b31712c04b2a58825566fe27fca603fe1675 SHA512 950b9cad047bcd047ec4a2e8d210aaacc0cba55e9b542f1ad1272f293e94cb1b3c5b08550fb3260faa77995644530393cec6fa4a3ec959dc8c356ff5c25d8204
+EBUILD tapestrea-0.1.0.5-r1.ebuild 2876 BLAKE2B 9b508a79875f6365ce9fdb5c76712001917ea2411339e3f0f411ebbc72e4794755fdc7b6d3c9b68454276a3bbaaafa9a954fdeb959c6fc6a06a9ff306bbe57cf SHA512 b0bd0f0e354c00908aab7fd56d775267e7cebf6d0e5cb19c35a11f3541b07d0df9730ad2f330b90f11401d53503f348667bcbfe94096fe9ee857fd5042b9e181
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/media-sound/tapestrea/tapestrea-0.1.0.5-r1.ebuild b/media-sound/tapestrea/tapestrea-0.1.0.5-r1.ebuild
index 10909861c095..63f2f3cd3774 100644
--- a/media-sound/tapestrea/tapestrea-0.1.0.5-r1.ebuild
+++ b/media-sound/tapestrea/tapestrea-0.1.0.5-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=7
 
-inherit eutils flag-o-matic toolchain-funcs
+inherit flag-o-matic toolchain-funcs
 
 DESCRIPTION="Expressive Synthesis, Transformation, Rendering of Environmental Audio"
 HOMEPAGE="http://taps.cs.princeton.edu/"
@@ -26,6 +26,11 @@ DEPEND="${RDEPEND}
 	sys-devel/bison:0
 	sys-devel/flex:0"
 
+PATCHES=(
+	"${FILESDIR}"/${P}-gcc44.patch
+	"${FILESDIR}"/${PF}-underlinking-alsa-pthread.patch
+)
+
 pkg_setup() {
 	if ! use alsa && ! use jack && ! use oss; then
 		eerror "One of the following USE flags is needed: jack, alsa or oss"
@@ -34,8 +39,6 @@ pkg_setup() {
 }
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-gcc44.patch
-
 	# Respect LDFLAGS/CC
 	for bend in alsa jack oss; do
 		sed -i -e "s:gcc -o:\$(CC) \$(LDFLAGS) -o :" \
@@ -51,20 +54,21 @@ src_prepare() {
 	sed -i -e "s:-make:\$(MAKE):g" \
 		"${S}/scripting/chuck-1.2.1.2/src/makefile" || die
 
-	epatch "${FILESDIR}"/${PF}-underlinking-alsa-pthread.patch
+	default
 }
 
 compile_backend() {
-	backend=$1
+	backend=${1}
 	einfo "Compiling against ${backend}"
 
-	cd "${S}/scripting/chuck-1.2.1.2/src"
+	cd "${S}/scripting/chuck-1.2.1.2/src" || die
+
 	emake -f "makefile.${backend}" \
-		CC=$(tc-getCC) CXX=$(tc-getCXX) CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
+		PKG_CONFIG=$(tc-getPKG_CONFIG) CC=$(tc-getCC) CXX=$(tc-getCXX) CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
 
 	cd "${S}/src"
 	emake -f "makefile.${backend}" \
-		CC=$(tc-getCC) CXX=$(tc-getCXX) CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
+		PKG_CONFIG=$(tc-getPKG_CONFIG) CC=$(tc-getCC) CXX=$(tc-getCXX) CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
 
 	mv taps{,-${backend}} || die
 	emake -f makefile clean
@@ -92,12 +96,15 @@ src_install() {
 	dodoc AUTHORS BUGS DEVELOPER PROGRAMMER QUICKSTART README THANKS TODO VERSIONS
 
 	if use doc ; then
-		for tapedir in `find examples/* -type d -maxdepth 0`; do
-			docinto $tapedir
-			dodoc `find $tapedir/* -type f -maxdepth 0`
-			for tapedir2 in `find $tapedir/* -type d -maxdepth 0`; do
-				docinto $tapedir2
-				dodoc `find $tapedir2/* -type f -maxdepth 0`
+		local tapedir
+		for tapedir in $(find examples/* -type d -maxdepth 0); do
+			docinto ${tapedir}
+			dodoc $(find ${tapedir}/* -type f -maxdepth 0)
+
+			local tapedir2
+			for tapedir2 in $(find ${tapedir}/* -type d -maxdepth 0); do
+				docinto ${tapedir2}
+				dodoc $(find ${tapedir2}/* -type f -maxdepth 0)
 			done
 		done
 		docinto doc