[proaudio] [2339] media-sound/buzztard: workaround multilib-strict and fix for distcc

[subversion@xxxxxxxxxxxxx]

Revision: 2339
Author:   gavlee
Date:     2012-11-23 19:14:43 +0100 (Fri, 23 Nov 2012)
Log Message:
-----------
media-sound/buzztard: workaround multilib-strict and fix for distcc

Modified Paths:
--------------
    trunk/overlays/proaudio/media-sound/buzztard/ChangeLog
    trunk/overlays/proaudio/media-sound/buzztard/Manifest
    trunk/overlays/proaudio/media-sound/buzztard/buzztard-0.6.0.ebuild
    trunk/overlays/proaudio/media-sound/buzztard/buzztard-9999.ebuild

Added Paths:
-----------
    trunk/overlays/proaudio/media-sound/buzztard/files/buzztard-9999/
    trunk/overlays/proaudio/media-sound/buzztard/files/buzztard-9999/0001-multilib-strict.patch
    trunk/overlays/proaudio/media-sound/buzztard/files/buzztard-9999/0002-strip-march-native.patch

Modified: trunk/overlays/proaudio/media-sound/buzztard/ChangeLog
===================================================================
--- trunk/overlays/proaudio/media-sound/buzztard/ChangeLog	2012-11-23 18:14:40 UTC (rev 2338)
+++ trunk/overlays/proaudio/media-sound/buzztard/ChangeLog	2012-11-23 18:14:43 UTC (rev 2339)
@@ -2,6 +2,13 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  23 Nov 2012; Gavin Pryke (gavlee) <gavinlee303@xxxxxxxxxxxxxx>
+  buzztard-0.6.0.ebuild, buzztard-9999.ebuild,
+  +files/buzztard-9999/0001-multilib-strict.patch,
+  +files/buzztard-9999/0002-strip-march-native.patch:
+  remove -march=native for distcc and work around multilib-strict, git now
+  contains media-libs/bsl
+
 *buzztard-9999 (22 Nov 2012)
 *buzztard-0.6.0 (22 Nov 2012)
 

Modified: trunk/overlays/proaudio/media-sound/buzztard/Manifest
===================================================================
--- trunk/overlays/proaudio/media-sound/buzztard/Manifest	2012-11-23 18:14:40 UTC (rev 2338)
+++ trunk/overlays/proaudio/media-sound/buzztard/Manifest	2012-11-23 18:14:43 UTC (rev 2339)
@@ -1,5 +1,7 @@
+AUX buzztard-9999/0001-multilib-strict.patch 665 SHA256 f4a700b569e70f151c406aee66f03512d8fb79d7872d0b97bb858074c8139de6 SHA512 78f3fe85dc64746b052bd92d3709e36dc8aef5b51fc28132c8c1b8ff06b60966d1379b4c88c8e5d39485668b79f14b405f1f02626d8d78252ef95ebf39b6af43 WHIRLPOOL 3fc8091fea6db168249a00e3d8a401de6d7f58d7c170f456a31fa650edd6d58d5cc690c90fba8d4794dfe4cd31c1091f089d3fcb96be1d7932699f76369d99cb
+AUX buzztard-9999/0002-strip-march-native.patch 654 SHA256 368c13888c56807359e4f441207dd5df835bc854272019bb875189c15d53233f SHA512 abcfc9fcc48077bbbbb9ebb27e2ca00822fd8d3ac41ec4ee8b71e64ce9d02e62d91179189708bce0bc90d36cf38c38e951ae4ea38321d403c0315c985c49a927 WHIRLPOOL 6ef7b3d969c94ba9276188537c02b008db4b9284880a57f143fd69257a4b4d399991e9cfe4fc4b4ac00ef2481d6ff90b4669c8ca71e80714d706f9778894fcea
 DIST buzztard-0.6.0.tar.gz 2479453 SHA256 20ecea4c68ac0b3cb4b558b9ef986a0158ec814643b88098a4b595f50c797b5a SHA512 2ecaf9c444569b7271998f190f8fc53dea659e3775cc680ea69579c9c345bc45a10e0c0f60807b495117c319ea3ff67eec3a3c3f8f198db9f31c10855d0f7d86 WHIRLPOOL d49cb459059131923d6e8bdde92d3742f6a96f18ab90d1a9b67ff79793b35b203afd354ffd4c64ba687bca18cfcab9dd7ca0cb780d712a78ed2e7cb2ce0d8f9d
-EBUILD buzztard-0.6.0.ebuild 1208 SHA256 868dcca9a7fc88f331c48338ef31175ab0b3c4ebd55484ed774ad4ce68b064bd SHA512 7b900da370add3a1b38937e1f112f1136eaa5758a7098a7f25da852805604d8f4771c6cdeae4f3703886f4629c64e3f6728ff0ebd4d885655b8c7864b60a53d5 WHIRLPOOL 18684dc091d2e402bda6a9d6ef40664b486586b635c774dcfa3550ecb1d64131ee8a02c665d1c49910bf631db5453575e1e68825662b09fc7fa929ab55af25e0
-EBUILD buzztard-9999.ebuild 1236 SHA256 1b3f05a3be84a37309941c72106712919c215719c2c63d8a8d5baee5711181b7 SHA512 8304e389f92a739814ffadd18c8f2b08862f868d49cd4160f4ce1762e72f8b3a5b8dd1596951ee45a4ebb02f97eef1c496d6b19dfe3efdad32ef21816b83d14c WHIRLPOOL c3700c5a1cc1a7b1c0bd653050437045347f5e73385f18486cd72397460390d68843284b8fb54bf67bac7bafe7a097312a7410ceaf8c3907a621133b217a4c1e
-MISC ChangeLog 842 SHA256 2dfee60a9027fbe7cfb2da19dfc3cc35d76dfb996087df0e7970cc47234f6477 SHA512 c82410fb63ab576caebf0ea29e8caf841267bf49fd4695f91b8ab7813dfec65964499851c42caf7a9dee500dbc68e5d2044f0c097855432b2d1155d36e9fd665 WHIRLPOOL 1a40ec3346fa6dfccd8fbef9af38d69f87ac4d82ccc520281e16d4dd25c874bac9d0397c4fe65526f712b27807837e969ec0b8387a1322d03100fce909cf6b24
+EBUILD buzztard-0.6.0.ebuild 1310 SHA256 36472a77fd1ede33c6600787eeded5299b3fd9494a46e6edd3c0123cf5168151 SHA512 b2ca11dc54b936fe17e58e216a65904b447c57256e375aad40fa2587c54736fe703545ef269dc132a7c4ca52b4cc1b0fb79c46fd5e651844a40c12fb6df6ef1b WHIRLPOOL df8e826d7c58a15988075a0cbb76309c5cb709f6ecb6a9c741e95796e96a6ac42ff2fc4feb248224d06e63c9129a87cc71bbccfcc8aee95b32e92a0e0561016f
+EBUILD buzztard-9999.ebuild 1393 SHA256 6b6e499fa5f54f4e106c56f49dc3df62dc405446219bac4911b426e75acca9dd SHA512 b99944f6860406a84a9ec6f7bef425b94770c89ac6ff07a03f1d53b1b5586624ed6552c091ec3714b15b6f989c7c7c2e22dac144fce76b7825e8a6e51f0c2d64 WHIRLPOOL 18a85b63820300434afcfbc2d5a58004b25902f5723528db8b9b7d8be03ee331ffa4950cc39325d75e2eea0e6e3a35b7f47ea10f8212d421dc568757cdec9605
+MISC ChangeLog 1161 SHA256 843ea19538d82ec1ea0ddb28f090544db7785ee64199e4ffeb13c2c80ad7ccc7 SHA512 7c4de4cd6d24019eadd338d84e5e90b797643926788110be1b93d8f9070a69645d6e04770dfd5837e9def38501c1aa38f270542ae39cc7ea62ce8e5d9fa070ce WHIRLPOOL 1339c57f0f2353aaf7fa5eeb93fa49df490723bc22c083e1fc6040bec0997d8649845052395745839418e77bf958987df5bec7c05d59d1f1190a43370f550b1e
 MISC metadata.xml 361 SHA256 5d2a4e17add590b83f5dbdefc94e76206a6097839729d6ef32ae6e12936eabbc SHA512 78fd54f26a2341e5f7efa52664482333c98497e76ddf05774e19bc6563e2edb30109fb5f8128dde442ed18fe1a03e1c02ba246dd0e7d3c4a826f54ac1fd430b3 WHIRLPOOL 2b8e75d29938e9c680da53c4678199c617705881a87d6e7810377a08adc7b7ec4b30648ba8dbb6e12d236785b8f9ad72c159a58a42fbb4097c90674d161ea647

Modified: trunk/overlays/proaudio/media-sound/buzztard/buzztard-0.6.0.ebuild
===================================================================
--- trunk/overlays/proaudio/media-sound/buzztard/buzztard-0.6.0.ebuild	2012-11-23 18:14:40 UTC (rev 2338)
+++ trunk/overlays/proaudio/media-sound/buzztard/buzztard-0.6.0.ebuild	2012-11-23 18:14:43 UTC (rev 2339)
@@ -24,8 +24,13 @@
 	virtual/pkgconfig
 	doc? ( dev-util/gtk-doc )"
 
+src_prepare() {
+	sed -i -e "s/-march=native//" configure || die
+	gnome2_src_prepare
+}
+
 src_configure() {
-	econf --disable-dependency-tracking \
+	gnome2_src_configure --disable-dependency-tracking \
 		$(use_enable doc gtk-doc-html) \
 		$(use_enable introspection) \
 		$(use_enable static-libs static)

Modified: trunk/overlays/proaudio/media-sound/buzztard/buzztard-9999.ebuild
===================================================================
--- trunk/overlays/proaudio/media-sound/buzztard/buzztard-9999.ebuild	2012-11-23 18:14:40 UTC (rev 2338)
+++ trunk/overlays/proaudio/media-sound/buzztard/buzztard-9999.ebuild	2012-11-23 18:14:43 UTC (rev 2339)
@@ -3,7 +3,7 @@
 # $Header: $
 
 EAPI=4
-inherit gnome2 git-2
+inherit gnome2 eutils autotools git-2
 
 DESCRIPTION="A free, open source music studio that is conceptionally based on Buzz"
 HOMEPAGE="http://www.buzztard.org";
@@ -22,11 +22,18 @@
 	>=x11-libs/gtk+-2.10:2[introspection?]
 	introspection? ( dev-libs/gobject-introspection )"
 DEPEND="${RDEPEND}
+	!media-libs/bsl
 	virtual/pkgconfig
 	doc? ( dev-util/gtk-doc )"
 
+src_prepare() {
+	epatch "${FILESDIR}"/${P}/*.patch
+	AT_NOELIBTOOLIZE=yes eautoreconf
+	gnome2_src_prepare
+}
+
 src_configure() {
-	econf --disable-dependency-tracking \
+	gnome2_src_configure --disable-dependency-tracking \
 		$(use_enable doc gtk-doc-html) \
 		$(use_enable introspection) \
 		$(use_enable static-libs static)

Added: trunk/overlays/proaudio/media-sound/buzztard/files/buzztard-9999/0001-multilib-strict.patch
===================================================================
--- trunk/overlays/proaudio/media-sound/buzztard/files/buzztard-9999/0001-multilib-strict.patch	                        (rev 0)
+++ trunk/overlays/proaudio/media-sound/buzztard/files/buzztard-9999/0001-multilib-strict.patch	2012-11-23 18:14:43 UTC (rev 2339)
@@ -0,0 +1,25 @@
+From 1842b2f87a78c05fca082768b70c52775e6bbb33 Mon Sep 17 00:00:00 2001
+From: "Gavin Pryke (gavlee)" <gavinlee303@xxxxxxxxxxxxxx>
+Date: Fri, 23 Nov 2012 17:20:41 +0000
+Subject: [PATCH 1/2] multilib-strict
+
+---
+ Makefile.src.am |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/Makefile.src.am b/Makefile.src.am
+index a73e93b..4940959 100644
+--- a/Makefile.src.am
++++ b/Makefile.src.am
+@@ -161,7 +161,7 @@ libbuzztard_core_HEADERS = \
+ #
+ 
+ # -- songio plugins
+-songiodir = ${exec_prefix}/lib/buzztard-songio
++songiodir = ${libdir}/buzztard-songio
+ songio_LTLIBRARIES = libbtbsl.la
+ libbtbsl_la_LIBADD = \
+ 	libbuzztard-core.la \
+-- 
+1.7.8.6
+

Added: trunk/overlays/proaudio/media-sound/buzztard/files/buzztard-9999/0002-strip-march-native.patch
===================================================================
--- trunk/overlays/proaudio/media-sound/buzztard/files/buzztard-9999/0002-strip-march-native.patch	                        (rev 0)
+++ trunk/overlays/proaudio/media-sound/buzztard/files/buzztard-9999/0002-strip-march-native.patch	2012-11-23 18:14:43 UTC (rev 2339)
@@ -0,0 +1,25 @@
+From 0aea0e250af3bca8b24116e4d67415432780bbce Mon Sep 17 00:00:00 2001
+From: "Gavin Pryke (gavlee)" <gavinlee303@xxxxxxxxxxxxxx>
+Date: Fri, 23 Nov 2012 17:21:55 +0000
+Subject: [PATCH 2/2] strip -march=native
+
+---
+ configure.ac |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 243b3f1..b8f3eff 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -460,7 +460,7 @@ ARCH_CFLAGS=""
+ ARCH_CPPFLAGS=""
+ case "x${host_cpu}" in
+   xi?86|k?|xx86_64|xamd64)
+-    ARCH_CFLAGS="-march=native"
++    ARCH_CFLAGS=""
+     ARCH_CPPFLAGS="-D__SSE__ -D__MMX__"
+     AC_CHECK_HEADERS([xmmintrin.h])
+     ;;
+-- 
+1.7.8.6
+