diff options
| -rw-r--r-- | dev-libs/sucs/ChangeLog | 8 | ||||
| -rw-r--r-- | dev-libs/sucs/Manifest | 44 | ||||
| -rw-r--r-- | dev-libs/sucs/files/digest-sucs-0.7.0 | 3 | ||||
| -rw-r--r-- | dev-libs/sucs/files/sucs-1.0.0-gcc4.diff | 45 | ||||
| -rw-r--r-- | dev-libs/sucs/files/sucs-1.0.0-signals.diff | 11 | ||||
| -rw-r--r-- | dev-libs/sucs/files/sucs-1.0.0-thread.diff | 12 | ||||
| -rw-r--r-- | dev-libs/sucs/files/sucs-1.0.0-various_fixes.diff | 242 | ||||
| -rw-r--r-- | dev-libs/sucs/files/sucs-1.0.0-xml.diff | 13 | ||||
| -rw-r--r-- | dev-libs/sucs/sucs-0.7.0.ebuild | 20 | ||||
| -rw-r--r-- | dev-libs/sucs/sucs-1.0.0.ebuild | 9 |
10 files changed, 264 insertions, 143 deletions
diff --git a/dev-libs/sucs/ChangeLog b/dev-libs/sucs/ChangeLog index 8e10919b7910..1bf8161f472e 100644 --- a/dev-libs/sucs/ChangeLog +++ b/dev-libs/sucs/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for dev-libs/sucs # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/sucs/ChangeLog,v 1.10 2007/02/22 01:11:27 peper Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/sucs/ChangeLog,v 1.11 2007/12/18 19:57:56 dev-zero Exp $ + + 18 Dec 2007; Tiziano Müller <dev-zero@gentoo.org> + -files/sucs-1.0.0-gcc4.diff, -files/sucs-1.0.0-signals.diff, + -files/sucs-1.0.0-thread.diff, +files/sucs-1.0.0-various_fixes.diff, + -files/sucs-1.0.0-xml.diff, -sucs-0.7.0.ebuild, sucs-1.0.0.ebuild: + Fixed bug #199530. Unified resulting diffs. Dropped old version. 22 Feb 2007; Piotr Jaroszyński <peper@gentoo.org> ChangeLog: Transition to Manifest2. diff --git a/dev-libs/sucs/Manifest b/dev-libs/sucs/Manifest index c6e0045f5a35..d77de303a6c1 100644 --- a/dev-libs/sucs/Manifest +++ b/dev-libs/sucs/Manifest @@ -1,40 +1,20 @@ -AUX sucs-1.0.0-gcc4.diff 1718 RMD160 9e0ac285fbf50a0c225f9baff1f2c82043969c66 SHA1 3755496658669f09ed6bd705bbf1e3ce916aac9c SHA256 f24927eb43a51303aa4c30ae394e52da7549a1f6ae29c0175f5218ac9613da7a -MD5 a0f1323cf59278f7c592ed9479d00661 files/sucs-1.0.0-gcc4.diff 1718 -RMD160 9e0ac285fbf50a0c225f9baff1f2c82043969c66 files/sucs-1.0.0-gcc4.diff 1718 -SHA256 f24927eb43a51303aa4c30ae394e52da7549a1f6ae29c0175f5218ac9613da7a files/sucs-1.0.0-gcc4.diff 1718 -AUX sucs-1.0.0-signals.diff 297 RMD160 80c02fef6101574fd6cce6e86841b82e34dd2643 SHA1 70ad0a76ced19ea31e034554725ad75719cd6482 SHA256 d5afdeb47c8efa18f57f8f25765c22c41cd6459f28522d09d6487a444ea06f1d -MD5 92e0fe6f25dbdda501f271efba35a1c0 files/sucs-1.0.0-signals.diff 297 -RMD160 80c02fef6101574fd6cce6e86841b82e34dd2643 files/sucs-1.0.0-signals.diff 297 -SHA256 d5afdeb47c8efa18f57f8f25765c22c41cd6459f28522d09d6487a444ea06f1d files/sucs-1.0.0-signals.diff 297 -AUX sucs-1.0.0-thread.diff 391 RMD160 c67eaf06f4df275d9b735f59cb0c04c83322df06 SHA1 a783e262f647a0477c16131f2e2fe43c4274836b SHA256 bb6765b24422da84b0b6a0ff9ff5e248dd8730f1d5d8af8ce1e96b74d5c9de77 -MD5 453493046b0c82b0266a5c7ebdf56195 files/sucs-1.0.0-thread.diff 391 -RMD160 c67eaf06f4df275d9b735f59cb0c04c83322df06 files/sucs-1.0.0-thread.diff 391 -SHA256 bb6765b24422da84b0b6a0ff9ff5e248dd8730f1d5d8af8ce1e96b74d5c9de77 files/sucs-1.0.0-thread.diff 391 -AUX sucs-1.0.0-xml.diff 450 RMD160 f367d641ac9f4c52eb7b0d2f74cb54dcf50773b6 SHA1 46a82e6d48eb6f506a57baa2c080a7f8d54b9607 SHA256 01d4f4c80efd4f7babfdfbb7d1d0f06632f111a3529939f20fcf653b0e355607 -MD5 7305ee01f9456f68d7d02cd4170844d1 files/sucs-1.0.0-xml.diff 450 -RMD160 f367d641ac9f4c52eb7b0d2f74cb54dcf50773b6 files/sucs-1.0.0-xml.diff 450 -SHA256 01d4f4c80efd4f7babfdfbb7d1d0f06632f111a3529939f20fcf653b0e355607 files/sucs-1.0.0-xml.diff 450 -DIST sucs-0.7.0.tar.bz2 95642 RMD160 bdfd182f79bbabe9d044b05427ebf2b466ff5926 SHA1 61b194180649a7ee3f9658090292499799e8358d SHA256 3a97ed0256fad8b7405c4fef83529f30ff5285bb9350b1c7c0c13a72e01b1ebd +AUX sucs-1.0.0-various_fixes.diff 6749 RMD160 b198271ac2cdc937b399c6d493f7d04cb28c0a15 SHA1 ec08aa8ce54572e5482c58cc79a9d42eb442f25c SHA256 88a91a25239753998b6db7cbfa32549312d3c2ec8ba7ac897daff53ff07b4d35 +MD5 acecdee16de56898a63c0876e33d7edc files/sucs-1.0.0-various_fixes.diff 6749 +RMD160 b198271ac2cdc937b399c6d493f7d04cb28c0a15 files/sucs-1.0.0-various_fixes.diff 6749 +SHA256 88a91a25239753998b6db7cbfa32549312d3c2ec8ba7ac897daff53ff07b4d35 files/sucs-1.0.0-various_fixes.diff 6749 DIST sucs-1.0.0.tar.bz2 162874 RMD160 26c3bf8c9d896fae7eb4835fe4982bb2f21e1a2c SHA1 425348510b942c71ae9cafd40bc3d8a30c1fb17f SHA256 5776bd5a3ccaae8cf5052cd2e85fa087296e6ebf474623ac3e945625dd5bdea1 -EBUILD sucs-0.7.0.ebuild 631 RMD160 f4fb608052330d3b52e4ea861d16fd400dc6303d SHA1 e1b8f67437aa9929b45b3dc90471c508ca76cc57 SHA256 96a4d74d1ba5947a21ce40594afd6e33d49a4030d70dcf1fc52e39949edf513d -MD5 72743ff7fa2bcfffef6b42e7feec254e sucs-0.7.0.ebuild 631 -RMD160 f4fb608052330d3b52e4ea861d16fd400dc6303d sucs-0.7.0.ebuild 631 -SHA256 96a4d74d1ba5947a21ce40594afd6e33d49a4030d70dcf1fc52e39949edf513d sucs-0.7.0.ebuild 631 -EBUILD sucs-1.0.0.ebuild 862 RMD160 ecab6506ffd0ccbd15ab131bc0b8bc0dc64dbe18 SHA1 782c9e82e4b5177fc11534e2989e5a445ff0c91e SHA256 e59fed5cceee139ad315549a4850cdd86303ec6419ad185552cd725a2b2ef755 -MD5 ab5f3a5559b4862eaf6f2f5a4119692b sucs-1.0.0.ebuild 862 -RMD160 ecab6506ffd0ccbd15ab131bc0b8bc0dc64dbe18 sucs-1.0.0.ebuild 862 -SHA256 e59fed5cceee139ad315549a4850cdd86303ec6419ad185552cd725a2b2ef755 sucs-1.0.0.ebuild 862 -MISC ChangeLog 1103 RMD160 662b390ad9c47ddcd7780b3096cef2073d4abacd SHA1 5f0ad54c1f517efa7ad56c4855c8decfda85b9ab SHA256 fd4f777dd88d4092f00baf051a2e2a0ec68710dbb0ec8722a64d5fdd950fefb8 -MD5 93688015392fb388641cb806cc12ca4c ChangeLog 1103 -RMD160 662b390ad9c47ddcd7780b3096cef2073d4abacd ChangeLog 1103 -SHA256 fd4f777dd88d4092f00baf051a2e2a0ec68710dbb0ec8722a64d5fdd950fefb8 ChangeLog 1103 +EBUILD sucs-1.0.0.ebuild 756 RMD160 5424633b0e26a31a27413b415dc624e37672817d SHA1 c8d795180e81f0b92cc660cb0fb1d0e19f48bec6 SHA256 960b3cc2e7a5161d76c07ff04b25d950cacdd6c54d21b95c7be79821ac255d76 +MD5 15b3e16fe1b52482cb300c579fa2b16c sucs-1.0.0.ebuild 756 +RMD160 5424633b0e26a31a27413b415dc624e37672817d sucs-1.0.0.ebuild 756 +SHA256 960b3cc2e7a5161d76c07ff04b25d950cacdd6c54d21b95c7be79821ac255d76 sucs-1.0.0.ebuild 756 +MISC ChangeLog 1430 RMD160 8d084ef9f584b01d2f40059627e4cd7b1bb77581 SHA1 8725fb7fbd13980f35f6dca1832c801c4005fa5a SHA256 8ea9c59d70d5242c6da83faf5dda906037cc96bbda74f20bb332a327ff3a33aa +MD5 c83f116f66c07d1f2184c19d8b81ee5a ChangeLog 1430 +RMD160 8d084ef9f584b01d2f40059627e4cd7b1bb77581 ChangeLog 1430 +SHA256 8ea9c59d70d5242c6da83faf5dda906037cc96bbda74f20bb332a327ff3a33aa ChangeLog 1430 MISC metadata.xml 417 RMD160 e3e7f745c9f7592c2b728dd900a303b00723ad4d SHA1 ce134caefe38a56e50aee2e0ead0e86022c15fd2 SHA256 5bbdbeaf1c22ea31f7539b9df26caf45e41dee1ba4b61c5526eaa5428c4415fe MD5 ef3d21518ad7bab1fccf101021ab63f5 metadata.xml 417 RMD160 e3e7f745c9f7592c2b728dd900a303b00723ad4d metadata.xml 417 SHA256 5bbdbeaf1c22ea31f7539b9df26caf45e41dee1ba4b61c5526eaa5428c4415fe metadata.xml 417 -MD5 a7ec460d6e5b26ae5a967c1c4e3ad4b0 files/digest-sucs-0.7.0 232 -RMD160 f5f323f24f5bfe7bc2bc62ac3628a8b97d4e1402 files/digest-sucs-0.7.0 232 -SHA256 cc74f441dfc759ae6d12f12dd3133aeff5b27417e613a5d93b8757f7e9b30e68 files/digest-sucs-0.7.0 232 MD5 f3de53bbe548ab764934fe3a856eb007 files/digest-sucs-1.0.0 235 RMD160 1a139b793dc96c1b519e0a4dc20f151f9dead1dd files/digest-sucs-1.0.0 235 SHA256 c072b1c96abe572276cdc3a1f1d16cff8f669b2c0218b92cebb38cc1d5502d7f files/digest-sucs-1.0.0 235 diff --git a/dev-libs/sucs/files/digest-sucs-0.7.0 b/dev-libs/sucs/files/digest-sucs-0.7.0 deleted file mode 100644 index dbc895fe8a62..000000000000 --- a/dev-libs/sucs/files/digest-sucs-0.7.0 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 c49a839c31e61de4af5318f3ef261f58 sucs-0.7.0.tar.bz2 95642 -RMD160 bdfd182f79bbabe9d044b05427ebf2b466ff5926 sucs-0.7.0.tar.bz2 95642 -SHA256 3a97ed0256fad8b7405c4fef83529f30ff5285bb9350b1c7c0c13a72e01b1ebd sucs-0.7.0.tar.bz2 95642 diff --git a/dev-libs/sucs/files/sucs-1.0.0-gcc4.diff b/dev-libs/sucs/files/sucs-1.0.0-gcc4.diff deleted file mode 100644 index 0c1159214dd1..000000000000 --- a/dev-libs/sucs/files/sucs-1.0.0-gcc4.diff +++ /dev/null @@ -1,45 +0,0 @@ -diff --exclude='*~' --exclude='.*' -I '$Id:' -urN sucs-1.0.0.orig/ipc/sema.cpp sucs-1.0.0/ipc/sema.cpp ---- sucs-1.0.0.orig/ipc/sema.cpp 2005-05-17 01:25:17.000000000 -0400 -+++ sucs-1.0.0/ipc/sema.cpp 2005-05-17 01:26:15.000000000 -0400 -@@ -15,6 +15,7 @@ - #pragma implementation - - #include <iostream> -+#include <cerrno> - using namespace std; - - #include <semaphore.h> -diff --exclude='*~' --exclude='.*' -I '$Id:' -urN sucs-1.0.0.orig/network/link.cpp sucs-1.0.0/network/link.cpp ---- sucs-1.0.0.orig/network/link.cpp 2005-05-17 01:25:17.000000000 -0400 -+++ sucs-1.0.0/network/link.cpp 2005-05-17 01:40:35.000000000 -0400 -@@ -17,6 +17,7 @@ - #include <string> - //#include <cstring> - #include <cassert> -+#include <cerrno> - using namespace std; - - #include <netinet/in.h> -diff --exclude='*~' --exclude='.*' -I '$Id:' -urN sucs-1.0.0.orig/signals/signallistener.cpp sucs-1.0.0/signals/signallistener.cpp ---- sucs-1.0.0.orig/signals/signallistener.cpp 2005-05-17 01:25:17.000000000 -0400 -+++ sucs-1.0.0/signals/signallistener.cpp 2005-05-17 01:39:04.000000000 -0400 -@@ -79,7 +79,7 @@ - theHandlers.erase(signal); - } - --void sucs::actualHandler(int signal) -+void actualHandler(int signal) - { - // cerr << "actualHandler: Received signal " << signal << "." << endl << flush; - SignalListener *l = SignalListener::signalListener(); -diff --exclude='*~' --exclude='.*' -I '$Id:' -urN sucs-1.0.0.orig/thread/thread.cpp sucs-1.0.0/thread/thread.cpp ---- sucs-1.0.0.orig/thread/thread.cpp 2005-05-17 01:25:17.000000000 -0400 -+++ sucs-1.0.0/thread/thread.cpp 2005-05-17 01:30:05.000000000 -0400 -@@ -17,6 +17,7 @@ - #include <iostream> - #include <string> - #include <cassert> -+#include <cerrno> - using namespace std; - - #include <csignal> diff --git a/dev-libs/sucs/files/sucs-1.0.0-signals.diff b/dev-libs/sucs/files/sucs-1.0.0-signals.diff deleted file mode 100644 index ec9d93c1e16a..000000000000 --- a/dev-libs/sucs/files/sucs-1.0.0-signals.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- signals/signallistener.cpp.orig 2006-10-20 19:30:24.000000000 +0000 -+++ signals/signallistener.cpp 2006-10-20 19:30:50.000000000 +0000 -@@ -29,6 +29,8 @@ - namespace sucs - { - -+void actualHandler(int signal); -+ - SignalListener *SignalListener::theOne = NULL; - - SignalListener::SignalListener() diff --git a/dev-libs/sucs/files/sucs-1.0.0-thread.diff b/dev-libs/sucs/files/sucs-1.0.0-thread.diff deleted file mode 100644 index 0576c61f916c..000000000000 --- a/dev-libs/sucs/files/sucs-1.0.0-thread.diff +++ /dev/null @@ -1,12 +0,0 @@ ---- thread/thread.cpp.orig 2006-10-20 19:32:13.000000000 +0000 -+++ thread/thread.cpp 2006-10-20 19:33:16.000000000 +0000 -@@ -29,6 +29,9 @@ - - Sema sucs::__output; - -+void *sucs::gameOn(void *arg); -+void sucs::cleanup(void *arg); -+ - int Thread::theIdCount = 0, Thread::theCount = 0, Thread::theNowRunningCount = 0; - Sema Thread::theNowRunning; - pthread_t Thread::theMainId = (pthread_t)NULL; diff --git a/dev-libs/sucs/files/sucs-1.0.0-various_fixes.diff b/dev-libs/sucs/files/sucs-1.0.0-various_fixes.diff new file mode 100644 index 000000000000..56677c6ea289 --- /dev/null +++ b/dev-libs/sucs/files/sucs-1.0.0-various_fixes.diff @@ -0,0 +1,242 @@ +diff -Naur sucs-1.0.0.orig/ipc/sema.cpp sucs-1.0.0/ipc/sema.cpp +--- sucs-1.0.0.orig/ipc/sema.cpp 2007-12-18 20:43:20.000000000 +0100 ++++ sucs-1.0.0/ipc/sema.cpp 2007-12-18 20:49:08.000000000 +0100 +@@ -15,6 +15,7 @@ + #pragma implementation + + #include <iostream> ++#include <cerrno> + using namespace std; + + #include <semaphore.h> +diff -Naur sucs-1.0.0.orig/network/link.cpp sucs-1.0.0/network/link.cpp +--- sucs-1.0.0.orig/network/link.cpp 2007-12-18 20:43:20.000000000 +0100 ++++ sucs-1.0.0/network/link.cpp 2007-12-18 20:49:08.000000000 +0100 +@@ -17,6 +17,7 @@ + #include <string> + //#include <cstring> + #include <cassert> ++#include <cerrno> + using namespace std; + + #include <netinet/in.h> +diff -Naur sucs-1.0.0.orig/signals/signallistener.cpp sucs-1.0.0/signals/signallistener.cpp +--- sucs-1.0.0.orig/signals/signallistener.cpp 2007-12-18 20:43:20.000000000 +0100 ++++ sucs-1.0.0/signals/signallistener.cpp 2007-12-18 20:49:08.000000000 +0100 +@@ -29,6 +29,8 @@ + namespace sucs + { + ++void actualHandler(int signal); ++ + SignalListener *SignalListener::theOne = NULL; + + SignalListener::SignalListener() +@@ -79,7 +81,7 @@ + theHandlers.erase(signal); + } + +-void sucs::actualHandler(int signal) ++void actualHandler(int signal) + { + // cerr << "actualHandler: Received signal " << signal << "." << endl << flush; + SignalListener *l = SignalListener::signalListener(); +diff -Naur sucs-1.0.0.orig/signals/signallistener.cpp.orig sucs-1.0.0/signals/signallistener.cpp.orig +--- sucs-1.0.0.orig/signals/signallistener.cpp.orig 1970-01-01 01:00:00.000000000 +0100 ++++ sucs-1.0.0/signals/signallistener.cpp.orig 2007-12-18 20:48:54.000000000 +0100 +@@ -0,0 +1,93 @@ ++// ++// C++ Implementation: signallistener ++// ++// Description: ++// ++// ++// Author: Gav Wood <gav@indigoarchive.net>, (C) 2004 ++// ++// Copyright: See COPYING file that comes with this distribution ++// ++// ++ ++#ifdef HAVE_CONFIG_H ++#include <config.h> ++#endif ++ ++#define __SUCS 1 ++ ++#include <iostream> ++using namespace std; ++ ++#include <signal.h> ++ ++#include "thread.h" ++#include "signalhandler.h" ++#include "signallistener.h" ++using namespace sucs; ++ ++namespace sucs ++{ ++ ++void actualHandler(int signal); ++ ++SignalListener *SignalListener::theOne = NULL; ++ ++SignalListener::SignalListener() ++{ ++} ++ ++SignalListener::~SignalListener() ++{ ++} ++ ++void SignalListener::set(int signal, SignalHandler *handler) ++{ ++/* struct sigaction *act = new struct sigaction; ++ act->sa_sigaction = actualHandler; ++ act->sa_mask = 0; ++ act->sa_flags = SA_SIGINFO; ++ sigaction(a, act, NULL); ++ delect act; ++*/ ++ tdbg("SignalListener::set: Object " << handler << " is handling signal " << signal << "." << endl); ++ if(!theHandlers.count(signal)) ++ ::signal(signal, actualHandler); ++ theHandlers.insert(make_pair<int, SignalHandler *>(signal, handler)); ++} ++ ++void SignalListener::reset(int signal, SignalHandler *handler) ++{ ++ tdbg("SignalListener::reset: Object " << handler << " is not handling signal " << signal << "." << endl); ++ ++ // erase the signal handler from the handlers list ++ for(multimap<int, SignalHandler *>::iterator i = theHandlers.lower_bound(signal); i != theHandlers.upper_bound(signal); i++) ++ if((*i).second == handler) ++ { theHandlers.erase(i); ++ break; ++ } ++ ++ // if no signals are being handled, resort to the default action ++ if(!theHandlers.count(signal)) ++ ::signal(signal, SIG_DFL); ++} ++ ++void SignalListener::ignore(int signal) ++{ ++ tdbg("SignalListener::ignore: Ignoring signal " << signal << "." << endl); ++ ::signal(signal, SIG_IGN); ++ for(multimap<int, SignalHandler *>::iterator i = theHandlers.lower_bound(signal); i != theHandlers.upper_bound(signal); i++) ++ (*i).second->unregister(signal); ++ theHandlers.erase(signal); ++} ++ ++void sucs::actualHandler(int signal) ++{ ++// cerr << "actualHandler: Received signal " << signal << "." << endl << flush; ++ SignalListener *l = SignalListener::signalListener(); ++ for(multimap<int, SignalHandler *>::iterator i = l->theHandlers.lower_bound(signal); i != l->theHandlers.upper_bound(signal); i++) ++ (*i).second->handler(signal); ++ ::signal(signal, actualHandler); ++} ++ ++}; +diff -Naur sucs-1.0.0.orig/thread/thread.cpp sucs-1.0.0/thread/thread.cpp +--- sucs-1.0.0.orig/thread/thread.cpp 2007-12-18 20:43:20.000000000 +0100 ++++ sucs-1.0.0/thread/thread.cpp 2007-12-18 20:49:08.000000000 +0100 +@@ -17,6 +17,7 @@ + #include <iostream> + #include <string> + #include <cassert> ++#include <cerrno> + using namespace std; + + #include <csignal> +@@ -28,17 +29,24 @@ + + Sema sucs::__output; + ++namespace sucs { ++ void *gameOn(void *arg); ++ void cleanup(void *arg); ++} ++ + int Thread::theIdCount = 0, Thread::theCount = 0, Thread::theNowRunningCount = 0; + Sema Thread::theNowRunning; + pthread_t Thread::theMainId = (pthread_t)NULL; + map<pthread_t, Thread *> Thread::theThreads; + +-ostream &sucs::operator<<(ostream &out, const Thread &t) +-{ +- if(&t) +- return out << t.id() << " (" << t.name() << "-" << t.threadId() << ")"; +- else +- return out << "0 (main-" << Thread::theMainId << ")"; ++namespace sucs { ++ ostream &operator<<(ostream &out, const Thread &t) ++ { ++ if(&t) ++ return out << t.id() << " (" << t.name() << "-" << t.threadId() << ")"; ++ else ++ return out << "0 (main-" << Thread::theMainId << ")"; ++ } + } + + void Thread::waitForDeath() const +diff -Naur sucs-1.0.0.orig/xml/xmlreader.cpp sucs-1.0.0/xml/xmlreader.cpp +--- sucs-1.0.0.orig/xml/xmlreader.cpp 2007-12-18 20:43:20.000000000 +0100 ++++ sucs-1.0.0/xml/xmlreader.cpp 2007-12-18 20:46:02.000000000 +0100 +@@ -24,6 +24,12 @@ + + using namespace sucs; + ++namespace sucs { ++ void cStartElement(void *userdata, const char *name, const char **atts); ++ void cEndElement(void *userdata, const char *name); ++ void cCharData(void *userdata, const XML_Char *s, int len); ++} ++ + XMLReader::XMLReader(bool newStripWhite) + { + StripWhite = newStripWhite; +@@ -39,7 +45,9 @@ + XML_ParserFree(theParser); + } + +-istream &sucs::operator>>(istream &in, XMLReader &me) ++namespace sucs { ++ ++istream &operator>>(istream &in, XMLReader &me) + { + char Buffer[256]; + while(!in.eof()) +@@ -52,9 +60,9 @@ + } + } + return in; +-}; ++} + +-void sucs::cStartElement(void *userdata, const char *name, const char **atts) ++void cStartElement(void *userdata, const char *name, const char **atts) + { + map<string, string> Attributes; + +@@ -64,12 +72,12 @@ + ((XMLReader *)userdata)->StartElement(name, Attributes); + } + +-void sucs::cEndElement(void *userdata, const char *name) ++void cEndElement(void *userdata, const char *name) + { + ((XMLReader *)userdata)->EndElement(name); + } + +-void sucs::cCharData(void *userdata, const XML_Char *s, int len) ++void cCharData(void *userdata, const XML_Char *s, int len) + { + char Buffer[len + 1]; + +@@ -89,3 +97,5 @@ + ((XMLReader *)userdata)->CharData(Buffer); + } + } ++ ++} diff --git a/dev-libs/sucs/files/sucs-1.0.0-xml.diff b/dev-libs/sucs/files/sucs-1.0.0-xml.diff deleted file mode 100644 index f5ee0f8a36a9..000000000000 --- a/dev-libs/sucs/files/sucs-1.0.0-xml.diff +++ /dev/null @@ -1,13 +0,0 @@ ---- xml/xmlreader.cpp.orig 2006-10-20 19:34:49.000000000 +0000 -+++ xml/xmlreader.cpp 2006-10-20 19:35:35.000000000 +0000 -@@ -24,6 +24,10 @@ - - using namespace sucs; - -+void sucs::cStartElement(void *userdata, const char *name, const char **atts); -+void sucs::cEndElement(void *userdata, const char *name); -+void sucs::cCharData(void *userdata, const XML_Char *s, int len); -+ - XMLReader::XMLReader(bool newStripWhite) - { - StripWhite = newStripWhite; diff --git a/dev-libs/sucs/sucs-0.7.0.ebuild b/dev-libs/sucs/sucs-0.7.0.ebuild deleted file mode 100644 index a0957a768c82..000000000000 --- a/dev-libs/sucs/sucs-0.7.0.ebuild +++ /dev/null @@ -1,20 +0,0 @@ -# Copyright 1999-2005 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/sucs/sucs-0.7.0.ebuild,v 1.8 2005/02/11 11:46:06 ka0ttic Exp $ - -DESCRIPTION="The Simple Utility Classes are C++ libraries of common C-based algorithms and libraries" -HOMEPAGE="http://sucs.sourceforge.net/" -SRC_URI="mirror://sourceforge/sucs/${P}.tar.bz2" - -LICENSE="LGPL-2" -SLOT="0" -KEYWORDS="x86" -IUSE="" - -DEPEND=">=dev-libs/libpcre-3.9 - >=dev-libs/expat-1.95.4" - -src_install() { - make DESTDIR="${D}" install || die "make install failed" - dodoc AUTHORS ChangeLog README COPYING -} diff --git a/dev-libs/sucs/sucs-1.0.0.ebuild b/dev-libs/sucs/sucs-1.0.0.ebuild index 0c39c65f584b..10a49b6d50e6 100644 --- a/dev-libs/sucs/sucs-1.0.0.ebuild +++ b/dev-libs/sucs/sucs-1.0.0.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2006 Gentoo Foundation +# Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/sucs/sucs-1.0.0.ebuild,v 1.4 2006/10/20 19:37:30 dev-zero Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/sucs/sucs-1.0.0.ebuild,v 1.5 2007/12/18 19:57:56 dev-zero Exp $ inherit eutils @@ -20,10 +20,7 @@ RDEPEND="${DEPEND}" src_unpack() { unpack ${A} cd "${S}" - epatch "${FILESDIR}/${P}-gcc4.diff" - epatch "${FILESDIR}/${P}-thread.diff" - epatch "${FILESDIR}/${P}-signals.diff" - epatch "${FILESDIR}/${P}-xml.diff" + epatch "${FILESDIR}/${P}-various_fixes.diff" } src_install() { |