Fix missing dodir (bug #219007) and compatibility with gcc 4.3 (bug #219352). Remove old.

(Portage version: 2.1.4.4)

4 files changed, 136 insertions, 98 deletions

diff --git a/net-p2p/museek+/ChangeLog b/net-p2p/museek+/ChangeLog
index ce66caef31dc..7b506faf8ac7 100644
--- a/net-p2p/museek+/ChangeLog
+++ b/net-p2p/museek+/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-p2p/museek+
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/museek+/ChangeLog,v 1.11 2008/02/29 20:27:17 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/museek+/ChangeLog,v 1.12 2008/04/30 21:09:32 coldwind Exp $
+
+*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.
diff --git a/net-p2p/museek+/files/museek+-0.1.13-gcc43.patch b/net-p2p/museek+/files/museek+-0.1.13-gcc43.patch
new file mode 100644
index 000000000000..a9b77ebd996f
--- /dev/null
+++ b/net-p2p/museek+/files/museek+-0.1.13-gcc43.patch
@@ -0,0 +1,124 @@
+gcc-4.3 compatibility, by Belegdol.
+http://www.museek-plus.org/changeset/743
+--- /museek+/trunk/sources/Museek/Museek.cc
++++ /museek+/trunk/sources/Museek/Museek.cc
+@@ -37,4 +37,5 @@
+ #include <queue>
+ #include <vector>
++#include <cstdlib>
+ 
+ using std::string;
+
+--- /museek+/trunk/sources/Museek/DistribManager.cc
++++ /museek+/trunk/sources/Museek/DistribManager.cc
+@@ -27,4 +27,6 @@
+ #define MULOG_DOMAIN "Museek.DM"
+ #include <Muhelp/Mulog.hh>
++
++#include <algorithm>
+ 
+ using std::vector;
+
+
+--- /museek+/trunk/sources/Museek/PeerManager.hh
++++ /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();
+ 	
+
+
+--- /museek+/trunk/sources/Museek/TransferManager.cc
++++ /museek+/trunk/sources/Museek/TransferManager.cc
+@@ -37,4 +37,5 @@
+ #include <vector>
+ #include <iostream>
++#include <algorithm>
+ 
+ using std::string;
+
+
+--- /museek+/trunk/sources/Museek/PeerManager.cc
++++ /museek+/trunk/sources/Museek/PeerManager.cc
+@@ -33,4 +33,5 @@
+ #include <queue>
+ #include <vector>
++#include <algorithm>
+ 
+ using std::string;
+
+
+--- /museek+/trunk/sources/Muhelp/string_ext.hh
++++ /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
+
+
+--- /museek+/trunk/sources/Muhelp/Mulog.cc
++++ /museek+/trunk/sources/Muhelp/Mulog.cc
+@@ -20,4 +20,6 @@
+ #include <system.h>
+ #include <syslog.h>
++
++#include <cstdlib>
+ 
+ #include <Muhelp/Mulog.hh>
+
+
+--- /museek+/trunk/sources/museekd/main.cc
++++ /museek+/trunk/sources/museekd/main.cc
+@@ -26,4 +26,5 @@
+ #include <Muhelp/Mulog.hh>
+ #include <fstream>
++#include <cstdlib>
+ 
+ using std::string;
+
+
+--- /museek+/trunk/sources/museekd/IfaceConnection.cc
++++ /museek+/trunk/sources/museekd/IfaceConnection.cc
+@@ -29,4 +29,5 @@
+ #include <map>
+ #include <vector>
++#include <cstdlib>
+ 
+ #define MULOG_DOMAIN "museekd.IL"
+
+
+--- /museek+/trunk/sources/Tools/muscan.cc
++++ /museek+/trunk/sources/Tools/muscan.cc
+@@ -27,4 +27,5 @@
+ 
+ #include <iostream>
++#include <cstdlib>
+ 
+ using std::vector;
+
+
+--- /museek+/trunk/sources/Tools/scanner.cc
++++ /museek+/trunk/sources/Tools/scanner.cc
+@@ -19,4 +19,6 @@
+ 
+ #include <system.h>
++
++#include <cstdlib>
+ 
+ extern "C" {
+
+
+--- /museek+/trunk/sources/Tools/muscand.cc
++++ /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+/museek+-0.1.13-r1.ebuild b/net-p2p/museek+/museek+-0.1.13-r1.ebuild
deleted file mode 100644
index e0435c6e3967..000000000000
--- a/net-p2p/museek+/museek+-0.1.13-r1.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2008 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-r1.ebuild,v 1.3 2008/01/24 22:07:05 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="~amd64 ~x86"
-IUSE="debug fam gtk ncurses qsa qt3 trayicon vorbis"
-
-RDEPEND=">=dev-cpp/libxmlpp-1.0.2
-	gtk? ( >=dev-python/pygtk-2.6.1 )
-	qt3? ( $(qt_min_version 3.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"
-
-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}-optional-deps.patch"
-	epatch "${FILESDIR}/${P}-post_release_fixes.patch"
-	sed -i -e "s:join('lib':join('$(get_libdir)':g" \
-		*/CMakeLists.txt || die "sed failed"
-}
-
-my_use() {
-	use $1 && echo "1" || echo "0"
-}
-
-my_not_use() {
-	use $1 && echo "0" || echo "1"
-}
-
-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
-	myconf="${myconf} -DMUCOUS=$(my_use ncurses)
-		-DMURMUR=$(my_use gtk)
-		-DNO_MUSEEQ=$(my_not_use qt3)
-		-DTRAYICON=$(my_use trayicon)
-		-DQSA=$(my_use qsa)
-		-DNO_MUSCAND=$(my_not_use fam)
-		-DVORBIS=$(my_use vorbis)"
-	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 "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."
-}
diff --git a/net-p2p/museek+/museek+-0.1.13-r2.ebuild b/net-p2p/museek+/museek+-0.1.13-r3.ebuild
index 85182bf62b49..a1358bcf40da 100644
--- a/net-p2p/museek+/museek+-0.1.13-r2.ebuild
+++ b/net-p2p/museek+/museek+-0.1.13-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 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-r2.ebuild,v 1.1 2008/02/16 14:33:07 coldwind Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/museek+/museek+-0.1.13-r3.ebuild,v 1.1 2008/04/30 21:09:32 coldwind Exp $
 
 inherit qt3 eutils distutils multilib
 
@@ -37,6 +37,7 @@ src_unpack() {
 	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"
 }
@@ -78,6 +79,7 @@ src_install() {
 	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
 }