media-sound/tapestrea: port to EAPI 7

Signed-off-by: Sam James <sam@gentoo.org>

2 files changed, 49 insertions, 41 deletions

diff --git a/media-sound/tapestrea/files/tapestrea-0.1.0.5-r1-underlinking-alsa-pthread.patch b/media-sound/tapestrea/files/tapestrea-0.1.0.5-r1-underlinking-alsa-pthread.patch
index a065ce0e683e..3f866d5c88e5 100644
--- a/media-sound/tapestrea/files/tapestrea-0.1.0.5-r1-underlinking-alsa-pthread.patch
+++ b/media-sound/tapestrea/files/tapestrea-0.1.0.5-r1-underlinking-alsa-pthread.patch
@@ -1,33 +1,34 @@
 --- a/src/makefile.alsa
 +++ b/src/makefile.alsa
 @@ -3,7 +3,7 @@
- CHUCK_DIR=../scripting/chuck-1.2.1.2/src
- INCLUDES=-I$(CHUCK_DIR)
- FLAGS=-D__LINUX_ALSA__ `pkg-config --cflags gtk+-2.0` $(CFLAGS) -c
--LIBS=-lasound -lstdc++ -lm -lsndfile -lGL -lGLU -lglut `pkg-config --libs gtk+-2.0`
-+LIBS=-lasound -lstdc++ -lm -lsndfile -lGL -lGLU -lglut `${PKG_CONFIG} --libs gtk+-2.0` -lpthread
- 
- TAPS_OBJS= taps_analysis.o taps_birdbrain.o taps_driver.o \
- 	taps_featurelibrary.o taps_pvc.o taps_regioncomparer.o \
+ CHUCK_DIR=../scripting/chuck-1.2.1.2/src

+ INCLUDES=-I$(CHUCK_DIR)

+ FLAGS=-D__LINUX_ALSA__ `pkg-config --cflags gtk+-2.0` $(CFLAGS) -c

+-LIBS=-lasound -lstdc++ -lm -lsndfile -lGL -lGLU -lglut `pkg-config --libs gtk+-2.0`

++LIBS=-lasound -lstdc++ -lm -lsndfile -lGL -lGLU -lglut `pkg-config --libs gtk+-2.0` -lpthread

+ 

+ TAPS_OBJS= taps_analysis.o taps_birdbrain.o taps_driver.o \

+ 	taps_featurelibrary.o taps_pvc.o taps_regioncomparer.o \

 --- a/scripting/chuck-1.2.1.2/src/makefile.alsa
 +++ b/scripting/chuck-1.2.1.2/src/makefile.alsa
 @@ -5,7 +5,7 @@
- INCLUDES=
- CFLAGS?= -O3
- FLAGS= -D__LINUX_ALSA__ -c $(CFLAGS)
--LIBS=-lasound -lstdc++ -ldl -lm
-+LIBS=-lasound -lstdc++ -lm -lpthread -ldl
- SF_OBJ=util_sndfile.o
- 
- ifneq ($(CHUCK_DEBUG),)
---- a/src/makefile.alsa
-+++ b/src/makefile.alsa
+ INCLUDES=

+ CFLAGS?= -O3

+ FLAGS= -D__LINUX_ALSA__ -c $(CFLAGS)

+-LIBS=-lasound -lstdc++ -ldl -lm

++LIBS=-lasound -lstdc++ -lm -lpthread -ldl

+ SF_OBJ=util_sndfile.o

+ 

+ ifneq ($(CHUCK_DEBUG),)

+diff -Naur a/src/makefile.alsa b/src/makefile.alsa
+--- a/src/makefile.alsa	2014-01-30 02:21:02.173891275 +0100
++++ b/src/makefile.alsa	2014-01-30 02:21:23.026891253 +0100
 @@ -48,7 +48,7 @@
- OBJS+=ui_scripting.o
- # scripting disable needs most of chuck anyway due to includes 
- # in latest rtaudio.cpp, so always keep this line:
--LIBS+=$(CHUCK_OBJS)
-+LIBS+=$(CHUCK_OBJS) -ldl
- 
- # uncomment to use preconfigured sndfile
- #FLAGS+=-D__USE_SNDFILE_PRECONF__
+ OBJS+=ui_scripting.o

+ # scripting disable needs most of chuck anyway due to includes 

+ # in latest rtaudio.cpp, so always keep this line:

+-LIBS+=$(CHUCK_OBJS)

++LIBS+=$(CHUCK_OBJS) -ldl

+ 

+ # uncomment to use preconfigured sndfile

+ #FLAGS+=-D__USE_SNDFILE_PRECONF__

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 fa60300ab16b..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-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=7
 
-inherit epatch 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