From 41441d8b02d900640c9b6416dac8d579ef443215 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Ra=C3=BAl=20Porcel?= Date: Wed, 14 Feb 2007 10:46:54 +0000 Subject: [PATCH] Add two new patches to make it work with newer scons, bug 166696, thanks to coldwind for the patch Package-Manager: portage-2.1.2-r9 --- net-p2p/museek+/ChangeLog | 8 +- net-p2p/museek+/Manifest | 24 ++- .../museek+-0.1.12-musetup-gtk-spaces.patch | 85 ++++++++ .../files/museek+-0.1.12-scons-0.96.94.patch | 204 ++++++++++++++++++ net-p2p/museek+/museek+-0.1.12.ebuild | 7 +- 5 files changed, 316 insertions(+), 12 deletions(-) create mode 100644 net-p2p/museek+/files/museek+-0.1.12-musetup-gtk-spaces.patch create mode 100644 net-p2p/museek+/files/museek+-0.1.12-scons-0.96.94.patch diff --git a/net-p2p/museek+/ChangeLog b/net-p2p/museek+/ChangeLog index 947d853aa42b..11697fad3e90 100644 --- a/net-p2p/museek+/ChangeLog +++ b/net-p2p/museek+/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for net-p2p/museek+ # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-p2p/museek+/ChangeLog,v 1.3 2007/02/13 14:24:25 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-p2p/museek+/ChangeLog,v 1.4 2007/02/14 10:46:54 armin76 Exp $ + + 14 Feb 2007; Raúl Porcel + +files/museek+-0.1.12-musetup-gtk-spaces.patch, + +files/museek+-0.1.12-scons-0.96.94.patch, museek+-0.1.12.ebuild: + Add two new patches to make it work with newer scons, bug 166696, thanks to + coldwind for the patch 13 Feb 2007; Raúl Porcel +files/museek+-0.1.12-libxmlpp-dep-order.patch, +files/museek: diff --git a/net-p2p/museek+/Manifest b/net-p2p/museek+/Manifest index 3e7d6f8ec33b..e146499026fa 100644 --- a/net-p2p/museek+/Manifest +++ b/net-p2p/museek+/Manifest @@ -6,15 +6,23 @@ AUX museek+-0.1.12-libxmlpp-dep-order.patch 711 RMD160 10ab48e0c2d7c798b04d18305 MD5 2ab0a5c53d8467029adadaf859bafe9d files/museek+-0.1.12-libxmlpp-dep-order.patch 711 RMD160 10ab48e0c2d7c798b04d183056a2230948887b0e files/museek+-0.1.12-libxmlpp-dep-order.patch 711 SHA256 2fbd2897644f4f1380b1a2517904b10a1d29833abc932d61d046e76dc5e6cba5 files/museek+-0.1.12-libxmlpp-dep-order.patch 711 +AUX museek+-0.1.12-musetup-gtk-spaces.patch 4006 RMD160 03b42af3d45c047055c3d6ea3f3f90c907d70d8b SHA1 d9f3bf4dccd43fc2e09f289e9a9ba85206d761b4 SHA256 1e960fd4f2c22f9f57a1430a0196e4549af2b7a9d535f13866d7583322cd9216 +MD5 cda96e991c87694fde314950ea0cee70 files/museek+-0.1.12-musetup-gtk-spaces.patch 4006 +RMD160 03b42af3d45c047055c3d6ea3f3f90c907d70d8b files/museek+-0.1.12-musetup-gtk-spaces.patch 4006 +SHA256 1e960fd4f2c22f9f57a1430a0196e4549af2b7a9d535f13866d7583322cd9216 files/museek+-0.1.12-musetup-gtk-spaces.patch 4006 +AUX museek+-0.1.12-scons-0.96.94.patch 7755 RMD160 42e807f95d9453a9353c30934670c3ff8d1f013a SHA1 abd58d60a20b4839929c652846f3365e746e215e SHA256 3c1bc12262dd01f441a891c9f33db09368cab02842ebcaa33839810fdde73cf0 +MD5 f55fea99d9b62eee323d07bd56e0fd22 files/museek+-0.1.12-scons-0.96.94.patch 7755 +RMD160 42e807f95d9453a9353c30934670c3ff8d1f013a files/museek+-0.1.12-scons-0.96.94.patch 7755 +SHA256 3c1bc12262dd01f441a891c9f33db09368cab02842ebcaa33839810fdde73cf0 files/museek+-0.1.12-scons-0.96.94.patch 7755 DIST museek+-0.1.12.tar.bz2 758908 RMD160 2be013e1c27e846b29ff4d51c825fc0cda2f58e9 SHA1 8ec3aafdbd22a9ac143419bb5c1296635be76ad9 SHA256 458a6d98cfec13c416382df32c99ff7862d70f54bc94ff3ad1cdb0723a7b3a53 -EBUILD museek+-0.1.12.ebuild 2394 RMD160 d71cd3e130a0d4c1384dec3be7da2bd2c7a86060 SHA1 ea2583165766a2eec462c60325c86872c69cbcc9 SHA256 c3e691aebcdd8cb41c85a92585a58831da9f6c5b69522dd9d8449794b99665ce -MD5 d242f1b7b8548fe31d48bedb97962d74 museek+-0.1.12.ebuild 2394 -RMD160 d71cd3e130a0d4c1384dec3be7da2bd2c7a86060 museek+-0.1.12.ebuild 2394 -SHA256 c3e691aebcdd8cb41c85a92585a58831da9f6c5b69522dd9d8449794b99665ce museek+-0.1.12.ebuild 2394 -MISC ChangeLog 701 RMD160 c074104191726bc031973b62232fab81c4ab77ad SHA1 12b44e574b9afefdc46b7eca0f32450f681b8991 SHA256 63a186ffe78b7b67bff3f5edc5c09dacc54cd21ea15866b07498785bd9f04c92 -MD5 e61cd17184d5c13f67af84ed5e786b65 ChangeLog 701 -RMD160 c074104191726bc031973b62232fab81c4ab77ad ChangeLog 701 -SHA256 63a186ffe78b7b67bff3f5edc5c09dacc54cd21ea15866b07498785bd9f04c92 ChangeLog 701 +EBUILD museek+-0.1.12.ebuild 2475 RMD160 1bc318fb878c23759658340bb0fc49ad62740d36 SHA1 81d7f4345ef621018ea5c89a53b1cce2a396a98b SHA256 772d3ef3b982612da433bac90447daad81611b1b218dda80cdb2115f16c689b0 +MD5 813b92f31f30b15c38a62f9c940d988c museek+-0.1.12.ebuild 2475 +RMD160 1bc318fb878c23759658340bb0fc49ad62740d36 museek+-0.1.12.ebuild 2475 +SHA256 772d3ef3b982612da433bac90447daad81611b1b218dda80cdb2115f16c689b0 museek+-0.1.12.ebuild 2475 +MISC ChangeLog 972 RMD160 2dbe4c1a353f9eb41e461663a190437a870570a6 SHA1 e9f52460cc7b3c87793db44a3ab23d1f7090343a SHA256 dc803d3cee56d6bcd1937e0359a0b3ccc0abb2d8c34d4d3e2d0325e63edef4c5 +MD5 adb7f399b9308a845e612384aeb3b617 ChangeLog 972 +RMD160 2dbe4c1a353f9eb41e461663a190437a870570a6 ChangeLog 972 +SHA256 dc803d3cee56d6bcd1937e0359a0b3ccc0abb2d8c34d4d3e2d0325e63edef4c5 ChangeLog 972 MISC metadata.xml 321 RMD160 403ebc62461ecb99222848ee74ebe0ed5c78e234 SHA1 18fcd19f64a5ebc2427d4f2b5aa292beb19d6963 SHA256 caffab45d7980802dde74ef5f317cf73d8e1ba438548541d2914e94e330a15f5 MD5 20592de563473d44a050a0a0ac0cda87 metadata.xml 321 RMD160 403ebc62461ecb99222848ee74ebe0ed5c78e234 metadata.xml 321 diff --git a/net-p2p/museek+/files/museek+-0.1.12-musetup-gtk-spaces.patch b/net-p2p/museek+/files/museek+-0.1.12-musetup-gtk-spaces.patch new file mode 100644 index 000000000000..700c8b6bf023 --- /dev/null +++ b/net-p2p/museek+/files/museek+-0.1.12-musetup-gtk-spaces.patch @@ -0,0 +1,85 @@ +--- museek+-0.1.12/pymuseekd/musetup-gtk 2007-02-13 17:49:28.000000000 +0100 ++++ museek+/pymuseekd/musetup-gtk 2007-02-13 17:24:22.000000000 +0100 +@@ -2711,14 +2711,12 @@ + def OnAddNormalDirs(self, widget): + directory = self.OpenDirectory(widget, _("Add a buddy-only Shared Directory")) + if directory != None: +- #self.muscan_execute(["muscan", "-c", self.CONFIG_PATH, "-v", "-s", directory]) +- self.muscan_execute("muscan -c " + self.CONFIG_PATH + " -v -s "+ directory) ++ self.muscan_execute("muscan -c \"%s\" -v -s \"%s\"" % (self.CONFIG_PATH, directory) ) + self.OnRefreshNormalDirs(None) + def OnAddBuddyDirs(self, widget): + directory = self.OpenDirectory(widget, _("Add a buddy-only Shared Directory")) + if directory != None: +- #self.muscan_execute(["muscan", "-c", self.CONFIG_PATH, "-v", "-b", "-s", directory]) +- self.muscan_execute("muscan -c " + self.CONFIG_PATH + " -v -b -s "+ directory) ++ self.muscan_execute("muscan -c \"%s\" -v -b -s \"%s\"" % (self.CONFIG_PATH, directory) ) + self.OnRefreshBuddyDirs(None) + + def OnRemoveBuddyDirs(self, widget): +@@ -2728,8 +2726,7 @@ + if self.selected_items != []: + key, num = self.selected_items + if key != "" and key is not None: +- #self.muscan_execute(["muscan", "-c", self.CONFIG_PATH, "-b", "-v", "-u", key]) +- self.muscan_execute("muscan -c " + self.CONFIG_PATH + " -b -v -u "+ key) ++ self.muscan_execute("muscan -c \"%s\" -b -v -u \"%s\"" % (self.CONFIG_PATH, key) ) + self.OnRefreshBuddyDirs(None) + + def OnRemoveNormalDirs(self, widget): +@@ -2740,8 +2737,7 @@ + if self.selected_items != []: + key, num = self.selected_items + if key != "" and key is not None: +- #self.muscan_execute(["muscan", "-c", self.CONFIG_PATH, "-v", "-u", key]) +- self.muscan_execute("muscan -c " + self.CONFIG_PATH + " -v -u "+ key) ++ self.muscan_execute("muscan -c \"%s\" -v -u \"%s\"" % (self.CONFIG_PATH, key) ) + self.OnRefreshNormalDirs(None) + + def muscan_execute(self, command): +@@ -2757,28 +2753,20 @@ + #print line + + def OnRescanBuddyDirs(self, widget): +- +- #self.muscan_execute(["muscan", "-c", self.CONFIG_PATH, "-b", "-v", "-r"]) +- self.muscan_execute("muscan -c", self.CONFIG_PATH + " -b -v -r") ++ self.muscan_execute("muscan -c \"%s\" -b -v -r" % (self.CONFIG_PATH) ) + self.Statusbar.pop(self.status_context_id) + self.Statusbar.push(self.status_context_id, "Rescanned Buddy shares") + + def OnRescanNormalDirs(self, widget): +- #self.muscan_execute("muscan ", "-c", self.CONFIG_PATH,"-v", "-r"]) +- self.muscan_execute("muscan -c "+ self.CONFIG_PATH +" -v -r") ++ self.muscan_execute("muscan -c \"%s\" -v -r" % (self.CONFIG_PATH) ) + self.Statusbar.pop(self.status_context_id) + self.Statusbar.push(self.status_context_id, "Rescanned Normal shares") + + def OnRefreshBuddyDirs(self, widget): + p = "/usr/bin/muscan" + if os.path.exists(p): +- output = commands.getoutput("muscan -c "+ self.CONFIG_PATH + " -b -l") ++ output = commands.getoutput("muscan -c \"%s\" -b -l" % (self.CONFIG_PATH) ) + stdout_text = output.split('\n') +- #z = subprocess.Popen( ["muscan", "-c", self.CONFIG_PATH, "-b", "-l"], stdout=subprocess.PIPE, stderr=subprocess.PIPE) +- #stdout_text, stderr_text = z.communicate() +- #z.wait() +- #print stdout_text +- #stdout_text = stdout_text.split('\n') + self.SharedDirs["buddy"] = [] + for line in stdout_text: + if line.isspace() or line == '': +@@ -2790,12 +2778,7 @@ + def OnRefreshNormalDirs(self, widget): + p = "/usr/bin/muscan" + if os.path.exists(p): +- +- #z = subprocess.Popen( ["muscan", "-c", self.CONFIG_PATH, "-l"], stdout=subprocess.PIPE, stderr=subprocess.PIPE) +- #stdout_text, stderr_text = z.communicate() +- #z.wait() +- #stdout_text = stdout_text.split('\n') +- output = commands.getoutput("muscan -c "+ self.CONFIG_PATH + " -l") ++ output = commands.getoutput("muscan -c \"%s\" -l" % (self.CONFIG_PATH) ) + stdout_text = output.split('\n') + + self.SharedDirs["normal"] = [] diff --git a/net-p2p/museek+/files/museek+-0.1.12-scons-0.96.94.patch b/net-p2p/museek+/files/museek+-0.1.12-scons-0.96.94.patch new file mode 100644 index 000000000000..5f50fd02eefe --- /dev/null +++ b/net-p2p/museek+/files/museek+-0.1.12-scons-0.96.94.patch @@ -0,0 +1,204 @@ +--- SConstruct.orig 2006-09-26 17:17:40.000000000 +0200 ++++ SConstruct 2007-02-13 23:48:46.000000000 +0100 +@@ -32,10 +32,11 @@ + opts.Add(BoolOption('PROFILE', 'Build for profiling (gcc only)', '')) + opts.Add(BoolOption('RELEASE', 'Build for release', '')) + opts.Add(ListOption('MULOG', 'Set debug output', '', ['debug', 'cycle', 'calltrace', 'traffictime'])) +-opts.Add(ListOption('MUSEEQTRANSLATIONS', 'Build translations for', '', ['fr','de','es','it','pl','ru','pt_BR','ja','zh','sk','he', 'ar', 'cs' ])) +-print "Reading CFLAGS from defaults.py and Command Line arguments" +-opts.Add(BoolOption('LOCKFLAGS', 'Don\'t modify CFLAGS, use only those selected', '')) +-opts.Add('CFLAGS', 'Set your CCFLAGS here', '') ++opts.Add('MUSEEQTRANSLATIONS', 'Build translations for', '', ) ++#['fr','de','es','it','pl','ru','pt_BR','ja','zh','sk','he', 'ar', 'cs' ] ++print "Reading FLAGS from defaults.py and Command Line arguments" ++opts.Add(BoolOption('LOCKFLAGS', 'Don\'t modify FLAGS, use only those selected', '')) ++opts.Add('FLAGS', 'Set your CCFLAGS here', '') + # CFLAGS are now a string, if you have a mulocal.py from 0.1.11, please remove it. + opts.Add(BoolOption('EPOLL', 'Use epoll when available', '')) + opts.Add(BoolOption('MUCOUS', 'Install Mucous (when SWIG can be found', '')) +@@ -64,16 +65,9 @@ + + env.SConsignFile() + +- +-# Build-dir, inspired by <...> +- +-if env['BUILDDIR']: +- arch = os.uname()[4] +- if arch == 'Power Macintosh': arch = 'ppc' +- os_name = os.uname()[0].lower().replace('-','') +- buildDir = 'build-%s-%s' % (arch, os_name) +-else: +- buildDir = None ++# Define a static buildir, so we can clean the sources tree ++# by removing workdir/ ++buildDir = 'workdir' + + if buildDir is None: + libbase = '#' +@@ -102,13 +96,7 @@ + # All warnings if compiler is gcc + + if os.path.basename(env['CC']) in ['gcc', 'apgcc']: +-# env['CFLAGS'] = ['-fPIC', '-Wall', '-pipe'] # allows x86_64 to compile +-# ['-Wall', '-pipe']) # original +- #flags = [] +- #for flag in str(env['CFLAGS']).split(','): +- #flags.append("-"+flag) +- #env.Append(CCFLAGS = flags) +- env.Append(CCFLAGS = env['CFLAGS'].split(' ')) ++ env.Append(CCFLAGS = env['FLAGS'].split(' ')) + if not env['LOCKFLAGS']: + if env['RELEASE'] and "-fomit-frame-pointer" not in env["CCFLAGS"]: + env.Append(CCFLAGS = ['-fomit-frame-pointer']) +@@ -120,8 +108,6 @@ + for i in env["CCFLAGS"]: + flagstring += i + " " + print "BUILDING with CCFLAGS: "+ flagstring +- +- #print "BUILDING with CFLAGS: "+ env['CFLAGS'] + + + # Set up additional include and library paths +@@ -190,7 +176,8 @@ + print "Couldn't figure out how to use the dynamic run-time linker" + Exit(1) + env.Replace(LIBS = libs) +- env.Append(CCFLAGS = ' -fPIC' ) ++ if "-fPIC" not in env["CCFLAGS"]: ++ env.Append(CCFLAGS = ' -fPIC' ) + + + if check_deps == 1: +@@ -397,7 +384,14 @@ + f.write('RELEASE = %s\n' % (`env['RELEASE']`)) + f.write('MULOG = %s\n' % (`string.join(env['MULOG'], ',')`)) + f.write('LOCKFLAGS = %s\n' % (`env['LOCKFLAGS']`)) +-f.write('CFLAGS = %s\n' % (`env['CFLAGS']`)) ++ ++if type(env['FLAGS']) == list: ++ CFLAGS = "" ++ for string in env['FLAGS']: ++ CFLAGS += " "+ string ++ env['FLAGS'] = CFLAGS.strip() ++ ++f.write('FLAGS = %s\n' % (`env['FLAGS']`)) + f.write('EPOLL = %s\n' % (`env['EPOLL']`)) + f.write('RELAY = %s\n' % (`env['RELAY']`)) + f.write('BINRELOC = %s\n' % (`env['BINRELOC']`)) +@@ -405,7 +399,8 @@ + f.write('MUSETUPGTK = %s\n' % (`env['MUSETUPGTK']`)) + f.write('MUSEEQ = %s\n' % (`env['MUSEEQ']`)) + f.write('ONLYMUSEEQ = %s\n' % (`env['ONLYMUSEEQ']`)) +-f.write('MUSEEQTRANSLATIONS = %s\n' % (`string.join(env['MUSEEQTRANSLATIONS'], ',')`)) ++ ++f.write('MUSEEQTRANSLATIONS = %s\n' % (`env['MUSEEQTRANSLATIONS']`)) + f.write('MUSEEQTRAYICON = %s\n' % (`env['MUSEEQTRAYICON']`)) + f.write('QSA = %s\n' % (`env['QSA']`)) + f.write('RELAY_QSA = %s\n' % (`env['RELAY_QSA']`)) +--- Tools/SConscript 2006-05-26 21:47:57.000000000 +0200 ++++ Tools/SConscript 2007-02-13 17:24:34.000000000 +0100 +@@ -1,5 +1,5 @@ + Import('env') +-import os ++import os, SCons + if env['RELAY']: + from muscons import Relay + +@@ -16,7 +16,20 @@ + if env['VORBIS']: + env_libmuscan.ParseConfig('pkg-config --libs --cflags vorbisfile') + if conf.CheckLibWithHeader('', 'vorbis/vorbisfile.h', 'C++', 'ov_clear(0);'): +- env_libmuscan.Append(CPPDEFINES = {'HAVE_VORBIS': 1}) ++ #print SCons.__version__ ++ sconsversion = SCons.__version__ ++ sv = sconsversion.split(".") ++ try: ++ if len(sv) > 2: ++ major, minor, micro = sv[0], sv[1], sv[2] ++ else: ++ major, minor, micro = sv[0], sv[1], 0 ++ if int(minor) == 96 and int(micro) >= 93: ++ env_libmuscan.Append(CPPDEFINES = 'HAVE_VORBIS=1') ++ else: ++ env_libmuscan.Append(CPPDEFINES = {'HAVE_VORBIS':1}) ++ except Exception, error: ++ print "ERROR:", error + print "OGG Vorbis found, compiling into muscan." + else: + print "OGG Vorbis NOT found, not compiled into muscan." +--- defaults.py 2006-09-26 17:17:40.000000000 +0200 ++++ defaults.py 2007-02-13 17:24:39.000000000 +0100 +@@ -29,7 +29,7 @@ + LOCKFLAGS=0 + + # CCFLAGS (fPIC, Wall, pipe) Do not include the prefix "-" +-CFLAGS='-fPIC -Wall -pipe' ++FLAGS='-fPIC -Wall -pipe' + + # Enable OGG Vorbis support (if available) in file scanner (muscan) + VORBIS=1 +--- museeq/SConscript 2006-09-13 11:24:31.000000000 +0200 ++++ museeq/SConscript 2007-02-13 17:24:33.000000000 +0100 +@@ -129,7 +129,7 @@ + + if not QTDIR and os.environ.has_key('QTDIR'): + QTDIR = os.environ['QTDIR'] +-ts_templates= env['MUSEEQTRANSLATIONS'] ++ts_templates= env['MUSEEQTRANSLATIONS'].split(",") + tr_dir = "translations/" + translations = [] + qm_files = [] +--- Mucipher/python/SConscript 2006-06-07 12:23:42.000000000 +0200 ++++ Mucipher/python/SConscript 2007-02-13 17:24:22.000000000 +0100 +@@ -23,16 +23,26 @@ + env_swigpy.Append(LIBS = ['ucipher']) + env_swigpy.Replace(SHLIBPREFIX='') + ++ if not os.path.exists("mucipher.py"): ++ open(str("mucipher.py"), "w").write( open(os.path.abspath("../../../Mucipher/python/mucipher.py")).read()) ++ if not os.path.exists("mucipher.i"): ++ open(str("mucipher.i"), "w").write(open(os.path.abspath("../mucipher.i")).read()) ++ if not os.path.exists("wraphelp.c"): ++ open(str("wraphelp.c"), "w").write(open(os.path.abspath("../wraphelp.c")).read()) + env_swigpy.Command("mucipher.i", "../mucipher.i", file_copy) + env_swigpy.Command("wraphelp.c", "../wraphelp.c", file_copy) + + mucipherc = env_swigpy.SharedLibrary('_mucipherc', sources, SWIGFLAGS='-python') +- ++ if type(mucipherc) == type([]): ++ mucipherc = mucipherc[0] + py_dest = env['DESTDIR'] + os.path.join(sys.prefix, "lib", "python" + py_ver, "site-packages") + +- install = env.Install(py_dest, source = [ mucipherc, 'mucipherc.py', 'mucipher.py']) ++ dp1 = env_swigpy.Install(py_dest, 'mucipherc.py') ++ dp2 = env_swigpy.Install(py_dest, mucipherc) ++ dp3 = env_swigpy.Install(py_dest, "mucipher.py") ++ Depends(dp1, dp2) + +- env.Alias('install_mucipher', install) ++ env.Alias('install_mucipher', [dp1, dp2, dp3]) + env.Alias('install', 'install_mucipher') + else: + print "WARNING: Python.h include not found, please install Python's development packages" +--- Mucipher/SConscript 2006-06-07 12:23:42.000000000 +0200 ++++ Mucipher/SConscript 2007-02-13 17:24:22.000000000 +0100 +@@ -1,5 +1,5 @@ + Import('env') +- ++import os + sources = Split(""" + md5.c + sha.c +@@ -10,7 +10,10 @@ + + + env.StaticLibrary(target = 'ucipher', source = sources) +- ++if not os.path.exists("mucipher.i"): ++ open(str("mucipher.i"), "w").write(open(os.path.abspath("../../Mucipher/mucipher.i")).read()) ++if not os.path.exists("wraphelp.c"): ++ open(str("wraphelp.c"), "w").write(open(os.path.abspath("../../Mucipher/wraphelp.c")).read()) + + if 'swig' in env['TOOLS']: + import os diff --git a/net-p2p/museek+/museek+-0.1.12.ebuild b/net-p2p/museek+/museek+-0.1.12.ebuild index 8eea7c300e1e..55f683b2b538 100644 --- a/net-p2p/museek+/museek+-0.1.12.ebuild +++ b/net-p2p/museek+/museek+-0.1.12.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-p2p/museek+/museek+-0.1.12.ebuild,v 1.1 2007/02/12 20:32:13 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-p2p/museek+/museek+-0.1.12.ebuild,v 1.2 2007/02/14 10:46:54 armin76 Exp $ inherit qt3 eutils @@ -47,6 +47,8 @@ src_unpack() { unpack ${A} cd "${S}" epatch "${FILESDIR}/${P}-libxmlpp-dep-order.patch" + epatch "${FILESDIR}/${P}-scons-0.96.94.patch" + epatch "${FILESDIR}/${P}-musetup-gtk-spaces.patch" } src_compile() { @@ -74,8 +76,7 @@ src_compile() { src_install() { scons DESTDIR="${D}" install || die "scons install failed" dodoc README - exeinto /usr/bin - doexe "${FILESDIR}/museek" + dobin "${FILESDIR}/museek" if use qt3 ; then doicon "icons/museeq-circle2.png" -- 2.26.2