[QA] Revision bump. EAPI 5. Fixed underlinking bug #369759 and LDFLAGS bug #333743 (with contribution by iamnr3), both reported by flameeyes; and some other small fixes.

Package-Manager: portage-HEAD/cvs/Linux x86_64
Manifest-Sign-Key: 0x6D34E57D

5 files changed, 164 insertions, 97 deletions

diff --git a/media-sound/tapestrea/ChangeLog b/media-sound/tapestrea/ChangeLog
index 587353d0e21f..58a769ac9070 100644
--- a/media-sound/tapestrea/ChangeLog
+++ b/media-sound/tapestrea/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for media-sound/tapestrea
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/tapestrea/ChangeLog,v 1.6 2013/06/01 12:18:01 pacho Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/tapestrea/ChangeLog,v 1.7 2014/01/30 01:29:12 tomwij Exp $
+
+*tapestrea-0.1.0.5-r1 (30 Jan 2014)
+
+  30 Jan 2014; Tom Wijsman <TomWij@gentoo.org>
+  +files/tapestrea-0.1.0.5-r1-underlinking-alsa-pthread.patch,
+  +tapestrea-0.1.0.5-r1.ebuild, -tapestrea-0.1.0.5.ebuild:
+  [QA] Revision bump. EAPI 5. Fixed underlinking bug #369759 and LDFLAGS bug
+  #333743 (with contribution by iamnr3), both reported by flameeyes; and some
+  other small fixes.
 
   01 Jun 2013; Pacho Ramos <pacho@gentoo.org> metadata.xml:
   Cleanup due bug #151880
diff --git a/media-sound/tapestrea/Manifest b/media-sound/tapestrea/Manifest
index 654f2f675a1b..b65520da9321 100644
--- a/media-sound/tapestrea/Manifest
+++ b/media-sound/tapestrea/Manifest
@@ -2,14 +2,19 @@
 Hash: SHA256
 
 AUX tapestrea-0.1.0.5-gcc44.patch 1301 SHA256 8ed8f8413a5d3f9d72c6f366b6bd6a85dd42c19c916b9d119e1c257f24c0592f SHA512 d55c5fec518fc79686720a1c5b9fa01483aaaf22141e2a10de541a1cbf63daf37bebf8b653172990f34bc188f4064af9d3e266e0d103e0fef4fbd557c406b5a7 WHIRLPOOL 11dd6f2cb93065e2bd7a9d6ba0febf2bf124464584709742faa05e121c25e497ef742c66a06c614738448509632501cd63c0d191460d2247cd6bb59726d0ff4b
-DIST tapestrea-0.1.0.5.tgz 21987831 SHA256 85c57e642814c534a0bdb17d1d5c59d1292d3a681ae397a0c07234637a1ac254
-EBUILD tapestrea-0.1.0.5.ebuild 2363 SHA256 af6f2e3fe578b5ec4d4c50042133cb3d02ef143eb7ce148135af4c70455c65fa SHA512 2dad8b5ebb1408dfe8ce83fbd4dfcb47fe045255bc6e0c8fda1f498a853d1ab9855cc5e3a5fa553e32767b06dc7e9da942bf5afc56c64ac3d330f1173b2aea47 WHIRLPOOL 42dace9224ab8f8c7e39d2225dad8db97b11a6ea66f911884d9f65358e190742cbb37a228e24a0633d10cc63ccc3e50170ffb054dc0d19fa82677e66f336be38
-MISC ChangeLog 994 SHA256 c74c0b0d2d0a13dea99d5927055f85bd6114d8982956c2e19fb8ffa7b208ce6a SHA512 a2405d38aabf99e525235719065ae6545e1a099ddcb2d83553273d0ebad45830b8e013043703c810ac8e928c3ad2703b8758d2562871adaaab75263cd82adf93 WHIRLPOOL 7fd409bac4f2dfac49fb6e5ac7d3873b69800d17890214079d8be470d108c08734bdbd15dcd6d96e77c91c775c2afb8902ac1ab24e43ad4de3e446a6f47dd27a
+AUX tapestrea-0.1.0.5-r1-underlinking-alsa-pthread.patch 1280 SHA256 f8a29a595c6ff9de159739fbfbf20a7e6972ad6b2ee988db8a8b7b7ab6f3d0c1 SHA512 de4ff80ba5ca256d794ceff80fe956459e16261b1d786a87691d2736835839e177056ab9e4732c78ec0381c01324c483b27de310f8168269ebc04dd6e39af344 WHIRLPOOL ed73ec0fd65abd2770e1872f20efa7feb81371d493c200b3e10b8a18a6ede0b8c578d4fc4d8bc9ab625573f79a1c267cd56a4157e31596a95ecdd0dc8ae2f818
+DIST tapestrea-0.1.0.5.tgz 21987831 SHA256 85c57e642814c534a0bdb17d1d5c59d1292d3a681ae397a0c07234637a1ac254 SHA512 8df64cb31e85167afb78e4891192dde7d5476c637241e53f6218b013bb8c40e43a626cc2a2c1368498491f00451a719e1126a90ca2d67aa52137a9e1cd034656 WHIRLPOOL c1f0c0e947dbae4ee65fc00b1632a233d6907ec7d7b47debfff589c0d3701287b9ddd0dc6d4a3c441202928deb228d95ad43edf88d618761ffff3f12fed8adb0
+EBUILD tapestrea-0.1.0.5-r1.ebuild 2895 SHA256 a222bcb37797a5ddc89e79748c6825b2616dd4b71e59254c2740655ace163a46 SHA512 44c4395b94180612a0d624411fcfdcf25fa2dd439ea2ef3e6bf0c9ba583270d391b54deecf739e2145f582fce2d97b65e8d65d13211790a7397c1736d62ec80e WHIRLPOOL e6af1046270376b3fe11edf7e0f9f7dfc00864e90a677d40feccf3c446f5ae4e75b16368fdf856c5d71f417b4435c6e616343072020572c5764f14c212d63b08
+MISC ChangeLog 1378 SHA256 6d6f00947ddaa7d5b2a668d3d4ea836cc3024ecc9751ab063e9a8e655a986274 SHA512 75424d89aabaa836e38891fde6c5acbdf09756b420253b9bd878d6fa4f04184414d0db3aa7669ed0b03fcf4391f7b8b990fc8f7ca5b21242f0ce1eea10873d16 WHIRLPOOL acc3865510c400f81be4d4b289fc799f89d44c778ed2fcc1faca244e3b455c698f4bbb7de5aa5d83685474d4a8973f6b8ab759cd21dbe537a6dfdc7f7662b9c1
 MISC metadata.xml 316 SHA256 a26e28756df0f44fbd1e7de65945b85ad08587dad0f1aa9133e8112c6605870e SHA512 24a65be611b85850e2b1dee8eb4580e3d963c9815e49b7312a1320ab8635ac16dcec349613d3dc9ddcddad7897b70e71f31ae89f5ffcd85f327e3a304a52a8a2 WHIRLPOOL 0b3d5669ac4a659395468f2392be2d3542ad610a0c2ea7fb073dd7e5b333fdb73d48a8beb315a0fab356c72f146e60df332d4b11e89bf9ce6b2be91d879eee92
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlGp5noACgkQCaWpQKGI+9Ta3wCeKFpuLbfukXT9Cn0KQOpd8QO5
-DywAn3QevB64N0SPfewC8pU1osqGt4HW
-=e2Jl
+iQEcBAEBCAAGBQJS6aqkAAoJEJWyH81tNOV9ehAH/RcdMpyYeo+zZGy0m/gymwti
+2GkSfPk96tbw1+wJKDV1VJ0N7Jrghiduu8ZtdOgE36CFjH5BH67WVx+X6LFuIiPx
+c01TRNNNifWmZTJsYRAJVW8cjQmWUUIK9R1ct+pWyE5Mdetova+zLo28m90Uqhlw
+5vvjLcJ/cCXKptr9+GPDW/DiVtu3aCF5mGrKtFryOSU2nwxQrkedTCH0/PVaf2Vl
+lf+stXs75dSxbF82CvWohbEh04fae/GWflLQN3qJcJcGZNYadutYVs1lU+QaLwPE
+kuAQak762MtFXca4a5CtFLlHYivb2jCS6rbkThLQtubOxd25HL4TlFj9o5CcsYY=
+=sYRC
 -----END PGP SIGNATURE-----
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
new file mode 100644
index 000000000000..3f866d5c88e5
--- /dev/null
+++ b/media-sound/tapestrea/files/tapestrea-0.1.0.5-r1-underlinking-alsa-pthread.patch
@@ -0,0 +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 \

+--- 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),)

+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__

diff --git a/media-sound/tapestrea/tapestrea-0.1.0.5-r1.ebuild b/media-sound/tapestrea/tapestrea-0.1.0.5-r1.ebuild
new file mode 100644
index 000000000000..6492d7ad8d2f
--- /dev/null
+++ b/media-sound/tapestrea/tapestrea-0.1.0.5-r1.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/tapestrea/tapestrea-0.1.0.5-r1.ebuild,v 1.1 2014/01/30 01:29:12 tomwij Exp $
+
+EAPI="5"
+
+inherit eutils flag-o-matic
+
+DESCRIPTION="Techniques + Paradigms for Expressive Synthesis, Transformation, Rendering of Environmental Audio"
+HOMEPAGE="http://taps.cs.princeton.edu/"
+SRC_URI="http://taps.cs.princeton.edu/release/files/${P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+alsa doc jack oss"
+
+RDEPEND="jack? ( media-sound/jack-audio-connection-kit:0 )
+	alsa? ( >=media-libs/alsa-lib-0.9:0 )
+	media-libs/libsndfile:0
+	media-libs/freeglut:0
+	virtual/opengl:0
+	virtual/glu:0
+	x11-libs/gtk+:2"
+
+DEPEND="${RDEPEND}
+	sys-devel/bison:0
+	sys-devel/flex:0"
+
+pkg_setup() {
+	if ! use alsa && ! use jack && ! use oss; then
+		eerror "One of the following USE flags is needed: jack, alsa or oss"
+		die "Please set at least one audio engine type"
+	fi
+}
+
+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 :" \
+			-e "s:-O3 -c:\$(CFLAGS) -c:" \
+			-e "s:make -C:\$(MAKE) -C :" \
+			"${S}/src/makefile.${bend}" || die
+	done
+
+	# Avoid "make jobserver unavailable" warning
+	sed -i -e "s:-make:\$(MAKE):g" \
+		"${S}/src/makefile" || die
+
+	sed -i -e "s:-make:\$(MAKE):g" \
+		"${S}/scripting/chuck-1.2.1.2/src/makefile" || die
+
+	epatch "${FILESDIR}"/${PF}-underlinking-alsa-pthread.patch
+}
+
+compile_backend() {
+	backend=$1
+	einfo "Compiling against ${backend}"
+
+	cd "${S}/scripting/chuck-1.2.1.2/src"
+	emake -f "makefile.${backend}" \
+		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}"
+
+	mv taps{,-${backend}} || die
+	emake -f makefile clean
+	cd "${S}/scripting/chuck-1.2.1.2/src"
+	emake -f makefile clean
+}
+
+src_compile() {
+	# When compiled with athlon or athlon-xp flags
+	# chuck crashes on removing a shred with a double free or corruption,
+	# it happens in Chuck_VM_Stack::shutdown() on the line
+	#   SAFE_DELETE_ARRAY( stack );
+	replace-cpu-flags athlon athlon-xp i686
+
+	use jack && compile_backend jack
+	use alsa && compile_backend alsa
+	use oss && compile_backend oss
+}
+
+src_install() {
+	use jack && dobin src/taps-jack
+	use alsa && dobin src/taps-alsa
+	use oss && dobin src/taps-oss
+
+	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`
+			done
+		done
+		docinto doc
+		dodoc doc/*
+	fi
+}
diff --git a/media-sound/tapestrea/tapestrea-0.1.0.5.ebuild b/media-sound/tapestrea/tapestrea-0.1.0.5.ebuild
deleted file mode 100644
index d42b6ad4a216..000000000000
--- a/media-sound/tapestrea/tapestrea-0.1.0.5.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/tapestrea/tapestrea-0.1.0.5.ebuild,v 1.4 2011/03/29 12:44:01 angelos Exp $
-
-EAPI="1"
-
-inherit eutils toolchain-funcs flag-o-matic
-
-DESCRIPTION="Techniques + Paradigms for Expressive Synthesis, Transformation, Rendering of Environmental Audio"
-HOMEPAGE="http://taps.cs.princeton.edu/"
-SRC_URI="http://taps.cs.princeton.edu/release/files/${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE="oss jack +alsa doc"
-
-RDEPEND="jack? ( media-sound/jack-audio-connection-kit )
-	alsa? ( >=media-libs/alsa-lib-0.9 )
-	media-libs/libsndfile
-	media-libs/freeglut
-	virtual/opengl
-	virtual/glu
-	x11-libs/gtk+:2"
-DEPEND="${RDEPEND}
-	sys-devel/bison
-	sys-devel/flex"
-
-pkg_setup() {
-	local cnt=0
-	use jack && cnt="$((${cnt} + 1))"
-	use alsa && cnt="$((${cnt} + 1))"
-	use oss && cnt="$((${cnt} + 1))"
-	if [[ "${cnt}" -eq 0 ]] ; then
-		eerror "One of the following USE flags is needed: jack, alsa or oss"
-		die "Please set one audio engine type"
-	elif [[ "${cnt}" -ne 1 ]] ; then
-		ewarn "You have set ${P} to use multiple audio engine."
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/${P}-gcc44.patch"
-}
-
-src_compile() {
-	local backend
-	if use jack; then
-		backend="jack"
-	elif use alsa; then
-		backend="alsa"
-	elif use oss; then
-		backend="oss"
-	fi
-	einfo "Compiling against ${backend}"
-
-	# when compile with athlon or athlon-xp flags
-	# chuck crashes on removing a shred with a double free or corruption
-	# it happens in Chuck_VM_Stack::shutdown() on the line
-	#   SAFE_DELETE_ARRAY( stack );
-	replace-cpu-flags athlon athlon-xp i686
-
-	cd "${S}/scripting/chuck-1.2.1.2/src"
-	emake -f "makefile.${backend}" CC=$(tc-getCC) CXX=$(tc-getCXX) || die "emake failed"
-
-	cd "${S}/src"
-	emake -f "makefile.${backend}" CC=$(tc-getCC) CXX=$(tc-getCXX) || die "emake failed"
-}
-
-src_install() {
-	dobin src/taps
-
-	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`
-			done
-		done
-		docinto doc
-		dodoc doc/*
-	fi
-}