diff options
author | Tomas Chvatal <scarabeus@gentoo.org> | 2009-12-23 16:57:49 +0000 |
---|---|---|
committer | Tomas Chvatal <scarabeus@gentoo.org> | 2009-12-23 16:57:49 +0000 |
commit | 3302743ea08bb1c37e643e807f226cd5cfab980d (patch) | |
tree | 0d2a78d857f29e6b8fcb091606cff519fde1de69 /net-p2p | |
parent | Stable for amd64 wrt bug #297844 (diff) | |
download | historical-3302743ea08bb1c37e643e807f226cd5cfab980d.tar.gz historical-3302743ea08bb1c37e643e807f226cd5cfab980d.tar.bz2 historical-3302743ea08bb1c37e643e807f226cd5cfab980d.zip |
Drop museek+. Per bug #287583
Diffstat (limited to 'net-p2p')
-rw-r--r-- | net-p2p/museek+/ChangeLog | 92 | ||||
-rw-r--r-- | net-p2p/museek+/Manifest | 17 | ||||
-rw-r--r-- | net-p2p/museek+/files/museek+-0.1.13-gcc43.patch | 124 | ||||
-rw-r--r-- | net-p2p/museek+/files/museek+-0.1.13-optional-deps.patch | 95 | ||||
-rw-r--r-- | net-p2p/museek+/files/museek+-0.1.13-post_release_fixes.patch | 163 | ||||
-rw-r--r-- | net-p2p/museek+/metadata.xml | 9 | ||||
-rw-r--r-- | net-p2p/museek+/museek+-0.1.13-r3.ebuild | 95 |
7 files changed, 0 insertions, 595 deletions
diff --git a/net-p2p/museek+/ChangeLog b/net-p2p/museek+/ChangeLog deleted file mode 100644 index 949d94f149b8..000000000000 --- a/net-p2p/museek+/ChangeLog +++ /dev/null @@ -1,92 +0,0 @@ -# ChangeLog for net-p2p/museek+ -# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-p2p/museek+/ChangeLog,v 1.18 2009/10/25 17:15:23 tove Exp $ - - 25 Oct 2009; Torsten Veller <tove@gentoo.org> metadata.xml: - Remove coldwind from metadata.xml (#181764) - - 07 Mar 2009; Petteri Räty <betelgeuse@gentoo.org> - museek+-0.1.13-r3.ebuild: - Migreate to EAPI 2. - - 17 Nov 2008; Diego E. Pettenò <flameeyes@gentoo.org> - files/museek+-0.1.13-gcc43.patch: - Fix patch with absolute paths. - - 17 Nov 2008; Diego E. Pettenò <flameeyes@gentoo.org> - files/museek+-0.1.13-gcc43.patch: - Fix patch with absolute paths. - - 28 Jul 2008; Carsten Lohrke <carlo@gentoo.org> museek+-0.1.13-r3.ebuild: - QA: Get rid of deprecated qt_min_version(). - - 28 May 2008; Santiago M. Mola <coldwind@gentoo.org> - -files/museek+-0.1.12-libxmlpp-dep-order.patch, - -files/museek+-0.1.12-musetup-gtk-spaces.patch, - -files/museek+-0.1.12-scons-0.96.94.patch, -files/museek, - -museek+-0.1.12.ebuild: - Remove old version. - -*museek+-0.1.13-r3 (30 Apr 2008) - - 30 Apr 2008; Santiago M. Mola <coldwind@gentoo.org> - +files/museek+-0.1.13-gcc43.patch, -museek+-0.1.13-r1.ebuild, - -museek+-0.1.13-r2.ebuild, +museek+-0.1.13-r3.ebuild: - Fix missing dodir (bug #219007) and compatibility with gcc 4.3 (bug - #219352). Remove old. - - 29 Feb 2008; Carsten Lohrke <carlo@gentoo.org> museek+-0.1.12.ebuild: - Remove icon extension from desktop entry to match Icon Theme Specification. - -*museek+-0.1.13-r2 (16 Feb 2008) - - 16 Feb 2008; Santiago M. Mola <coldwind@gentoo.org> - +museek+-0.1.13-r2.ebuild: - Revbump fixing #210364 - - 24 Jan 2008; Santiago M. Mola <coldwind@gentoo.org> - museek+-0.1.13-r1.ebuild: - Keyworded ~amd64 and an elog message added warning about extra software - needed to run musetup-{gtk,qt}, #193444. - - 13 Oct 2007; Santiago M. Mola <coldwind@gentoo.org> - museek+-0.1.13-r1.ebuild: - Depend on >=dev-util/cmake-2.4.6 (#195414). - -*museek+-0.1.13-r1 (23 Sep 2007) - - 23 Sep 2007; Santiago M. Mola <coldwind@gentoo.org> - +files/museek+-0.1.13-optional-deps.patch, - files/museek+-0.1.13-post_release_fixes.patch, -museek+-0.1.13.ebuild, - +museek+-0.1.13-r1.ebuild: - Make optional deps configurable. - -*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. - - 14 Feb 2007; Raúl Porcel <armin76@gentoo.org> - +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 <armin76@gentoo.org> - +files/museek+-0.1.12-libxmlpp-dep-order.patch, +files/museek: - add missing files, thanks to coldwind for reporting - - 12 Feb 2007; Raúl Porcel <armin76@gentoo.org> metadata.xml: - ColdWind will maintain this - -*museek+-0.1.12 (12 Feb 2007) - - 12 Feb 2007; Raúl Porcel <armin76@gentoo.org> +metadata.xml, - +museek+-0.1.12.ebuild: - New ebuild, from bug 140047, thanks to Santiago M. Mola Velasco <cooldwind - at gmail dot com> for the ebuild - diff --git a/net-p2p/museek+/Manifest b/net-p2p/museek+/Manifest deleted file mode 100644 index 50a4a64dcfcb..000000000000 --- a/net-p2p/museek+/Manifest +++ /dev/null @@ -1,17 +0,0 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - -AUX museek+-0.1.13-gcc43.patch 2637 RMD160 d4afe3d5878e61ba6d7c7e049981148dd31f546d SHA1 58a40c1a3b77a27104e7e55fdaf5806137bd9bae SHA256 3f0540229a43c3c53fec4b731465a154fa47e098374b062cd861011674c701ce -AUX museek+-0.1.13-optional-deps.patch 2982 RMD160 fb285a39b704e7fb841c0319a744a870c6014740 SHA1 35d23e5347bf1971b27e6cfea2f2e891d143be89 SHA256 058496ff74454995dfef8c93775fe89a9008af3d97c327e040ca16b0eaa9d94d -AUX museek+-0.1.13-post_release_fixes.patch 6801 RMD160 d039d8c09241dab2e93a082817197d7c14ba6212 SHA1 4ef183c740df67b8b5347083504c027586885899 SHA256 a99b83a517061efe7d1d027f669e903eb66a7be4590ade5bacfdc5523d2826ae -DIST museek+-0.1.13.tar.bz2 1186870 RMD160 25e1febce98ee536ba380e58b052ed7113f84d06 SHA1 003cc4f7d98b8bce8cdfa969b370a5e3c10ca9a1 SHA256 e1958556b30dee59eb7648973432d4d048f30c79f38ab7145fca6f0f2690473e -EBUILD museek+-0.1.13-r3.ebuild 2557 RMD160 4813ae4dce780a760093dc024ce1509d196f58f2 SHA1 f92d422a3125ed4d48d45ea93a0c2672675f0d17 SHA256 8ae29e27c4a1cd8b95abf8f6520d044f87e6889d198e90f2b5416f1d931f9bb8 -MISC ChangeLog 3293 RMD160 ec8ae6cc4674768200fbc570c3a2f29e05e909f4 SHA1 7d5296c9342f1fdcbf342c69b1bd3e61957e1052 SHA256 4d6721957880257ba9b3eb0478cdd2a520d9ba90b7788834be66008405a301f2 -MISC metadata.xml 300 RMD160 1cdb6fddd0c17132effed294e65c55086cb56e74 SHA1 f31841c0cbee61ce0f715ef7e34e1af1b495809e SHA256 1eca22ebf3aff7cac442a7590debf8cd0e9612199ac4e9f999268c36f2527adc ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.11 (GNU/Linux) - -iEYEARECAAYFAkrkh7EACgkQV3J2n04EauzlqACdGK5iQoiNN1kic6I+gPPJvmIH -U8QAoK/u0C1qnt9BcIc2KT6ntIRSz7B2 -=bYHT ------END PGP SIGNATURE----- diff --git a/net-p2p/museek+/files/museek+-0.1.13-gcc43.patch b/net-p2p/museek+/files/museek+-0.1.13-gcc43.patch deleted file mode 100644 index b3a469a753f3..000000000000 --- a/net-p2p/museek+/files/museek+-0.1.13-gcc43.patch +++ /dev/null @@ -1,124 +0,0 @@ -gcc-4.3 compatibility, by Belegdol. -http://www.museek-plus.org/changeset/743 ---- a/museek+/trunk/sources/Museek/Museek.cc -+++ b/museek+/trunk/sources/Museek/Museek.cc -@@ -37,4 +37,5 @@ - #include <queue> - #include <vector> -+#include <cstdlib> - - using std::string; - ---- a/museek+/trunk/sources/Museek/DistribManager.cc -+++ b/museek+/trunk/sources/Museek/DistribManager.cc -@@ -27,4 +27,6 @@ - #define MULOG_DOMAIN "Museek.DM" - #include <Muhelp/Mulog.hh> -+ -+#include <algorithm> - - using std::vector; - - ---- a/museek+/trunk/sources/Museek/PeerManager.hh -+++ b/museek+/trunk/sources/Museek/PeerManager.hh -@@ -96,5 +96,5 @@ - inline void set_uploading(Transfer* uploading) { mUploading = uploading; } - -- void push_download(uint path, const std::wstring& path); -+ void push_download(uint path1, const std::wstring& path); - void flush_downloads(); - - - ---- a/museek+/trunk/sources/Museek/TransferManager.cc -+++ b/museek+/trunk/sources/Museek/TransferManager.cc -@@ -37,4 +37,5 @@ - #include <vector> - #include <iostream> -+#include <algorithm> - - using std::string; - - ---- a/museek+/trunk/sources/Museek/PeerManager.cc -+++ b/museek+/trunk/sources/Museek/PeerManager.cc -@@ -33,4 +33,5 @@ - #include <queue> - #include <vector> -+#include <algorithm> - - using std::string; - - ---- a/museek+/trunk/sources/Muhelp/string_ext.hh -+++ b/museek+/trunk/sources/Muhelp/string_ext.hh -@@ -51,4 +51,5 @@ - #include <vector> - #include <list> -+#include <cstdlib> - - // Split a string into a list of strings - - ---- a/museek+/trunk/sources/Muhelp/Mulog.cc -+++ b/museek+/trunk/sources/Muhelp/Mulog.cc -@@ -20,4 +20,6 @@ - #include <system.h> - #include <syslog.h> -+ -+#include <cstdlib> - - #include <Muhelp/Mulog.hh> - - ---- a/museek+/trunk/sources/museekd/main.cc -+++ b/museek+/trunk/sources/museekd/main.cc -@@ -26,4 +26,5 @@ - #include <Muhelp/Mulog.hh> - #include <fstream> -+#include <cstdlib> - - using std::string; - - ---- a/museek+/trunk/sources/museekd/IfaceConnection.cc -+++ b/museek+/trunk/sources/museekd/IfaceConnection.cc -@@ -29,4 +29,5 @@ - #include <map> - #include <vector> -+#include <cstdlib> - - #define MULOG_DOMAIN "museekd.IL" - - ---- a/museek+/trunk/sources/Tools/muscan.cc -+++ b/museek+/trunk/sources/Tools/muscan.cc -@@ -27,4 +27,5 @@ - - #include <iostream> -+#include <cstdlib> - - using std::vector; - - ---- a/museek+/trunk/sources/Tools/scanner.cc -+++ b/museek+/trunk/sources/Tools/scanner.cc -@@ -19,4 +19,6 @@ - - #include <system.h> -+ -+#include <cstdlib> - - extern "C" { - - ---- a/museek+/trunk/sources/Tools/muscand.cc -+++ b/museek+/trunk/sources/Tools/muscand.cc -@@ -9,4 +9,6 @@ - - #include <iostream> -+#include <cstdlib> -+#include <algorithm> - - using std::string; diff --git a/net-p2p/museek+/files/museek+-0.1.13-optional-deps.patch b/net-p2p/museek+/files/museek+-0.1.13-optional-deps.patch deleted file mode 100644 index c5f282cde693..000000000000 --- a/net-p2p/museek+/files/museek+-0.1.13-optional-deps.patch +++ /dev/null @@ -1,95 +0,0 @@ ---- CMakeLists.txt 2007-09-23 13:10:33.000000000 +0200 -+++ CMakeLists.txt 2007-09-23 13:14:32.000000000 +0200 -@@ -261,7 +261,7 @@ - endif (NOT DIR_H) - - # Detect Vorbisfile library --if (HAVE_VORBIS_H) -+if (HAVE_VORBIS_H AND VORBIS) - find_library(VORBIS_LIBRARIES NAMES vorbisfile PATHS /usr/lib /usr/local/lib) - if (VORBIS_LIBRARIES) - set(HAVE_VORBIS 1) -@@ -270,9 +270,9 @@ - message(STATUS "Vorbisfile library wasn't found, ogg metadata will not be created") - set(VORBIS_LIBRARIES "") - endif (VORBIS_LIBRARIES) --else (HAVE_VORBIS_H) -+else (HAVE_VORBIS_H AND VORBIS) - set(VORBIS_LIBRARIES "") --endif (HAVE_VORBIS_H) -+endif (HAVE_VORBIS_H AND VORBIS) - - set(CMAKE_REQUIRED_LIBRARIES) - -@@ -340,4 +340,4 @@ - add_subdirectory(museeq) - else (C_MUSEEQ) - message("!!! museeq will NOT be installed [NO_MUSEEQ=0]") --endif (C_MUSEEQ) -\ No hay ningún carácter de nueva línea al final del fichero -+endif (C_MUSEEQ) ---- museeq/CMakeLists.txt 2007-09-23 13:10:33.000000000 +0200 -+++ museeq/CMakeLists.txt 2007-09-23 13:13:58.000000000 +0200 -@@ -1,9 +1,7 @@ - project(museeq) # the name of your project - - MESSAGE("DECLARATIONS: PREFIX (/usr), MANDIR (PREFIX/man), DATADIR (PREFIX/share), BINRELOC, TRAYICON --Prefix declarations with -D and set them with either 1, 0 or a path. --QSA is detected automatically --") -+Prefix declarations with -D and set them with either 1, 0 or a path.") - - - cmake_minimum_required(VERSION 2.4.0) -@@ -175,13 +173,17 @@ - int main() { - QSInterpreter::defaultInterpreter()->hasFunction(\"\"); - } --" QSA) -+" HAVE_QSA) - - if (QSA) --MESSAGE(STATUS "QSA available") -- add_definitions(-DHAVE_QSA=1 -DHAVE_QSA_DIALOG=1 ) -+ if (HAVE_QSA) -+ MESSAGE(STATUS "QSA available") -+ add_definitions(-DHAVE_QSA=1 -DHAVE_QSA_DIALOG=1 ) -+ else (HAVE_QSA) -+ MESSAGE(FATAL_ERROR "!!! QSA NOT available") -+ endif (HAVE_QSA) - else (QSA) --MESSAGE("!!! QSA NOT available") -+MESSAGE("!!! QSA disabled") - endif (QSA) - - message(STATUS "moc binary:" ${QT_MOC_EXECUTABLE}) -@@ -369,4 +371,4 @@ - MESSAGE(" * without a Trayicon.. [TRAYICON=1]") - else (NOT TRAYICON) - MESSAGE(" * with a Trayicon.. [TRAYICON=0]") --endif (NOT TRAYICON) -\ No hay ningún carácter de nueva línea al final del fichero -+endif (NOT TRAYICON) ---- Tools/CMakeLists.txt 2007-09-23 13:10:33.000000000 +0200 -+++ Tools/CMakeLists.txt 2007-09-23 13:11:55.000000000 +0200 -@@ -42,7 +42,7 @@ - ) - MESSAGE("--> muscan (file scanner) will be installed..") - # To build, or not build muscand --if (FAM_LIBRARIES AND FAM_H) -+if (NOT NO_MUSCAND AND FAM_LIBRARIES AND FAM_H) - - add_executable(muscand ${MUSCAND_SOURCES}) - -@@ -68,9 +68,9 @@ - DESTINATION bin - ) - MESSAGE("--> muscand (FAM-based file scanning daemon) will be installed..") --else(FAM_LIBRARIES AND FAM_H) -+else(NOT NO_MUSCAND AND FAM_LIBRARIES AND FAM_H) - MESSAGE("!!! muscand will NOT be installed..") --endif(FAM_LIBRARIES AND FAM_H) -+endif(NOT NO_MUSCAND AND FAM_LIBRARIES AND FAM_H) - - target_link_libraries( - muscan 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 deleted file mode 100644 index 4c5be3ff1636..000000000000 --- a/net-p2p/museek+/files/museek+-0.1.13-post_release_fixes.patch +++ /dev/null @@ -1,163 +0,0 @@ -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 -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+/metadata.xml b/net-p2p/museek+/metadata.xml deleted file mode 100644 index 4983c355bf5a..000000000000 --- a/net-p2p/museek+/metadata.xml +++ /dev/null @@ -1,9 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <herd>net-p2p</herd> - <use> - <flag name="qsa">Enable QSA scripting for museeq</flag> - <flag name="trayicon">Enable support for trayicon</flag> - </use> -</pkgmetadata> diff --git a/net-p2p/museek+/museek+-0.1.13-r3.ebuild b/net-p2p/museek+/museek+-0.1.13-r3.ebuild deleted file mode 100644 index 7e0e89b42de3..000000000000 --- a/net-p2p/museek+/museek+-0.1.13-r3.ebuild +++ /dev/null @@ -1,95 +0,0 @@ -# Copyright 1999-2009 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-r3.ebuild,v 1.3 2009/03/07 15:22:26 betelgeuse Exp $ - -EAPI=2 - -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="~amd64 ~x86" -IUSE="debug fam gtk ncurses qsa qt3 trayicon vorbis" - -RDEPEND=">=dev-cpp/libxmlpp-1.0.2 - dev-lang/python[ncurses?] - gtk? ( >=dev-python/pygtk-2.6.1 ) - qt3? ( x11-libs/qt:3 ) - qsa? ( >=dev-libs/qsa-1.1.1 ) - vorbis? ( media-libs/libvorbis - media-libs/libogg ) - fam? ( virtual/fam )" -DEPEND="${RDEPEND} - dev-lang/swig - >=dev-util/cmake-2.4.6" - -src_prepare() { - unpack ${A} - cd "${S}" - epatch "${FILESDIR}/${P}-optional-deps.patch" - epatch "${FILESDIR}/${P}-post_release_fixes.patch" - epatch "${FILESDIR}/${P}-gcc43.patch" - sed -i -e "s:join('lib':join('$(get_libdir)':g" \ - */CMakeLists.txt || die "sed failed" -} - -my_use() { - use $1 && echo "1" || echo "0" -} - -src_configure() { - # 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 - myconf="${myconf} -DMUCOUS=$(my_use ncurses) - -DMURMUR=$(my_use gtk) - -DNO_MUSEEQ=$(my_use !qt3) - -DTRAYICON=$(my_use trayicon) - -DQSA=$(my_use qsa) - -DNO_MUSCAND=$(my_use !fam) - -DVORBIS=$(my_use vorbis)" - if ! use debug ; then - myconf="${myconf} -DMULOG=none" - fi - - cmake ${myconf} || die "cmake failed" -} - -src_compile() { - 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 || die - - # Install setup tools - cd "${S}/setup" - distutils_src_install - - # fix wrong path to make musetup-gtk working, #193444, #210364 - dodir /usr/share/museek/museekd - mv "${D}"/usr/share/{,museek/museekd/}config.xml.tmpl -} - -pkg_postinst() { - distutils_pkg_postinst - - elog "Some tools require you to install extra software to run:" - elog "musetup-gtk: dev-python/pygtk" - elog "musetup-qt: dev-python/PyQt" - elog - 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." -} |