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

Package-Manager: portage-2.1.4.4

5 files changed, 139 insertions, 101 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+/Manifest b/net-p2p/museek+/Manifest
index 4c2710468175..fd19ea06b83d 100644
--- a/net-p2p/museek+/Manifest
+++ b/net-p2p/museek+/Manifest
@@ -2,12 +2,12 @@ AUX museek 1124 RMD160 6a362342ad7600f83c0db80c518de2ae0d2574a3 SHA1 14ed19cc603
 AUX museek+-0.1.12-libxmlpp-dep-order.patch 711 RMD160 10ab48e0c2d7c798b04d183056a2230948887b0e SHA1 74c10c0e15959ef50a025b946e412f5abcc57559 SHA256 2fbd2897644f4f1380b1a2517904b10a1d29833abc932d61d046e76dc5e6cba5
 AUX museek+-0.1.12-musetup-gtk-spaces.patch 4006 RMD160 03b42af3d45c047055c3d6ea3f3f90c907d70d8b SHA1 d9f3bf4dccd43fc2e09f289e9a9ba85206d761b4 SHA256 1e960fd4f2c22f9f57a1430a0196e4549af2b7a9d535f13866d7583322cd9216
 AUX museek+-0.1.12-scons-0.96.94.patch 7755 RMD160 42e807f95d9453a9353c30934670c3ff8d1f013a SHA1 abd58d60a20b4839929c652846f3365e746e215e SHA256 3c1bc12262dd01f441a891c9f33db09368cab02842ebcaa33839810fdde73cf0
+AUX museek+-0.1.13-gcc43.patch 2613 RMD160 6ea01c8d3e0518261b2b56b89506d90736720951 SHA1 62ee7c6e2070770a4b0dc222ba5489a481b80bff SHA256 0ab4d9e84a3855a5a1df73120b8bd9b41702320411d5b3c82be0b697ede17264
 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.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 2469 RMD160 5d4e741d384df517e71617981073a7211fea5d1e SHA1 4bbc006dedab396b6b356cfe870a52db8147b871 SHA256 ffe4b07e01ef01bc35e49f59449f7a58b10f6d8a672b7c815a26256d8947822d
-EBUILD museek+-0.1.13-r1.ebuild 2621 RMD160 39587affa2b44533069c839bd2608db9364b986d SHA1 87ee3788cde2f2e43af1276dd05e8b9d7404c3ce SHA256 533cd4ff7e954857b7954d4c4c698edd4505962e38df2e3d89775a6c8c801cad
-EBUILD museek+-0.1.13-r2.ebuild 2685 RMD160 be3e914ad3bb0e6d08c9f6352c56c03972f4e405 SHA1 03c79b7be85b7fb29106760d607333a09a7de877 SHA256 deab61ba2aa1121665ebd1eb58e3aa912ec6fb33a28bed75e2ab46f2e287e68e
-MISC ChangeLog 2141 RMD160 f00fcc703009d55c3ed956363643c2dcb9d95fd6 SHA1 47e34b1ea7d4933e9bf2bf517c5f11de63ec7e44 SHA256 5da27da53a863b77770bcd784baffde7d42294d8ab0096a8a09233d1bc5fe458
+EBUILD museek+-0.1.13-r3.ebuild 2757 RMD160 9bd716bfb8c84b863de9ea75fc572a8fcc272988 SHA1 d225a9e7402e6e219b4c573c12a4f1087a67469f SHA256 7da94eabdfadbaad24b3e7c794bd44c8c3e0b9d46fa72f4e44ae2549d30566eb
+MISC ChangeLog 2447 RMD160 345cf045507de4fb6cd256bc483f4726bcf9276c SHA1 9bafc89283d4a8b1294b5a58a85adde2a649296d SHA256 e5134a2f83565de51a8417c8cf6aaf71cb1abaedfd140f5d91d6db6fdc6682e1
 MISC metadata.xml 252 RMD160 7e449912477ab0ef9b7d65a9b64dc43231363517 SHA1 e8ec909da9c64cc2d1b86d75290af7f143222aad SHA256 a82843a279b0bc7cc4f5a1ae7a89c75976e1bac6def09f666c5c5ffc7e34f7dc
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
 }