remove old patches

Package-Manager: portage-2.2.0_alpha10/cvs/Linux i686

5 files changed, 8 insertions, 123 deletions

diff --git a/app-accessibility/eflite/ChangeLog b/app-accessibility/eflite/ChangeLog
index b862f0f117a5..f4b9d7b4b2ab 100644
--- a/app-accessibility/eflite/ChangeLog
+++ b/app-accessibility/eflite/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-accessibility/eflite
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/eflite/ChangeLog,v 1.32 2009/12/29 00:17:11 williamh Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/eflite/ChangeLog,v 1.33 2010/12/29 19:06:24 williamh Exp $
+
+  29 Dec 2010; William Hubbs <williamh@gentoo.org>
+  -files/eflite-0.3.8-daemon.patch, -files/eflite-0.3.8-read_pipe.patch,
+  -files/eflite-0.3.8-shared_flite.patch:
+  remove old patches
 
   29 Dec 2009; William Hubbs <williamh@gentoo.org> -eflite-0.3.8-r2.ebuild:
   removed old version
diff --git a/app-accessibility/eflite/Manifest b/app-accessibility/eflite/Manifest
index d07d891c68aa..3c441bd09489 100644
--- a/app-accessibility/eflite/Manifest
+++ b/app-accessibility/eflite/Manifest
@@ -1,9 +1,6 @@
-AUX eflite-0.3.8-daemon.patch 1728 RMD160 bd0b7985f8fe129e837c04781168df35dd0ffcd2 SHA1 ba424a15d0ef672b3db55b01546c540b5c7e50a1 SHA256 e71f0902e5892b2a4804ea57e5c9a0e774c96421ad0fb5c5461091574a44329c
-AUX eflite-0.3.8-read_pipe.patch 380 RMD160 0c69ef7b060dd34931298a1d1946df14d84cce96 SHA1 6f7d138d6228dc8e4438786aab12c2eee745b821 SHA256 8a96b1cb5658f08f1cbd456079477a9aa5e795c3ad86ab11443e74f067e3f571
-AUX eflite-0.3.8-shared_flite.patch 2116 RMD160 24532a47312ed0665330515975f69a0a612215f4 SHA1 d0b2703c53e241c0af2ddc4337538673d56f0fb7 SHA256 5150c495b0d981e28504599ed20d8700cbadac531682d528f86669941ecbcd28
 AUX eflite.rc 756 RMD160 97a4e0fa54bb6cd32803fc95ce25a1d57a741150 SHA1 1502133b26235c61303cb05bdac792b4c717d083 SHA256 af252f4a588846201814a8836c9cc7c529986f306db14d8c08a99760cba19076
 AUX es.conf 213 RMD160 3f096e0b12bc0bf4f4534a486246fce420b71a3a SHA1 530a6f5f0bf5f63b8c55603af64cc4561ca05363 SHA256 20de1fd6979f3a4254fb5e7cac4f135647c8abce030ceef88648b6db0c745d27
 DIST eflite-0.4.1.tar.gz 63192 RMD160 18125ad8fab4dafcac8fb3ccdd489e5a58d31808 SHA1 c56a52b7b49879f2d37ce84e049e984be14de4df SHA256 91ad85855e55a3fc3b97a1a525db5fd1d211d54342bbfc88d1026813104f1721
 EBUILD eflite-0.4.1.ebuild 1009 RMD160 9be78cf60d06319ca8031626a1dc3bb3c414ff3e SHA1 ed82c7ede13c79d567d88b17947b0b8d1d9c4bd6 SHA256 e7d6f64768b622b1b9f9b11ae4a6102d82fcde91aa36b0e472065e5bb5371ba9
-MISC ChangeLog 4378 RMD160 9d3a1d6f4d3b864c8ee7672f6a066832e356f6ca SHA1 42a078bcceb15517b7e338be473fcbf5cd78468c SHA256 355c1a5da949e3d502d8183e2241063b4207f5e75f90458983745972519fe700
+MISC ChangeLog 4566 RMD160 32e681b558cce9a352fa7766c092fb7989bc8fed SHA1 7cff2e772a14bf7215481e6bdeb9eb4c849c393d SHA256 eb52ae90dbbbb9236a3630893e950cee0a1bedeae1d8816ed17be7b35791c9b3
 MISC metadata.xml 1176 RMD160 d4b2ff3cb34339a8d75835ef87eac85c8cc8a739 SHA1 52f902a0dcbeaac84d223a19cd5a91874b2fefce SHA256 151b6e4d6ec44a3c9626e48d0076aaad98ad1509d8ee87c35290ac6b49a0bc5c
diff --git a/app-accessibility/eflite/files/eflite-0.3.8-daemon.patch b/app-accessibility/eflite/files/eflite-0.3.8-daemon.patch
deleted file mode 100644
index ceb9dbf8565b..000000000000
--- a/app-accessibility/eflite/files/eflite-0.3.8-daemon.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-diff -Naur eflite-0.3.8.orig/es.c eflite-0.3.8/es.c
---- eflite-0.3.8.orig/es.c	2004-02-20 15:58:35.000000000 -0800
-+++ eflite-0.3.8/es.c	2004-03-21 23:32:25.000000000 -0800
-@@ -760,9 +760,13 @@
-   char *input = NULL;
-   int more_opts = 1;
-   int debug = 0;
-+  int daemon_only = 0;
- 
--  while (more_opts) switch(getopt_long(argc, argv, "df:v", (struct option *)&longopts, NULL))
-+  while (more_opts) switch(getopt_long(argc, argv, "Ddf:v", (struct option *)&longopts, NULL))
-   {
-+  case 'D':
-+    daemon_only = 1;
-+    break;
-   case 'd':
-     debug = 1;
-     break;
-@@ -783,19 +787,32 @@
-   sockname = lookup_string(NULL, "socketfile");
-   if (!sockname) sockname = "/tmp/es.socket";
-   local_fd = sockconnect(sockname);
--  if (local_fd != -1) passthrough(infile, local_fd);
--  if (!debug && (child = fork()))
-+
-+  if(daemon_only)
-   {
--    usleep(200000);
--    local_fd = sockconnect(sockname);
--    if (local_fd == -1)
-+    if(local_fd != -1)
-     {
--      es_log(1 | LOG_STDERR, "Daemon not accepting connections -- exiting\n");
-+      es_log(1 | LOG_STDERR, "Socket already exists.  Exiting.\n");
-       exit(1);
-     }
--    passthrough(infile, local_fd);
--    exit(0);
-   }
-+  else
-+  {
-+    if (local_fd != -1) passthrough(infile, local_fd);
-+    if (!debug && (child = fork()))
-+    {
-+      usleep(200000);
-+      local_fd = sockconnect(sockname);
-+      if (local_fd == -1)
-+      {
-+        es_log(1 | LOG_STDERR, "Daemon not accepting connections -- exiting\n");
-+        exit(1);
-+      }
-+      passthrough(infile, local_fd);
-+      exit(0);
-+    }
-+  }
-+
-   punct_some = lookup_string(NULL, "punct_some");
-   if (punct_some == NULL) punct_some = "@#$%^&_[]{}\\|";
-   punct_all = lookup_string(NULL, "punct_all");
diff --git a/app-accessibility/eflite/files/eflite-0.3.8-read_pipe.patch b/app-accessibility/eflite/files/eflite-0.3.8-read_pipe.patch
deleted file mode 100644
index e5fd895bfbd3..000000000000
--- a/app-accessibility/eflite/files/eflite-0.3.8-read_pipe.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Index: es.c
-===================================================================
-RCS file: /cvsroot/eflite/eflite/es.c,v
-retrieving revision 1.20
-diff -r1.20 es.c
-714c714,722
-<     if (size == -1) terror("read");
----
->     if (size == -1)
->     {
->       if (errno == EBADF)
->       {
-> 	/* this might really be an eof */
-> 	exit(0);
->       }
->       else terror("read");
->     }
diff --git a/app-accessibility/eflite/files/eflite-0.3.8-shared_flite.patch b/app-accessibility/eflite/files/eflite-0.3.8-shared_flite.patch
deleted file mode 100644
index a68f5757f62e..000000000000
--- a/app-accessibility/eflite/files/eflite-0.3.8-shared_flite.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-diff -Naur eflite-0.3.8.orig/Makefile.in eflite-0.3.8/Makefile.in
---- eflite-0.3.8.orig/Makefile.in	2004-02-20 15:58:35.000000000 -0800
-+++ eflite-0.3.8/Makefile.in	2004-03-21 00:39:47.000000000 -0800
-@@ -27,10 +27,10 @@
- #CFLAGS+= -DDEBUG=2
- 
- # For making releases
--FLITE_LIBS:=$(flite_dir)/lib/libflite_$(FL_VOX).a $(flite_dir)/lib/libflite_$(FL_LEX).a $(flite_dir)/lib/libflite_$(FL_LANG).a $(flite_dir)/lib/libflite.a
-+FLITE_LIBS:=-L$(flite_dir)/lib -lflite_$(FL_VOX) -lflite_$(FL_LEX) -lflite_$(FL_LANG) -lflite
- 
--eflite: fs.o es.o soccon.o sockopen.o tone.o $(FLITE_LIBS)
--	$(CC) $(LDFLAGS) -o $@ $^ -lm $(LIBS)
-+eflite: fs.o es.o soccon.o sockopen.o tone.o
-+	$(CC) $(LDFLAGS) -o $@ $^ -lm $(LIBS) $(FLITE_LIBS)
- 
- fs.o: fs.c
- 	$(CC) $(CFLAGS) -I. -I$(flite_include_dir) -DREGISTER_VOX=register_$(subst cmu_us_kal16,cmu_us_kal,$(FL_VOX)) -DSTANDALONE -DEFLITE -c -o $@ $<
-diff -Naur eflite-0.3.8.orig/configure.in eflite-0.3.8/configure.in
---- eflite-0.3.8.orig/configure.in	2004-02-20 15:58:35.000000000 -0800
-+++ eflite-0.3.8/configure.in	2004-03-21 00:37:08.000000000 -0800
-@@ -29,6 +29,20 @@
-     flite_dir=/usr/src/flite-1.1-release;
-   elif test -f /usr/local/src/flite-1.1-release/lib/libflite.a; then
-     flite_dir=/usr/local/src/flite-1.1-release;
-+  elif test -f /usr/local/lib/libflite.so; then
-+    flite_dir=/usr/local
-+  elif test -f /usr/lib/libflite.so; then
-+    flite_dir=/usr
-+  elif test -f /opt/flite/lib/libflite.so; then
-+    flite_dir=/opt
-+  elif test -f $HOME/flite-1.2-release/lib/libflite.so; then
-+    flite_dir=$HOME/flite-1.2-release
-+  elif test -f $HOME/flite-1.1-release/lib/libflite.so; then
-+    flite_dir=$HOME/flite-1.1-release
-+  elif test -f /usr/src/flite-1.1-release/lib/libflite.so; then
-+    flite_dir=/usr/src/flite-1.1-release;
-+  elif test -f /usr/local/src/flite-1.1-release/lib/libflite.so; then
-+    flite_dir=/usr/local/src/flite-1.1-release;
-   else
-     AC_MSG_ERROR(Cannot locate libflite.a.  Please specify flite_dir explicitly (see INSTALL).  If you do not have FLite headers and libraries available, then compile FLite and re-run configure.)
-     fi