Version bump, gtk2 version, bug #150602

(Portage version: 2.1.3_rc9)

4 files changed, 89 insertions, 0 deletions

diff --git a/media-sound/ardour/files/ardour-2.0.3-cflags.patch b/media-sound/ardour/files/ardour-2.0.3-cflags.patch
new file mode 100644
index 000000000000..61ffa3c9b6ab
--- /dev/null
+++ b/media-sound/ardour/files/ardour-2.0.3-cflags.patch
@@ -0,0 +1,37 @@
+Index: ardour-2.0.3/SConstruct
+===================================================================
+--- ardour-2.0.3.orig/SConstruct
++++ ardour-2.0.3/SConstruct
+@@ -27,6 +27,7 @@ subst_dict = { }
+ opts = Options('scache.conf')
+ opts.AddOptions(
+     ('ARCH', 'Set architecture-specific compilation flags by hand (all flags as 1 argument)',''),
++    ('CFLAGS', 'Set custom CFLAGS',''),
+     BoolOption('AUDIOUNITS', 'Compile with Apple\'s AudioUnit library. (experimental)', 0),
+     BoolOption('COREAUDIO', 'Compile with Apple\'s CoreAudio library', 0),
+     BoolOption('DEBUG', 'Set to build with debugging information and no optimizations', 0),
+@@ -668,14 +669,18 @@ if env['ARCH'] != '':
+ # prepend boiler plate optimization flags
+ #
+ 
+-opt_flags[:0] = [
+-    "-O3",
+-    "-fomit-frame-pointer",
+-    "-ffast-math",
+-    "-fstrength-reduce",
+-    "-pipe"
++if env['CFLAGS'] != '':
++    opt_flags[:0]=env['CFLAGS'].split()
++else:
++    opt_flags[:0] = [
++        "-O3",
++        "-fomit-frame-pointer",
++        "-ffast-math",
++        "-fstrength-reduce",
++        "-pipe"
+     ]
+ 
++
+ if env['DEBUG'] == 1:
+     env.Append(CCFLAGS=" ".join (debug_flags))
+     env.Append(LINKFLAGS=" ".join (debug_flags))
diff --git a/media-sound/ardour/files/ardour-2.0.3-multilibstrict.patch b/media-sound/ardour/files/ardour-2.0.3-multilibstrict.patch
new file mode 100644
index 000000000000..508a4eaadc9d
--- /dev/null
+++ b/media-sound/ardour/files/ardour-2.0.3-multilibstrict.patch
@@ -0,0 +1,13 @@
+Index: ardour-2.0.3/libs/surfaces/powermate/SConscript
+===================================================================
+--- ardour-2.0.3.orig/libs/surfaces/powermate/SConscript
++++ ardour-2.0.3/libs/surfaces/powermate/SConscript
+@@ -49,7 +49,7 @@ Default(libardour_powermate)
+ if env['NLS']:
+ 	i18n (powermate, powermate_files, env)
+ 	      
+-env.Alias('install', env.Install(os.path.join(install_prefix, 'lib/ardour2/surfaces'), libardour_powermate))
++env.Alias('install', env.Install(os.path.join(install_prefix, env['LIBDIR'], 'ardour2', 'surfaces'), libardour_powermate))
+ 
+ env.Alias('tarball', env.Distribute (env['DISTTREE'],
+ 				     [ 'SConscript' ] +
diff --git a/media-sound/ardour/files/ardour-2.0.3-sndfile-external.patch b/media-sound/ardour/files/ardour-2.0.3-sndfile-external.patch
new file mode 100644
index 000000000000..02fd68327652
--- /dev/null
+++ b/media-sound/ardour/files/ardour-2.0.3-sndfile-external.patch
@@ -0,0 +1,36 @@
+Index: ardour-2.0.3/SConstruct
+===================================================================
+--- ardour-2.0.3.orig/SConstruct
++++ ardour-2.0.3/SConstruct
+@@ -459,8 +459,8 @@ libraries = { }
+ 
+ libraries['core'] = LibraryInfo (CCFLAGS = '-Ilibs')
+ 
+-#libraries['sndfile'] = LibraryInfo()
+-#libraries['sndfile'].ParseConfig('pkg-config --cflags --libs sndfile')
++libraries['sndfile-ardour'] = LibraryInfo()
++libraries['sndfile-ardour'].ParseConfig('pkg-config --cflags --libs sndfile')
+ 
+ libraries['lrdf'] = LibraryInfo()
+ libraries['lrdf'].ParseConfig('pkg-config --cflags --libs lrdf')
+@@ -861,9 +861,9 @@ if env['SYSLIBS']:
+ # cannot use system one for the time being
+ #
+     
+-    libraries['sndfile-ardour'] = LibraryInfo(LIBS='libsndfile-ardour',
+-                                    LIBPATH='#libs/libsndfile',
+-                                    CPPPATH=['#libs/libsndfile/src'])
++#    libraries['sndfile-ardour'] = LibraryInfo(LIBS='libsndfile-ardour',
++#                                    LIBPATH='#libs/libsndfile',
++ #                                   CPPPATH=['#libs/libsndfile/src'])
+ 
+ #    libraries['libglademm'] = LibraryInfo()
+ #    libraries['libglademm'].ParseConfig ('pkg-config --cflags --libs libglademm-2.4')
+@@ -883,7 +883,6 @@ if env['SYSLIBS']:
+     ]
+     
+     subdirs = [
+-        'libs/libsndfile',
+         'libs/pbd',
+         'libs/midi++2',
+         'libs/ardour',
diff --git a/media-sound/ardour/files/digest-ardour-2.0.3 b/media-sound/ardour/files/digest-ardour-2.0.3
new file mode 100644
index 000000000000..aeda102a60c4
--- /dev/null
+++ b/media-sound/ardour/files/digest-ardour-2.0.3
@@ -0,0 +1,3 @@
+MD5 d047d3f9e7b5b4bf80980c5b267c1068 ardour-2.0.3.tar.bz2 2745744
+RMD160 702dc6b234a7c36ba93377e4e8caffd25e75ff4d ardour-2.0.3.tar.bz2 2745744
+SHA256 36df4728b92aaab141ed7dbfab4c29f8a1fb83e4ebb95bc2ffa40c831f4d787e ardour-2.0.3.tar.bz2 2745744