summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSantiago M. Mola <coldwind@gentoo.org>2008-05-28 20:58:57 +0000
committerSantiago M. Mola <coldwind@gentoo.org>2008-05-28 20:58:57 +0000
commit139ae0c94e9df62217bee8f6f198482f177327bd (patch)
treea1c6b20e0557bbb9ee4658c5b0505d2478e0130a /net-p2p/museek+/files
parentSnapshot bump (diff)
downloadgentoo-2-139ae0c94e9df62217bee8f6f198482f177327bd.tar.gz
gentoo-2-139ae0c94e9df62217bee8f6f198482f177327bd.tar.bz2
gentoo-2-139ae0c94e9df62217bee8f6f198482f177327bd.zip
Remove old version.
(Portage version: 2.1.4.4)
Diffstat (limited to 'net-p2p/museek+/files')
-rw-r--r--net-p2p/museek+/files/museek47
-rw-r--r--net-p2p/museek+/files/museek+-0.1.12-libxmlpp-dep-order.patch16
-rw-r--r--net-p2p/museek+/files/museek+-0.1.12-musetup-gtk-spaces.patch85
-rw-r--r--net-p2p/museek+/files/museek+-0.1.12-scons-0.96.94.patch204
4 files changed, 0 insertions, 352 deletions
diff --git a/net-p2p/museek+/files/museek b/net-p2p/museek+/files/museek
deleted file mode 100644
index e934d05d880c..000000000000
--- a/net-p2p/museek+/files/museek
+++ /dev/null
@@ -1,47 +0,0 @@
-#!/bin/bash
-MULOG=0
-PIDPATH="$HOME/.museekd"
-
-while getopts ckmqrsh name
-do
- case $name in
- c) close=1;;
- k) kill=1;;
- m) mucous=1;;
- q) museeq=1;;
- r) restart=1;;
- s) scan=1;;
- h|?) help=1;;
- esac
-done
-
-if [ $help ]; then
- echo -e "Usage: `basename $0` [OPTIONS]"
- echo -e "This will start museekd by default. The following can be done in addition:"
- echo -e " -r restart museekd"
- echo -e " -s rescan shares"
- echo -e " -q start museeq"
- echo -e " -m start mucous"
- echo -e " -c kill museekd when mucous closes"
- echo -e " -k kill museekd and exit"
- echo -e " -h display this help and exit"
- exit 0
-elif [ "$kill" -o "$restart" ]; then
- killall museekd
- [ $kill ] && exit
-fi
-
-if [ ! -d "/proc/`cat $PIDPATH/museekd.pid`" ]; then
- exec museekd &
- echo $! > $PIDPATH/museekd.pid
-fi
-
-if [ $MULOG != 0 -a $MULOG -a ! -d "/proc/`cat $PIDPATH/mulog.pid`" ]; then
- exec mulog &
- echo $! > $PIDPATH/mulog.pid
-fi
-
-[ $scan ] && muscan -r >/dev/null 2>&1 && killall -q -HUP museekd &
-[ $museeq ] && exec museeq >/dev/null 2>&1 &
-[ $mucous ] && mucous; [ $close ] && killall -q museekd
-
diff --git a/net-p2p/museek+/files/museek+-0.1.12-libxmlpp-dep-order.patch b/net-p2p/museek+/files/museek+-0.1.12-libxmlpp-dep-order.patch
deleted file mode 100644
index 6f5faf3d18d9..000000000000
--- a/net-p2p/museek+/files/museek+-0.1.12-libxmlpp-dep-order.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- Muhelp/SConscript.old 2007-01-27 22:06:19.000000000 +0100
-+++ Muhelp/SConscript 2007-01-27 22:06:40.000000000 +0100
-@@ -17,10 +17,10 @@
- sys.stdout.flush()
-
- libxmlpp = None
--if not os.spawnlpe(os.P_WAIT, 'pkg-config', 'pkg-config', '--exists', 'libxml++-1.0', os.environ):
-- libxmlpp = 'libxml++-1.0'
--elif not os.spawnlpe(os.P_WAIT, 'pkg-config', 'pkg-config', '--exists', 'libxml++-2.6', os.environ):
-+if not os.spawnlpe(os.P_WAIT, 'pkg-config', 'pkg-config', '--exists', 'libxml++-2.6', os.environ):
- libxmlpp = 'libxml++-2.6'
-+elif not os.spawnlpe(os.P_WAIT, 'pkg-config', 'pkg-config', '--exists', 'libxml++-1.0', os.environ):
-+ libxmlpp = 'libxml++-1.0'
-
- if libxmlpp is None:
- print
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
deleted file mode 100644
index 700c8b6bf023..000000000000
--- a/net-p2p/museek+/files/museek+-0.1.12-musetup-gtk-spaces.patch
+++ /dev/null
@@ -1,85 +0,0 @@
---- 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
deleted file mode 100644
index 5f50fd02eefe..000000000000
--- a/net-p2p/museek+/files/museek+-0.1.12-scons-0.96.94.patch
+++ /dev/null
@@ -1,204 +0,0 @@
---- 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