do not ignore cxxflags, bug #428384

Package-Manager: portage-2.2.0_alpha142/cvs/Linux x86_64
Manifest-Sign-Key: 0x160F534A

4 files changed, 91 insertions, 5 deletions

diff --git a/media-libs/stk/ChangeLog b/media-libs/stk/ChangeLog
index 022da0da67d7..44fa5836c889 100644
--- a/media-libs/stk/ChangeLog
+++ b/media-libs/stk/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-libs/stk
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/stk/ChangeLog,v 1.13 2012/11/24 16:10:32 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/stk/ChangeLog,v 1.14 2012/11/24 16:13:41 aballier Exp $
+
+*stk-4.4.4-r1 (24 Nov 2012)
+
+  24 Nov 2012; Alexis Ballier <aballier@gentoo.org> +stk-4.4.4-r1.ebuild,
+  +files/stk-4.4.4/050_all_cxxflags.patch:
+  do not ignore cxxflags, bug #428384
 
   24 Nov 2012; Alexis Ballier <aballier@gentoo.org> -stk-4.4.2.ebuild,
   -files/stk-4.4.2/010_all_removeForcedFlags.patch,
diff --git a/media-libs/stk/Manifest b/media-libs/stk/Manifest
index a5904551fab9..fd955bf16371 100644
--- a/media-libs/stk/Manifest
+++ b/media-libs/stk/Manifest
@@ -5,14 +5,16 @@ AUX stk-4.4.4/010_all_removeForcedFlags.patch 388 SHA256 a0fafafc33ebbfa34877e79
 AUX stk-4.4.4/020_all_noExamplesOrDemo.patch 1010 SHA256 16c9fed0600dd40e9cc877c52d633bcf44221699a09f681045034053e2c6003a SHA512 380515b3854c8cd257b22533d6215391d06dc8dac679ce5d8a7d37bb936fc9b98976c83921cfa256c48dfe046b8aad173b374b95f4fe5e429584ba2e9d3fb656 WHIRLPOOL 1bb40384b182d807b036cd07d886c67edfaa6934a815f7168c3d39c1d5ecca9354201d852974577f4342560886aa38613390e91e2301d0bd6d4f902ffcb17b0c
 AUX stk-4.4.4/030_all_sharedlib.patch 416 SHA256 71357937d099f46f8490eacc31376aa22798fa4a7124461f925af178b5eda9ab SHA512 9cf10f17f7d2df0c50b2f61aa6bdc8a15f7410225ec73bbe22a1ddab6c8af82a830cdcb2a80ca765a545f18d097afc7511e54116cbe3ebccee1cbeb77de44a88 WHIRLPOOL 050892ec53dffed47e70c42557920a446a8d0079fbaf8f6c1982205aec4eef833e4427a4a7451efb42e8c2bb5732af98910f370ac5c68923245ab2d5c9852c9d
 AUX stk-4.4.4/040_all_sharedliblink.patch 478 SHA256 01868b98903d3bf4660687dade64d5ccad7f233629be0ff820bac3dc0ae03e3b SHA512 e8bd153b5ce20fc5742b2c3aec2afe022a782afb4c7d34fda1cfa0747fa1cd41eb7f6f66d1c73a901d856057c1813ebb103310df052c3b6a0f36bd2d5bfe4c38 WHIRLPOOL 5edeaf69722d96929d1c37f007d061a1b08e8cca6e3a29cdc3ece5326fa9bed0e72e1d7e09eff009bf0f83efd537e325514b9288a2d5fdda402b431e27dc89ca
+AUX stk-4.4.4/050_all_cxxflags.patch 451 SHA256 3014a5a8f66b1c57f64224eb4abe3d6c5d9852e94c0cd8dd53e5bdee559652c9 SHA512 27567ba29bdc0a4caf781c6ad5ece392f5227353dc55cdccd3505bb0a1d85b96feb6263364ae341bc202fecca1d3d786f95e6d4e13b0f521a7b22a7f56c168a0 WHIRLPOOL 7268aac7e656e58acd9717bcdd11d0bad909542de470438f36ba0f3d7c56d4aedbc24e349ea251d9a1ee958b10428698aa1fa52519cdd2e0e9079910971869bb
 DIST stk-4.4.4.tar.gz 6181713 SHA256 1276986481704f148933d4a2f8eaebb84827124acbd0243e5c8a004fa7c70710 SHA512 e36c43a20e95eb86ed0335ae17df23c1a672562656738496f9e2e5654a825292c4235e04774fcb0356d47a775b7d7af6b4fd63c9d151ab7f2f9195bb5f728e37 WHIRLPOOL 2bfbcfe16dd37e31a0db16603c39e107d0c6a78c667e4597e6dc05243d2edb451acd3f3f7ac1b6698807213f06d11d0982298e13011fed3f5bc814eb4d0cd74d
+EBUILD stk-4.4.4-r1.ebuild 1675 SHA256 f6861f5837c957096d6fb4bdec7639816ca503afbcea1b24fcb417216f3ecf0e SHA512 4e3410a81a0820f7b34e05fb349a6bbd21e3a3ad584c28b8c34ea7f044b21122a9b992ed754b5d5c8c0fc87af7e8fbf0a4ff55388821856ce1580fbf2b10a83b WHIRLPOOL 9c084f69d7119b4d977e1ec4f66718f18dbf3b5815d8d6ac21096524295e9e9a22a009f5dc91e9332d33cbdd6f1cf98761c955025cd88669191e087d48767c4d
 EBUILD stk-4.4.4.ebuild 1672 SHA256 4aef575fb54309cb6f4c5b2066534dd4283d9f5293b1a9ce9a3261b9a3e3c10b SHA512 3303b0f9ff99740a933fc38c81c8f78dc898790ec38c1a4b5ca12991786fa297f453e7c0bcfeefda311153786eff147557a56857354c10446e74d6f9ecf7ca02 WHIRLPOOL 6e26815426a31ff898b8813313a91bbf4b08b09ad6891a6cc61fc7ad3273324801e2de1711ed2b412b9e161a31cefea3cb1b0bd8251d5b03864f38637235d728
-MISC ChangeLog 3403 SHA256 0a34badffa7f81fa4ddef3da5bef7ac52938c4ea2ecbceddd55db8df0af99ebb SHA512 70ea524e674355437137eccabba40739b38bc8f21e3547b0c3b68f5ba11ded936b9590a6286014fd1f721acb126506008772c74f53d9fcd1145f1149d1b7ee55 WHIRLPOOL 687c45c63f5777e2f54bb548b9a8512938c0422a8286e507fefc9bc9dbb97fbe8a8bb7d46e5afd9267867b21fe248cbacf5583bfb5f9d1636066b0bd8d346d0d
+MISC ChangeLog 3588 SHA256 d290532413ba12b009f2bcaa435710f6752b6845464dee1ed1a15f498744e553 SHA512 d116a87f847483adc3fc1e9fbfa11e22c915161395d0809afe6c149cc0cd954e8eac53ba8e3003e55b7034d2942c592faa9124da87ca31fa06f1830c14c62a25 WHIRLPOOL 57b1d71e868e07de799818961e84d7fbcbecabbd84babdb2c82b2b1fa03e84f5613298df275c13335c43899dc29c7bd13282d713296cb667a1dc7b12f0ce48c9
 MISC metadata.xml 352 SHA256 f2c8dc1810e2ee90a144d4670591484d8ad5ce927df0f493016548ea5cbaf343 SHA512 2d5bc4b6cacce501d26ef538cda2a7bae95d52daa9bca6773e547898c0fc59ee94b86454478c75d64b4db261d441eb8a6c3d7bff2dde5b12a36fd8472bde92e4 WHIRLPOOL bd309068330150cce196c8beeb041c34d7fa3d8d58d19cd9606f9995de0d1db685786378b4c081f6054ebff91f2dc639e576efd18cfcd3c213e344d799d6addd
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlCw8XkACgkQvFcC4BYPU0oFtgCgl3fF++OEYqXHZcv9BnIFemL9
-b4YAn1vl5iEMOnxFLBQdKxFZj0n0swNC
-=B2XK
+iEYEAREIAAYFAlCw8jYACgkQvFcC4BYPU0pDaACfQJpC7QjC6OdefGZMnmHTdads
+risAnjKGjRlHOe41T75ZtKfMKFBnoPBd
+=7SPE
 -----END PGP SIGNATURE-----
diff --git a/media-libs/stk/files/stk-4.4.4/050_all_cxxflags.patch b/media-libs/stk/files/stk-4.4.4/050_all_cxxflags.patch
new file mode 100644
index 000000000000..d4db1d81c5e3
--- /dev/null
+++ b/media-libs/stk/files/stk-4.4.4/050_all_cxxflags.patch
@@ -0,0 +1,15 @@
+Index: stk-4.4.4/configure.ac
+===================================================================
+--- stk-4.4.4.orig/configure.ac
++++ stk-4.4.4/configure.ac
+@@ -80,8 +80,8 @@ fi
+ CPPFLAGS="$CPPFLAGS $cppflag"
+ 
+ # For debugging and optimization ... overwrite default because it has both -g and -O2
+-echo "$CXXFLAGS"
+-CXXFLAGS="$cxxflag"
++#echo "$CXXFLAGS"
++#CXXFLAGS="$cxxflag"
+ 
+ # Check compiler and use -Wall if gnu.
+ if [test $GXX = "yes" ;] then
diff --git a/media-libs/stk/stk-4.4.4-r1.ebuild b/media-libs/stk/stk-4.4.4-r1.ebuild
new file mode 100644
index 000000000000..9ed0701151eb
--- /dev/null
+++ b/media-libs/stk/stk-4.4.4-r1.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/stk/stk-4.4.4-r1.ebuild,v 1.1 2012/11/24 16:13:41 aballier Exp $
+
+EAPI="2"
+inherit eutils autotools
+
+DESCRIPTION="Synthesis ToolKit in C++"
+HOMEPAGE="http://ccrma.stanford.edu/software/stk/"
+SRC_URI="http://ccrma.stanford.edu/software/stk/release/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="alsa debug doc jack oss"
+
+RDEPEND="alsa? ( media-libs/alsa-lib )
+	jack? ( media-sound/jack-audio-connection-kit )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	dev-lang/perl"
+
+src_prepare() {
+	EPATCH_SUFFIX="patch" epatch "${FILESDIR}/${P}"
+	eautoreconf
+}
+
+src_configure() {
+	#breaks with --disable-foo...uses as --enable-foo
+	local myconf
+	if use debug; then
+		myconf="${myconf} --enable-debug"
+	fi
+	if use oss; then
+		myconf="${myconf} --with-oss"
+	fi
+	if use alsa; then
+		myconf="${myconf} --with-alsa"
+	fi
+	if use jack; then
+		myconf="${myconf} --with-jack"
+	fi
+
+	econf ${myconf} \
+		RAWWAVE_PATH=/usr/share/stk/rawwaves/
+}
+
+src_install() {
+	dodoc README || die "Failed to install README"
+	# install the lib
+	dolib src/libstk.* || die "Failed to install libstk.*"
+	# install headers
+	insinto /usr/include/stk || die "Failed to create header directory."
+	doins include/*.h include/*.msg include/*.tbl \
+		|| die "Failed to install msg, tbl and h files."
+	# install rawwaves
+	insinto /usr/share/stk/rawwaves || die "Failed to create rawwave directory."
+	doins rawwaves/*.raw || die "Failed to install rawwave files."
+	# install docs
+	if use doc; then
+		dohtml -r doc/html/* || die "Failed to install docs."
+	fi
+}