net-p2p/museek+: Using upstream ebuild thanks to Xero. Features trayicon USE flag, and launch script.

svn path=/sunrise/; revision=2088

12 files changed, 80 insertions, 305 deletions

diff --git a/net-p2p/museek+/ChangeLog b/net-p2p/museek+/ChangeLog
index 23992862f..a374921c2 100644
--- a/net-p2p/museek+/ChangeLog
+++ b/net-p2p/museek+/ChangeLog
@@ -3,6 +3,14 @@
 # $Header: $
 
   03 Dec 2006; Santiago M. Mola <cooldwind@gmail.com>
+  -museek+-0.1.11.ebuild, -files/museek+-0.1.11-SConstruct.patch,
+  -files/museek+-0.1.11-defaults.py.patch, museek+-0.1.12.ebuild,
+  -files/conf.d-mulog, -files/conf.d-museekd, -files/init.d-mulog,
+  -files/init.d-museekd, +files/museek:
+  Using upstream ebuild thanks to Xero. Features trayicon USE flag, and launch
+  script.
+
+  03 Dec 2006; Santiago M. Mola <cooldwind@gmail.com>
   +museek+-0.1.12.ebuild:
   Version bump 0.1.12.
 
diff --git a/net-p2p/museek+/Manifest b/net-p2p/museek+/Manifest
index e3b8ae1a9..030d3b128 100644
--- a/net-p2p/museek+/Manifest
+++ b/net-p2p/museek+/Manifest
@@ -1,48 +1,20 @@
-AUX conf.d-mulog 153 RMD160 9fa9a04cc98ca62fc9ce5304a49f2d4b8610e261 SHA1 9e2ce1f93d394701bd495aa6e598a598249695aa SHA256 fa599e424b7a962e8dda24ddda9bfedb05eeb5747c0165b4a041235a19b9ef31
-MD5 5add123fac3f9882b61e023c0871aae0 files/conf.d-mulog 153
-RMD160 9fa9a04cc98ca62fc9ce5304a49f2d4b8610e261 files/conf.d-mulog 153
-SHA256 fa599e424b7a962e8dda24ddda9bfedb05eeb5747c0165b4a041235a19b9ef31 files/conf.d-mulog 153
-AUX conf.d-museekd 408 RMD160 1fd26b8e21a980ff6d4eeac56df636f66279e406 SHA1 948ece35a62264d864e71173a8a238883b45e2d2 SHA256 a5b0088974b5dc5bab3268df3e5ad3a6c9321d06f957dd631f21e8b69cf3980d
-MD5 fd49a0921bd808879e9a15b948145783 files/conf.d-museekd 408
-RMD160 1fd26b8e21a980ff6d4eeac56df636f66279e406 files/conf.d-museekd 408
-SHA256 a5b0088974b5dc5bab3268df3e5ad3a6c9321d06f957dd631f21e8b69cf3980d files/conf.d-museekd 408
-AUX init.d-mulog 590 RMD160 df2873a814a2ef796a9dc52be60e592e656e40fe SHA1 1698b356ac01cf04299407483cf0d55ec14178d0 SHA256 2abd48f394cc1fea901094267f82f0a8d528beb6011f80b639d5ea6cdfd4c0f3
-MD5 4e63c426dfb5ac9346d98f8da43d722b files/init.d-mulog 590
-RMD160 df2873a814a2ef796a9dc52be60e592e656e40fe files/init.d-mulog 590
-SHA256 2abd48f394cc1fea901094267f82f0a8d528beb6011f80b639d5ea6cdfd4c0f3 files/init.d-mulog 590
-AUX init.d-museekd 855 RMD160 21bfefb6620d780f5be42b9939e99ae118760a84 SHA1 9e29814a21cf64a6fa501504f1fc453945b2edc7 SHA256 095a498d51f8fa031073485bce0c9201afb1b1cb7cb9a895d8c77740fd18b02e
-MD5 e566a90cdb6e3d8085842aa9cf8e57e9 files/init.d-museekd 855
-RMD160 21bfefb6620d780f5be42b9939e99ae118760a84 files/init.d-museekd 855
-SHA256 095a498d51f8fa031073485bce0c9201afb1b1cb7cb9a895d8c77740fd18b02e files/init.d-museekd 855
-AUX museek+-0.1.11-SConstruct.patch 2414 RMD160 9d3b1fb345a31d30cb3e0803cfa860d7126e2bc9 SHA1 07b870a9e47be69732250533d227d3b09eecfe09 SHA256 a67714eebb1d7cce0a2851fd2115770d14a15531769a1ff102d8c3d7057f1863
-MD5 64053e44a78902004df8be451d8fc7a4 files/museek+-0.1.11-SConstruct.patch 2414
-RMD160 9d3b1fb345a31d30cb3e0803cfa860d7126e2bc9 files/museek+-0.1.11-SConstruct.patch 2414
-SHA256 a67714eebb1d7cce0a2851fd2115770d14a15531769a1ff102d8c3d7057f1863 files/museek+-0.1.11-SConstruct.patch 2414
-AUX museek+-0.1.11-defaults.py.patch 338 RMD160 bb3823246e7b7c462af8b31a7c2a82d775e8b8a3 SHA1 14447f37661141b8d8316e2528aa4e9ccf2494a9 SHA256 2ee545e645cb8c87333bdbdd15dbf228e34427ad13fd3be8131e87114da795cc
-MD5 7d34938a84056d9eebcdf2b92e537d84 files/museek+-0.1.11-defaults.py.patch 338
-RMD160 bb3823246e7b7c462af8b31a7c2a82d775e8b8a3 files/museek+-0.1.11-defaults.py.patch 338
-SHA256 2ee545e645cb8c87333bdbdd15dbf228e34427ad13fd3be8131e87114da795cc files/museek+-0.1.11-defaults.py.patch 338
-DIST museek+-0.1.11.tar.bz2 787571 RMD160 bff4a40be36303cb746b9071b9426d3c2c9c6af2 SHA1 4e3ad47b9f6ac41980c57042362fb08f6a57656e SHA256 6f4640855aae927028f8961e9a78454c0b4abd5244eb821c0b25f60150639ccf
+AUX museek 1124 RMD160 6a362342ad7600f83c0db80c518de2ae0d2574a3 SHA1 14ed19cc603cb0742a848c62b1a85d93577c2b17 SHA256 b3085e35396be01118f669705fae260a9bba315c6a62b9c8393fa52886468aba
+MD5 a75e2e988510954c8c6b3c756ee3903b files/museek 1124
+RMD160 6a362342ad7600f83c0db80c518de2ae0d2574a3 files/museek 1124
+SHA256 b3085e35396be01118f669705fae260a9bba315c6a62b9c8393fa52886468aba files/museek 1124
 DIST museek+-0.1.12.tar.bz2 758908 RMD160 2be013e1c27e846b29ff4d51c825fc0cda2f58e9 SHA1 8ec3aafdbd22a9ac143419bb5c1296635be76ad9 SHA256 458a6d98cfec13c416382df32c99ff7862d70f54bc94ff3ad1cdb0723a7b3a53
-EBUILD museek+-0.1.11.ebuild 2542 RMD160 feb5a093463ce6b343f43fcaa710696fc3d7ed11 SHA1 d7bc46060158feb87d4fdcd515f344bd6863505c SHA256 c9ebbc83d9a1b3aea3931dec9c885d04a057af7d658f1aafb4c3be9e0d837a58
-MD5 5ab279600aee909459dbbca346be61db museek+-0.1.11.ebuild 2542
-RMD160 feb5a093463ce6b343f43fcaa710696fc3d7ed11 museek+-0.1.11.ebuild 2542
-SHA256 c9ebbc83d9a1b3aea3931dec9c885d04a057af7d658f1aafb4c3be9e0d837a58 museek+-0.1.11.ebuild 2542
-EBUILD museek+-0.1.12.ebuild 2411 RMD160 38b8c9fae0d49c80efb4f1472000f092da9cda4c SHA1 14c2746b783ea3d5910a72bd1cd5f46d2f94820e SHA256 a0565493297a9fba43ac0575ace1175875935ddff6505c2df4fd37f519bfbf70
-MD5 3c4d140346f187b60ff3b53782e8c092 museek+-0.1.12.ebuild 2411
-RMD160 38b8c9fae0d49c80efb4f1472000f092da9cda4c museek+-0.1.12.ebuild 2411
-SHA256 a0565493297a9fba43ac0575ace1175875935ddff6505c2df4fd37f519bfbf70 museek+-0.1.12.ebuild 2411
-MISC ChangeLog 908 RMD160 74a5b18aa4e88e8dae7c39deb90b8a1c536555fa SHA1 3d18c4c4632aab2b4946dfcf9c60a570ed84b41c SHA256 33b072df50d42453cec482ca4d67b069ecea261e82ee2b5716adddc8208e1ae3
-MD5 4f00f368a13bfdeb84bdcb3551b6fc53 ChangeLog 908
-RMD160 74a5b18aa4e88e8dae7c39deb90b8a1c536555fa ChangeLog 908
-SHA256 33b072df50d42453cec482ca4d67b069ecea261e82ee2b5716adddc8208e1ae3 ChangeLog 908
+EBUILD museek+-0.1.12.ebuild 2137 RMD160 c07cf93da44eb887e30945fd5f55c5a5390130ad SHA1 193b549e72d0618a1ac908ed303904a36fc29099 SHA256 d4e9f09e1f9b51ac63ec529658f777462c76f3888a4156b5ef80c7093faf2839
+MD5 6ba309787201af28fde5780e7869b881 museek+-0.1.12.ebuild 2137
+RMD160 c07cf93da44eb887e30945fd5f55c5a5390130ad museek+-0.1.12.ebuild 2137
+SHA256 d4e9f09e1f9b51ac63ec529658f777462c76f3888a4156b5ef80c7093faf2839 museek+-0.1.12.ebuild 2137
+MISC ChangeLog 1291 RMD160 2d623f804cf077f21c1283de0268390a17f4bdea SHA1 b7ccf884a23a3f655da6fa5429ccfc767b7cb77b SHA256 7326acb43aae6453999ba6749006f49f1c4b4592fd63e976328bc50e1bce2986
+MD5 fae2f9465a325759adde8f1cfb8d3911 ChangeLog 1291
+RMD160 2d623f804cf077f21c1283de0268390a17f4bdea ChangeLog 1291
+SHA256 7326acb43aae6453999ba6749006f49f1c4b4592fd63e976328bc50e1bce2986 ChangeLog 1291
 MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42
 MD5 1e678929a9fec6632e227bdf2262e9a1 metadata.xml 170
 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 metadata.xml 170
 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42 metadata.xml 170
-MD5 dee6500216ea82c558ac13b9e31c75d0 files/digest-museek+-0.1.11 247
-RMD160 f835d18d841d208cf66d4d4f12582e9eb43bd1dc files/digest-museek+-0.1.11 247
-SHA256 8fd2f1397745ce84a8844a5b8fc0324c116482ecb38e6002804d70cb8227a9da files/digest-museek+-0.1.11 247
 MD5 c2fa9be1bc551c4ccad3b3ad223ce7be files/digest-museek+-0.1.12 247
 RMD160 b631e175011aed7ee2e4c56442c1a31a109132d0 files/digest-museek+-0.1.12 247
 SHA256 3a5376cf776176b2c8e76b558b0fbf15ef916756f984f8042779bae2d6569de6 files/digest-museek+-0.1.12 247
diff --git a/net-p2p/museek+/files/conf.d-mulog b/net-p2p/museek+/files/conf.d-mulog
deleted file mode 100644
index 21acbd4e7..000000000
--- a/net-p2p/museek+/files/conf.d-mulog
+++ /dev/null
@@ -1,9 +0,0 @@
-#MULOG_USER=<user>
-#MULOG_PASS=<pass>
-MULOG_HOST=localhost
-MULOG_PORT=2240
-
-# MULOG_PATH
-#
-# MULOG_PATH=/home/jimmy/.mulog/
-# MULOG_PATH=/var/log/mulog/
diff --git a/net-p2p/museek+/files/conf.d-museekd b/net-p2p/museek+/files/conf.d-museekd
deleted file mode 100644
index d7d67a48b..000000000
--- a/net-p2p/museek+/files/conf.d-museekd
+++ /dev/null
@@ -1,16 +0,0 @@
-####
-# * MUSEEKD_USER
-# Set here your main user.
-# MUSEEKD_USER=jimmy:users
-# Or an users created ad-hoc for this like p2p.
-# MUSEEKD_USER=p2p:users
-#
-#
-# * MUSEEKD_CONFIG
-# Here goes the config file.
-#
-# The standard setting should be set it in your home:
-# MUSEEKD_CONFIG=/home/jimmy/.museekd/config.xml
-#
-# But you can set it system wide with somethine like this:
-# MUSEEKD_CONFIG=/etc/museekd/config.xml
diff --git a/net-p2p/museek+/files/digest-museek+-0.1.11 b/net-p2p/museek+/files/digest-museek+-0.1.11
deleted file mode 100644
index 821edce0b..000000000
--- a/net-p2p/museek+/files/digest-museek+-0.1.11
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 935f1dedbe8a800cd4649b6867e98f01 museek+-0.1.11.tar.bz2 787571
-RMD160 bff4a40be36303cb746b9071b9426d3c2c9c6af2 museek+-0.1.11.tar.bz2 787571
-SHA256 6f4640855aae927028f8961e9a78454c0b4abd5244eb821c0b25f60150639ccf museek+-0.1.11.tar.bz2 787571
diff --git a/net-p2p/museek+/files/init.d-mulog b/net-p2p/museek+/files/init.d-mulog
deleted file mode 100644
index fe7aebad7..000000000
--- a/net-p2p/museek+/files/init.d-mulog
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/sbin/runscript
-# Copyright 2004 SeeSchloss
-# Distributed under the terms of the GNU General Public License v2
-
-# NB: Config is in /etc/conf.d/mulog
-
-depend() {
-	need museekd
-}
-
-start() {
-	ebegin "Starting mulog as user $MULOG_USER"
-	start-stop-daemon --start --quiet --exec /usr/bin/mulog.py --chuid $MULOG_USER --background --pidfile /var/run/mulog.pid --make-pidfile -- $MULOG_HOST:$MULOG_PORT $MULOG_PASS $MULOG_PATH
-	eend $? "Failed to start mulog"
-}
-
-stop() {
-	ebegin "Stopping mulog"
-	start-stop-daemon --stop --quiet --pidfile /var/run/mulog.pid
-	eend $? "Failed to stop mulog"
-}
diff --git a/net-p2p/museek+/files/init.d-museekd b/net-p2p/museek+/files/init.d-museekd
deleted file mode 100644
index 542701025..000000000
--- a/net-p2p/museek+/files/init.d-museekd
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/sbin/runscript
-# Copyright 2004-2005 SeeSchloss
-# Distributed under the terms of the GNU General Public License v2
-
-# NB: Config is in /etc/conf.d/museek
-
-opts="start stop restart reload rescan"
-
-depend() {
-	need net
-}
-
-start() {
-	ebegin "Starting museekd as user $MUSEEKD_USER"
-	start-stop-daemon --start --quiet --exec /usr/bin/museekd --chuid $MUSEEKD_USER --background --pidfile /var/run/museekd.pid --make-pidfile -- -c $MUSEEKD_CONFIG
-	eend $? "Failed to start museekd"
-}
-
-stop() {
-	ebegin "Stopping museekd"
-	start-stop-daemon --stop --quiet --pidfile /var/run/museekd.pid
-	eend $? "Failed to stop museekd"
-}
-
-rescan() {
-	ebegin "Scanning museek shares"
-	muscan -c $MUSEEKD_CONFIG
-	eend $? "Failed to rescan shares"
-}
-
-reload() {
-	ebegin "Reloading museek shares"
-	kill -HUP `cat /var/run/museekd.pid`
-	eend $? "Impossible to reload shares ?"
-}
diff --git a/net-p2p/museek+/files/museek b/net-p2p/museek+/files/museek
new file mode 100644
index 000000000..e934d05d8
--- /dev/null
+++ b/net-p2p/museek+/files/museek
@@ -0,0 +1,47 @@
+#!/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.11-SConstruct.patch b/net-p2p/museek+/files/museek+-0.1.11-SConstruct.patch
deleted file mode 100644
index 717087505..000000000
--- a/net-p2p/museek+/files/museek+-0.1.11-SConstruct.patch
+++ /dev/null
@@ -1,53 +0,0 @@
---- SConstruct.bkp	2006-09-17 22:41:56.000000000 +0200
-+++ SConstruct	2006-09-17 23:36:47.000000000 +0200
-@@ -34,8 +34,7 @@
- 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(ListOption('CFLAGS', 'Set your CCFLAGS here', '', ['fPIC', 'Wall', 'pipe', "g", "O0", "O1", "O2", "O3", "funrollloop", "Os", "fomit-frame-pointer"]))
--# New CCFLAGS must be added to the above option, or you'll just get error messages
-+opts.Add('CFLAGS', 'Set your CCFLAGS here', '')
- opts.Add(BoolOption('EPOLL', 'Use epoll when available', ''))
- opts.Add(BoolOption('MUCOUS', 'Install Mucous (when SWIG can be found', ''))
- opts.Add(BoolOption('MUSETUPGTK', 'Install Musetup-GTK', ''))
-@@ -103,20 +102,9 @@
- # 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(' '))
- 	
--	if env['RELEASE'] and "-fomit-frame-pointer" not in env["CCFLAGS"]:
--		env.Append(CCFLAGS = ['-fomit-frame-pointer'])
--	if env['PROFILE'] and "-pg" not in env["CCFLAGS"]:
--		env.Append(CCFLAGS = ['-pg'])
--	if not env['RELEASE'] and not env['PROFILE'] and "-g" not in env["CCFLAGS"]:
--		env.Append(CCFLAGS = ['-g'])
--	flagstring =""
--	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
-@@ -185,7 +173,7 @@
- 		print "Couldn't figure out how to use the dynamic run-time linker"
- 		Exit(1)
- 	env.Replace(LIBS = libs)
--	env.Append(CCFLAGS = ['-fPIC'])
-+	env.Append(CCFLAGS = ' -fPIC')
- 
- 
- if check_deps == 1:
-@@ -390,7 +378,7 @@
- f.write('BUILDDIR = %s\n' % (`env['BUILDDIR']`))
- f.write('RELEASE = %s\n' % (`env['RELEASE']`))
- f.write('MULOG = %s\n' % (`string.join(env['MULOG'], ',')`))
--f.write('CFLAGS = %s\n' % (`string.join(env['CFLAGS'], ',')`))
-+f.write('CFLAGS = %s\n' % (`env['CFLAGS']`))
- f.write('EPOLL = %s\n' % (`env['EPOLL']`))
- f.write('RELAY = %s\n' % (`env['RELAY']`))
- f.write('BINRELOC = %s\n' % (`env['BINRELOC']`))
diff --git a/net-p2p/museek+/files/museek+-0.1.11-defaults.py.patch b/net-p2p/museek+/files/museek+-0.1.11-defaults.py.patch
deleted file mode 100644
index 6d5f18fbb..000000000
--- a/net-p2p/museek+/files/museek+-0.1.11-defaults.py.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- defaults.py.bkp	2006-09-17 23:26:43.000000000 +0200
-+++ defaults.py	2006-09-17 23:28:08.000000000 +0200
-@@ -26,7 +26,7 @@
- MULOG='debug'
- 
- # CCFLAGS (fPIC, Wall, pipe) Do not include the prefix "-"
--CFLAGS='fPIC,Wall,pipe'
-+#CFLAGS='-fPIC -Wall -pipe'
- 
- # Enable OGG Vorbis support (if available) in file scanner (muscan)
- VORBIS=1
diff --git a/net-p2p/museek+/museek+-0.1.11.ebuild b/net-p2p/museek+/museek+-0.1.11.ebuild
deleted file mode 100644
index afaba2e49..000000000
--- a/net-p2p/museek+/museek+-0.1.11.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-inherit qt3 eutils flag-o-matic
-
-DESCRIPTION="a SoulSeek client which uses a daemon and multiple gui clients."
-HOMEPAGE="http://museek-plus.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN/+/-plus}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE="debug gtk ncurses qsa qt3 vorbis"
-
-LANGS="fr de es it pl ru pt_BR ja zh sk he ar cs"
-
-for X in ${LANGS} ; do
-	IUSE="${IUSE} linguas_${X}"
-done
-
-RDEPEND="dev-lang/python
-		>=dev-cpp/libxmlpp-1.0.2
-		gtk? ( >=dev-python/pygtk-2.6.1 )
-		qsa? ( >=dev-libs/qsa-1.1.1 )
-		qt3? ( $(qt_min_version 3.3) )
-		vorbis? ( media-libs/libvorbis
-				media-libs/libogg )"
-DEPEND="${RDEPEND}
-		=dev-util/scons-0.96*
-		dev-lang/swig"
-
-pkg_setup() {
-	if use ncurses && ! built_with_use dev-lang/python ncurses ; then
-		eerror "In order to build Mucose (museek ncurses client)"
-		eerror "you need dev-lang/python built with ncurses USE flag enabled."
-		die "no ncurses support in Python"
-	fi
-
-	if use qsa && ! use qt3 ; then
-		eerror "In order to use QSA you need to build Museek+"
-		eerror "with QT3 support too."
-		die "using qsa without qt3"
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/${P}-defaults.py.patch"
-	epatch "${FILESDIR}/${P}-SConstruct.patch"
-}
-
-src_compile() {
-	local myconf=""
-	use qt3 || myconf="${myconf} MUSEEQ=no"
-	use qsa || myconf="${myconf} QSA=no"
-	use gtk || myconf="${myconf} MUSETUPGTK=no"
-	use ncurses || myconf="${myconf} MUCOUS=no"
-	use vorbis || myconf="${myconf} VORBIS=no"
-	use debug && myconf="${myconf} MULOG=cycle,debug"
-
-	local mylinguas=""
-	for X in ${LANGS} ; do
-		if use linguas_${X} ; then
-			mylinguas="${mylinguas}${X},"
-		fi
-	done
-
-	myconf="${myconf} MUSEEQTRANSLATIONS=${mylinguas/,$/}"
-
-	scons ${myconf} CFLAGS="${CFLAGS}" PREFIX=/usr || die "scons failed"
-}
-
-src_install() {
-	scons DESTDIR="${D}" install || die "scons install failed"
-	dodoc README
-
-	if use qt3 ; then
-		doicon "icons/museeq-circle2.png"
-		make_desktop_entry ${PN/k+/q} "Museeq" museeq-circle2.png \
-		"Qt;Network;P2P"
-	fi
-
-	# conf.d and init.d scripts by SeeSchloss
-	#newinitd "${FILESDIR}/init.d-mulog" mulog
-	newinitd "${FILESDIR}/init.d-museekd" museekd
-
-	#newconfd "${FILESDIR}"/conf.d-mulog mulog
-	newconfd "${FILESDIR}/conf.d-museekd" museekd
-}
-
-pkg_postinst() {
-	elog "Look at /etc/conf.d/museekd and configure all options"
-	elog "before starting it. When you are done,"
-	elog "configure all settings with musetup or musetup-gtk."
-}
diff --git a/net-p2p/museek+/museek+-0.1.12.ebuild b/net-p2p/museek+/museek+-0.1.12.ebuild
index 24f0eb332..cf4901068 100644
--- a/net-p2p/museek+/museek+-0.1.12.ebuild
+++ b/net-p2p/museek+/museek+-0.1.12.ebuild
@@ -2,16 +2,16 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-inherit qt3 eutils flag-o-matic
+inherit qt3 eutils
 
-DESCRIPTION="a SoulSeek client which uses a daemon and multiple gui clients."
-HOMEPAGE="http://museek-plus.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN/+/-plus}/${P}.tar.bz2"
+DESCRIPTION="A SoulSeek client which uses a daemon and multiple gui clients."
+HOMEPAGE="http://www.museek-plus.org"
+SRC_URI="mirror://sourceforge/museek-plus/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~x86"
-IUSE="debug gtk ncurses qsa qt3 vorbis"
+IUSE="debug gtk ncurses qsa qt3 trayicon vorbis"
 
 LANGS="fr de es it pl ru pt_BR ja zh sk he ar cs"
 
@@ -27,12 +27,12 @@ RDEPEND="dev-lang/python
 		vorbis? ( media-libs/libvorbis
 				media-libs/libogg )"
 DEPEND="${RDEPEND}
-		=dev-util/scons-0.96*
+		>=dev-util/scons-0.96
 		dev-lang/swig"
 
 pkg_setup() {
 	if use ncurses && ! built_with_use dev-lang/python ncurses ; then
-		eerror "In order to build Mucose (museek ncurses client)"
+		eerror "In order to build Mucous (museek ncurses client)"
 		eerror "you need dev-lang/python built with ncurses USE flag enabled."
 		die "no ncurses support in Python"
 	fi
@@ -51,7 +51,8 @@ src_compile() {
 	use gtk || myconf="${myconf} MUSETUPGTK=no"
 	use ncurses || myconf="${myconf} MUCOUS=no"
 	use vorbis || myconf="${myconf} VORBIS=no"
-	use debug && myconf="${myconf} MULOG=cycle,debug"
+	use trayicon || myconf="${myconf} MUSEEQTRAYICON=no"
+	use debug || myconf="${myconf} RELEASE=yes MULOG=none"
 
 	local mylinguas=""
 	for X in ${LANGS} ; do
@@ -68,23 +69,15 @@ src_compile() {
 src_install() {
 	scons DESTDIR="${D}" install || die "scons install failed"
 	dodoc README
+	exeinto /usr/bin
+	doexe ${FILESDIR}/museek
 
 	if use qt3 ; then
 		doicon "icons/museeq-circle2.png"
-		make_desktop_entry ${PN/k+/q} "Museeq" museeq-circle2.png \
-		"Qt;Network;P2P"
+		make_desktop_entry museeq "Museeq" museeq-circle2.png "Qt;Network;P2P"
 	fi
-
-	# conf.d and init.d scripts by SeeSchloss
-	#newinitd "${FILESDIR}/init.d-mulog" mulog
-	newinitd "${FILESDIR}/init.d-museekd" museekd
-
-	#newconfd "${FILESDIR}"/conf.d-mulog mulog
-	newconfd "${FILESDIR}/conf.d-museekd" museekd
 }
 
 pkg_postinst() {
-	elog "Look at /etc/conf.d/museekd and configure all options"
-	elog "before starting it. When you are done,"
-	elog "configure all settings with musetup or musetup-gtk."
+	einfo "Use museek to launch the daemon."
 }