diff options
Diffstat (limited to 'net-p2p/museek+')
| -rw-r--r-- | net-p2p/museek+/ChangeLog | 8 | ||||
| -rw-r--r-- | net-p2p/museek+/Manifest | 20 | ||||
| -rw-r--r-- | net-p2p/museek+/files/digest-museek+-0.1.13 | 3 | ||||
| -rw-r--r-- | net-p2p/museek+/files/museek+-0.1.13-post_release_fixes.patch | 170 | ||||
| -rw-r--r-- | net-p2p/museek+/museek+-0.1.13.ebuild | 91 |
5 files changed, 287 insertions, 5 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+/Manifest b/net-p2p/museek+/Manifest index b1de2c949a0e..5f99e4c24e91 100644 --- a/net-p2p/museek+/Manifest +++ b/net-p2p/museek+/Manifest @@ -14,15 +14,24 @@ AUX museek+-0.1.12-scons-0.96.94.patch 7755 RMD160 42e807f95d9453a9353c30934670c 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 +AUX museek+-0.1.13-post_release_fixes.patch 7026 RMD160 e1a4f62dbcd9d6e51061bdf255e45faed3ee6ca1 SHA1 af3abc48b8326a9f945a602d6c84b10758a413e3 SHA256 447fa903f14c99a78644a7389497919471254578ef6aaade8f90470aa595dc2e +MD5 f04ea07cf8f97d2d21a1b246fc924326 files/museek+-0.1.13-post_release_fixes.patch 7026 +RMD160 e1a4f62dbcd9d6e51061bdf255e45faed3ee6ca1 files/museek+-0.1.13-post_release_fixes.patch 7026 +SHA256 447fa903f14c99a78644a7389497919471254578ef6aaade8f90470aa595dc2e files/museek+-0.1.13-post_release_fixes.patch 7026 DIST museek+-0.1.12.tar.bz2 758908 RMD160 2be013e1c27e846b29ff4d51c825fc0cda2f58e9 SHA1 8ec3aafdbd22a9ac143419bb5c1296635be76ad9 SHA256 458a6d98cfec13c416382df32c99ff7862d70f54bc94ff3ad1cdb0723a7b3a53 +DIST museek+-0.1.13.tar.bz2 1186870 RMD160 25e1febce98ee536ba380e58b052ed7113f84d06 SHA1 003cc4f7d98b8bce8cdfa969b370a5e3c10ca9a1 SHA256 e1958556b30dee59eb7648973432d4d048f30c79f38ab7145fca6f0f2690473e 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 1071 RMD160 462f39563e12c41798d06b3332a700376552e19d SHA1 03f8f8f6a4e69c27c010603730211d0f77b82a60 SHA256 c27a4065b62c6119a594591189612851ae5785f720f0a3b92b2db5f0383cdf79 -MD5 28eba80ea2fdf4e8be206511e9e2d39c ChangeLog 1071 -RMD160 462f39563e12c41798d06b3332a700376552e19d ChangeLog 1071 -SHA256 c27a4065b62c6119a594591189612851ae5785f720f0a3b92b2db5f0383cdf79 ChangeLog 1071 +EBUILD museek+-0.1.13.ebuild 2379 RMD160 47a0e33887adbca7a2c18daba1c2b6194928b6b6 SHA1 17230a49a24a174ada9f0314aaa54ab2e8dff983 SHA256 d06cf1d6f34f662dfdea0be6b24fdc9291aa2e111965491092f146538cab4f25 +MD5 d993d9833a85116d79abcf864a90b5c7 museek+-0.1.13.ebuild 2379 +RMD160 47a0e33887adbca7a2c18daba1c2b6194928b6b6 museek+-0.1.13.ebuild 2379 +SHA256 d06cf1d6f34f662dfdea0be6b24fdc9291aa2e111965491092f146538cab4f25 museek+-0.1.13.ebuild 2379 +MISC ChangeLog 1249 RMD160 8f1e2cd9586704a5f083ace28dd6af99f9971e06 SHA1 63138f3d85bc2d5f7b3b195bb9580fa42b0af9d2 SHA256 88e29c0c1d0c300f127aecafb93367995b83242f8dbbdae480e448f66f2d35b8 +MD5 9fe81dbf306d9235137a8c75e9b55a63 ChangeLog 1249 +RMD160 8f1e2cd9586704a5f083ace28dd6af99f9971e06 ChangeLog 1249 +SHA256 88e29c0c1d0c300f127aecafb93367995b83242f8dbbdae480e448f66f2d35b8 ChangeLog 1249 MISC metadata.xml 313 RMD160 b0805df315468fbaa87cfbf5f13bdf4e39dc46a9 SHA1 f3d60151d576d04d35a23a6abf18d91aa7dcf8a0 SHA256 8050a8119d7f3b6d1ae17c8f5d53c743a0dd78b74c506d9d5fee6cae94ed521f MD5 f8759be35c2bed29cb5cb729b8377d2f metadata.xml 313 RMD160 b0805df315468fbaa87cfbf5f13bdf4e39dc46a9 metadata.xml 313 @@ -30,3 +39,6 @@ SHA256 8050a8119d7f3b6d1ae17c8f5d53c743a0dd78b74c506d9d5fee6cae94ed521f metadata 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 +MD5 e76a1fcced1acfdc800a08ed72d4ed68 files/digest-museek+-0.1.13 250 +RMD160 429240e5007a3f9de947fa3c596f4e1e756a3232 files/digest-museek+-0.1.13 250 +SHA256 bbe7f83ab932001afd23b1bd9ae9d25a63799eae62d7143cbf7e7351ab4d5360 files/digest-museek+-0.1.13 250 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." +} |