Bump to 0.1.13.

(Portage version: 2.1.3.9)

4 files changed, 271 insertions, 1 deletions

diff --git a/net-p2p/museek+/ChangeLog b/net-p2p/museek+/ChangeLog
index d979ecc8d63f..da1964daf709 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.5 2007/07/03 21:20:52 coldwind Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/museek+/ChangeLog,v 1.6 2007/09/22 19:26:08 coldwind Exp $
+
+*museek+-0.1.13 (22 Sep 2007)
+
+  22 Sep 2007; Santiago M. Mola <coldwind@gentoo.org>
+  +files/museek+-0.1.13-post_release_fixes.patch, +museek+-0.1.13.ebuild:
+  Bump to 0.1.13.
 
   03 Jul 2007; Santiago M. Mola <coldwind@gentoo.org> metadata.xml:
   Update my maintainer data.
diff --git a/net-p2p/museek+/files/digest-museek+-0.1.13 b/net-p2p/museek+/files/digest-museek+-0.1.13
new file mode 100644
index 000000000000..831269f7b4d6
--- /dev/null
+++ b/net-p2p/museek+/files/digest-museek+-0.1.13
@@ -0,0 +1,3 @@
+MD5 7aada627839578ebe525c54a1cef7dc4 museek+-0.1.13.tar.bz2 1186870
+RMD160 25e1febce98ee536ba380e58b052ed7113f84d06 museek+-0.1.13.tar.bz2 1186870
+SHA256 e1958556b30dee59eb7648973432d4d048f30c79f38ab7145fca6f0f2690473e museek+-0.1.13.tar.bz2 1186870
diff --git a/net-p2p/museek+/files/museek+-0.1.13-post_release_fixes.patch b/net-p2p/museek+/files/museek+-0.1.13-post_release_fixes.patch
new file mode 100644
index 000000000000..6dd5df3cf77c
--- /dev/null
+++ b/net-p2p/museek+/files/museek+-0.1.13-post_release_fixes.patch
@@ -0,0 +1,170 @@
+Index: museeq/CMakeLists.txt
+===================================================================
+--- museeq/CMakeLists.txt	(revisión: 735)
++++ museeq/CMakeLists.txt	(copia de trabajo)
+@@ -29,7 +29,7 @@
+       SET(_moc ${CMAKE_CURRENT_BINARY_DIR}/${_basename}.moc.cpp)
+ 
+       ADD_CUSTOM_COMMAND(OUTPUT ${_moc}
+-         COMMAND moc #${QT_MOC_EXECUTABLE} 
++         COMMAND /usr/qt/3/bin/moc #${QT_MOC_EXECUTABLE} 
+          ARGS ${_tmp_FILE} -o ${_moc}
+          DEPENDS ${_tmp_FILE}
+       )
+@@ -90,6 +90,7 @@
+     /usr/share/qt3/lib
+     C:/Progra~1/qt/lib
+     /usr/X11R6/lib
++    /opt/qt/lib
+ )
+ 
+ IF(PREFIX)
+@@ -304,8 +305,12 @@
+ 
+ 
+ add_executable(museeq ${MUSEEQ_SOURCES} ${MUSEEQ_MOC_HEADERS})
++set(LINK_LIBRARIES  Mucipher ${QT_LIBRARIES})
++if (QSA)
++  set(LINK_LIBRARIES ${LINK_LIBRARIES} ${QSA_LIBRARY})
++endif (QSA)
+ 
+-target_link_libraries(museeq Mucipher ${QT_LIBRARIES} ${QSA_LIBRARY})
++target_link_libraries(museeq ${LINK_LIBRARIES})
+ 
+ install(
+   TARGETS museeq
+@@ -331,13 +336,13 @@
+ )
+ 
+ file(GLOB_RECURSE THEME_DEFAULT default/*.png)
+-install(FILES ${THEME_DEFAULT} DESTINATION ${DATADIR}/museek/museeq/default)
++install(FILES ${THEME_DEFAULT} DESTINATION ${DATADIR}/museek/museeq/icons/default)
+ file(GLOB_RECURSE THEME_BLUEBOX bluebox/*.png)
+-install(FILES ${THEME_BLUEBOX} DESTINATION ${DATADIR}/museek/museeq/bluebox)
++install(FILES ${THEME_BLUEBOX} DESTINATION ${DATADIR}/museek/museeq/icons/bluebox)
+ file(GLOB_RECURSE THEME_SILK mikelabo-silk/*.png)
+-install(FILES ${THEME_SILK} DESTINATION ${DATADIR}/museek/museeq/mikelabo-silk)
++install(FILES ${THEME_SILK} DESTINATION ${DATADIR}/museek/museeq/icons/mikelabo-silk)
+ file(GLOB_RECURSE THEME_TRI mikelabo-tri/*.png)
+-install(FILES ${THEME_TRI} DESTINATION ${DATADIR}/museek/museeq/mikelabo-tri)
++install(FILES ${THEME_TRI} DESTINATION ${DATADIR}/museek/museeq/icons/mikelabo-tri)
+ 
+ set(ICONS
+   museeq.png
+@@ -369,4 +374,4 @@
+   MESSAGE(" * without a Trayicon.. [TRAYICON=1]")
+ else (NOT TRAYICON)
+   MESSAGE(" * with a Trayicon.. [TRAYICON=0]")
+-endif (NOT TRAYICON)
+\ Sin fin-de-línea al final del archivo
++endif (NOT TRAYICON)
+Index: museeq/mainwin.cpp
+===================================================================
+--- museeq/mainwin.cpp	(revisión: 735)
++++ museeq/mainwin.cpp	(copia de trabajo)
+@@ -119,13 +119,8 @@
+ 	mMenuSettings->setItemEnabled(1, true);
+ 
+ 	mMenuSettings->setItemEnabled(3, false);
+-	mMenuSettings->setItemChecked(3, museeq->mShowTickers);
+-	mMenuSettings->setItemEnabled(4, false);
+-	mMenuSettings->setItemChecked(4, museeq->mShowStatusLog);
+-	mMenuSettings->setItemChecked(5, museeq->mShowTimestamps);
+-	mMenuSettings->setItemEnabled(8, true);
+-	mMenuSettings->setItemChecked(8, museeq->mUsetray);
+ 	
++	
+ 	menuBar()->insertItem(tr("&Settings"), mMenuSettings);
+ 	mMenuModes = new QPopupMenu(this);
+ 	mMenuModes->insertItem( IMG("chatroom-small"), tr("&Chat Rooms"), this, SLOT(changeCMode()), 0, 0);
+@@ -263,12 +258,8 @@
+ 
+ 	connect(museeq->driver(), SIGNAL(userStatus(const QString&, uint)), SLOT(slotUserStatus(const QString&, uint)));
+ 	QSettings settings;
+-	QString showStatusLog = settings.readEntry("/TheGraveyard.org/Museeq/showStatusLog");
+-	if (! showStatusLog.isEmpty() and (showStatusLog == "true" || showStatusLog == true)) {
+-		museeq->mShowStatusLog = true;
+-	} else if (! showStatusLog.isEmpty() and (showStatusLog == "false" || showStatusLog == false)) {
+-		museeq->mShowStatusLog = false;
+-	}
++	museeq->mShowStatusLog = settings.readBoolEntry("/TheGraveyard.org/Museeq/showStatusLog", FALSE);
++
+ 	if ( ! museeq->mShowStatusLog)
+ 		mLog->hide();
+ 	QString exitdialog = settings.readEntry("/TheGraveyard.org/Museeq/ShowExitDialog");
+@@ -326,9 +317,10 @@
+ 	museeq->mColorTrusted = settings.readEntry("/TheGraveyard.org/Museeq/colorTrusted");
+ 	museeq->mColorRemote = settings.readEntry("/TheGraveyard.org/Museeq/colorRemote");
+ 	museeq->mColorTime = settings.readEntry("/TheGraveyard.org/Museeq/colorTime");
+-	QString showTimestamps = settings.readEntry("/TheGraveyard.org/Museeq/showTimestamps");
+-	QString showIPinLog = settings.readEntry("/TheGraveyard.org/Museeq/showIPinLog");
+-	QString showAlertsInLog = settings.readEntry("/TheGraveyard.org/Museeq/showAlertsInLog");
++	museeq->mShowTickers = settings.readBoolEntry("/TheGraveyard.org/Museeq/showTickers", FALSE);
++	museeq->mShowTimestamps = settings.readBoolEntry("/TheGraveyard.org/Museeq/showTimestamps", FALSE);
++	museeq->mIPLog = settings.readBoolEntry("/TheGraveyard.org/Museeq/showIPinLog", FALSE);
++	museeq->mOnlineAlert = settings.readBoolEntry("/TheGraveyard.org/Museeq/showAlertsInLog", FALSE);
+ 	
+ 	if (! museeq->mFontTime.isEmpty()) {
+ 		mSettingsDialog->STimeFont->setText(museeq->mFontTime);
+@@ -357,28 +349,14 @@
+ 	if (! museeq->mColorTime.isEmpty()) {
+ 		mSettingsDialog->STimeText->setText(museeq->mColorTime);
+ 	}
+-	if (! showTimestamps.isEmpty() and (showTimestamps == "true" || showTimestamps == true)) {
+-		museeq->mShowTimestamps = true;
+-		mMenuSettings->setItemChecked(5, true);
+-	} else if (! showTimestamps.isEmpty() and (showTimestamps == "false" || showTimestamps == false)) {
+-		museeq->mShowTimestamps = false;
+-		mMenuSettings->setItemChecked(5, false);
+-	}
+-	if (! showIPinLog.isEmpty() and (showIPinLog == "true" || showIPinLog == true)) {
+-		mSettingsDialog->SIPLog->setChecked(true);
+-		museeq->mIPLog = true;
+-		
+-	} else if (! showIPinLog.isEmpty() and (showIPinLog == "false" || showIPinLog == false)){
+-		mSettingsDialog->SIPLog->setChecked(false);
+-		museeq->mIPLog = false;
+-	}
+-	if (! showAlertsInLog.isEmpty() and (showAlertsInLog == "true" || showAlertsInLog == true)) {
+-		mSettingsDialog->SOnlineAlerts->setChecked(true);
+-		museeq->mOnlineAlert = true;
+-	} else if (! showAlertsInLog.isEmpty() and (showAlertsInLog == "false" || showAlertsInLog == false)){
+-		mSettingsDialog->SOnlineAlerts->setChecked(false);
+-		museeq->mOnlineAlert = false;
+-	}
++
++	
++	mMenuSettings->setItemChecked(3, museeq->mShowTickers);
++	mMenuSettings->setItemChecked(4, museeq->mShowStatusLog);
++	mMenuSettings->setItemChecked(5, museeq->mShowTimestamps);
++	mMenuSettings->setItemChecked(8, museeq->mUsetray);
++	mSettingsDialog->SOnlineAlerts->setChecked(museeq->mOnlineAlert);
++	mSettingsDialog->SIPLog->setChecked(museeq->mIPLog);
+ 	box->setEnabled(false);
+ 	daemon = new QProcess(this);
+ 	connect( daemon, SIGNAL(readyReadStdout()), this,   SLOT(readFromStdout()) );
+Index: museeq/system.h
+===================================================================
+--- museeq/system.h	(revisión: 741)
++++ museeq/system.h	(copia de trabajo)
+@@ -66,7 +66,7 @@
+ #endif
+ 
+ 
+-#define HAVE_UINT
++/* #undef HAVE_UINT */
+ #ifndef HAVE_UINT
+  typedef unsigned int uint;
+ #endif
+Index: Tools/mp3.c
+===================================================================
+--- Tools/mp3.c	(revisión: 735)
++++ Tools/mp3.c	(copia de trabajo)
+@@ -19,6 +19,7 @@
+ 
+ #include <system.h>
+ 
++#include <stdlib.h>
+ #include "mp3.h"
+ 
+ #define ENDIAN(head) ((head >> 24) | ((head & 0x00ff0000) >> 8) | ((head & 0x0000ff00) << 8) | (head << 24))
diff --git a/net-p2p/museek+/museek+-0.1.13.ebuild b/net-p2p/museek+/museek+-0.1.13.ebuild
new file mode 100644
index 000000000000..cd87f88d2c77
--- /dev/null
+++ b/net-p2p/museek+/museek+-0.1.13.ebuild
@@ -0,0 +1,91 @@
+# 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.13.ebuild,v 1.1 2007/09/22 19:26:08 coldwind Exp $
+
+inherit qt3 eutils distutils multilib
+
+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 qt3 trayicon"
+
+RDEPEND=">=dev-cpp/libxmlpp-1.0.2
+		gtk? ( >=dev-python/pygtk-2.6.1 )
+		qt3? ( $(qt_min_version 3.3)
+			>=dev-libs/qsa-1.1.1 )
+		media-libs/libvorbis
+		media-libs/libogg
+		virtual/fam"
+DEPEND="${RDEPEND}
+		dev-lang/swig"
+
+pkg_setup() {
+	if use ncurses && ! built_with_use dev-lang/python ncurses ; then
+		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
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}/${P}-post_release_fixes.patch"
+	sed -i -e "s:join('lib':join('$(get_libdir)':g" \
+		*/CMakeLists.txt || die "sed failed"
+}
+
+src_compile() {
+	# Build museekd, mucous, murmur, python bindings and clients
+	local myconf="-DPREFIX=/usr -DMANDIR=share/man -DBINDINGS=1 -DCLIENTS=1"
+	myconf="${myconf} -DSWIG_DIR='$(swig -swiglib)'" # bug #192594
+	if use ncurses ; then
+		myconf="${myconf} -DMUCOUS=1"
+	else
+		myconf="${myconf} -DMUCOUS=0"
+	fi
+	if use gtk ; then
+		myconf="${myconf} -DMURMUR=1"
+	else
+		myconf="${myconf} -DMURMUR=0"
+	fi
+	if use qt3 ; then
+		myconf="${myconf} -DNO_MUSEEQ=0"
+		use trayicon && myconf="${myconf} -DTRAYICON=1"
+	else
+		myconf="${myconf} -DNO_MUSEEQ=1"
+	fi
+	if ! use debug ; then
+		myconf="${myconf} -DMULOG=none"
+	fi
+
+	cmake ${myconf} || die "cmake failed"
+	emake || die "emake failed"
+
+	# Build setup tools
+	cd "${S}/setup"
+	distutils_src_compile
+}
+
+src_install() {
+	# Install main stuff
+	emake DESTDIR="${D}" install || die "emake install failed"
+	dodoc README CREDITS CHANGELOG TODO
+
+	# Install setup tools
+	cd "${S}/setup"
+	distutils_src_install
+}
+
+pkg_postinst() {
+	distutils_pkg_postinst
+
+	elog "In order to configure ${PN} execute musetup, musetup-gtk,"
+	elog "or musetup-qt with your user."
+	elog "Then you can launch ${PN} daemon with 'museekd' and use"
+	elog "any of the provided clients."
+}