Revision bump: EAPI 5, epatch_user. Respect LDFLAGS, wrt bug #333747, add workaround for underlinking in bundled library, wrt bug #367845

Package-Manager: portage-2.2.0_alpha185/cvs/Linux x86_64
Manifest-Sign-Key: 0x1F357D42

3 files changed, 113 insertions, 6 deletions

diff --git a/media-sound/miniaudicle/ChangeLog b/media-sound/miniaudicle/ChangeLog
index 0292a804c344..2f13988cc960 100644
--- a/media-sound/miniaudicle/ChangeLog
+++ b/media-sound/miniaudicle/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-sound/miniaudicle
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/miniaudicle/ChangeLog,v 1.9 2013/06/01 12:17:17 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/miniaudicle/ChangeLog,v 1.10 2013/06/27 09:01:01 pinkbyte Exp $
+
+*miniaudicle-0.1.3.8-r2 (27 Jun 2013)
+
+  27 Jun 2013; Sergey Popov <pinkbyte@gentoo.org>
+  +miniaudicle-0.1.3.8-r2.ebuild:
+  Revision bump: EAPI 5, epatch_user. Respect LDFLAGS, wrt bug #333747, add
+  workaround for underlinking in bundled library, wrt bug #367845
 
   01 Jun 2013; Pacho Ramos <pacho@gentoo.org> metadata.xml:
   Cleanup due bug #151880
diff --git a/media-sound/miniaudicle/Manifest b/media-sound/miniaudicle/Manifest
index a82ea4d53a7f..71a0c3f5e55c 100644
--- a/media-sound/miniaudicle/Manifest
+++ b/media-sound/miniaudicle/Manifest
@@ -6,12 +6,17 @@ AUX miniaudicle-0.1.3.8-hid-smc.patch 3101 SHA256 20c137254828b1638c5ef1aecb25d5
 AUX miniaudicle-0.1.3.8-void-to-int-cast.patch 2821 SHA256 3deb04ae8df380698e47a80c46ca48a612d38afd463cfc4d5944bbdfbeb58472 SHA512 88b6a70f9c0a1af6fa9c9e58300c086ee3328821d90059dc8ef811e660ac92c6a3d764917ea0b020684ddf4e870d30d2f29eb0e0ecf312b81927301b9bd8d7e8 WHIRLPOOL 30f33dc80ae3aeb49bb7a54be32f5425d3598b50aebe68f16f5290dcb22105f19b3cab630b120d4f51a84fea8fe7acb2ad9e4a6e7a3e4e3562b98404ce2c25c4
 DIST miniAudicle-0.1.3.8.tgz 2253821 SHA256 adfbd244a7963e646c466f70111fee4ecf32eee500c4c9a33ca9b52387631cd6
 EBUILD miniaudicle-0.1.3.8-r1.ebuild 2591 SHA256 13f3cf56b2086da847b5885dd5856da4d0e7ba13e7284bff1e76c7011e4e082b SHA512 11efe0de221eb1136b6d383b07c08c6bc43331352ba315df1906134ff8e9b310f46e7c93ff9e350c1d21c7f58b5348c5ae07b5e4bcc8b8c2d9b66b8005e22966 WHIRLPOOL 4ca5817165e5b377eb61d377637807a883c0b10c5229671e006cb994895298a54c4f08f4752744d592f985f6eb497f23398145c98bee1f04ad2e94d9ab3af66c
-MISC ChangeLog 1582 SHA256 f4796772fe157a7ce89f488306d31082b432a189d07f87c484d7220f31fa0952 SHA512 2dd0ad36fc31ce0bc64eb4c215bc7744486ae23660999601a70c4ec2da50d599af5b13d090f6af5503d12fd8b93588a488cf5bd8ab59ec3c8b55b593abdd0d56 WHIRLPOOL 6e9c113e619c2531f2ef49cc08a9ae2c23cafe81a151317b110d63950ff073707f77020b2e916f3d8db45a1d42f6dac01172fc670cccd59027fcebb1a207f0f9
+EBUILD miniaudicle-0.1.3.8-r2.ebuild 2666 SHA256 906131833ed5d256e2442a2c6bce266bc6cfaabee55c33e12adac3de4815d2a0 SHA512 8d13171be52e3692e4f64b297626d0097c4fea2d8651f259676afd4a8e7e81c9b28633559923df3dd628342fd6a6419d898ec8c280c418b3a388ee6a8055404d WHIRLPOOL 95b453699ab6dba92df26b40a099b8fb08b1efcbddc17ccbe9f9198642a66b6fe7d187757334db0e8d6d51df6ca52af4ddffadd5f88bd6ab9f70ffa76bbe5a69
+MISC ChangeLog 1852 SHA256 5fc2197d88daf55fab16859974a2b687e9cd0dfad62bc370413c9478ec85044d SHA512 8cd310680d93e41285892ababa93c74426b0bdd387279347a0802baba9371206f5661e3611ce3da94c4e3112f55b2246826def73979a63d6465b61796d5908a3 WHIRLPOOL 4ae5819560d269c4673d91598af30b73d3399b4b872cbb3eecda0c071e9483721c5f14dfe65cac3004519edb4907bb5fa9c61253e625c5408d29d607e73285f3
 MISC metadata.xml 367 SHA256 b479caf5c52d956c84e7de954cf959963b5b76432129a7507dcd09919b85bd4d SHA512 9354560dbefdb4384372594eee28f401251c830481d85b9c2d8cede38b557b404236bb117024f164473adf398556c65c924e5637cbec91e3c9ceec6f84eace13 WHIRLPOOL 589c39cb67c8b28e8da108973ac0c4cda64cd57d9ce6a0284f36b6760952441e28e704377df3112a49ad4e9f42758adf08f3621290310c5de08afaf73cf4b73f
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iEYEAREIAAYFAlGp5k4ACgkQCaWpQKGI+9SA4gCfeOb7RBPYMKJ7u1Hrk7l067Qy
-W0AAn0sQdWtksOkjDk7NRDruQZMzQFMi
-=9wCj
+iQEcBAEBCAAGBQJRy/8TAAoJECo/aRed9267Q1oH/3B8P2Ykky64gnEWyQzSh7vd
+uJ+vVPWhtFuDzfW6NFWgzOyu1uHhN1R/L/4eOPnCMhWdCCrhkQyciCUYsqNpJ7uB
+VJfQwHuEktmXdZOa2fRwb7cHUwXPLcXHbkabw7y1cM9WWyAXgGfNbkXyBPU9CkQ2
+4M+wV514gobbt4wBceXC6+h7l+rIMIRc4wMjUHry/TX+UUfZJgdVVYzkaKNEkdHZ
+gccX6hhZagXBerb9cMA97m2I8AkiUUdz80TISKTgjgFy9FgFmgPP7UiG3tw4ARFg
+NKtnXXvLeE0MavrAU3bpBnB6HeNx2dCpYZ6GqLGXiHPNfgCHx8KcRseNwxF9/zs=
+=kLI8
 -----END PGP SIGNATURE-----
diff --git a/media-sound/miniaudicle/miniaudicle-0.1.3.8-r2.ebuild b/media-sound/miniaudicle/miniaudicle-0.1.3.8-r2.ebuild
new file mode 100644
index 000000000000..5191e88ffd4e
--- /dev/null
+++ b/media-sound/miniaudicle/miniaudicle-0.1.3.8-r2.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/miniaudicle/miniaudicle-0.1.3.8-r2.ebuild,v 1.1 2013/06/27 09:01:01 pinkbyte Exp $
+
+EAPI=5
+WX_GTK_VER=2.8
+inherit eutils toolchain-funcs flag-o-matic wxwidgets
+
+MY_P="${P/a/A}"
+
+DESCRIPTION="integrated development + performance environment for chuck"
+HOMEPAGE="http://audicle.cs.princeton.edu/mini/"
+SRC_URI="http://audicle.cs.princeton.edu/mini/release/files/${MY_P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+alsa jack oss"
+
+RDEPEND="jack? ( media-sound/jack-audio-connection-kit )
+	alsa? ( >=media-libs/alsa-lib-0.9 )
+	media-libs/libsndfile
+	>=x11-libs/gtk+-2.10:2
+	x11-libs/wxGTK:2.8[X]
+	app-admin/eselect-miniaudicle"
+DEPEND="${RDEPEND}
+	sys-devel/bison
+	sys-devel/flex"
+
+S="${WORKDIR}/${MY_P}"
+
+REQUIRED_USE="|| ( alsa jack oss )"
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}/${P}-hid-smc.patch" \
+		"${FILESDIR}/${P}-gcc44.patch" \
+		"${FILESDIR}/${P}-void-to-int-cast.patch"
+
+	sed -i -e 's/make -C/#make -C/' \
+		-e 's/g++/$(CXX)/' \
+		-e 's/-O3 -c/-c $(CFLAGS)/' \
+		-e 's/$(LIBS)/$(LDFLAGS) $(LIBS)/' \
+		makefile.* || die "sed failed"
+
+	# Respect LDFLAGS in bundled media-sound/chuck
+	# prevent underlinking with pthreads library
+	sed -i -e 's/$(LIBS)/$(LDFLAGS) $(LIBS) -lpthread/' \
+		chuck/src/makefile.* || die "sed failed"
+
+	epatch_user
+}
+
+compile_backend() {
+	local backend="$1"
+	einfo "Compiling against ${backend}"
+	cd "${S}/chuck/src"
+	emake -f "makefile.${backend}" CC="$(tc-getCC)" \
+		CXX="$(tc-getCXX)"
+	cd "${S}"
+	emake -f "makefile.${backend}" CC="$(tc-getCC)" \
+		CXX="$(tc-getCXX)"
+	mv wxw/miniAudicle{,-${backend}}
+	emake -f "makefile.${backend}" clean
+	cd "${S}/chuck/src"
+	emake -f "makefile.${backend}" clean
+}
+
+src_compile() {
+	# when compiled with -march=athlon or -march=athlon-xp
+	# miniaudicle 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 wxw/miniAudicle-jack
+	use alsa && dobin wxw/miniAudicle-alsa
+	use oss && dobin wxw/miniAudicle-oss
+	dodoc BUGS README.linux VERSIONS
+}
+
+pkg_postinst() {
+	elog "miniAudicle now can use many audio engines, so you can specify audio engine"
+	elog "with miniAudicle-{jack,alsa,oss}"
+	elog "Or you can use 'eselect miniaudicle' to set the audio engine"
+
+	einfo "Calling eselect miniaudicle update..."
+	eselect miniaudicle update --if-unset
+}