Fix bug 240616 (gcc-4.3), thanks to Francisco José Cañizares Santofimia <telefrancisco@gmail.com> and bug 243000 (update-mime-database collision).

Package-Manager: portage-2.2_rc13/cvs/Linux 2.6.27 x86_64

4 files changed, 389 insertions, 14 deletions

diff --git a/media-sound/beast/ChangeLog b/media-sound/beast/ChangeLog
index e1a46cd8b99a..d838386572d5 100644
--- a/media-sound/beast/ChangeLog
+++ b/media-sound/beast/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-sound/beast
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/beast/ChangeLog,v 1.37 2008/06/29 17:46:18 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/beast/ChangeLog,v 1.38 2008/11/02 14:59:30 loki_val Exp $
+
+  02 Nov 2008; Peter Alfredsen <loki_val@gentoo.org>
+  +files/beast-0.7.1-gcc43.patch, beast-0.7.1-r1.ebuild:
+  Fix bug 240616 (gcc-4.3), thanks to Francisco José Cañizares Santofimia
+  <telefrancisco@gmail.com> and bug 243000 (update-mime-database collision).
 
   29 Jun 2008; Gilles Dartiguelongue <eva@gentoo.org> -beast-0.7.1.ebuild:
   clean up old broken revision, fix bug #226761.
diff --git a/media-sound/beast/Manifest b/media-sound/beast/Manifest
index 40820a49cd04..0e049a85dead 100644
--- a/media-sound/beast/Manifest
+++ b/media-sound/beast/Manifest
@@ -1,20 +1,11 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX beast-0.7.1-configure.patch 2689 RMD160 8bae5d7925f0d86c1c5d46fcd413e87c3d9d7906 SHA1 f9707728e41f608bd6624122e96dfa8b42bc6958 SHA256 b50cd22620a4fa3bdaedd7481b720387a47f649815eecac86842ac7c9e40f924
+AUX beast-0.7.1-gcc43.patch 12025 RMD160 1dc0f60b488b3ce2a3d6282c47072d0edcf6e6f9 SHA1 81358b3522cc3f96448d06a98684199c6c910499 SHA256 92bfe93b65240c844a9674aef872f6236aaa64ea2dd4ecd95d0e9a82fab9219e
 AUX beast-0.7.1-glib.patch 1242 RMD160 f0291a1a293566d027135f6388dd861f46fcf87f SHA1 9ed5d954a21c45fdd03cb82a36188f0547223fc9 SHA256 63aa730d5ed5509ea2dfca68c481b66c38f271c7a2a8909138f46411790b8ffd
 AUX beast-0.7.1-noinstalltest.patch 1386 RMD160 d4e2051fd020bbb3711b00d4905dcbb6608b04a2 SHA1 501b240bced2285d85ffa08e54fb56811d8ded77 SHA256 d6d8cf493d4116dfbec7d89f07f133326d6216f48a1e782280699d0fa2eca643
 AUX beast-0.7.1-potfiles.patch 935 RMD160 8e3d7e29e717786b4a51ab1e4274a5ec54360285 SHA1 ef9b297e2dc19ea7feeb5fa2ee44d92fbf259db1 SHA256 1888e78d4eae3ca85aaf10875ba20324035954b32857e88f75f3f245994daff3
 AUX beast-0.7.1-signalheader.patch 622 RMD160 78a80612b046d9ad88a213f6a5f7f23718c05d7b SHA1 76d1e0426fafd774c58c1da84f786006594a9c79 SHA256 942c4e65ae53632d9ffebbec5ca82f1be70be8dfc7ea97719e78004ce9690465
 DIST beast-0.7.1-guile-1.8.diff.bz2 5709 RMD160 8c47de83fd9e59b3dc3b4f5f3fa5e33de361f919 SHA1 37ae2db136c1319efc73a597710bd066025d33f0 SHA256 dc5194deff4b0a0eec368a69090db682d0c3113044ce2c2ed017ddfec9d3814e
 DIST beast-0.7.1.tar.bz2 5806537 RMD160 45d928542573cdbc73791bae6b871bc59f5a6c8f SHA1 6dac7e6f3e36305f85e472bc6724d875ea22fc30 SHA256 b4bc1dfb3bba22f7fe1a5588d2d4a66c746e9c7607709304b13aa390420cd44b
-EBUILD beast-0.7.1-r1.ebuild 2252 RMD160 2589545016450d6382c1d137553e14bce24584f5 SHA1 00cf821c1ac07a450b85c3f14d2b205792e640f0 SHA256 f0205256c3426cd91afcc96cc1577bf5b9df5d9fd55abcd6bcd7f1c944d096e7
-MISC ChangeLog 5587 RMD160 2c19d8183a02d8219f39c8d5490f5094d9290559 SHA1 e43831c4bda4afcd3d368bfe64e036e84bbe576d SHA256 359ab8cddb76435b5d8409c84db2ad3f2367529a4a2ec1b653f70cb760866711
+EBUILD beast-0.7.1-r1.ebuild 2410 RMD160 8fcc1037e133641078fb412f1d8c1a506d12d500 SHA1 73f5226de68b41d531e56cf80a0813970ca3990e SHA256 2a5ca89ce31e3ddef37e672799e404a09b485db03d21621fdb56269f23254a37
+MISC ChangeLog 5856 RMD160 73c3504ee45b18562001374d52cb9ac316ea759e SHA1 b379305dcd7c35129b27a7e96672751cde4f5fe7 SHA256 f1937b0b0867601e6e58d656c32ad74b39a78f93defcaac8f632bd45c6a9adb0
 MISC metadata.xml 177 RMD160 c4ff678488aa3bd8f3e5e4cf6e52a56caba3dad9 SHA1 73b04fb757f8a6473a2c43b0807a95381da37afc SHA256 dfb196addaf8aa212436c53c3d47cda0d10c2850c59fa2dcb7554dfa10190af2
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkhnymwACgkQ1fmVwcYIWAYV+ACfV1K5IFx6Dcy5N8zsIuiioaCH
-XR4AoMpNKZgJQ05NC7XN1D52k5otx2uv
-=UeKL
------END PGP SIGNATURE-----
diff --git a/media-sound/beast/beast-0.7.1-r1.ebuild b/media-sound/beast/beast-0.7.1-r1.ebuild
index 938289e1cd8a..eeafe6971d22 100644
--- a/media-sound/beast/beast-0.7.1-r1.ebuild
+++ b/media-sound/beast/beast-0.7.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/beast/beast-0.7.1-r1.ebuild,v 1.6 2008/06/22 22:10:00 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/beast/beast-0.7.1-r1.ebuild,v 1.7 2008/11/02 14:59:30 loki_val Exp $
 
 inherit autotools eutils fdo-mime
 
@@ -56,6 +56,9 @@ src_unpack() {
 	# Fix po tests
 	epatch "${FILESDIR}/${P}-potfiles.patch"
 
+	# Fix gcc 4.3.x
+	epatch "${FILESDIR}/${P}-gcc43.patch"
+
 	# Remove useless dist check that makes tests fail
 	sed -i "s/\.PHONY:.*/.PHONY:/" Makefile.decl || die "sed failed"
 
@@ -64,6 +67,9 @@ src_unpack() {
 }
 
 src_compile() {
+	#kluge to work-around update-mime-database collision
+	export UPDATE_MIME_DATABASE="/bin/true"
+
 	#for some weird reasons there is no doxer in this release
 	econf $(use_enable debug) \
 		$(use_enable static) \
diff --git a/media-sound/beast/files/beast-0.7.1-gcc43.patch b/media-sound/beast/files/beast-0.7.1-gcc43.patch
new file mode 100644
index 000000000000..fbe28d7b3fd4
--- /dev/null
+++ b/media-sound/beast/files/beast-0.7.1-gcc43.patch
@@ -0,0 +1,373 @@
+--- beast-0.7.1.orig/bse/tests/resamplehandle.cc
++++ beast-0.7.1/bse/tests/resamplehandle.cc
+@@ -24,6 +24,7 @@
+ #include <bse/gsldatautils.h>
+ #include <bse/bseblockutils.hh>
+ #include <vector>
++#include <cstdlib>
+ 
+ using std::vector;
+ using std::max;
+only in patch2:
+unchanged:
+--- beast-0.7.1.orig/bse/tests/firhandle.cc
++++ beast-0.7.1/bse/tests/firhandle.cc
+@@ -26,6 +26,7 @@
+ #include <math.h>
+ #include <complex>
+ #include <vector>
++#include <cstdlib>
+ 
+ using std::vector;
+ using std::min;
+only in patch2:
+unchanged:
+--- beast-0.7.1.orig/bse/tests/filtertest.cc
++++ beast-0.7.1/bse/tests/filtertest.cc
+@@ -26,6 +26,7 @@
+ #include "topconfig.h"
+ #include <math.h>
+ #include <complex>
++#include <cstdlib>
+ 
+ typedef std::complex<double> Complex;
+ using namespace Birnet;
+only in patch2:
+unchanged:
+--- beast-0.7.1.orig/bse/bseresamplerimpl.hh
++++ beast-0.7.1/bse/bseresamplerimpl.hh
+@@ -23,6 +23,8 @@
+ #include <bse/bseresampler.hh>
+ #include <birnet/birnet.hh>
+ #include <math.h>
++#include <cstring>
++#include <cstdlib>
+ #ifdef __SSE__
+ #include <xmmintrin.h>
+ #endif
+only in patch2:
+unchanged:
+--- beast-0.7.1.orig/bse/bseprocidl.cc
++++ beast-0.7.1/bse/bseprocidl.cc
+@@ -24,6 +24,7 @@
+ #include <stdio.h>
+ #include <string>
+ #include <set>
++#include <cstring>
+ 
+ std::set<std::string> needTypes;
+ std::set<std::string> needClasses;
+only in patch2:
+unchanged:
+--- beast-0.7.1.orig/bse/bsecxxplugin.hh
++++ beast-0.7.1/bse/bsecxxplugin.hh
+@@ -56,7 +56,7 @@
+ #define BSE_CXX_REGISTER_STATIC_HOOK(HookType)  BSE_CXX_REGISTER_HOOK_NODE (HookType, 1)
+ #define BSE_CXX_REGISTER_HOOK_NODE(HookType, __static)                  \
+   template<class E> static BseExportNode* bse_export_node ();           \
+-  template<> static BseExportNode*                                      \
++  template<> BseExportNode*                                      \
+   bse_export_node<HookType> ()                                          \
+   {                                                                     \
+     static BseExportNodeHook hnode = {                                  \
+@@ -91,7 +91,7 @@
+   (::NameSpace::bse_type_keeper__3##EnumType.get_type ())
+ #define BSE_CXX_DECLARE_ENUM(EnumType,EnumName,N,ICode)                 \
+   template<class E> static BseExportNode* bse_export_node ();           \
+-  template<> static BseExportNode*                                      \
++  template<> BseExportNode*                                      \
+   bse_export_node<EnumType> ()                                          \
+   {                                                                     \
+     static BseExportNodeEnum enode = {                                  \
+@@ -145,7 +145,7 @@
+   (::NameSpace::bse_type_keeper__1##RecordType.get_type ())
+ #define BSE_CXX_DECLARE_RECORD(RecordType)                              \
+   template<class E> static BseExportNode* bse_export_node ();           \
+-  template<> static BseExportNode*                                      \
++  template<> BseExportNode*                                      \
+   bse_export_node<RecordType> ()                                        \
+   {                                                                     \
+     static BseExportNodeBoxed bnode = {                                 \
+@@ -181,7 +181,7 @@
+   (::NameSpace::bse_type_keeper__2##SequenceType.get_type ())
+ #define BSE_CXX_DECLARE_SEQUENCE(SequenceType)                                  \
+   template<class E> static BseExportNode* bse_export_node ();                   \
+-  template<> static BseExportNode*                                              \
++  template<> BseExportNode*                                              \
+   bse_export_node<SequenceType> ()                                              \
+   {                                                                             \
+     static BseExportNodeBoxed bnode = {                                         \
+@@ -219,7 +219,7 @@
+   extern ::Bse::ExportTypeKeeper bse_type_keeper__9##ProcType;
+ #define BSE_CXX_REGISTER_PROCEDURE(ProcType)                                    \
+   template<class C> static ::BseExportNode* bse_export_node ();                 \
+-  template<> static ::BseExportNode*                                            \
++  template<> ::BseExportNode*                                            \
+   bse_export_node<Procedure::ProcType> ()                                       \
+   {                                                                             \
+     static ::BseExportNodeProc pnode = {                                        \
+@@ -259,7 +259,7 @@
+ #define BSE_CXX_REGISTER_EFFECT(Effect)                                         \
+   BSE_CXX_DEFINE_STATIC_DATA (Effect##Base);                                    \
+   template<class C> static ::BseExportNode* bse_export_node ();                 \
+-  template<> static ::BseExportNode*                                            \
++  template<> ::BseExportNode*                                            \
+   bse_export_node<Effect> ()                                                    \
+   {                                                                             \
+     static ::BseExportNodeClass cnode = {                                       \
+only in patch2:
+unchanged:
+--- beast-0.7.1.orig/bse/Makefile.in
++++ beast-0.7.1/bse/Makefile.in
+@@ -422,7 +422,7 @@
+ # need -I$(srcdir) for "bseserver.h" in .genprc.c
+ # need -I. (builddir) for "bsecore.genidl.hh" in bsecore.cc
+ INCLUDES = -I$(top_srcdir) -I$(top_builddir) -I$(srcdir) -I. \
+-	$(BSE_CFLAGS) -DG_DISABLE_DEPRECATED -DG_DISABLE_CONST_RETURNS
++	$(BSE_CFLAGS) -DG_DISABLE_CONST_RETURNS
+ EXTRA_HEADERS =
+ MAINTAINERCLEANFILES = $(GENERATED) $(am__append_2)
+ #	-Wl,-Bsymbolic
+only in patch2:
+unchanged:
+--- beast-0.7.1.orig/bse/bseloader-guspatch.cc
++++ beast-0.7.1/bse/bseloader-guspatch.cc
+@@ -22,6 +22,7 @@
+ #include <errno.h>
+ #include <vector>
+ #include <string>
++#include <cstring>
+ 
+ #undef  WITH_GUSPATCH_XINFOS
+ static SFI_MSG_TYPE_DEFINE (debug_guspatch, "guspatch", SFI_MSG_DEBUG, NULL);
+only in patch2:
+unchanged:
+--- beast-0.7.1.orig/bse/bsesequencer.cc
++++ beast-0.7.1/bse/bsesequencer.cc
+@@ -30,6 +30,7 @@
+ #include <fcntl.h>
+ #include <errno.h>
+ #include <vector>
++#include <cstring>
+ 
+ /* due to a linker/compiler bug on SuSE 9.2, we need to
+  * define extern "C" symbols outside of any C++ namespace,
+only in patch2:
+unchanged:
+--- beast-0.7.1.orig/sfi/sfidl-cxxbase.cc
++++ beast-0.7.1/sfi/sfidl-cxxbase.cc
+@@ -23,6 +23,7 @@
+ #include <unistd.h>
+ #include <errno.h>
+ #include <ctype.h>
++#include <cstring>
+ #include "sfidl-namespace.hh"
+ #include "sfidl-options.hh"
+ #include "sfidl-parser.hh"
+only in patch2:
+unchanged:
+--- beast-0.7.1.orig/sfi/sfidl-namespace.cc
++++ beast-0.7.1/sfi/sfidl-namespace.cc
+@@ -21,6 +21,7 @@
+ #include <list>
+ #include <string>
+ #include <map>
++#include <algorithm>
+ #include "sfidl-namespace.hh"
+ #include <sfi/glib-extra.h>
+ 
+only in patch2:
+unchanged:
+--- beast-0.7.1.orig/sfi/sfidl-options.cc
++++ beast-0.7.1/sfi/sfidl-options.cc
+@@ -22,6 +22,7 @@
+ #include "topconfig.h"
+ #include <sfi/glib-extra.h>
+ #include <stdio.h>
++#include <cstring>
+ 
+ /* FIXME: should be filled out and written into topconfig.h by configure */
+ #define SFIDL_VERSION        BST_VERSION
+only in patch2:
+unchanged:
+--- beast-0.7.1.orig/sfi/sficxx.hh
++++ beast-0.7.1/sfi/sficxx.hh
+@@ -23,6 +23,7 @@
+ #include <sfi/sfi.h>
+ #include <string>
+ #include <new>
++#include <cstring>
+ 
+ namespace Sfi {
+ 
+only in patch2:
+unchanged:
+--- beast-0.7.1.orig/sfi/sfidl-factory.cc
++++ beast-0.7.1/sfi/sfidl-factory.cc
+@@ -18,6 +18,7 @@
+  */
+ #include "sfidl-factory.hh"
+ #include "glib-extra.h"
++#include <algorithm>
+ 
+ using namespace Sfidl;
+ using namespace std;
+only in patch2:
+unchanged:
+--- beast-0.7.1.orig/sfi/sfidl-parser.cc
++++ beast-0.7.1/sfi/sfidl-parser.cc
+@@ -27,6 +27,9 @@
+ #include <iostream>
+ #include <set>
+ #include <stack>
++#include <cstring>
++#include <cstdlib>
++#include <algorithm>
+ 
+ const std::string
+ Sfidl::string_from_int (long long int lli)
+only in patch2:
+unchanged:
+--- beast-0.7.1.orig/tests/bse/filtertest.cc
++++ beast-0.7.1/tests/bse/filtertest.cc
+@@ -28,6 +28,7 @@
+ #include <birnet/birnettests.h>
+ #include "topconfig.h"
+ #include <errno.h>
++#include <cstdlib>
+ 
+ using std::string;
+ using std::vector;
+only in patch2:
+unchanged:
+--- beast-0.7.1.orig/tools/bsewavetool.cc
++++ beast-0.7.1/tools/bsewavetool.cc
+@@ -34,6 +34,7 @@
+ #include <fcntl.h>
+ #include <vector>
+ #include <map>
++#include <algorithm>
+ 
+ 
+ namespace BseWaveTool {
+only in patch2:
+unchanged:
+--- beast-0.7.1.orig/tools/bsefcompare.cc
++++ beast-0.7.1/tools/bsefcompare.cc
+@@ -28,6 +28,7 @@
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <fcntl.h>
++#include <cstring>
+ 
+ #include "topconfig.h"
+ 
+only in patch2:
+unchanged:
+--- beast-0.7.1.orig/tools/bsefextract.cc
++++ beast-0.7.1/tools/bsefextract.cc
+@@ -27,6 +27,8 @@
+ #include <errno.h>
+ #include <assert.h>
+ #include "topconfig.h"
++#include <cstring>
++#include <cstdlib>
+ 
+ #include <map>
+ #include <string>
+only in patch2:
+unchanged:
+--- beast-0.7.1.orig/birnet/tests/sorting.cc
++++ beast-0.7.1/birnet/tests/sorting.cc
+@@ -19,6 +19,8 @@
+ // #define TEST_VERBOSE
+ #include <birnet/birnettests.h>
+ #include <math.h>
++#include <cstdlib>
++#include <algorithm>
+ 
+ namespace {
+ using namespace Birnet;
+only in patch2:
+unchanged:
+--- beast-0.7.1.orig/birnet/tests/strings.cc
++++ beast-0.7.1/birnet/tests/strings.cc
+@@ -18,6 +18,7 @@
+  */
+ //#define TEST_VERBOSE
+ #include <birnet/birnettests.h>
++#include <cstdlib>
+ using namespace Birnet;
+ 
+ namespace {
+only in patch2:
+unchanged:
+--- beast-0.7.1.orig/birnet/tests/threads.cc
++++ beast-0.7.1/birnet/tests/threads.cc
+@@ -18,6 +18,7 @@
+  */
+ //#define TEST_VERBOSE
+ #include <birnet/birnettests.h>
++#include <cstdlib>
+ 
+ namespace {
+ using namespace Birnet;
+only in patch2:
+unchanged:
+--- beast-0.7.1.orig/birnet/birnetutils.cc
++++ beast-0.7.1/birnet/birnetutils.cc
+@@ -31,6 +31,7 @@
+ #include <algorithm>
+ #include <cxxabi.h>
+ #include <signal.h>
++#include <cstring>
+ 
+ #ifndef _
+ #define _(s)    s
+only in patch2:
+unchanged:
+--- beast-0.7.1.orig/birnet/birnetsignal.hh
++++ beast-0.7.1/birnet/birnetsignal.hh
+@@ -435,7 +435,7 @@
+ /* --- predefined signals --- */
+ template<class Emitter>
+ struct SignalFinalize : Signal0 <Emitter, void, ScopeReferenceFinalizationMark> {
+-  typedef Signal0<Emitter, void, ScopeReferenceFinalizationMark> Signal0;
++  typedef Birnet::Signals::Signal0<Emitter, void, ScopeReferenceFinalizationMark> Signal0;
+   explicit SignalFinalize (Emitter &emitter)                             : Signal0 (emitter) {}
+   explicit SignalFinalize (Emitter &emitter, void (Emitter::*method) ()) : Signal0 (emitter, method) {}
+   BIRNET_PRIVATE_CLASS_COPY (SignalFinalize);
+@@ -443,7 +443,7 @@
+ 
+ template<class Emitter>
+ struct SignalVoid : Signal0 <Emitter, void> {
+-  typedef Signal0<Emitter, void> Signal0;
++	typedef Birnet::Signals::Signal0<Emitter, void> Signal0;
+   explicit SignalVoid (Emitter &emitter)                                 : Signal0 (emitter) {}
+   explicit SignalVoid (Emitter &emitter, void (Emitter::*method) (void)) : Signal0 (emitter, method) {}
+   BIRNET_PRIVATE_CLASS_COPY (SignalVoid);
+only in patch2:
+unchanged:
+--- beast-0.7.1.orig/birnet/birnetmsg.cc
++++ beast-0.7.1/birnet/birnetmsg.cc
+@@ -21,6 +21,7 @@
+ #include "birnetthread.hh"
+ #include <syslog.h>
+ #include <errno.h>
++#include <cstring>
+ 
+ #ifndef _ // FIXME
+ #define _(x)    (x)
+only in patch2:
+unchanged:
+--- beast-0.7.1.orig/birnet/birnetsignaltemplate.hh
++++ beast-0.7.1/birnet/birnetsignaltemplate.hh
+@@ -165,7 +165,7 @@
+ template<class Emitter, typename R0, typename A1, typename A2, typename A3, class Collector>
+ struct Signal<Emitter, R0 (A1, A2, A3), Collector> : Signal3<Emitter, R0, A1, A2, A3, Collector>
+ {
+-  typedef Signal3<Emitter, R0, A1, A2, A3, Collector> Signal3;
++  typedef Birnet::Signals::Signal3<Emitter, R0, A1, A2, A3, Collector> Signal3;
+   explicit Signal (Emitter &emitter) :
+     Signal3 (emitter)
+     {}