Bump, new upstream version. Adding myself as maintainer as per bug 247677. Various patches added to make the new buildsystem play nice. BerkeleyDB, slp and qdbm support dropped in this release by upstream. Shiny new dbus bindings added.

(Portage version: 2.2_rc17/cvs/Linux 2.6.28-rc6 x86_64)

22 files changed, 364 insertions, 350 deletions

diff --git a/net-libs/wvstreams/ChangeLog b/net-libs/wvstreams/ChangeLog
index 957c528fac88..a4888493d762 100644
--- a/net-libs/wvstreams/ChangeLog
+++ b/net-libs/wvstreams/ChangeLog
@@ -1,6 +1,32 @@
 # ChangeLog for net-libs/wvstreams
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/wvstreams/ChangeLog,v 1.124 2008/11/19 19:30:33 loki_val Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/wvstreams/ChangeLog,v 1.125 2008/12/09 23:31:27 loki_val Exp $
+
+*wvstreams-4.5 (09 Dec 2008)
+
+  09 Dec 2008; Peter Alfredsen <loki_val@gentoo.org>
+  -files/wvstreams-4.4.1-as-needed.patch,
+  -files/wvstreams-4.4.1-external-xplc.patch,
+  -files/wvstreams-4.4.1-gcc43.patch, -files/wvstreams-4.4.1-gnulib.patch,
+  -files/wvstreams-4.4.1-linux-serial.patch,
+  -files/wvstreams-4.4.1-sigaction.patch,
+  -files/wvstreams-4.4.1-type-punned.patch,
+  -files/wvstreams-4.4.1-uniconfd-ini.patch,
+  -files/wvstreams-4.4.1-valgrind.patch,
+  -files/wvstreams-4.4.1-wireless-user.patch,
+  -files/wvstreams-4.4.1-wvconfemu.patch,
+  +files/wvstreams-4.5-configure.patch,
+  +files/wvstreams-4.5-dbus-configure-fix.patch,
+  +files/wvstreams-4.5-gcc43.patch,
+  +files/wvstreams-4.5-no_sarestorer.patch,
+  +files/wvstreams-4.5-parallel-make.patch,
+  +files/wvstreams-4.5-qt-fixup.patch,
+  +files/wvstreams-4.5-valgrind-optional.patch, metadata.xml,
+  -wvstreams-4.4.1.ebuild, +wvstreams-4.5.ebuild:
+  Bump, new upstream version. Adding myself as maintainer as per bug 247677.
+  Various patches added to make the new buildsystem play nice. BerkeleyDB,
+  slp and qdbm support dropped in this release by upstream. Shiny new dbus
+  bindings added.
 
   19 Nov 2008; Peter Alfredsen <loki_val@gentoo.org> wvstreams-4.4.1.ebuild:
   Ugly fix for eautoreconf failure. Bug 211327.
diff --git a/net-libs/wvstreams/files/wvstreams-4.4.1-as-needed.patch b/net-libs/wvstreams/files/wvstreams-4.4.1-as-needed.patch
deleted file mode 100644
index b6cbdac1061c..000000000000
--- a/net-libs/wvstreams/files/wvstreams-4.4.1-as-needed.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-diff -Nru wvstreams-4.4.1.orig/configure.ac wvstreams-4.4.1/configure.ac
---- wvstreams-4.4.1.orig/configure.ac	2007-08-30 05:47:54.000000000 +0300
-+++ wvstreams-4.4.1/configure.ac	2008-01-20 12:55:11.000000000 +0200
-@@ -460,16 +460,19 @@
-         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
-             eval wv_qtdir="$wv_qtdir"
-             CPPFLAGS="$CPPFLAGS_save -I$wv_qtdir/include -I$wv_qtdir/include/qt3"
--            LDFLAGS="$LDFLAGS_save -L$wv_qtdir/lib -lqt-mt"
-+            LDFLAGS="$LDFLAGS_save -L$wv_qtdir/lib"
-+            LIBS="$LIBS_save -lqt-mt"
-             AC_TRY_LINK([#include <qstring.h>],
-                         [QString x("hello"); return 0; ],
-                         [wv_cv_with_qt=$wv_qtdir; break])
-         done
-         CPPFLAGS="$CPPFLAGS_save"
-         LDFLAGS="$LDFLAGS_save"
-+        LIBS="$LIBS_save"
-     ])
-     with_qt=$wv_cv_with_qt
-     if test "$with_qt" != no; then
-diff -Nru wvstreams-4.4.1.orig/wvrules.mk wvstreams-4.4.1/wvrules.mk
---- wvstreams-4.4.1.orig/wvrules.mk	2007-08-17 08:15:31.000000000 +0300
-+++ wvstreams-4.4.1/wvrules.mk	2008-01-20 12:55:11.000000000 +0200
-@@ -226,7 +226,7 @@
- 
- wvsoname=$(if $($1-SONAME),$($1-SONAME),$(if $(SONAME),$(SONAME),$1))
- define wvlink_so
--	$(LINK_MSG)$(WVLINK_CC) $(LDFLAGS) $($1-LDFLAGS) -Wl,-soname,$(call wvsoname,$1) -shared -o $1 $(filter %.o %.a %.so,$2) $($1-LIBS) $(LIBS) $(XX_LIBS)
-+	$(LINK_MSG)$(WVLINK_CC) $(LDFLAGS) $($1-LDFLAGS) -Wl,-soname,$(call wvsoname,$1) -shared -o $1 $(filter %.o %.a,$2) $(filter %.so,$2) $($1-LIBS) $(LIBS) $(XX_LIBS)
- 	$(if $(filter-out $(call wvsoname,$1),$1),$(call wvlns,$1,$(call wvsoname,$1)))
- endef
- 
-diff -Nru wvstreams-4.4.1.orig/wvrules-posix.mk wvstreams-4.4.1/wvrules-posix.mk
---- wvstreams-4.4.1.orig/wvrules-posix.mk	2007-08-17 08:15:31.000000000 +0300
-+++ wvstreams-4.4.1/wvrules-posix.mk	2008-01-20 12:58:00.000000000 +0200
-@@ -16,7 +16,7 @@
- 		  -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
- CFLAGS += $(COPTS) $(C_AND_CXX_FLAGS) 
- CXXFLAGS += $(CXXOPTS) $(C_AND_CXX_FLAGS)
--LDFLAGS += $(LDOPTS) -L$(WVSTREAMS_LIB)
-+LDFLAGS += $(LDOPTS) -L$(WVSTREAMS_LIB) -Wl,-rpath-link,$(WVSTREAMS_LIB)
- 
- # Default compiler we use for linking
- WVLINK_CC = gcc
diff --git a/net-libs/wvstreams/files/wvstreams-4.4.1-external-xplc.patch b/net-libs/wvstreams/files/wvstreams-4.4.1-external-xplc.patch
deleted file mode 100644
index 9b514e41db19..000000000000
--- a/net-libs/wvstreams/files/wvstreams-4.4.1-external-xplc.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-diff -Nru wvstreams-4.4.1.orig/configure.ac wvstreams-4.4.1/configure.ac
---- wvstreams-4.4.1.orig/configure.ac	2008-01-20 14:04:54.000000000 +0200
-+++ wvstreams-4.4.1/configure.ac	2008-01-20 14:06:45.000000000 +0200
-@@ -488,10 +488,9 @@
- 
- # xplc
- if test "$with_xplc" != "no"; then
--    if test "$with_xplc" = ""; then
--	if pkg-config --modversion xplc-${xplc_version}; then
--            WV_APPEND(CPPFLAGS, [`pkg-config --cflags xplc-${xplc_version}`])
--	    WV_APPEND(LDFLAGS, [`pkg-config --libs xplc-${xplc_version}`])
-+	if pkg-config --atleast-version=${xplc_version} xplc; then
-+	    WV_APPEND(CPPFLAGS, [`pkg-config --cflags xplc`])
-+	    WV_APPEND(LDFLAGS, [`pkg-config --libs xplc`])
- 	    AC_CHECK_HEADERS(xplc/core.h,, [with_xplc=no], [#define UNSTABLE])
- 	    LIBS_save="$LIBS"
- 	    AC_CHECK_LIB(xplc, XPLC_getServiceManager,, [with_xplc=no])
-@@ -501,24 +500,6 @@
- 	else
- 	    with_xplc='no'
- 	fi
--    else
--        WV_APPEND(CPPFLAGS, [-I$with_xplc/include])
--	WV_APPEND(LDFLAGS, [-L$with_xplc])
--	AC_CHECK_HEADERS(xplc/core.h,, [with_xplc=no], [#define UNSTABLE])
--	LIBS_save="$LIBS"
--	AC_CHECK_LIB(xplc, XPLC_getServiceManager,, [with_xplc=no])
--	LIBS="$LIBS_save"
--	xplc_pc="xplc-${xplc_version}"
--    fi
--    # What if we can't find it?
--    if test "$with_xplc" = "no" && test -d xplc; then
--        WV_APPEND(CPPFLAGS, [-I\$(WVSTREAMS)/xplc/include])
--        WV_APPEND(LDFLAGS, [-L\$(WVSTREAMS)/xplc])
--        AC_CONFIG_SUBDIRS(xplc)
--        build_xplc=yes
--        with_xplc='$(WVSTREAMS)/xplc'
--	xplc_pc='wvxplc'
--    fi
- fi
- 
- # zlib
diff --git a/net-libs/wvstreams/files/wvstreams-4.4.1-gcc43.patch b/net-libs/wvstreams/files/wvstreams-4.4.1-gcc43.patch
deleted file mode 100644
index 525582309903..000000000000
--- a/net-libs/wvstreams/files/wvstreams-4.4.1-gcc43.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -ur wvstreams-4.4.1.orig/include/uniconfkey.h wvstreams-4.4.1/include/uniconfkey.h
---- wvstreams-4.4.1.orig/include/uniconfkey.h	2007-07-19 22:22:49.000000000 +0100
-+++ wvstreams-4.4.1/include/uniconfkey.h	2008-06-17 19:54:46.000000000 +0100
-@@ -7,6 +7,8 @@
- #ifndef __UNICONFKEY_H
- #define __UNICONFKEY_H
- 
-+#include <climits>
-+
- #include "wvstring.h"
- #include "wvlinklist.h"
- 
-diff -ur wvstreams-4.4.1.orig/include/wvserialize.h wvstreams-4.4.1/include/wvserialize.h
---- wvstreams-4.4.1.orig/include/wvserialize.h	2007-08-17 06:15:30.000000000 +0100
-+++ wvstreams-4.4.1/include/wvserialize.h	2008-06-17 20:02:28.000000000 +0100
-@@ -349,7 +349,7 @@
-  * except as the last character.
-  */
- template <>
--extern WvString _wv_deserialize<WvString>(WvBuf &buf);
-+WvString _wv_deserialize<WvString>(WvBuf &buf);
- 
- 
- /** Deserialize a WvBuf. */
diff --git a/net-libs/wvstreams/files/wvstreams-4.4.1-gnulib.patch b/net-libs/wvstreams/files/wvstreams-4.4.1-gnulib.patch
deleted file mode 100644
index 509f64d9df0f..000000000000
--- a/net-libs/wvstreams/files/wvstreams-4.4.1-gnulib.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Nru wvstreams-4.4.1.orig/configure.ac wvstreams-4.4.1/configure.ac
---- wvstreams-4.4.1.orig/configure.ac	2008-01-20 14:56:26.000000000 +0200
-+++ wvstreams-4.4.1/configure.ac	2008-01-20 14:43:41.000000000 +0200
-@@ -316,6 +316,7 @@
- # Check for advanced Linux-style modem support
- AC_CHECK_HEADERS([linux/serial.h])
- AC_CHECK_FUNCS([cfmakeraw])
-+AC_CHECK_FUNCS([strndup])
- 
- # Detect hard-linking based on LN_S's behaviour
- AC_MSG_CHECKING([whether ln works...])
diff --git a/net-libs/wvstreams/files/wvstreams-4.4.1-linux-serial.patch b/net-libs/wvstreams/files/wvstreams-4.4.1-linux-serial.patch
deleted file mode 100644
index 5653a6516eaf..000000000000
--- a/net-libs/wvstreams/files/wvstreams-4.4.1-linux-serial.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-diff -Nru wvstreams-4.4.1.orig/streams/wvmodem.cc wvstreams-4.4.1/streams/wvmodem.cc
---- wvstreams-4.4.1.orig/streams/wvmodem.cc	2007-07-20 00:22:57.000000000 +0300
-+++ wvstreams-4.4.1/streams/wvmodem.cc	2008-01-20 12:48:07.000000000 +0200
-@@ -194,22 +194,22 @@
-     drain();
-     
- #if HAVE_LINUX_SERIAL_H
--    struct serial_struct old_sinfo, sinfo;
--    sinfo.reserved_char[0] = 0;
--    if (ioctl(getrfd(), TIOCGSERIAL, &old_sinfo) < 0)
--	log("Cannot get information for serial port.");
--    else
--    {
--	sinfo = old_sinfo;
--	// Why there are two closing wait timeouts, is beyond me
--	// but there are... apparently the second one is deprecated
--	// but why take a chance...
--	sinfo.closing_wait = ASYNC_CLOSING_WAIT_NONE;
--	sinfo.closing_wait2 = ASYNC_CLOSING_WAIT_NONE;
--
--	if (ioctl(getrfd(), TIOCSSERIAL, &sinfo) < 0)
--	    log("Cannot set information for serial port.");
--    }
-+ 	if (getuid() == 0)
-+ 	{
-+     struct serial_struct sinfo;
-+     if (ioctl(getrfd(), TIOCGSERIAL, &sinfo) >= 0) //Ignore errors because some modems (at least slmodem) do not support this
-+     {
-+     	// Why there are two closing wait timeouts, is beyond me
-+     	// but there are... apparently the second one is deprecated
-+     	// but why take a chance...
-+     	sinfo.closing_wait = ASYNC_CLOSING_WAIT_NONE;
-+     	sinfo.closing_wait2 = ASYNC_CLOSING_WAIT_NONE;
-+ 
-+     	//Ignore errors because ltmodem module implement TIOCGSERIAL but do not implement TIOCSSERIAL (go figure...) 
-+			//see http://bugs.gentoo.org/show_bug.cgi?id=85754
-+			ioctl(getrfd(), TIOCSSERIAL, &sinfo); 
-+ 		}
-+ 	}
- #endif
- 
-     // set up the terminal characteristics.
diff --git a/net-libs/wvstreams/files/wvstreams-4.4.1-sigaction.patch b/net-libs/wvstreams/files/wvstreams-4.4.1-sigaction.patch
deleted file mode 100644
index 8afd4df655c4..000000000000
--- a/net-libs/wvstreams/files/wvstreams-4.4.1-sigaction.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Nru 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 08:15:30.000000000 +0300
-+++ wvstreams-4.4.1/utils/wvcrash.cc	2008-01-20 13:07:57.000000000 +0200
-@@ -388,7 +388,6 @@
-     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.4.1-type-punned.patch b/net-libs/wvstreams/files/wvstreams-4.4.1-type-punned.patch
deleted file mode 100644
index fb53cfc96772..000000000000
--- a/net-libs/wvstreams/files/wvstreams-4.4.1-type-punned.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff -Nru wvstreams-4.4.1.orig/urlget/wvhttppool.cc wvstreams-4.4.1/urlget/wvhttppool.cc
---- wvstreams-4.4.1.orig/urlget/wvhttppool.cc	2007-07-20 00:22:36.000000000 +0300
-+++ wvstreams-4.4.1/urlget/wvhttppool.cc	2008-01-20 13:06:30.000000000 +0200
-@@ -43,7 +43,12 @@
-     {
-         WvBufUrlStream *x = new WvBufUrlStream;
-         outstream = x;
--        x->death_notify = (WvStream **)&outstream;
-+        union {
-+            WvBufUrlStream** ppbufurlstream;
-+            WvStream**       ppstream;
-+        } s;
-+        s.ppbufurlstream = &outstream;
-+        x->death_notify = s.ppstream;
-         x->url = url;
- 
-         putstream = content_source;
diff --git a/net-libs/wvstreams/files/wvstreams-4.4.1-uniconfd-ini.patch b/net-libs/wvstreams/files/wvstreams-4.4.1-uniconfd-ini.patch
deleted file mode 100644
index bd5368a68552..000000000000
--- a/net-libs/wvstreams/files/wvstreams-4.4.1-uniconfd-ini.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -Nru wvstreams-4.4.1.orig/Makefile wvstreams-4.4.1/Makefile
---- wvstreams-4.4.1.orig/Makefile	2007-08-30 05:48:09.000000000 +0300
-+++ wvstreams-4.4.1/Makefile	2008-01-20 12:53:19.000000000 +0200
-@@ -189,8 +189,8 @@
- 	$(INSTALL_PROGRAM) uniconf/tests/uni $(DESTDIR)$(bindir)/
- 	$(INSTALL) -d $(DESTDIR)$(sbindir)
- 	$(INSTALL_PROGRAM) uniconf/daemon/uniconfd $(DESTDIR)$(sbindir)/
--	$(INSTALL) -d $(DESTDIR)$(localstatedir)/lib/uniconf
--	touch $(DESTDIR)$(localstatedir)/lib/uniconf/uniconfd.ini
-+	$(INSTALL) -d $(DESTDIR)$(localstatedir)/uniconf
-+	$(INSTALL_DATA) uniconf/daemon/uniconfd.ini $(DESTDIR)$(localstatedir)/uniconf
- 	$(INSTALL) -d $(DESTDIR)$(mandir)/man8
- 	$(INSTALL_DATA) uniconf/daemon/uniconfd.8 $(DESTDIR)$(mandir)/man8
- 	$(INSTALL_DATA) uniconf/tests/uni.8 $(DESTDIR)$(mandir)/man8
diff --git a/net-libs/wvstreams/files/wvstreams-4.4.1-valgrind.patch b/net-libs/wvstreams/files/wvstreams-4.4.1-valgrind.patch
deleted file mode 100644
index 719d376d657d..000000000000
--- a/net-libs/wvstreams/files/wvstreams-4.4.1-valgrind.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff -ruN wvstreams-4.4.1/utils/wvtask.cc wvstreams-4.4.1.patched/utils/wvtask.cc
---- wvstreams-4.4.1/utils/wvtask.cc	2007-07-19 23:22:55.000000000 +0200
-+++ wvstreams-4.4.1.patched/utils/wvtask.cc	2008-04-02 20:20:54.000000000 +0200
-@@ -37,12 +37,12 @@
- #include <unistd.h>
- #include <sys/resource.h>
- 
--#ifdef HAVE_VALGRIND_MEMCHECK_H
--#include <valgrind/memcheck.h>
--#else
-+//#ifdef HAVE_VALGRIND_MEMCHECK_H
-+//#include <valgrind/memcheck.h>
-+//#else
- #define VALGRIND_MAKE_READABLE(x, y)
- #define RUNNING_ON_VALGRIND 0
--#endif
-+//#endif
- 
- #define TASK_DEBUG 0
- #if TASK_DEBUG
diff --git a/net-libs/wvstreams/files/wvstreams-4.4.1-wireless-user.patch b/net-libs/wvstreams/files/wvstreams-4.4.1-wireless-user.patch
deleted file mode 100644
index a39e2a6c3d6d..000000000000
--- a/net-libs/wvstreams/files/wvstreams-4.4.1-wireless-user.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Nru wvstreams-4.4.1.orig/linuxstreams/wvinterface.cc wvstreams-4.4.1/linuxstreams/wvinterface.cc
---- wvstreams-4.4.1.orig/linuxstreams/wvinterface.cc	2007-07-20 00:22:51.000000000 +0300
-+++ wvstreams-4.4.1/linuxstreams/wvinterface.cc	2008-01-20 12:51:20.000000000 +0200
-@@ -21,6 +21,7 @@
- #include <errno.h>
- #include <linux/sockios.h>
- 
-+#include <sys/sysctl.h> /* Needed for __user definition */
- #define _LINUX_IF_H /* Hack to prevent loading linux/if.h */
- #include <linux/wireless.h>
- 
diff --git a/net-libs/wvstreams/files/wvstreams-4.4.1-wvconfemu.patch b/net-libs/wvstreams/files/wvstreams-4.4.1-wvconfemu.patch
deleted file mode 100644
index 00a53b920d2b..000000000000
--- a/net-libs/wvstreams/files/wvstreams-4.4.1-wvconfemu.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -Nru wvstreams-4.4.1.orig/vars.mk wvstreams-4.4.1/vars.mk
---- wvstreams-4.4.1.orig/vars.mk	2007-08-17 08:15:31.000000000 +0300
-+++ wvstreams-4.4.1/vars.mk	2008-01-20 13:09:46.000000000 +0200
-@@ -156,7 +156,8 @@
- 	streams/wvfile.o \
- 	streams/wvstreamclone.o  \
- 	streams/wvconstream.o \
--	utils/wvcrashbase.o
-+	utils/wvcrashbase.o \
-+	uniconf/wvconfemu.o
- 
- TESTOBJS = utils/wvtest.o 
- 
diff --git a/net-libs/wvstreams/files/wvstreams-4.5-configure.patch b/net-libs/wvstreams/files/wvstreams-4.5-configure.patch
new file mode 100644
index 000000000000..08d20699603a
--- /dev/null
+++ b/net-libs/wvstreams/files/wvstreams-4.5-configure.patch
@@ -0,0 +1,16 @@
+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
new file mode 100644
index 000000000000..837be1d0a99c
--- /dev/null
+++ b/net-libs/wvstreams/files/wvstreams-4.5-dbus-configure-fix.patch
@@ -0,0 +1,18 @@
+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
new file mode 100644
index 000000000000..93323945ac77
--- /dev/null
+++ b/net-libs/wvstreams/files/wvstreams-4.5-gcc43.patch
@@ -0,0 +1,73 @@
+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-no_sarestorer.patch b/net-libs/wvstreams/files/wvstreams-4.5-no_sarestorer.patch
new file mode 100644
index 000000000000..bca2f82a6576
--- /dev/null
+++ b/net-libs/wvstreams/files/wvstreams-4.5-no_sarestorer.patch
@@ -0,0 +1,15 @@
+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
new file mode 100644
index 000000000000..5194d5598ede
--- /dev/null
+++ b/net-libs/wvstreams/files/wvstreams-4.5-parallel-make.patch
@@ -0,0 +1,69 @@
+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
new file mode 100644
index 000000000000..489ebdd1cb0f
--- /dev/null
+++ b/net-libs/wvstreams/files/wvstreams-4.5-qt-fixup.patch
@@ -0,0 +1,16 @@
+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
new file mode 100644
index 000000000000..47120e6b1f14
--- /dev/null
+++ b/net-libs/wvstreams/files/wvstreams-4.5-valgrind-optional.patch
@@ -0,0 +1,32 @@
+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])
diff --git a/net-libs/wvstreams/metadata.xml b/net-libs/wvstreams/metadata.xml
index d974ad958eaa..618b660c2a0b 100644
--- a/net-libs/wvstreams/metadata.xml
+++ b/net-libs/wvstreams/metadata.xml
@@ -3,8 +3,8 @@
 <pkgmetadata>
 <herd>cpp</herd>
 <maintainer>
-<email>mrness@gentoo.org</email>
-<name>Alin Nastac</name>
+<email>loki_val@gentoo.org</email>
+<name>Peter Alfredsen</name>
 </maintainer>
 <longdescription>A network programming library in C++</longdescription>
 </pkgmetadata>
diff --git a/net-libs/wvstreams/wvstreams-4.4.1.ebuild b/net-libs/wvstreams/wvstreams-4.4.1.ebuild
deleted file mode 100644
index 4ba086a11bca..000000000000
--- a/net-libs/wvstreams/wvstreams-4.4.1.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/wvstreams/wvstreams-4.4.1.ebuild,v 1.3 2008/11/19 19:30:33 loki_val Exp $
-
-EAPI=1
-
-WANT_AUTOCONF=latest
-WANT_AUTOMAKE=none
-
-inherit eutils fixheadtails autotools qt3
-
-DESCRIPTION="A network programming library in C++"
-HOMEPAGE="http://alumnit.ca/wiki/?WvStreams"
-SRC_URI="http://wvstreams.googlecode.com/files/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~sparc ~x86"
-IUSE="qt3 qdbm pam slp doc debug"
-
-RESTRICT="test"
-
-RDEPEND=">=sys-libs/db-4
-	sys-libs/zlib
-	dev-libs/openssl
-	dev-libs/xplc
-	qt3? ( x11-libs/qt:3 )
-	qdbm? ( dev-db/qdbm )
-	pam? ( sys-libs/pam )
-	slp? ( net-libs/openslp )"
-
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	doc? ( app-doc/doxygen )"
-
-src_unpack() {
-	unpack ${A}
-
-	epatch "${FILESDIR}/${P}-linux-serial.patch"
-	epatch "${FILESDIR}/${P}-wireless-user.patch"
-	epatch "${FILESDIR}/${P}-uniconfd-ini.patch"
-	epatch "${FILESDIR}/${P}-as-needed.patch"
-	epatch "${FILESDIR}/${P}-type-punned.patch"
-	epatch "${FILESDIR}/${P}-sigaction.patch"
-	epatch "${FILESDIR}/${P}-wvconfemu.patch"
-	epatch "${FILESDIR}/${P}-external-xplc.patch"
-	use qt3 && epatch "${FILESDIR}/${P}-MOC-fix.patch"
-	epatch "${FILESDIR}/${P}-valgrind.patch"
-	epatch "${FILESDIR}/${P}-gnulib.patch"
-	epatch "${FILESDIR}/${P}-gcc43.patch"
-
-	ht_fix_file "${S}/configure.ac"
-
-	cd "${S}"
-
-	sed -r -i \
-		-e '/AC_DEFINE.*__EXTENSIONS__/d' \
-		gnulib/m4/extensions.m4
-	sed -i -n \
-		 -e :a -e '1,10!{P;N;D;};N;ba' \
-		 configure.ac
-	#needed by xplc, as-needed and gnulib patch
-	AT_M4DIR="gnulib/m4" eautoreconf || die "eautoreconf failed"
-}
-
-src_compile() {
-	econf \
-		`use_with qdbm` \
-		`use_with pam` \
-		`use_with slp openslp` \
-		`use_with qt3 qt` \
-		`use_enable debug` \
-		--disable-optimization \
-		--without-tcl \
-		--without-swig \
-		--with-xplc \
-		--enable-verbose \
-		--with-bdb \
-		--with-zlib \
-		--with-openssl \
-		|| die "configure failed"
-	emake CXXOPTS="-fPIC -DPIC" COPTS="-fPIC -DPIC" || die "compile failed"
-	use doc && doxygen
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "make install failed"
-
-	if use doc ; then
-		#the list of files is too big for dohtml -r Docs/doxy-html/*
-		cd Docs/doxy-html
-		dohtml -r *
-	fi
-}
diff --git a/net-libs/wvstreams/wvstreams-4.5.ebuild b/net-libs/wvstreams/wvstreams-4.5.ebuild
new file mode 100644
index 000000000000..a8fe85ae4000
--- /dev/null
+++ b/net-libs/wvstreams/wvstreams-4.5.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/wvstreams/wvstreams-4.5.ebuild,v 1.1 2008/12/09 23:31:27 loki_val Exp $
+
+EAPI=2
+
+inherit autotools toolchain-funcs qt3 versionator
+
+DESCRIPTION="A network programming library in C++"
+HOMEPAGE="http://alumnit.ca/wiki/?WvStreams"
+SRC_URI="http://wvstreams.googlecode.com/files/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~sparc ~x86"
+IUSE="qt3 pam doc +ssl +dbus debug"
+
+#Tests fail if openssl is not compiled with -DPURIFY. Gentoo's isn't. FAIL!
+RESTRICT="test"
+
+#QA Fail: xplc is compiled as a part of wvstreams.
+#It'll take a larger patching effort to get it extracted, since upstream integrated it
+#more tightly this time. Probably for the better since upstream xplc seems dead.
+
+RDEPEND="sys-libs/readline
+	sys-libs/zlib
+	dbus? (  sys-apps/dbus )
+	dev-libs/openssl
+	qt3? ( x11-libs/qt:3 )
+	pam? ( sys-libs/pam )
+	virtual/c++-tr1-functional"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	doc? ( app-doc/doxygen )"
+
+pkg_setup() {
+	if has_version '>=sys-devel/gcc-4.1' && ! has_version '>=dev-libs/boost-1.34.1'
+	then
+		if ! version_is_at_least 4.1 "$(gcc-fullversion)"
+		then
+			eerror "This package needs the active gcc to be atleast of version 4.1"
+			eerror "or for >=dev-libs/boost-1.34.1 to be installed"
+			die "Please activate >=sys-devel/gcc-4.1 with gcc-config"
+		fi
+	fi
+}
+
+src_prepare() {
+	#Fixes Fedora 402531:
+	#https://bugzilla.redhat.com/show_bug.cgi?id=402531
+	epatch "${FILESDIR}/${P}-no_sarestorer.patch"
+	epatch "${FILESDIR}/${PN}-4.4.1-MOC-fix.patch"
+	epatch "${FILESDIR}/${P}-valgrind-optional.patch"
+	#Imported from Fedora CVS
+	epatch "${FILESDIR}/${P}-gcc43.patch"
+	epatch "${FILESDIR}/${P}-configure.patch"
+	epatch "${FILESDIR}/${P}-parallel-make.patch"
+	epatch "${FILESDIR}/${P}-dbus-configure-fix.patch"
+	epatch "${FILESDIR}/${P}-qt-fixup.patch"
+	eautoreconf || die "eautoreconf failed"
+}
+
+src_configure() {
+	export CXX=$(tc-getCXX)
+
+	econf	$(use_with pam) \
+		$(use_with qt3 qt) \
+		$(use_enable debug) \
+		$(use_with dbus) \
+		--without-valgrind \
+		--with-openssl \
+		--disable-optimization \
+		--enable-warnings \
+		--without-tcl \
+		--with-zlib \
+		|| die "configure failed"
+}
+
+src_compile() {
+	emake || die "compile failed"
+	use doc && doxygen
+}
+
+src_test() {
+	emake test
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "make install failed"
+
+	if use doc ; then
+		#the list of files is too big for dohtml -r Docs/doxy-html/*
+		cd Docs/doxy-html
+		dohtml -r *
+	fi
+}