no need to bzip smallish patches

Package-Manager: portage-2.1_pre3-r1

6 files changed, 331 insertions, 23 deletions

diff --git a/media-sound/apollo/ChangeLog b/media-sound/apollo/ChangeLog
index 55dcbf0e9cec..09d2008f27f6 100644
--- a/media-sound/apollo/ChangeLog
+++ b/media-sound/apollo/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-sound/apollo
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/apollo/ChangeLog,v 1.18 2005/07/28 20:56:30 caleb Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/apollo/ChangeLog,v 1.19 2006/01/28 18:46:55 blubb Exp $
+
+  28 Jan 2006; Simon Stelling <blubb@gentoo.org> +files/apollo-1.4.1.patch,
+  -files/apollo-1.4.1.patch.bz2, apollo-1.4.1.ebuild:
+  no need to bzip smallish patches
 
   28 Jul 2005; Caleb Tennis <caleb@gentoo.org> apollo-1.4.1.ebuild,
   apollo-1.4.2.ebuild:
diff --git a/media-sound/apollo/Manifest b/media-sound/apollo/Manifest
index c57d6bbe56ea..30cb65358fae 100644
--- a/media-sound/apollo/Manifest
+++ b/media-sound/apollo/Manifest
@@ -1,8 +1,8 @@
+MD5 1b4a6e587a9a52230e3bad828f1f3421 ChangeLog 2751
+MD5 0dcf98fb55d0b30ddb8310f7edf2c9ea apollo-1.4.1.ebuild 1517
 MD5 457a0b0d8375d273bf618d02ace1be2e apollo-1.4.2.ebuild 1107
-MD5 ccfdda6e9622bde79224ace0d7f07046 apollo-1.4.1.ebuild 1537
-MD5 b41ed815ba2a4255bb8c641d90a6fb08 ChangeLog 2585
-MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
-MD5 6ea3dbd53a98afe867e6cac2a499a897 files/apollo-1.4.1.patch.bz2 2650
+MD5 9dd9902455d474605900db9618977079 files/apollo-1.4.1.patch 10768
+MD5 146cde786093f6e5ec2eae823291260c files/apollo-1.4.2-gentoo.diff 276
 MD5 a00fe12f4ef67580f796cb1a239a2ca4 files/digest-apollo-1.4.1 71
 MD5 6f7fe591f805258399900cb0e7aab313 files/digest-apollo-1.4.2 71
-MD5 146cde786093f6e5ec2eae823291260c files/apollo-1.4.2-gentoo.diff 276
+MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
diff --git a/media-sound/apollo/apollo-1.4.1.ebuild b/media-sound/apollo/apollo-1.4.1.ebuild
index 9bda5c753f00..4290aec621a9 100644
--- a/media-sound/apollo/apollo-1.4.1.ebuild
+++ b/media-sound/apollo/apollo-1.4.1.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/apollo/apollo-1.4.1.ebuild,v 1.9 2005/07/28 20:56:30 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/apollo/apollo-1.4.1.ebuild,v 1.10 2006/01/28 18:46:55 blubb Exp $
+
+inherit eutils
 
 IUSE="kde qt"
 
@@ -24,7 +26,7 @@ src_unpack() {
 	cd ${WORKDIR}
 	unpack ${A}
 	cd ${S}
-	bzip2 -dc ${FILESDIR}/${P}.patch.bz2 | patch || die "Patch failed"
+	epatch ${FILESDIR}/${P}.patch
 	mv install.sh install.sh.orig
 	sed -e 's:$PREFIX/local:$PREFIX:g' -e 's:BINDIR=$dir::' \
 		install.sh.orig > install.sh
diff --git a/media-sound/apollo/files/apollo-1.4.1.patch b/media-sound/apollo/files/apollo-1.4.1.patch
new file mode 100644
index 000000000000..12dcf6d9d294
--- /dev/null
+++ b/media-sound/apollo/files/apollo-1.4.1.patch
@@ -0,0 +1,312 @@
+--- install.sh        2002-09-26 09:29:50.000000000 +0200
++++ ../../apollo-1.4.1-1/install.sh        2002-10-04 21:48:22.000000000 +0200
+@@ -101,7 +101,6 @@
+ echo "Installing binaries to $BINDIR"
+
+ install -m 755 apollo $BINDIR || exit 1
+-install -m 755 apollo-client $BINDIR || exit 1
+
+ echo "Installing documentation to $DOCDIR"
+ echo
+--- qmaccelmanager.cpp	2002-09-26 09:29:49.000000000 +0200
++++ ../../apollo-1.4.1-1/qmaccelmanager.cpp	2002-10-03 04:04:08.000000000 +0200
+@@ -35,7 +35,7 @@
+ #include <qobject.h>
+ #include <qdict.h>
+ 
+-#include <iostream>
++#include <iostream.h>
+ 
+ /*!
+    \file qmaccelmanager.cpp
+--- qmmadplayer.cpp   2002-09-26 09:29:49.000000000 +0200
++++ ../../apollo-1.4.1-1/qmmadplayer.cpp   2002-10-04 21:07:47.000000000 +0200
+@@ -28,7 +28,7 @@
+ 
+ #include "qmmadplayer.h"
+
+-#include <iostream>
++#include <iostream.h>
+ #include <sys/mman.h>
+ #include <sys/stat.h>
+ #include <unistd.h>
+--- qmconfig.cpp	2002-09-26 09:29:49.000000000 +0200
++++ ../../apollo-1.4.1-1/qmconfig.cpp	2002-10-03 04:05:29.000000000 +0200
+@@ -35,7 +35,7 @@
+ #include <qstring.h>
+ #include <qtextstream.h>
+ 
+-#include <iostream>
++#include <iostream.h>
+ 
+ #include <unistd.h>
+ 
+--- qmlistview.cpp	2002-09-26 09:29:49.000000000 +0200
++++ ../../apollo-1.4.1-1/qmlistview.cpp	2002-10-03 04:06:26.000000000 +0200
+@@ -919,8 +919,8 @@
+ 	
+     QTextStream save_stream( &save_file );
+     save_stream.setEncoding(QTextStream::UnicodeUTF8);
+-    save_stream << "<?xml version='1.0'?>" << std::endl
+-                << "<!DOCTYPE APOLLO-PLAYLIST>" << std::endl;
++    save_stream << "<?xml version='1.0'?>" << endl
++                << "<!DOCTYPE APOLLO-PLAYLIST>" << endl;
+ 	save(save_stream);
+ }
+ 
+--- qmminibuffer.cpp	2002-09-26 09:29:49.000000000 +0200
++++ ../../apollo-1.4.1-1/qmminibuffer.cpp	2002-10-03 04:49:17.000000000 +0200
+@@ -152,7 +152,7 @@
+ 	m_pMessage->clear();
+ }
+ 
+-QmMiniBuffer::QmLineEdit::QmLineEdit(QmMiniBuffer *buf, QWidget *parent, const char *name=0)
++QmMiniBuffer::QmLineEdit::QmLineEdit(QmMiniBuffer *buf, QWidget *parent, const char *name)
+ 	: QLineEdit(parent, name),
+ 	  m_pBuf(buf)
+ {
+--- qmminibuffer.h	2002-09-26 09:29:50.000000000 +0200
++++ ../../apollo-1.4.1-1/qmminibuffer.h	2002-10-03 04:10:03.000000000 +0200
+@@ -66,7 +66,7 @@
+     
+ private:
+ 	class QmLineEdit;
+-	friend QmLineEdit;
++	friend struct QmMiniBuffer::QmLineEdit;
+ 	class QmLineEdit : public QLineEdit
+ 	{
+ 		QmMiniBuffer *m_pBuf;
+--- qmmpg123player.cpp	2002-09-26 09:29:49.000000000 +0200
++++ ../../apollo-1.4.1-1/qmmpg123player.cpp	2002-10-03 04:15:58.000000000 +0200
+@@ -289,7 +289,7 @@
+ 	{
+ 		m_Message = "";
+ 		QTextOStream ostr(&m_Message);
+-		ostr << "mpg123 process exited with status " << WIFEXITED(status) << "." << std::endl;
++		ostr << "mpg123 process exited with status " << WIFEXITED(status) << "." << endl;
+ 		emit playerMessage(m_Message);
+ 		m_PlayerPid = 0;
+ 		return -1;
+@@ -467,8 +467,8 @@
+ 				m_Message = "";
+ 				QTextOStream ostr(&m_Message);
+ 				ostr << "dataReceived(): Received " << bytes_read
+-					 << " bytes, skipping line " << line_counter << ":" << std::endl
+-					 << line_ptr << " - Filename: " << m_Filename << std::endl;
++					 << " bytes, skipping line " << line_counter << ":" << endl
++					 << line_ptr << " - Filename: " << m_Filename << endl;
+ 				emit playerMessage(m_Message);
+ 			}
+ 
+@@ -561,7 +561,7 @@
+         default:
+ 			m_Message = "";
+ 			QTextOStream ostr(&m_Message);
+-			ostr << "Unknown code: " << read_buffer << std::endl;
++			ostr << "Unknown code: " << read_buffer << endl;
+ 			emit playerMessage(m_Message);
+             break;
+     }
+@@ -679,7 +679,7 @@
+ 	 {
+ 		 m_Message = "";
+ 		 QTextOStream ostr(&m_Message);
+-		 ostr << "Failed to parse status from mpg123. Failed on: " << read_buffer << std::endl;
++		 ostr << "Failed to parse status from mpg123. Failed on: " << read_buffer << endl;
+ 		 emit playerMessage(m_Message);
+ 	 }
+ }
+@@ -870,7 +870,7 @@
+ 	default:
+ 		m_Message = "";
+ 		QTextOStream ostr(&m_Message);
+-		ostr << "Unknown play status: " << read_buffer << std::endl;
++		ostr << "Unknown play status: " << read_buffer << endl;
+ 		emit playerMessage(m_Message);
+ 		break;
+ 	}
+@@ -891,7 +891,7 @@
+ {
+ 	m_Message = "";
+ 	QTextOStream ostr(&m_Message);
+-	ostr << "Error: " << read_buffer << std::endl;
++	ostr << "Error: " << read_buffer << endl;
+ 	emit playerMessage(m_Message);
+ }
+ 
+--- qmplaylist.cpp	2002-09-26 09:29:50.000000000 +0200
++++ ../../apollo-1.4.1-1/qmplaylist.cpp	2002-10-03 04:23:58.000000000 +0200
+@@ -1379,9 +1379,9 @@
+         out.setEncoding(QTextStream::UnicodeUTF8);
+ 
+     out << "<?xml version='1.0' encoding=\"" << QmConfig::instance()->getString( "stuff", "encoding")
+-        << "\"?>" << std::endl
+-        << "<!DOCTYPE APOLLO-PLAYLIST>" << std::endl
+-        << "<apollo-playlist>" << std::endl;
++        << "\"?>\n"
++        << "<!DOCTYPE APOLLO-PLAYLIST>\n"
++        << "<apollo-playlist>\n";
+     
+     QmDirItem *dir;
+     QmSongItem *song;
+@@ -1422,8 +1422,8 @@
+         }
+     }
+     while (depth-->0)
+-        out << "</dir>" << std::endl;
+-    out << "</apollo-playlist>" << std::endl;
++        out << "</dir>\n";
++    out << "</apollo-playlist>\n";
+     
+     int duration = time(0) - start_time;
+     
+@@ -1467,7 +1467,7 @@
+ 
+ 	updateSongIndex();
+     for (uint i=0; i<m_SongIndex.size(); ++i)
+-        out << m_SongIndex[i]->filePath() << std::endl;
++        out << m_SongIndex[i]->filePath() << "\n";
+ 
+     QmMainWindow::mainwin->statusUpdate(new Message(Message::Status,
+                                                     "Saved %d songs in %s",
+@@ -1708,9 +1708,9 @@
+                 if (utf8)
+                     tout.setEncoding(QTextStream::UnicodeUTF8);
+                 
+-                tout << "<?xml version='1.0' encoding=\"" << enc << "\"?>" << endl;
+-                tout << "<!DOCTYPE APOLLO-PLAYLISTTREE>" << endl;
+-                tout << "<apollo-playlisttree>" << endl;
++                tout << "<?xml version='1.0' encoding=\"" << enc << "\"?>\n";
++                tout << "<!DOCTYPE APOLLO-PLAYLISTTREE>\n";
++                tout << "<apollo-playlisttree>\n";
+             }
+         }
+     }
+@@ -1743,8 +1743,8 @@
+                 if (!first) 
+                 {
+                     if (!firstAlbum)
+-                        arout << "</dir>" << endl;
+-                    arout << "</dir>" << endl << "</apollo-playlist>" << endl;
++                        arout << "</dir>\n";
++                    arout << "</dir>\n</apollo-playlist>\n";
+                     
+                     arfile.close();
+                 }
+@@ -1775,8 +1775,8 @@
+                 if (alsoPlayListTree)
+                 {
+ 					if (!first)
+-						tout << "</dir>" << endl;
+-					tout << "<dir><name><![CDATA[" << artist << "]]></name>" << endl;
++						tout << "</dir>\n";
++					tout << "<dir><name><![CDATA[" << artist << "]]></name>\n";
+ 				} 
+                     
+                 QmMainWindow::mainwin->statusUpdate(new Message(Message::Update,
+@@ -1789,11 +1789,11 @@
+                 if (utf8)
+                     arout.setEncoding(QTextStream::UnicodeUTF8);
+ 
+-                arout << "<?xml version='1.0' encoding=\"" << enc << "\"?>" << endl
+-					  << "<!DOCTYPE APOLLO-PLAYLIST>" << endl
+-					  << "<apollo-playlist>" << endl;
++                arout << "<?xml version='1.0' encoding=\"" << enc << "\"?>\n"
++					  << "<!DOCTYPE APOLLO-PLAYLIST>\n"
++					  << "<apollo-playlist>\n";
+ 
+-                arout << "<dir>" << endl << "<name><![CDATA[" << artist << "]]></name>" << endl;
++                arout << "<dir>\n<name><![CDATA[" << artist << "]]></name>\n";
+             }
+             album = si[i]->album();
+ 			
+@@ -1808,8 +1808,8 @@
+ 			alfilename = pldir + arclean + "  " + alclean + ".xml";
+ 			if (!first)
+ 			{
+-				alout << "</dir></dir>" << endl; 
+-				alout << "</apollo-playlist>" << endl; 
++				alout << "</dir></dir>\n"; 
++				alout << "</apollo-playlist>\n"; 
+ 				alfile.close();
+ 			}
+ 
+@@ -1829,24 +1829,24 @@
+ 			if (utf8)
+ 				alout.setEncoding(QTextStream::UnicodeUTF8);
+ 			
+-			alout << "<?xml version='1.0' encoding=\"" << enc << "\"?>" << endl
+-				  << "<!DOCTYPE APOLLO-PLAYLIST>" << endl
+-				  << "<apollo-playlist>" << endl;
++			alout << "<?xml version='1.0' encoding=\"" << enc << "\"?>\n"
++				  << "<!DOCTYPE APOLLO-PLAYLIST>\n"
++				  << "<apollo-playlist>\n";
+ 
+ 			if (alsoPlayListTree)
+ 			{
+-				tout << "<playlist>" << endl
+-					 << "<name><![CDATA[" << album << "]]></name>" << endl
+-					 << "<path><![CDATA[" << alfilename << "]]></path>" << endl
+-					 << "</playlist>" << endl;
++				tout << "<playlist>\n"
++					 << "<name><![CDATA[" << album << "]]></name>\n"
++					 << "<path><![CDATA[" << alfilename << "]]></path>\n"
++					 << "</playlist>\n";
+ 			}
+             
+             if (!firstAlbum) 
+-                arout << "</dir>" << endl; 
++                arout << "</dir>\n"; 
+             
+-            arout << "<dir>" << endl << "<name><![CDATA[" << album << "]]></name>" << endl;
+-			alout << "<dir>" << endl << "<name><![CDATA[" << artist << "]]></name>" << endl;
+-			alout << "<dir>" << endl << "<name><![CDATA[" << album << "]]></name>" << endl;
++            arout << "<dir>\n<name><![CDATA[" << album << "]]></name>\n";
++			alout << "<dir>\n<name><![CDATA[" << artist << "]]></name>\n";
++			alout << "<dir>\n<name><![CDATA[" << album << "]]></name>\n";
+ 
+ 			first = firstAlbum = false;
+         } 
+@@ -1856,7 +1856,7 @@
+     }
+     
+     if (alsoPlayListTree)
+-        tout << "</dir>" << endl << "</apollo-playlisttree>" << endl;
++        tout << "</dir>\n</apollo-playlisttree>\n";
+     
+     QmMainWindow::mainwin->statusUpdate(new Message(Message::Status, "Generated %i playlists", count));
+     QmMainWindow::mainwin->setState(QmMainWindow::Ready);
+--- qmplaylistpropertypage.cpp	2002-09-26 09:29:50.000000000 +0200
++++ ../../apollo-1.4.1-1/qmplaylistpropertypage.cpp	2002-10-03 04:31:30.000000000 +0200
+@@ -56,8 +56,8 @@
+ QmPlayListPropertyPage::QmPlayListPropertyPage(
+ 	QmPlayListBrowserItem *item,
+ 	QmConfigDialog *parent,
+-	const char *name)
+-	: QmConfigPage(parent, name, WType_Modal),
++	const char *namea)
++	: QmConfigPage(parent, namea, WType_Modal),
+ 	  m_pItem(item),
+ 	  m_pFile(0)
+ {
+--- qmplaylistpropertypage.h	2002-09-26 09:29:50.000000000 +0200
++++ ../../apollo-1.4.1-1/qmplaylistpropertypage.h	2002-10-03 04:32:31.000000000 +0200
+@@ -47,7 +47,7 @@
+ 
+ private slots:
+ 	void okay();
+-	void nameChanged(const QString &name);
++	void nameChanged(const QString &);
+ 	void browse();
+ 
+ private:
+--- qmremotecontrol.cpp	2002-09-26 09:29:50.000000000 +0200
++++ ../../apollo-1.4.1-1/qmremotecontrol.cpp	2002-10-03 04:53:31.000000000 +0200
+@@ -42,6 +42,7 @@
+ #include <pwd.h>
+ #include <stdio.h>
+ #include <fcntl.h>
++#include <iostream>
+ 
+ #ifndef FALSE
+ #define FALSE (0)
diff --git a/media-sound/apollo/files/apollo-1.4.1.patch.bz2 b/media-sound/apollo/files/apollo-1.4.1.patch.bz2
deleted file mode 100644
index db5b97c5a871..000000000000
--- a/media-sound/apollo/files/apollo-1.4.1.patch.bz2
+++ /dev/null
diff --git a/media-sound/museseq/Manifest b/media-sound/museseq/Manifest
index 8df0fa2c5e27..fda9b0002e98 100644
--- a/media-sound/museseq/Manifest
+++ b/media-sound/museseq/Manifest
@@ -1,7 +1,4 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 1e2053ada2a3ceea0ff16bbca662a613 ChangeLog 5897
+MD5 d47e638506a0b515008ace3f92b91ca0 ChangeLog 6085
 MD5 fbb837028f0103f8c2775f24e661888b files/digest-museseq-0.6.2-r1 64
 MD5 20ef97c251eae618ada71d7493308b96 files/digest-museseq-0.7.0-r1 64
 MD5 1006036f5832dc460206b706858ff87b files/digest-museseq-0.7.1 69
@@ -11,21 +8,14 @@ MD5 bb5d649185761033994533106e904174 files/digest-museseq-0.7.2_pre5 67
 MD5 49c3c1f0136766a89c7cd1ba91006bc6 files/museseq-0.6.2-drumport.patch 771
 MD5 08b5947de834c47253a313e6a7d0a3e5 files/museseq-0.6.2-fPIC.patch 4002
 MD5 8bf0be08b3013a6047aecad1e99bc1fb files/museseq-0.6.2-gcc34.patch 5500
-MD5 135d65fe445ace2c95913e681e7a7b68 files/museseq-0.6.2-int2ptr.patch.gz 4000
+MD5 34b26def47703a0516433e9fb07ed0fd files/museseq-0.6.2-int2ptr.patch 20425
 MD5 7fb0bc9c25aa67018b8c07120f4f16a1 files/museseq-0.6.2-memory.patch 2032
 MD5 fd23ed0d1b20d7ed5f18d26d4a45acc1 files/museseq-0.7.0-suidinstall.patch 837
 MD5 5cfdb8a06e52a3113b39a238bd45c860 files/museseq-0.7.2_pre5-rtctimerfix.patch 509
 MD5 d0d7ea03e238a808414b4426394c100f metadata.xml 221
-MD5 a03dd77415ceaab8e76a3e8ff75fff88 museseq-0.6.2-r1.ebuild 3144
+MD5 e3c9d995656f80d91052de1320af5934 museseq-0.6.2-r1.ebuild 3140
 MD5 298a2b1058e54c7d5da5294d1d63e07b museseq-0.7.0-r1.ebuild 1960
 MD5 caecf6cff21c5e9ec670b5904f6700ab museseq-0.7.1.ebuild 1752
 MD5 807a8c3d57d8116a56cc51e6c64db7ff museseq-0.7.1_pre3.ebuild 1696
 MD5 e55b1aaf26a535d85a9ee2353999c80a museseq-0.7.2_pre2.ebuild 1720
 MD5 d0a418e0dc2395d7ed2e59d04e15b216 museseq-0.7.2_pre5.ebuild 1810
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDyBhCvpz1081QvMkRAot5AJ40DU3ZulMFgU50MdQDP3KPEr/KMACgmwtd
-nNoQ7nfcoXEN0itnxAMj1KI=
-=x1sz
------END PGP SIGNATURE-----