QA fix: Move 21KB patch to mirrors.

Package-Manager: portage-2.1_pre4-r1

6 files changed, 50 insertions, 712 deletions

diff --git a/media-sound/timidity++/ChangeLog b/media-sound/timidity++/ChangeLog
index 1bc4ae6d08c5..b87e0a606c28 100644
--- a/media-sound/timidity++/ChangeLog
+++ b/media-sound/timidity++/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-sound/timidity++
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/timidity++/ChangeLog,v 1.53 2005/09/10 15:45:37 flameeyes Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/timidity++/ChangeLog,v 1.54 2006/02/19 02:10:33 chainsaw Exp $
+
+  19 Feb 2006; Tony Vroon <chainsaw@gentoo.org>
+  -files/timidity++-2.13.2-exiterror.patch, timidity++-2.13.2-r2.ebuild:
+  QA fix: Move 21KB patch to mirrors.
 
   10 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
   timidity++-2.13.2.ebuild, timidity++-2.13.2-r2.ebuild:
diff --git a/media-sound/timidity++/Manifest b/media-sound/timidity++/Manifest
index a2f264df845f..e8255f2a2d19 100644
--- a/media-sound/timidity++/Manifest
+++ b/media-sound/timidity++/Manifest
@@ -1,24 +1,49 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 a2b226de8022eccf954f82b8f04852cd ChangeLog 9165
+MD5 9b7401e34f77355ef2b6befe85ffa9a5 ChangeLog 9324
+RMD160 f73129de282941b2ddcf60e62ffa1789b8b9e7f8 ChangeLog 9324
+SHA256 5a265ed5951a9230e4b1b17278a85019c8329ed32ea9dbce87288fc8846bd391 ChangeLog 9324
 MD5 dbfc5d45b6177ffaf7dd74d4971a520a files/conf.d.timidity 912
+RMD160 ba936b4f721ed4d3dac2912659b13b125b09833a files/conf.d.timidity 912
+SHA256 df5cec5d1335b9bdaf87c358b6d69f4f9300454c16aceaaccb212c98fb08f5a3 files/conf.d.timidity 912
 MD5 2762e58e610bb861189b3d6b424312fc files/digest-timidity++-2.13.2 71
-MD5 2762e58e610bb861189b3d6b424312fc files/digest-timidity++-2.13.2-r2 71
+RMD160 20a31646dd568dbe911c2b71e005ba924cf46180 files/digest-timidity++-2.13.2 71
+SHA256 37c70659352d2700ff92c185a98c17ccaace02bcdbcdd3b1bf0cad993b856cc2 files/digest-timidity++-2.13.2 71
+MD5 f9f8b7aa60633b1d571491781e2c2f1d files/digest-timidity++-2.13.2-r2 536
+RMD160 c335b2484ab9ba2e1c2cff0a5bc14325614c31ad files/digest-timidity++-2.13.2-r2 536
+SHA256 98bad02a8730d1cd370c7b6f53cecc9bf9ddaa29625e93f228b7feefed147f82 files/digest-timidity++-2.13.2-r2 536
 MD5 67ee26f08d8de1243029a0a8849cd022 files/gnuconfig_update.patch 477
+RMD160 9c5ba3ec8b953f177110cc755a8bd1c5bed3042c files/gnuconfig_update.patch 477
+SHA256 2906bd19277b08dbc3400708e568715298c54b904b12803c725ac72e08519447 files/gnuconfig_update.patch 477
 MD5 dbc4910aa5c6a5681dd4f121b5db63e8 files/init.d.timidity 457
-MD5 31bdaea612f18e2c3d45a8a73ab44c81 files/timidity++-2.13.2-exiterror.patch 21406
+RMD160 af1eb92172f06b02f6761e414ea88b6e40c446f4 files/init.d.timidity 457
+SHA256 8882137a10d5e858fa3c20f91d439192dca0759f43702180085d3514a12a59fd files/init.d.timidity 457
 MD5 0868926c5290817cacb9a1849bc043c2 files/timidity++-2.13.2-gcc4.patch 1325
+RMD160 31383eb4a1d0a839d60af8d635aeba02febc9bb5 files/timidity++-2.13.2-gcc4.patch 1325
+SHA256 20ca5deb95ccbb527c0212f4ad002a5a8df1a9c005e210494abe7bc240cef3ee files/timidity++-2.13.2-gcc4.patch 1325
 MD5 16a4adec164836d4390dc6b0f9a69ce9 files/timidity++-2.13.2-gtk26.patch 588
+RMD160 588eefcb0727af0162b24b17970df300ea5fdd64 files/timidity++-2.13.2-gtk26.patch 588
+SHA256 fdb95708e353425fbc8f141d45f5b876fa85636f953200cdbc147834b4a31f56 files/timidity++-2.13.2-gtk26.patch 588
 MD5 15fce5a2d3dfc834b4de65428105e63b files/timidity-update 2513
+RMD160 d980dc303cc67b37ef63c66349376d947d1806cc files/timidity-update 2513
+SHA256 55e0067baebc73f87adbde61ce1669de27a72fd2db89519cbd0754f895d7d058 files/timidity-update 2513
 MD5 80fb82d4216373cbf4efafd7719628e0 files/timidity.cfg-r1 669
+RMD160 856294ef64ab459a03375cb86e5f0fbcdef88ab3 files/timidity.cfg-r1 669
+SHA256 50fb27ea57cc225fcb8e8368e8afc130f2bba22d0787ebb6beacd2112550f9ce files/timidity.cfg-r1 669
 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
-MD5 64139cf755355defe1357cfe9ccc0099 timidity++-2.13.2-r2.ebuild 4096
-MD5 9cb6f48c3571e0ef7446942fab32b3b3 timidity++-2.13.2.ebuild 3822
+RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e metadata.xml 158
+SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b metadata.xml 158
+MD5 d33d793a3bae608a126c71d47d6287f7 timidity++-2.13.2-r2.ebuild 4145
+RMD160 5241daaee2add56f312528a3cd4f0b5310423a50 timidity++-2.13.2-r2.ebuild 4145
+SHA256 36dad5de00647ae7699eef766c68f04c0c4c8ccc43e911a65c037e71f7016de8 timidity++-2.13.2-r2.ebuild 4145
+MD5 401447625c092dcc856e210a90965753 timidity++-2.13.2.ebuild 3804
+RMD160 5d95982df19ac6640ce7f1744d5c24acbc6ad2ae timidity++-2.13.2.ebuild 3804
+SHA256 e3a9d36f06627c9093e87ed0c7c8726573643ff7d86a1820bb4f76edcb3bcec3 timidity++-2.13.2.ebuild 3804
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
+Version: GnuPG v1.4.2.1 (GNU/Linux)
 
-iD8DBQFDwJLu2+ySkm8kpY0RAgM7AJ4tDlqIj3ov/4ZjFqGs81WvIIhJBgCfcbdf
-cEY+g24bt7bsvBPvzNuKF/o=
-=7zgI
+iD8DBQFD99P4p5vW4rUFj5oRAgt1AJwLvtxDwcUnx+E7y7sgbOwO/z3QvgCgmnl/
+yeKXPD+w6CzKvQqwwdJvwr8=
+=EFqz
 -----END PGP SIGNATURE-----
diff --git a/media-sound/timidity++/files/digest-timidity++-2.13.2-r2 b/media-sound/timidity++/files/digest-timidity++-2.13.2-r2
index 95bd00b0521f..7a95c8bb2fb6 100644
--- a/media-sound/timidity++/files/digest-timidity++-2.13.2-r2
+++ b/media-sound/timidity++/files/digest-timidity++-2.13.2-r2
@@ -1 +1,6 @@
 MD5 a82ceeb2245e22f4de2b41da21eaee32 TiMidity++-2.13.2.tar.bz2 1581230
+RMD160 0156221846a88abef9312700a050972d85084fd8 TiMidity++-2.13.2.tar.bz2 1581230
+SHA256 0a8524b789b57eaf944c3d9bce32c21a4e893016b22a02a24cd0a4c6afee7260 TiMidity++-2.13.2.tar.bz2 1581230
+MD5 31bdaea612f18e2c3d45a8a73ab44c81 timidity++-2.13.2-exiterror.patch 21406
+RMD160 6b73552e18580422ca4471f12142440a4f3760a9 timidity++-2.13.2-exiterror.patch 21406
+SHA256 ccf1a3678beff5cd143bec07b64ca35620b8eac98b093898c072459051752b77 timidity++-2.13.2-exiterror.patch 21406
diff --git a/media-sound/timidity++/files/timidity++-2.13.2-exiterror.patch b/media-sound/timidity++/files/timidity++-2.13.2-exiterror.patch
deleted file mode 100644
index 01a83fead814..000000000000
--- a/media-sound/timidity++/files/timidity++-2.13.2-exiterror.patch
+++ /dev/null
@@ -1,695 +0,0 @@
-diff -ur TiMidity++-2.13.2/interface/alsaseq_c.c TiMidity++-2.13.2-new/interface/alsaseq_c.c
---- TiMidity++-2.13.2/interface/alsaseq_c.c	2005-01-02 02:53:01.000000000 +0100
-+++ TiMidity++-2.13.2-new/interface/alsaseq_c.c	2005-01-02 03:39:15.968158520 +0100
-@@ -177,7 +177,7 @@
- static int ctl_read(int32 *valp);
- static int cmsg(int type, int verbosity_level, char *fmt, ...);
- static void ctl_event(CtlEvent *e);
--static void ctl_pass_playing_list(int n, char *args[]);
-+static int ctl_pass_playing_list(int n, char *args[]);
- 
- /**********************************/
- /* export the interface functions */
-@@ -308,7 +308,7 @@
-         return 0;
- }
- 
--static void ctl_pass_playing_list(int n, char *args[])
-+static int ctl_pass_playing_list(int n, char *args[])
- {
- 	double btime;
- 	int i, j;
-@@ -323,7 +323,7 @@
- 
- 	if (alsa_seq_open(&alsactx.handle) < 0) {
- 		fprintf(stderr, "error in snd_seq_open\n");
--		return;
-+		return 1;
- 	}
- 	alsactx.queue = -1;
- 	alsactx.client = snd_seq_client_id(alsactx.handle);
-@@ -342,7 +342,7 @@
- 		int port;
- 		port = alsa_create_port(alsactx.handle, i);
- 		if (port < 0)
--			return;
-+			return 1;
- 		alsactx.port[i] = port;
- 		alsa_set_timestamping(&alsactx, port);
- 		printf(" %d:%d", alsactx.client, alsactx.port[i]);
-@@ -411,6 +411,7 @@
- 		server_reset();
- 		doit(&alsactx);
- 	}
-+	return 0;
- }
- 
- /*
-diff -ur TiMidity++-2.13.2/interface/emacs_c.c TiMidity++-2.13.2-new/interface/emacs_c.c
---- TiMidity++-2.13.2/interface/emacs_c.c	2005-01-02 02:53:01.000000000 +0100
-+++ TiMidity++-2.13.2-new/interface/emacs_c.c	2005-01-02 03:02:02.000000000 +0100
-@@ -78,7 +78,7 @@
- static void ctl_close(void);
- static int ctl_read(int32 *valp);
- static int cmsg(int type, int verbosity_level, char *fmt, ...);
--static void ctl_pass_playing_list(int number_of_files, char *list_of_files[]);
-+static int ctl_pass_playing_list(int number_of_files, char *list_of_files[]);
- static void ctl_event(CtlEvent *e);
- static int read_ready(void);
- static int emacs_type = 0; /* 0:emacs, 1:mule, 2:??
-@@ -249,7 +249,7 @@
-     return s;
- }
- 
--static void ctl_pass_playing_list(int argc, char *argv[])
-+static int ctl_pass_playing_list(int argc, char *argv[])
- {
-     int i;
-     char cmd[BUFSIZ];
-@@ -274,7 +274,7 @@
-     {
- 	for(i = 1; i < argc; i++)
- 	    play_midi_file(argv[i]);
--	return;
-+	return 0;
-     }
- 
-     /* Main Loop */
-@@ -296,11 +296,11 @@
- 		ctl_refresh();
- 		break;
- 	      case RC_QUIT:
--		return;
-+		return 0;
- 	    } /* skipping others command */
- 	}
- 	else if(!strncmp(cmd, "QUIT", 4))
--	    return;
-+	    return 0;
- 	else
- 	    continue; /* skipping unknown command */
-     }
-diff -ur TiMidity++-2.13.2/interface/gtk_c.c TiMidity++-2.13.2-new/interface/gtk_c.c
---- TiMidity++-2.13.2/interface/gtk_c.c	2005-01-02 02:53:01.000000000 +0100
-+++ TiMidity++-2.13.2-new/interface/gtk_c.c	2005-01-02 03:35:53.447946272 +0100
-@@ -57,7 +57,7 @@
- 
- static int ctl_open(int using_stdin, int using_stdout);
- static void ctl_close(void);
--static void ctl_pass_playing_list(int number_of_files, char *list_of_files[]);
-+static int ctl_pass_playing_list(int number_of_files, char *list_of_files[]);
- static int ctl_read(int32 *valp);
- static int cmsg(int type, int verbosity_level, char *fmt, ...);
- static void ctl_event(CtlEvent *e);
-@@ -528,7 +528,7 @@
- #endif
- }
- 
--static void
-+static int 
- ctl_pass_playing_list(int number_of_files, char *list_of_files[])
- {
-     int i=0;
-@@ -558,7 +558,7 @@
- 	}
- 	else {
- 	    if (command==RC_QUIT)
--		return;
-+		return 0;
- 	    if (command==RC_ERROR)
- 		command=RC_TUNE_END; /* Launch next file */
- 	    
-@@ -580,6 +580,7 @@
- 	    command = ctl_blocking_read(&val);
- 	}
-     }
-+    return 0;
- }
- 
- /*
-diff -ur TiMidity++-2.13.2/interface/mac_c.c TiMidity++-2.13.2-new/interface/mac_c.c
---- TiMidity++-2.13.2/interface/mac_c.c	2005-01-02 02:53:01.000000000 +0100
-+++ TiMidity++-2.13.2-new/interface/mac_c.c	2005-01-02 03:04:13.000000000 +0100
-@@ -71,7 +71,7 @@
- static void ctl_pitch_bend(int channel, int val);
- static void ctl_reset(void);
- static int ctl_open(int using_stdin, int using_stdout);
--static void ctl_pass_playing_list(int number_of_files, char *list_of_files[]);
-+static int ctl_pass_playing_list(int number_of_files, char *list_of_files[]);
- static void ctl_close(void);
- static int ctl_read(int32 *valp);
- static int cmsg(int type, int verbosity_level, char *fmt, ...);
-@@ -955,7 +955,7 @@
- }
- 
- 
--static void ctl_pass_playing_list(int init_number_of_files,
-+static int ctl_pass_playing_list(int init_number_of_files,
- 				  char * /*init_list_of_files*/ [])
- {
- 	EventRecord	event;
-@@ -983,6 +983,7 @@
- 		mac_HandleEvent(&event);
- 	}	
- 	Do_Quit();
-+	return 0;
- }
- 
- static Boolean UserWantsControl()
-diff -ur TiMidity++-2.13.2/interface/motif_c.c TiMidity++-2.13.2-new/interface/motif_c.c
---- TiMidity++-2.13.2/interface/motif_c.c	2005-01-02 02:53:01.000000000 +0100
-+++ TiMidity++-2.13.2-new/interface/motif_c.c	2005-01-02 03:05:04.000000000 +0100
-@@ -60,7 +60,7 @@
- static void ctl_close(void);
- static int ctl_read(int32 *valp);
- static int cmsg(int type, int verbosity_level, char *fmt, ...);
--static void ctl_pass_playing_list(int number_of_files, char *list_of_files[]);
-+static int ctl_pass_playing_list(int number_of_files, char *list_of_files[]);
- static void ctl_event(CtlEvent *e);
- 
- static int motif_ready = 0;
-@@ -346,12 +346,13 @@
-   return(ctl_blocking_read(valp));
- }
- 
--static void ctl_pass_playing_list(int number_of_files, char *list_of_files[])
-+static int ctl_pass_playing_list(int number_of_files, char *list_of_files[])
- {
-     int i=0;
-     char file_to_play[1000];
-     int command;
-     int32 val;
-+    int retval;
- 
-     motif_ready = 1;
- 
-@@ -381,12 +382,13 @@
- 	    else
- 		{
- 		    if (command==RC_QUIT)
--			return;
-+			return 0;
- 
- 		    switch(command)
- 			{
- 			case RC_ERROR:
- 			    m_pipe_int_write(ERROR_MESSAGE);
-+			    retval=1;
- 			    break;
- 			case RC_NONE:
- 			    break;
-@@ -411,6 +413,7 @@
- 		    command = ctl_blocking_read(&val);
- 		}
- 	}
-+    return retval;
- }
- 
- /*
-diff -ur TiMidity++-2.13.2/interface/ncurs_c.c TiMidity++-2.13.2-new/interface/ncurs_c.c
---- TiMidity++-2.13.2/interface/ncurs_c.c	2005-01-02 02:53:01.000000000 +0100
-+++ TiMidity++-2.13.2-new/interface/ncurs_c.c	2005-01-02 03:05:48.000000000 +0100
-@@ -174,7 +174,7 @@
- 
- static int ctl_open(int using_stdin, int using_stdout);
- static void ctl_close(void);
--static void ctl_pass_playing_list(int number_of_files, char *list_of_files[]);
-+static int ctl_pass_playing_list(int number_of_files, char *list_of_files[]);
- static int ctl_read(int32 *valp);
- static int cmsg(int type, int verbosity_level, char *fmt, ...);
- static void ctl_event(CtlEvent *e);
-@@ -3100,7 +3100,7 @@
-     reuse_mblock(&tmpbuffer);
- }
- 
--static void ctl_pass_playing_list(int number_of_files, char *list_of_files[])
-+static int ctl_pass_playing_list(int number_of_files, char *list_of_files[])
- {
-     int i;
-     int act_number_of_files;
-@@ -3128,7 +3128,7 @@
- 
-     if (file_list.number<0) {
-       cmsg(CMSG_FATAL, VERB_NORMAL, "No MIDI file to play!");
--      return;
-+      return 1;
-     }
- 
-     ctl_listmode_max=1;
-@@ -3169,7 +3169,7 @@
- 		    if(!(ctl.flags & CTLF_LIST_LOOP) || stdin_check)
- 		    {
- 			aq_flush(0);
--			return;
-+			return 0;
- 		    }
- 		    i = 0;
- 		    if(rc == RC_TUNE_END)
-@@ -3187,7 +3187,7 @@
- 
- 		/* else fall through */
- 	    case RC_QUIT:
--		return;
-+		return 0;
- 	    }
- 	  ctl_reset();
- 	}
-diff -ur TiMidity++-2.13.2/interface/portmidisyn_c.c TiMidity++-2.13.2-new/interface/portmidisyn_c.c
---- TiMidity++-2.13.2/interface/portmidisyn_c.c	2005-01-02 02:53:01.000000000 +0100
-+++ TiMidity++-2.13.2-new/interface/portmidisyn_c.c	2005-01-02 03:13:05.000000000 +0100
-@@ -96,7 +96,7 @@
- static int ctl_read(int32 *valp);
- static int cmsg(int type, int verbosity_level, char *fmt, ...);
- static void ctl_event(CtlEvent *e);
--static void ctl_pass_playing_list(int n, char *args[]);
-+static int ctl_pass_playing_list(int n, char *args[]);
- 
- #ifndef __W32__
- static void init_keybord(void);
-@@ -215,17 +215,17 @@
- 
- #ifdef IA_W32G_SYN
- extern void w32g_syn_doit(void);
--extern void w32g_syn_ctl_pass_playing_list(int n_, char *args_[]);
-+extern int w32g_syn_ctl_pass_playing_list(int n_, char *args_[]);
- 
- 
--static void ctl_pass_playing_list(int n, char *args[])
-+static int ctl_pass_playing_list(int n, char *args[])
- {
--	w32g_syn_ctl_pass_playing_list ( n, args );
-+	return w32g_syn_ctl_pass_playing_list ( n, args );
- }
- #endif
- 
- #ifndef IA_W32G_SYN
--static void ctl_pass_playing_list(int n, char *args[])
-+static int ctl_pass_playing_list(int n, char *args[])
- #else
- // 0: OK, 2: Require to reset.
- int ctl_pass_playing_list2(int n, char *args[])
-@@ -241,7 +241,7 @@
- #ifndef IA_W32G_SYN
- 	if(n > MAX_PORT ){
- 		printf( "Usage: timidity -iW [Midi interface No s]\n");
--		return;
-+		return 1;
- 	}
- #endif
- 
-@@ -347,11 +347,7 @@
- #endif /* USE_GTK_GUI */
- 	rtsyn_close();
- 
--#ifdef IA_W32G_SYN
- 	return 0;
--#else
--	return;
--#endif
- }
- 
- 
-diff -ur TiMidity++-2.13.2/interface/server_c.c TiMidity++-2.13.2-new/interface/server_c.c
---- TiMidity++-2.13.2/interface/server_c.c	2005-01-02 02:53:01.000000000 +0100
-+++ TiMidity++-2.13.2-new/interface/server_c.c	2005-01-02 03:07:38.000000000 +0100
-@@ -176,7 +176,7 @@
- static int ctl_read(int32 *valp);
- static int cmsg(int type, int verbosity_level, char *fmt, ...);
- static void ctl_event(CtlEvent *e);
--static void ctl_pass_playing_list(int n, char *args[]);
-+static int ctl_pass_playing_list(int n, char *args[]);
- 
- /**********************************/
- /* export the interface functions */
-@@ -356,14 +356,14 @@
- static void compute_sample_increment(void);
- static void server_reset(void);
- 
--static void ctl_pass_playing_list(int n, char *args[])
-+static int ctl_pass_playing_list(int n, char *args[])
- {
-     int sock;
- 
-     if(n != 2 && n != 1)
-     {
- 	fprintf(stderr, "Usage: timidity -ir control-port [data-port]\n");
--	return;
-+	return 1;
-     }
- 
- #ifdef SIGPIPE
-@@ -379,7 +379,7 @@
-     if (control_port) {
- 	sock = pasv_open(&control_port);
- 	if(sock == -1)
--	    return;
-+	    return 1;
-     }
-     opt_realtime_playing = 1; /* Enable loading patch while playing */
-     allocate_cache_size = 0; /* Don't use pre-calclated samples */
-@@ -404,7 +404,7 @@
- 		    continue;
- 		perror("accept");
- 		close(sock);
--		return;
-+		return 1;
- 	    }
- 	}
- 	else control_fd = 0;
-@@ -446,6 +446,7 @@
- 	if (!control_port)
- 	    break;
-     }
-+    return 0;
- }
- 
- #define MAX_GETCMD_PARAMS 8
-diff -ur TiMidity++-2.13.2/interface/tk_c.c TiMidity++-2.13.2-new/interface/tk_c.c
---- TiMidity++-2.13.2/interface/tk_c.c	2005-01-02 02:53:01.000000000 +0100
-+++ TiMidity++-2.13.2-new/interface/tk_c.c	2005-01-02 03:08:48.000000000 +0100
-@@ -86,7 +86,7 @@
- static void ctl_close(void);
- static int ctl_read(int32 *valp);
- static int cmsg(int type, int verbosity_level, char *fmt, ...);
--static void ctl_pass_playing_list(int number_of_files, char *list_of_files[]);
-+static int ctl_pass_playing_list(int number_of_files, char *list_of_files[]);
- static int ctl_blocking_read(int32 *valp);
- static void ctl_note(int status, int ch, int note, int vel);
- static void ctl_event(CtlEvent *e);
-@@ -587,7 +587,7 @@
- 	return(ctl_blocking_read(valp));
- }
- 
--static void ctl_pass_playing_list(int number_of_files, char *list_of_files[])
-+static int ctl_pass_playing_list(int number_of_files, char *list_of_files[])
- {
- 	int i=0;
- 	char local[1000];
-@@ -618,7 +618,7 @@
- 				/* if really QUIT */
- 				k_pipe_gets(local, sizeof(local)-1);
- 				if (*local == 'Z')
--					return;
-+					return 0;
- 				/* only stop playing..*/
- 			}
- 			if (command==RC_CHANGE_VOLUME) /* init volume */
-@@ -646,6 +646,7 @@
- 			command = ctl_blocking_read(&val);
- 		}
- 	}
-+	return 0;
- }
- 
- 
-diff -ur TiMidity++-2.13.2/interface/w32g_c.c TiMidity++-2.13.2-new/interface/w32g_c.c
---- TiMidity++-2.13.2/interface/w32g_c.c	2005-01-02 02:53:01.000000000 +0100
-+++ TiMidity++-2.13.2-new/interface/w32g_c.c	2005-01-02 03:10:03.000000000 +0100
-@@ -86,7 +86,7 @@
- 
- static int ctl_open(int using_stdin, int using_stdout);
- static void ctl_close(void);
--static void ctl_pass_playing_list(int number_of_files, char *list_of_files[]);
-+static int ctl_pass_playing_list(int number_of_files, char *list_of_files[]);
- static void ctl_event(CtlEvent *e);
- static int ctl_read(int32 *valp);
- static int cmsg(int type, int verbosity_level, char *fmt, ...);
-@@ -662,7 +662,7 @@
- }
- 
- extern BOOL SetWrdWndActive(void);
--static void ctl_pass_playing_list(int number_of_files, char *list_of_files[])
-+static int ctl_pass_playing_list(int number_of_files, char *list_of_files[])
- {
- 	static int init_flag = 1;
-     int rc;
-@@ -779,7 +779,7 @@
- 		if(ctl.flags & CTLF_AUTOEXIT) {
- 		    if(play_mode->fd != -1)
- 			aq_flush(0);
--		    return;
-+		    return 0;
- 		}
- 		break;
- 	    }
-@@ -803,7 +803,7 @@
- 		if(ctl.flags & CTLF_AUTOEXIT){
- 		    if(play_mode->fd != -1)
- 			aq_flush(0);
--		    return;
-+		    return 0;
- 		}
- 		if((ctl.flags & CTLF_LIST_LOOP) && w32g_nvalid_playlist())
- 		{
-@@ -839,7 +839,7 @@
- 	  case RC_QUIT:
- 	    if(play_mode->fd != -1)
- 		aq_flush(1);
--	    return;
-+	    return 0;
- 
- 	  case RC_CHANGE_VOLUME:
- 	    amplification += value;
-@@ -868,6 +868,7 @@
- 	    PrefSettingApplyReally();
- 	rc = RC_NONE;
-     }
-+	return 0;
- }
- 
- static void ctl_lcd_mark(int flag, int x, int y)
-diff -ur TiMidity++-2.13.2/interface/w32g_syn.c TiMidity++-2.13.2-new/interface/w32g_syn.c
---- TiMidity++-2.13.2/interface/w32g_syn.c	2005-01-02 02:53:01.000000000 +0100
-+++ TiMidity++-2.13.2-new/interface/w32g_syn.c	2005-01-02 03:10:49.000000000 +0100
-@@ -281,7 +281,7 @@
- static int wait_for_termination_of_syn_thread ( void );
- int w32g_message_set ( int cmd );
- int w32g_message_get ( w32g_syn_message_t *msg );
--void w32g_syn_ctl_pass_playing_list ( int n_, char *args_[] );
-+int w32g_syn_ctl_pass_playing_list ( int n_, char *args_[] );
- int w32g_syn_do_before_pref_apply ( void );
- int w32g_syn_do_after_pref_apply ( void );
- 
-@@ -1403,7 +1403,7 @@
- 	}
- }
- 
--void w32g_syn_ctl_pass_playing_list ( int n_, char *args_[] )
-+int w32g_syn_ctl_pass_playing_list ( int n_, char *args_[] )
- {
- 	int i;
- #ifndef TWSYNSRV
-@@ -1471,6 +1471,7 @@
- 	}
- #endif
- 	if ( w32g_syn.quit_state < 2 ) w32g_syn.quit_state = 2;
-+	return 0;
- }
- 
- int w32g_syn_do_before_pref_apply ( void )
-diff -ur TiMidity++-2.13.2/interface/winsyn_c.c TiMidity++-2.13.2-new/interface/winsyn_c.c
---- TiMidity++-2.13.2/interface/winsyn_c.c	2005-01-02 02:53:01.000000000 +0100
-+++ TiMidity++-2.13.2-new/interface/winsyn_c.c	2005-01-02 03:11:36.000000000 +0100
-@@ -88,7 +88,7 @@
- static int ctl_read(int32 *valp);
- static int cmsg(int type, int verbosity_level, char *fmt, ...);
- static void ctl_event(CtlEvent *e);
--static void ctl_pass_playing_list(int n, char *args[]);
-+static int ctl_pass_playing_list(int n, char *args[]);
- 
- #ifndef __W32__
- static void init_keybord(void);
-@@ -207,17 +207,17 @@
- 
- #ifdef IA_W32G_SYN
- extern void w32g_syn_doit(void);
--extern void w32g_syn_ctl_pass_playing_list(int n_, char *args_[]);
-+extern int w32g_syn_ctl_pass_playing_list(int n_, char *args_[]);
- 
- 
--static void ctl_pass_playing_list(int n, char *args[])
-+static int ctl_pass_playing_list(int n, char *args[])
- {
--	w32g_syn_ctl_pass_playing_list ( n, args );
-+	return w32g_syn_ctl_pass_playing_list ( n, args );
- }
- #endif
- 
- #ifndef IA_W32G_SYN
--static void ctl_pass_playing_list(int n, char *args[])
-+static int ctl_pass_playing_list(int n, char *args[])
- #else
- // 0: OK, 2: Require to reset.
- int ctl_pass_playing_list2(int n, char *args[])
-@@ -233,7 +233,7 @@
- #ifndef IA_W32G_SYN
- 	if(n > MAX_PORT ){
- 		printf( "Usage: timidity -iW [Midi interface No s]\n");
--		return;
-+		return 1;
- 	}
- #endif
- 
-@@ -339,11 +339,7 @@
- #endif /* USE_GTK_GUI */
- 	rtsyn_close();
- 
--#ifdef IA_W32G_SYN
- 	return 0;
--#else
--	return;
--#endif
- }
- 
- 
-diff -ur TiMidity++-2.13.2/interface/xaw_c.c TiMidity++-2.13.2-new/interface/xaw_c.c
---- TiMidity++-2.13.2/interface/xaw_c.c	2005-01-02 02:53:01.000000000 +0100
-+++ TiMidity++-2.13.2-new/interface/xaw_c.c	2005-01-02 03:11:57.000000000 +0100
-@@ -55,7 +55,7 @@
- static void ctl_close(void);
- static int ctl_read(int32 *valp);
- static int cmsg(int type, int verbosity_level, char *fmt, ...);
--static void ctl_pass_playing_list(int number_of_files, char *list_of_files[]);
-+static int ctl_pass_playing_list(int number_of_files, char *list_of_files[]);
- static void ctl_event(CtlEvent *e);
- 
- static void a_pipe_open(void);
-@@ -463,7 +463,7 @@
-   }
- }
- 
--static void ctl_pass_playing_list(int init_number_of_files,
-+static int ctl_pass_playing_list(int init_number_of_files,
-                   char *init_list_of_files[]) {
-   int current_no,command=RC_NONE,i,j;
-   int32 val;
-diff -ur TiMidity++-2.13.2/interface/xskin_c.c TiMidity++-2.13.2-new/interface/xskin_c.c
---- TiMidity++-2.13.2/interface/xskin_c.c	2005-01-02 02:53:01.000000000 +0100
-+++ TiMidity++-2.13.2-new/interface/xskin_c.c	2005-01-02 03:12:31.000000000 +0100
-@@ -55,7 +55,7 @@
- static void ctl_close(void);
- static int ctl_read(int32 *valp);
- static int cmsg(int type, int verbosity_level, char *fmt, ...);
--static void ctl_pass_playing_list(int number_of_files, char *list_of_files[]);
-+static int ctl_pass_playing_list(int number_of_files, char *list_of_files[]);
- static void ctl_event(CtlEvent *e);
- static void ctl_speana_data(double *val, int size);
- static void initialize_exp_hz_table( void );
-@@ -342,7 +342,7 @@
-   }
- }
- 
--static void ctl_pass_playing_list(int number_of_files, char *list_of_files[]) {
-+static int ctl_pass_playing_list(int number_of_files, char *list_of_files[]) {
- 
-   int current_no,command,i;
-   int32 val;
-@@ -403,7 +403,7 @@
-       command=play_midi_file(list_of_files[file_table[current_no]]);
-     } else {
-       /* Quit timidity*/
--      if (exitflag) return;
-+      if (exitflag) return 0;
-       /* Stop playing */
-       if (command==RC_QUIT) {
- 	sprintf(local_buf,"T 00:00");
-@@ -461,6 +461,7 @@
-       command=ctl_blocking_read(&val);
-     }
-   }
-+  return 0;
- }
- 
- /* ------ Pipe handlers ----- */
-diff -ur TiMidity++-2.13.2/timidity/controls.h TiMidity++-2.13.2-new/timidity/controls.h
---- TiMidity++-2.13.2/timidity/controls.h	2005-01-02 02:53:01.000000000 +0100
-+++ TiMidity++-2.13.2-new/timidity/controls.h	2005-01-02 02:59:37.000000000 +0100
-@@ -147,7 +147,7 @@
- 
-   int  (*open)(int using_stdin, int using_stdout);
-   void (*close)(void);
--  void (*pass_playing_list)(int number_of_files, char *list_of_files[]);
-+  int (*pass_playing_list)(int number_of_files, char *list_of_files[]);
-   int  (*read)(int32 *valp);
-   int  (*cmsg)(int type, int verbosity_level, char *fmt, ...);
-   void (*event)(CtlEvent *ev);	/* Control events */
-diff -ur TiMidity++-2.13.2/timidity/playmidi.c TiMidity++-2.13.2-new/timidity/playmidi.c
---- TiMidity++-2.13.2/timidity/playmidi.c	2005-01-02 02:53:01.000000000 +0100
-+++ TiMidity++-2.13.2-new/timidity/playmidi.c	2005-01-02 03:15:55.000000000 +0100
-@@ -8562,7 +8562,7 @@
-     return rc;
- }
- 
--void dumb_pass_playing_list(int number_of_files, char *list_of_files[])
-+int dumb_pass_playing_list(int number_of_files, char *list_of_files[])
- {
-     #ifndef CFG_FOR_SF
-     int i = 0;
-@@ -8586,12 +8586,12 @@
- 	    aq_flush(0);
- 
- 	    if(!(ctl->flags & CTLF_LIST_LOOP))
--		return;
-+		return 0;
- 	    i = 0;
- 	    break;
- 
- 	    case RC_QUIT:
--		return;
-+		return 0;
- 	}
-     }
-     #endif
-diff -ur TiMidity++-2.13.2/timidity/playmidi.h TiMidity++-2.13.2-new/timidity/playmidi.h
---- TiMidity++-2.13.2/timidity/playmidi.h	2005-01-02 02:53:01.000000000 +0100
-+++ TiMidity++-2.13.2-new/timidity/playmidi.h	2005-01-02 03:16:07.000000000 +0100
-@@ -577,7 +577,7 @@
- extern int opt_pan_delay;
- 
- extern int play_midi_file(char *fn);
--extern void dumb_pass_playing_list(int number_of_files, char *list_of_files[]);
-+extern int dumb_pass_playing_list(int number_of_files, char *list_of_files[]);
- extern void default_ctl_lyric(int lyricid);
- extern int check_apply_control(void);
- extern void recompute_freq(int v);
-diff -ur TiMidity++-2.13.2/timidity/sndfont.c TiMidity++-2.13.2-new/timidity/sndfont.c
---- TiMidity++-2.13.2/timidity/sndfont.c	2005-01-02 02:53:01.000000000 +0100
-+++ TiMidity++-2.13.2-new/timidity/sndfont.c	2005-01-02 03:15:27.000000000 +0100
-@@ -1893,7 +1893,7 @@
- 
- #if CFG_FOR_SF_SUPPORT_FFT
- int check_apply_control(void) { return 0; } // not pass
--void dumb_pass_playing_list(int number_of_files, char *list_of_files[]) {}
-+int dumb_pass_playing_list(int number_of_files, char *list_of_files[]) {return 0;}
- void recompute_freq(int v) {} // not pass
- int32 control_ratio = 0;
- int reduce_quality_flag = 0;
-diff -ur TiMidity++-2.13.2/timidity/timidity.c TiMidity++-2.13.2-new/timidity/timidity.c
---- TiMidity++-2.13.2/timidity/timidity.c	2005-01-02 02:53:01.000000000 +0100
-+++ TiMidity++-2.13.2-new/timidity/timidity.c	2005-01-02 02:59:29.000000000 +0100
-@@ -5291,6 +5291,7 @@
-     int need_stdin = 0, need_stdout = 0;
-     int i;
-     int output_fail = 0;
-+    int retval;
- 
-     if(nfiles == 0 && !strchr(INTERACTIVE_INTERFACE_IDS, ctl->id_character))
- 	return 0;
-@@ -5410,7 +5411,7 @@
- 	ctl->cmsg(CMSG_INFO, VERB_DEBUG_SILLY,
- 		  "pass_playing_list() nfiles=%d", nfiles);
- 
--	ctl->pass_playing_list(nfiles, files);
-+	retval=ctl->pass_playing_list(nfiles, files);
- 
- 	if(intr)
- 	    aq_flush(1);
-@@ -5451,7 +5452,7 @@
-     url_news_connection_cache(URL_NEWS_CLOSE_CACHE);
- #endif /* SUPPORT_SOCKET */
- 
--    return 0;
-+    return retval;
- }
- 
- #ifdef IA_W32GUI
diff --git a/media-sound/timidity++/timidity++-2.13.2-r2.ebuild b/media-sound/timidity++/timidity++-2.13.2-r2.ebuild
index 233c1985f48e..829933e47120 100644
--- a/media-sound/timidity++/timidity++-2.13.2-r2.ebuild
+++ b/media-sound/timidity++/timidity++-2.13.2-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/timidity++/timidity++-2.13.2-r2.ebuild,v 1.7 2006/01/08 04:18:41 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/timidity++/timidity++-2.13.2-r2.ebuild,v 1.8 2006/02/19 02:10:33 chainsaw Exp $
 
 inherit eutils
 
@@ -10,7 +10,7 @@ S=${WORKDIR}/${MY_P}
 
 DESCRIPTION="A handy MIDI to WAV converter with OSS and ALSA output support"
 HOMEPAGE="http://timidity.sourceforge.net/"
-SRC_URI="mirror://sourceforge/timidity/${MY_P}.tar.bz2"
+SRC_URI="mirror://sourceforge/timidity/${MY_P}.tar.bz2 mirror://gentoo/${P}-exiterror.patch"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -41,10 +41,10 @@ RDEPEND="${RDEPEND}
 	emacs? ( virtual/emacs )"
 
 src_unpack() {
-	unpack ${A}
+	unpack ${MY_P}.tar.bz2
 	cd ${S}
+	epatch ${DISTDIR}/${P}-exiterror.patch
 	epatch ${FILESDIR}/${P}-gtk26.patch
-	epatch ${FILESDIR}/${P}-exiterror.patch
 	epatch ${FILESDIR}/${P}-gcc4.patch
 
 	# fix header location of speex
diff --git a/media-sound/timidity++/timidity++-2.13.2.ebuild b/media-sound/timidity++/timidity++-2.13.2.ebuild
index 1915364ef08d..3c13ee628fc5 100644
--- a/media-sound/timidity++/timidity++-2.13.2.ebuild
+++ b/media-sound/timidity++/timidity++-2.13.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/timidity++/timidity++-2.13.2.ebuild,v 1.12 2006/01/08 04:18:41 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/timidity++/timidity++-2.13.2.ebuild,v 1.13 2006/02/19 02:10:33 chainsaw Exp $
 
 inherit eutils
 
@@ -18,7 +18,6 @@ KEYWORDS="amd64 arm hppa ppc sparc x86"
 IUSE="oss nas esd motif X gtk vorbis tcltk slang alsa arts jack portaudio emacs"
 
 RDEPEND=">=sys-libs/ncurses-5.0
-	X? ( virtual/x11 )
 	esd? ( >=media-sound/esound-0.2.22 )
 	gtk? ( =x11-libs/gtk+-1.2* )
 	nas? ( >=media-libs/nas-1.4 )