old

(Portage version: 2.2_rc67/cvs/Linux x86_64)

8 files changed, 0 insertions, 295 deletions

diff --git a/net-libs/wvstreams/files/wvstreams-4.5-configure.patch b/net-libs/wvstreams/files/wvstreams-4.5-configure.patch
deleted file mode 100644
index 08d20699603a..000000000000
--- a/net-libs/wvstreams/files/wvstreams-4.5-configure.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -NrU5 wvstreams-4.5.orig/configure.ac wvstreams-4.5/configure.ac
---- wvstreams-4.5.orig/configure.ac	2008-12-07 18:17:16.000000000 +0100
-+++ wvstreams-4.5/configure.ac	2008-12-07 18:30:39.000000000 +0100
-@@ -481,11 +481,11 @@
-         LIBS="$LIBS_save"
-     ])
-     with_qt=$wv_cv_with_qt
-     if test "$with_qt" != no; then
-         WV_APPEND(CPPFLAGS, -I$with_qt/include -I$with_qt/include/qt3)
--        if [ "$wv_qtdir" != "/usr" ]; then
-+        if test "$wv_qtdir" != "/usr" ; then
-                 # never explicitly include /usr/lib
- 	        WV_APPEND(LDFLAGS, -L$with_qt/lib)
- 	fi
-         WV_APPEND(LIBS_QT, -lqt-mt)
-     fi
diff --git a/net-libs/wvstreams/files/wvstreams-4.5-dbus-configure-fix.patch b/net-libs/wvstreams/files/wvstreams-4.5-dbus-configure-fix.patch
deleted file mode 100644
index 837be1d0a99c..000000000000
--- a/net-libs/wvstreams/files/wvstreams-4.5-dbus-configure-fix.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff -NrU5 wvstreams-4.5.orig/configure.ac wvstreams-4.5/configure.ac
---- wvstreams-4.5.orig/configure.ac	2008-12-07 23:22:50.000000000 +0100
-+++ wvstreams-4.5/configure.ac	2008-12-08 00:52:38.000000000 +0100
-@@ -346,12 +346,12 @@
- fi
- 
- # dbus
- if test "$with_dbus" != "no"; then
-     WV_APPEND(CPPFLAGS, -DDBUS_API_SUBJECT_TO_CHANGE -Iinclude/dbus-upstream)
--    if test "$with_dbus" = ""; then
--        DBUS_LIBDIR="$(pkg-config --libs-only-L dbus-1 | sed 's/^-L//' | awk '{print $1}')"
-+    if test "$with_dbus" = "" -o "$with_dbus" = "yes"; then
-+        DBUS_LIBDIR="$(pkg-config --variable=libdir dbus-1)"
- 	if test -z "$DBUS_LIBDIR"; then
- 	    DBUS_LIBDIR=/usr/lib  # Default path for static linking
- 	fi
-         WV_APPEND(CPPFLAGS, [`pkg-config --cflags dbus-1`])
-         WV_APPEND(LDFLAGS, [`pkg-config --libs-only-L dbus-1`])
diff --git a/net-libs/wvstreams/files/wvstreams-4.5-gcc43.patch b/net-libs/wvstreams/files/wvstreams-4.5-gcc43.patch
deleted file mode 100644
index 93323945ac77..000000000000
--- a/net-libs/wvstreams/files/wvstreams-4.5-gcc43.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-diff -NrU5 wvstreams-4.5.orig/include/wvserialize.h wvstreams-4.5/include/wvserialize.h
---- wvstreams-4.5.orig/include/wvserialize.h	2008-12-07 20:03:29.000000000 +0100
-+++ wvstreams-4.5/include/wvserialize.h	2008-12-07 18:15:36.000000000 +0100
-@@ -346,21 +346,21 @@
- /**
-  * Deserialize a WvString.  Stops at (and includes) the terminating nul
-  * (zero) character.  Serialized WvStrings are guaranteed not to contain nul
-  * except as the last character.
-  */
--template <>
--extern WvString _wv_deserialize<WvString>(WvBuf &buf);
-+//template <>
-+//extern WvString _wv_deserialize<WvString>(WvBuf &buf); 
- 
- 
- /** Deserialize a WvBuf. */
- // FIXME: it should be possible to do this without using a class!
- template <>
- class WvDeserialize<WvBuf *>
- {
- public:
--    static inline WvBuf *go(WvBuf &buf)
-+    static WvBuf *go(WvBuf &buf)
-     {
- 	size_t len = wv_deserialize<size_t>(buf);
- 	WvBuf *outbuf = new WvInPlaceBuf(new char[len], 0, len, true);
- 	outbuf->merge(buf, len);
- 	return outbuf;
-diff -NrU5 wvstreams-4.5.orig/uniconf/uniconf.cc wvstreams-4.5/uniconf/uniconf.cc
---- wvstreams-4.5.orig/uniconf/uniconf.cc	2008-12-07 20:03:29.000000000 +0100
-+++ wvstreams-4.5/uniconf/uniconf.cc	2008-12-07 18:15:36.000000000 +0100
-@@ -6,10 +6,12 @@
-  */
- #include "uniconf.h"
- #include "uniconfroot.h"
- #include "uniconfgen.h"
- #include "wvstream.h"
-+#include <climits>
-+#include <algorithm>
- #include <assert.h>
- 
- 
- UniConf::UniConf(UniConfRoot *root, const UniConfKey &fullkey)
-     : xroot(root), xfullkey(fullkey)
-diff -NrU5 wvstreams-4.5.orig/utils/t/wvstringmask.t.cc wvstreams-4.5/utils/t/wvstringmask.t.cc
---- wvstreams-4.5.orig/utils/t/wvstringmask.t.cc	2008-12-07 18:17:16.000000000 +0100
-+++ wvstreams-4.5/utils/t/wvstringmask.t.cc	2008-12-07 20:04:30.000000000 +0100
-@@ -1,9 +1,10 @@
- #include "wvtest.h"
- #include "wvstringmask.h"
- 
- #include <stdio.h>
-+#include <climits>
- 
- WVTEST_MAIN("wvstringmask")
- {
-     WvStringMask a, b(""), c(' '), d("cab");
- 
-diff -NrU5 wvstreams-4.5.orig/utils/wvtclstring.cc wvstreams-4.5/utils/wvtclstring.cc
---- wvstreams-4.5.orig/utils/wvtclstring.cc	2008-12-07 20:03:29.000000000 +0100
-+++ wvstreams-4.5/utils/wvtclstring.cc	2008-12-07 18:15:36.000000000 +0100
-@@ -6,10 +6,11 @@
- #include "wvbuf.h"
- #include "wvstream.h"
- #include "wvstring.h"
- #include "wvstringmask.h"
- #include "wvtclstring.h"
-+#include <climits>
- 
- const WvStringMask WVTCL_NASTY_SPACES(WVTCL_NASTY_SPACES_STR);
- const WvStringMask WVTCL_NASTY_NEWLINES(WVTCL_NASTY_NEWLINES_STR);
- const WvStringMask WVTCL_SPLITCHARS(WVTCL_SPLITCHARS_STR);
- 
diff --git a/net-libs/wvstreams/files/wvstreams-4.5-glibc.patch b/net-libs/wvstreams/files/wvstreams-4.5-glibc.patch
deleted file mode 100644
index 534d0e18ae4e..000000000000
--- a/net-libs/wvstreams/files/wvstreams-4.5-glibc.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-diff -Nurp wvstreams-4.5.orig/ipstreams/wvaddr.cc wvstreams-4.5/ipstreams/wvaddr.cc
---- wvstreams-4.5.orig/ipstreams/wvaddr.cc	2008-07-14 21:11:35.000000000 +0200
-+++ wvstreams-4.5/ipstreams/wvaddr.cc	2009-06-19 16:39:37.757382441 +0200
-@@ -538,7 +538,7 @@ WvIPNet::WvIPNet(const WvIPNet &_net)
- // If the netmask is not specified, it will default to all 1's.
- void WvIPNet::string_init(const char string[])
- {
--    char *maskptr;
-+    const char *maskptr;
-     int bits;
-     uint32_t imask;
- 
-diff -Nurp wvstreams-4.5.orig/utils/strutils.cc wvstreams-4.5/utils/strutils.cc
---- wvstreams-4.5.orig/utils/strutils.cc	2008-10-21 21:39:21.000000000 +0200
-+++ wvstreams-4.5/utils/strutils.cc	2009-06-19 16:36:48.959741828 +0200
-@@ -315,7 +315,7 @@ WvString url_decode(WvStringParm str, bo
-  
-     const char *iptr;
-     char *optr;
--    char *idx1, *idx2;
-+    const char *idx1, *idx2;
-     static const char hex[] = "0123456789ABCDEF";
-     WvString in, intmp(str), out;
- 
-@@ -967,7 +967,7 @@ WvString afterstr(WvStringParm line, WvS
-     if (!line || !a)
- 	return WvString::null;
- 
--    char *loc = strstr(line, a);
-+    const char *loc = strstr(line, a);
-     if (loc == 0)
- 	return "";
- 
-@@ -984,8 +984,8 @@ WvString beforestr(WvStringParm line, Wv
- 	return WvString::null;
- 
-     WvString ret = line;
--    ret.unique();     
--    char *loc = strstr(ret, a);
-+    ret.unique();
-+    char *loc = strstr(ret.edit(), a);
- 
-     if (loc == 0)
- 	return line;
-diff -Nurp wvstreams-4.5.orig/utils/verstring.cc wvstreams-4.5/utils/verstring.cc
---- wvstreams-4.5.orig/utils/verstring.cc	2008-07-14 21:11:35.000000000 +0200
-+++ wvstreams-4.5/utils/verstring.cc	2009-06-19 16:37:02.021698602 +0200
-@@ -147,7 +147,7 @@ bool is_new_ver(unsigned int ver)
- 
- bool is_new_verstr(const char *str)
- {
--    char *p = strchr(str, '.');
-+    const char *p = strchr(str, '.');
-     if (p && strchr(p+1, '.'))
-         return true;
- 
diff --git a/net-libs/wvstreams/files/wvstreams-4.5-no_sarestorer.patch b/net-libs/wvstreams/files/wvstreams-4.5-no_sarestorer.patch
deleted file mode 100644
index bca2f82a6576..000000000000
--- a/net-libs/wvstreams/files/wvstreams-4.5-no_sarestorer.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -pruN wvstreams-4.4.1.orig/utils/wvcrash.cc wvstreams-4.4.1/utils/wvcrash.cc
---- wvstreams-4.4.1.orig/utils/wvcrash.cc	2007-08-17 07:15:07.000000000 +0100
-+++ wvstreams-4.4.1/utils/wvcrash.cc	2007-11-28 15:20:09.000000000 +0100
-@@ -346,10 +346,10 @@ void wvcrash_add_signal(int sig)
- #if WVCRASH_USE_SIGALTSTACK
-     struct sigaction act;
-     
-+    memset(&act,0,sizeof(act));
-     act.sa_handler = wvcrash;
-     sigfillset(&act.sa_mask);
-     act.sa_flags = SA_ONSTACK | SA_RESTART;
--    act.sa_restorer = NULL;
-     
-     if (sigaction(sig, &act, NULL))
-         fprintf(stderr, "Failed to setup wvcrash handler for signal %d: %s\n",
diff --git a/net-libs/wvstreams/files/wvstreams-4.5-parallel-make.patch b/net-libs/wvstreams/files/wvstreams-4.5-parallel-make.patch
deleted file mode 100644
index 5194d5598ede..000000000000
--- a/net-libs/wvstreams/files/wvstreams-4.5-parallel-make.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-diff -NrU5 wvstreams-4.5.orig/Makefile wvstreams-4.5/Makefile
---- wvstreams-4.5.orig/Makefile	2008-12-07 22:18:20.000000000 +0100
-+++ wvstreams-4.5/Makefile	2008-12-07 22:12:01.000000000 +0100
-@@ -109,14 +109,22 @@
- 
- #
- # libwvstreams: stream/event handling library
- #
- TARGETS += libwvstreams.so
--TARGETS += crypto/tests/ssltest ipstreams/tests/unixtest
-+TARGETS += crypto/tests/ssltest
-+crypto/tests/ssltest: $(LIBWVSTREAMS)
-+
-+TARGETS += ipstreams/tests/unixtest
-+ipstreams/tests/unixtest: $(LIBWVSTREAMS)
-+
- TARGETS += crypto/tests/printcert
-+crypto/tests/printcert: $(LIBWVSTREAMS)
-+
- ifneq ("$(with_readline)", "no")
-   TARGETS += ipstreams/tests/wsd
-+  ipstreams/tests/wsd: $(LIBWVSTREAMS)
-   ipstreams/tests/wsd-LIBS += -lreadline
- else
-   TEST_SKIP_OBJS += ipstreams/tests/wsd
- endif
- TESTS += $(call tests_cc,configfile/tests)
-@@ -151,11 +159,17 @@
- #
- # libwvdbus: C++ DBus library based on wvstreams
- #
- ifneq ("$(with_dbus)", "no")
-   TARGETS += libwvdbus.so
--  TARGETS += dbus/tests/wvdbus dbus/tests/wvdbusd
-+
-+  TARGETS += dbus/tests/wvdbus
-+  dbus/tests/wvdbus: $(LIBWVDBUS)
-+
-+  TARGETS += dbus/tests/wvdbusd
-+  dbus/tests/wvdbusd: $(LIBWVDBUS)
-+  
-   TESTS += $(call tests_cc,dbus/tests)
-   libwvdbus_OBJS += $(call objects,dbus)
-   libwvdbus.so: $(libwvdbus_OBJS) $(LIBWVSTREAMS)
-   libwvdbus.so-LIBS += $(LIBS_DBUS)
-   dbus/tests/%: PRELIBS+=$(LIBWVDBUS)
-diff -NrU5 wvstreams-4.5.orig/wvrules-posix.mk wvstreams-4.5/wvrules-posix.mk
---- wvstreams-4.5.orig/wvrules-posix.mk	2008-12-07 22:18:20.000000000 +0100
-+++ wvstreams-4.5/wvrules-posix.mk	2008-12-07 22:52:57.000000000 +0100
-@@ -83,14 +83,17 @@
- 	    done; \
- 	done; \
- 	$(AR) s $1
- endef
- 
--CC: FORCE
-+CC:
- 	@CC="$(CC)" CFLAGS="$(CFLAGS)" CPPFLAGS="$(CPPFLAGS)" \
- 	  $(WVSTREAMS)/gen-cc CC c
- 
--CXX: FORCE
-+CXX:
- 	@CC="$(CXX)" CFLAGS="$(CXXFLAGS)" CPPFLAGS="$(CPPFLAGS)" \
-	  $(WVSTREAMS)/gen-cc CXX cc
-+
-+#All files must depend on the above two rules. This is a godawful hack.
-+$(shell find -type f '(' -name '*.c' -o -name '*.cc' ')' ): CC CXX
- 
- wvlink=$(LINK_MSG)$(WVLINK_CC) $(LDFLAGS) $($1-LDFLAGS) -o $1 $(filter %.o %.a %.so, $2) $($1-LIBS) $(XX_LIBS) $(LDLIBS) $(PRELIBS) $(LIBS)
diff --git a/net-libs/wvstreams/files/wvstreams-4.5-qt-fixup.patch b/net-libs/wvstreams/files/wvstreams-4.5-qt-fixup.patch
deleted file mode 100644
index 489ebdd1cb0f..000000000000
--- a/net-libs/wvstreams/files/wvstreams-4.5-qt-fixup.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -NrU5 wvstreams-4.5.orig/configure.ac wvstreams-4.5/configure.ac
---- wvstreams-4.5.orig/configure.ac	2008-12-08 20:47:44.000000000 +0100
-+++ wvstreams-4.5/configure.ac	2008-12-08 21:12:55.000000000 +0100
-@@ -466,11 +466,11 @@
-     AC_CACHE_CHECK([for Qt], [wv_cv_with_qt], [
-         wv_cv_with_qt=no
-         CPPFLAGS_save="$CPPFLAGS"
-         LDFLAGS_save="$LDFLAGS"
-         LIBS_save="$LIBS"
--        for wv_qtdir in $with_qt $QTDIR $QT_SEARCH_PATH; do
-+        for wv_qtdir in $with_qt $QTDIR $QT_SEARCH_PATH $(pkg-config --variable=prefix qt-mt); do
-             eval wv_qtdir="$wv_qtdir"
-             CPPFLAGS="$CPPFLAGS_save -I$wv_qtdir/include -I$wv_qtdir/include/qt3"
-             LDFLAGS="$LDFLAGS_save -L$wv_qtdir/lib"
-             LIBS="$LIBS_save -lqt-mt"
-             AC_TRY_LINK([#include <qstring.h>],
diff --git a/net-libs/wvstreams/files/wvstreams-4.5-valgrind-optional.patch b/net-libs/wvstreams/files/wvstreams-4.5-valgrind-optional.patch
deleted file mode 100644
index 47120e6b1f14..000000000000
--- a/net-libs/wvstreams/files/wvstreams-4.5-valgrind-optional.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-diff -NrU5 wvstreams-4.5.orig/configure.ac wvstreams-4.5/configure.ac
---- wvstreams-4.5.orig/configure.ac	2008-12-07 18:38:13.000000000 +0100
-+++ wvstreams-4.5/configure.ac	2008-12-07 21:15:08.000000000 +0100
-@@ -61,10 +61,11 @@
- AC_ARG_WITH(openssl, AC_HELP_STRING([--with-openssl], [OpenSSL >= 0.9.7 (required)]))
- AC_ARG_WITH(pam, AC_HELP_STRING([--with-pam], [PAM]))
- AC_ARG_WITH(tcl, AC_HELP_STRING([--with-tcl], [Tcl]))
- AC_ARG_WITH(qt, AC_HELP_STRING([--with-qt], [Qt]))
- AC_ARG_WITH(zlib, AC_HELP_STRING([--with-zlib], [zlib (required)]))
-+AC_ARG_WITH(valgrind, AC_HELP_STRING([--with-valgrind], [Valgrind]))
- 
- AC_ARG_VAR(MOC, [Qt meta object compiler])
- AC_ARG_VAR(WEAVER_BUILD_INFO, [Extra version info])
- 
- # avoid autoconf's default values, but keep those the user might have given
-@@ -491,12 +492,14 @@
-     fi
-     AC_PATH_PROG(MOC, moc, [moc not found], $with_qt/bin)
- fi
- 
- # valgrind
--AC_CHECK_PROG(VALGRIND, valgrind, valgrind)
--AC_CHECK_HEADERS(valgrind/memcheck.h)
-+if test "$with_valgrind" != "no"; then
-+    AC_CHECK_PROG(VALGRIND, valgrind, valgrind)
-+    AC_CHECK_HEADERS(valgrind/memcheck.h)
-+fi
- 
- # zlib
- if test "$with_zlib" != "no"; then
-     AC_CHECK_HEADERS(zlib.h,, [with_zlib=no])
-     AC_CHECK_LIB(z, compress,, [with_zlib=no])