Fix broken compilation when valgrind is installed (#210867).

Version bump (#211327).
(Portage version: 2.1.4.4)

16 files changed, 394 insertions, 2 deletions

diff --git a/net-libs/wvstreams/ChangeLog b/net-libs/wvstreams/ChangeLog
index 93a962681fcb..2abd3a25ceb5 100644
--- a/net-libs/wvstreams/ChangeLog
+++ b/net-libs/wvstreams/ChangeLog
@@ -1,6 +1,25 @@
 # 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.120 2008/05/14 22:59:35 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/wvstreams/ChangeLog,v 1.121 2008/06/21 01:34:57 mrness Exp $
+
+*wvstreams-4.4.1 (21 Jun 2008)
+
+  21 Jun 2008; Alin Năstac <mrness@gentoo.org>
+  +files/wvstreams-4.4.1-MOC-fix.patch,
+  +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.4-valgrind.patch, wvstreams-4.4.ebuild,
+  +wvstreams-4.4.1.ebuild:
+  Fix broken compilation when valgrind is installed (#210867). Version bump
+  (#211327).
 
   14 May 2008; Diego Pettenò <flameeyes@gentoo.org> wvstreams-4.4.ebuild:
   Depend on virtual/pam as the code builds fine with OpenPAM.
diff --git a/net-libs/wvstreams/files/wvstreams-4.4-valgrind.patch b/net-libs/wvstreams/files/wvstreams-4.4-valgrind.patch
new file mode 100644
index 000000000000..8effcdcdb778
--- /dev/null
+++ b/net-libs/wvstreams/files/wvstreams-4.4-valgrind.patch
@@ -0,0 +1,21 @@
+diff -ruN wvstreams-4.4/utils/wvtask.cc wvstreams-4.4.patched/utils/wvtask.cc
+--- wvstreams-4.4/utils/wvtask.cc	2007-07-19 23:22:55.000000000 +0200
++++ wvstreams-4.4.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
++//#ifdef HAVE_VALGRIND_MEMCHECK_H
+ #include <valgrind/memcheck.h>
+-#else
+-#define VALGRIND_MAKE_READABLE(x, y)
+-#define RUNNING_ON_VALGRIND 0
+-#endif
++//#else
++#define VALGRIND_MAKE_READABLE(x, y)
++//#define RUNNING_ON_VALGRIND 0
++//#endif
+ 
+ #define TASK_DEBUG 0
+ #if TASK_DEBUG
diff --git a/net-libs/wvstreams/files/wvstreams-4.4.1-MOC-fix.patch b/net-libs/wvstreams/files/wvstreams-4.4.1-MOC-fix.patch
new file mode 100644
index 000000000000..3e3310a47839
--- /dev/null
+++ b/net-libs/wvstreams/files/wvstreams-4.4.1-MOC-fix.patch
@@ -0,0 +1,12 @@
+diff -Nru wvstreams-4.4.1.orig/wvrules.mk wvstreams-4.4.1/wvrules.mk
+--- wvstreams-4.4.1.orig/wvrules.mk	2008-01-20 13:00:48.000000000 +0200
++++ wvstreams-4.4.1/wvrules.mk	2008-01-20 13:25:51.000000000 +0200
+@@ -248,7 +248,7 @@
+ %.E: %.cc;	$(call wvcxx,$@,$<,$*,,-E)
+ %.E: %.cpp;	$(call wvcxx,$@,$<,$*,,-E)
+ 
+-%.moc: %.h;	moc -o $@ $<
++%.moc: %.h;	$(MOC) -o $@ $<
+ 
+ %: %.o;		$(call wvlink,$@,$^) 
+ %.t: %.t.o;	$(call wvlink,$@,$(call reverse,$(filter %.o,$^)) $(filter-out %.o,$^) $(LIBWVTEST))
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
new file mode 100644
index 000000000000..b6cbdac1061c
--- /dev/null
+++ b/net-libs/wvstreams/files/wvstreams-4.4.1-as-needed.patch
@@ -0,0 +1,48 @@
+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
new file mode 100644
index 000000000000..9b514e41db19
--- /dev/null
+++ b/net-libs/wvstreams/files/wvstreams-4.4.1-external-xplc.patch
@@ -0,0 +1,42 @@
+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
new file mode 100644
index 000000000000..525582309903
--- /dev/null
+++ b/net-libs/wvstreams/files/wvstreams-4.4.1-gcc43.patch
@@ -0,0 +1,24 @@
+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
new file mode 100644
index 000000000000..509f64d9df0f
--- /dev/null
+++ b/net-libs/wvstreams/files/wvstreams-4.4.1-gnulib.patch
@@ -0,0 +1,11 @@
+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
new file mode 100644
index 000000000000..5653a6516eaf
--- /dev/null
+++ b/net-libs/wvstreams/files/wvstreams-4.4.1-linux-serial.patch
@@ -0,0 +1,42 @@
+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
new file mode 100644
index 000000000000..8afd4df655c4
--- /dev/null
+++ b/net-libs/wvstreams/files/wvstreams-4.4.1-sigaction.patch
@@ -0,0 +1,11 @@
+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
new file mode 100644
index 000000000000..fb53cfc96772
--- /dev/null
+++ b/net-libs/wvstreams/files/wvstreams-4.4.1-type-punned.patch
@@ -0,0 +1,17 @@
+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
new file mode 100644
index 000000000000..bd5368a68552
--- /dev/null
+++ b/net-libs/wvstreams/files/wvstreams-4.4.1-uniconfd-ini.patch
@@ -0,0 +1,14 @@
+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
new file mode 100644
index 000000000000..b6be9f7b8b43
--- /dev/null
+++ b/net-libs/wvstreams/files/wvstreams-4.4.1-valgrind.patch
@@ -0,0 +1,21 @@
+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
++//#ifdef HAVE_VALGRIND_MEMCHECK_H
+ #include <valgrind/memcheck.h>
+-#else
+-#define VALGRIND_MAKE_READABLE(x, y)
+-#define RUNNING_ON_VALGRIND 0
+-#endif
++//#else
++#define VALGRIND_MAKE_READABLE(x, y)
++//#define RUNNING_ON_VALGRIND 0
++//#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
new file mode 100644
index 000000000000..a39e2a6c3d6d
--- /dev/null
+++ b/net-libs/wvstreams/files/wvstreams-4.4.1-wireless-user.patch
@@ -0,0 +1,11 @@
+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
new file mode 100644
index 000000000000..00a53b920d2b
--- /dev/null
+++ b/net-libs/wvstreams/files/wvstreams-4.4.1-wvconfemu.patch
@@ -0,0 +1,13 @@
+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/wvstreams-4.4.1.ebuild b/net-libs/wvstreams/wvstreams-4.4.1.ebuild
new file mode 100644
index 000000000000..5af88bd07560
--- /dev/null
+++ b/net-libs/wvstreams/wvstreams-4.4.1.ebuild
@@ -0,0 +1,85 @@
+# 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.1 2008/06/21 01:34:57 mrness Exp $
+
+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? ( $(qt_min_version 3.1) )
+	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"
+
+	#needed by xplc, as-needed and gnulib patch
+	cd "${S}"
+	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.4.ebuild b/net-libs/wvstreams/wvstreams-4.4.ebuild
index ebf9992d8665..500faf9de9e1 100644
--- a/net-libs/wvstreams/wvstreams-4.4.ebuild
+++ b/net-libs/wvstreams/wvstreams-4.4.ebuild
@@ -1,6 +1,6 @@
 # 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.ebuild,v 1.9 2008/05/14 22:59:35 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/wvstreams/wvstreams-4.4.ebuild,v 1.10 2008/06/21 01:34:57 mrness Exp $
 
 WANT_AUTOCONF=latest
 WANT_AUTOMAKE=none
@@ -42,6 +42,7 @@ src_unpack() {
 	epatch "${FILESDIR}/${P}-type-punned.patch"
 	epatch "${FILESDIR}/${P}-sigaction.patch"
 	epatch "${FILESDIR}/${P}-wvconfemu.patch"
+	epatch "${FILESDIR}/${P}-valgrind.patch"
 
 	epatch "${FILESDIR}/${P}-external-xplc.patch"
 	local XPLC_VER=`best_version dev-libs/xplc`