clean up

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

13 files changed, 0 insertions, 398 deletions

diff --git a/net-libs/wvstreams/Manifest b/net-libs/wvstreams/Manifest
index d4c0a2fdd769..48c8795c953e 100644
--- a/net-libs/wvstreams/Manifest
+++ b/net-libs/wvstreams/Manifest
@@ -1,19 +1,6 @@
-AUX wvstreams-4.4-as-needed.patch 2127 RMD160 2e577dbdc8019858392e5f671cf5adbbba4114e1 SHA1 7c93cbb9462175d44257e6152baf0c83cca2dc2f SHA256 05484ded8bf9f46cc1a5217a41f3b99de549375f83003da67036b1014512f441
-AUX wvstreams-4.4-external-xplc.patch 1205 RMD160 0b55a10c19647ae5d792283ea9b1f1b123498e3e SHA1 2e6d36d4249679e2ffa25f6bee9f191338e8a9ca SHA256 99521d3b5649cec99b4d6251bd7b7f59273b0a495dd51e4b36b77eb343ba700b
-AUX wvstreams-4.4-gcc-4.3.patch 577 RMD160 c34bde2904dbd1e32464c325ede4a80336469335 SHA1 7fa24a701e6184b35e40c2a8e3fca1bedf85caec SHA256 7c09d426020331c72fa2616f38975699f657aa9c773efce1a5c11f9e8c6acf1c
-AUX wvstreams-4.4-linux-serial.patch 1632 RMD160 6731576316598f2f2cdbe00b08ab6ced9eee0fd8 SHA1 8852774b47f941edbf24943b5895f3497ddc18c9 SHA256 068866ac51058cff6e5b789c9a5ebd007bf5301ed001a27b4d84ba80e5d5cb2e
-AUX wvstreams-4.4-sane-cflags.patch 1566 RMD160 2ba116157a8226b75e1901da8d56f85db828d43a SHA1 f58e0f74d89b70855f15b4ecae186c21bb55d4da SHA256 1e9d3f2b3042e544eb8012356ab87fd72db503eade4aadb2df576fad2290713a
-AUX wvstreams-4.4-sigaction.patch 503 RMD160 8bf25b06026e64dc3b0679738e37ae4b8a9a1174 SHA1 7ca737f3faf5b611596d1f114dbc199a928425b5 SHA256 fe61219b67ba974ba920726dd09f39fe36453fe07026f1feaa389c86fa13f32f
-AUX wvstreams-4.4-type-punned.patch 649 RMD160 be490cc3b91f818c6ffc5b0793a53ebce0a7d701 SHA1 2e997401fb98fa70bd26a21f084fb3ec246044ba SHA256 215e6c2e0b52efc2a0b16a558452fcf6a8f2d62b0e18c6a2c420f401e1e40c3c
-AUX wvstreams-4.4-uniconfd-ini.patch 796 RMD160 57b582cb5b4fbfe038b057295024b10210a9b830 SHA1 0823b65f5ef5c09b4446a0ed923fca438287c122 SHA256 7d9526f56e0adc748081a8dc910a83cb851ab88521613efe4331487d4abf6770
-AUX wvstreams-4.4-valgrind.patch 573 RMD160 abc34078cb400dcc47ab517e74604709770be43a SHA1 f396153f51988a3a75fc6e428d1606a6b6124a45 SHA256 2c440d329974186c445fe6f0c6845f5cbe8c3c7fa5415879964875781d99101b
-AUX wvstreams-4.4-wireless-user.patch 489 RMD160 d96b35981362aff522c1d6c92a2d8af792b6a539 SHA1 0d6e3a6f78f9a2829ea2225f6f09b0ee5147e2f1 SHA256 e6425c6416db5d5f50be74aa67c4dccde91162d844655b07366b9dd8f26386c8
-AUX wvstreams-4.4-wvconfemu.patch 384 RMD160 2ee5b030cd101923f88cbd7bc63b4587cfb2190f SHA1 33eeb9b0288f2d0ceedcbacf11ad10c4550c36cf SHA256 88d1897c41763b3616ffdee8e9e361dd53b38e18f6c73b98fac02942aa842e11
 AUX wvstreams-4.6.1-openssl-1.0.0.patch 470 RMD160 360e22417bb45eba87eade0c475464b36c026c38 SHA1 0bbbc7ca86181edab61152fa31675bdc906d3c51 SHA256 992a3ae041e0c859991ca0325590dc6e498214eadcc56395956dd23f6bdbd098
 AUX wvstreams-4.6.1-parallel-make.patch 2236 RMD160 fc1082804587b0f392e4cc358fb56d0a4aba2801 SHA1 3c57a5a237059616fcc1cc76b6f08a35a39dc019 SHA256 aaefbb5aa45a7f377b91a11671d25cfe62856a5c801271b1be783eccc1acd7a0
-DIST wvstreams-4.4.tar.gz 1296853 RMD160 82ad9584d586895612f42dcb1709edb8a7fcb6a6 SHA1 8a7ec82c0c4002bec16ec521747a689fb50d8f27 SHA256 c478eb0755b383baebe66e55135257eebbdb113e194946a40be0c765e14fb4d6
 DIST wvstreams-4.6.1.tar.gz 1118456 RMD160 55550608ccfa53c7daf0ee195466f077b3540acb SHA1 1431efc3f46a13b6a8dbcad4123e19473369f767 SHA256 8403f5fbf83aa9ac0c6ce15d97fd85607488152aa84e007b7d0621b8ebc07633
-EBUILD wvstreams-4.4.ebuild 2557 RMD160 6203577d394b0b2cd1c95a9f04b84b3e77580b80 SHA1 42f018d46b0d155e4baca92b2472ac3980d0b420 SHA256 38cf855242998ffc4540efd6696c5aad7184c9d4b1aa130f40210dec478243d5
 EBUILD wvstreams-4.6.1-r1.ebuild 2130 RMD160 46aa4200e5aab02ae4456c9a236f12f52446a000 SHA1 6d6e416e62875230206b6d0e199e2ceadf58e759 SHA256 67d6a174ce3f36bd8b2345773798125f06a877715c85c5af83b1bb2e540fb13f
 EBUILD wvstreams-4.6.1.ebuild 2076 RMD160 c7e6769a9e536ab7e5496d8a52d6c2e24732246e SHA1 b8bdc11c8c69789ac53059da756db0f012facc57 SHA256 00d34e42622e2a12579bd080c2225076e79f69c72ee4cd55eb977e9c7522b1be
 MISC ChangeLog 24322 RMD160 85a2591301603bd69b62eca86cfa5f137457a46c SHA1 eb3f84598dfd0db71ab2c5c2089163b971e51f2c SHA256 af20401b9b6627c3f5d7a5fa829576a23e8688dfbd4718978b25951f49b38edc
diff --git a/net-libs/wvstreams/files/wvstreams-4.4-as-needed.patch b/net-libs/wvstreams/files/wvstreams-4.4-as-needed.patch
deleted file mode 100644
index 4cbc702dcdb7..000000000000
--- a/net-libs/wvstreams/files/wvstreams-4.4-as-needed.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-diff -Nru wvstreams-4.4.orig/configure.ac wvstreams-4.4/configure.ac
---- wvstreams-4.4.orig/configure.ac	2007-07-20 00:22:57.000000000 +0300
-+++ wvstreams-4.4/configure.ac	2007-08-17 22:41:34.000000000 +0300
-@@ -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.orig/wvrules.mk wvstreams-4.4/wvrules.mk
---- wvstreams-4.4.orig/wvrules.mk	2007-07-20 19:36:55.000000000 +0300
-+++ wvstreams-4.4/wvrules.mk	2007-08-17 22:41:34.000000000 +0300
-@@ -60,7 +60,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
-@@ -270,7 +270,7 @@
- %.so: SONAME=$@$(if $(SO_VERSION),.$(SO_VERSION))
- 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 --git a/net-libs/wvstreams/files/wvstreams-4.4-external-xplc.patch b/net-libs/wvstreams/files/wvstreams-4.4-external-xplc.patch
deleted file mode 100644
index 744c96bfd784..000000000000
--- a/net-libs/wvstreams/files/wvstreams-4.4-external-xplc.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff -Nru wvstreams-4.4.orig/configure.ac wvstreams-4.4/configure.ac
---- wvstreams-4.4.orig/configure.ac	2007-08-17 22:43:47.000000000 +0300
-+++ wvstreams-4.4/configure.ac	2007-08-17 22:52:07.000000000 +0300
-@@ -488,7 +488,6 @@
- 
- # 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}`])
-@@ -500,15 +499,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])
-@@ -516,7 +506,7 @@
-         AC_CONFIG_SUBDIRS(xplc)
-         build_xplc=yes
-         with_xplc='$(WVSTREAMS)/xplc'
--	xplc_pc='wvxplc'
-+        xplc_pc='wvxplc'
-     fi
- fi
- 
diff --git a/net-libs/wvstreams/files/wvstreams-4.4-gcc-4.3.patch b/net-libs/wvstreams/files/wvstreams-4.4-gcc-4.3.patch
deleted file mode 100644
index c775ad210212..000000000000
--- a/net-libs/wvstreams/files/wvstreams-4.4-gcc-4.3.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- wvstreams-4.4.orig/include/uniconfkey.h
-+++ wvstreams-4.4/include/uniconfkey.h
-@@ -9,7 +9,7 @@
- 
- #include "wvstring.h"
- #include "wvlinklist.h"
--
-+#include <climits>
- 
- // The Python headers try to #define ANY as void.  If we're building Python
- // wrappers, get rid of that.
---- wvstreams-4.4.orig/include/wvserialize.h
-+++ wvstreams-4.4/include/wvserialize.h
-@@ -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-linux-serial.patch b/net-libs/wvstreams/files/wvstreams-4.4-linux-serial.patch
deleted file mode 100644
index 7b8fa08deb86..000000000000
--- a/net-libs/wvstreams/files/wvstreams-4.4-linux-serial.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-diff -Nru wvstreams-4.4.orig/streams/wvmodem.cc wvstreams-4.4/streams/wvmodem.cc
---- wvstreams-4.4.orig/streams/wvmodem.cc	2007-07-20 00:22:57.000000000 +0300
-+++ wvstreams-4.4/streams/wvmodem.cc	2007-08-17 22:36:21.000000000 +0300
-@@ -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-sane-cflags.patch b/net-libs/wvstreams/files/wvstreams-4.4-sane-cflags.patch
deleted file mode 100644
index 70553659f045..000000000000
--- a/net-libs/wvstreams/files/wvstreams-4.4-sane-cflags.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-diff -Nru wvstreams-4.4.orig/vars.mk wvstreams-4.4/vars.mk
---- wvstreams-4.4.orig/vars.mk	2007-07-20 00:22:57.000000000 +0300
-+++ wvstreams-4.4/vars.mk	2007-08-17 22:43:29.000000000 +0300
-@@ -52,10 +52,10 @@
- CXXFLAGS+=-D_GNU_SOURCE -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
- CFLAGS+=-D_GNU_SOURCE -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
- 
--ifeq ($(DEBUG),)
--CXXFLAGS+=-g
--CFLAGS+=-g
--endif
-+#ifeq ($(DEBUG),)
-+#CXXFLAGS+=-g
-+#CFLAGS+=-g
-+#endif
- 
- ifneq ($(DEBUG),)
- CXXFLAGS+=-ggdb -DDEBUG$(if $(filter-out yes,$(DEBUG)), -DDEBUG_$(DEBUG))
-@@ -77,9 +77,9 @@
- endif
- 
- ifneq ("$(enable_optimization)", "no")
--CXXFLAGS+=-O2
-+#CXXFLAGS+=-O2
- #CXXFLAGS+=-felide-constructors
--CFLAGS+=-O2
-+#CFLAGS+=-O2
- endif
- 
- ifneq ("$(enable_warnings)", "no")
-diff -Nru wvstreams-4.4.orig/wvrules.mk wvstreams-4.4/wvrules.mk
---- wvstreams-4.4.orig/wvrules.mk	2007-08-17 22:43:47.000000000 +0300
-+++ wvstreams-4.4/wvrules.mk	2007-08-17 22:43:29.000000000 +0300
-@@ -82,9 +82,9 @@
- endif
- 
- ifneq ("$(enable_optimization)", "no")
--  CXXFLAGS+=-O2
-+  #CXXFLAGS+=-O2
-   #CXXFLAGS+=-felide-constructors
--  CFLAGS+=-O2
-+  #CFLAGS+=-O2
- endif
- 
- ifneq ("$(enable_warnings)", "no")
-@@ -175,11 +175,11 @@
-   C_AND_CXX_FLAGS += -ggdb -DDEBUG=1
-   LDFLAGS += -ggdb
- else
--  C_AND_CXX_FLAGS += -g -DDEBUG=0
-+  C_AND_CXX_FLAGS += -DDEBUG=0
-   #CFLAGS += -DNDEBUG    # I don't like disabling assertions...
-   #CFLAGS += -fomit-frame-pointer  # really evil
-   #CXXFLAGS += -fno-implement-inlines  # causes trouble with egcs 1.0
--  LDFLAGS += -g
-+  #LDFLAGS += -g
- endif
- 
- ifeq ($(PROFILE),1)
diff --git a/net-libs/wvstreams/files/wvstreams-4.4-sigaction.patch b/net-libs/wvstreams/files/wvstreams-4.4-sigaction.patch
deleted file mode 100644
index 3478430df88f..000000000000
--- a/net-libs/wvstreams/files/wvstreams-4.4-sigaction.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Nru wvstreams-4.4.orig/utils/wvcrash.cc wvstreams-4.4/utils/wvcrash.cc
---- wvstreams-4.4.orig/utils/wvcrash.cc	2007-07-20 00:22:55.000000000 +0300
-+++ wvstreams-4.4/utils/wvcrash.cc	2007-08-17 22:49:50.000000000 +0300
-@@ -385,7 +385,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-type-punned.patch b/net-libs/wvstreams/files/wvstreams-4.4-type-punned.patch
deleted file mode 100644
index f4dff0f69e1a..000000000000
--- a/net-libs/wvstreams/files/wvstreams-4.4-type-punned.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff -Nru wvstreams-4.4.orig/urlget/wvhttppool.cc wvstreams-4.4/urlget/wvhttppool.cc
---- wvstreams-4.4.orig/urlget/wvhttppool.cc	2007-07-20 00:22:36.000000000 +0300
-+++ wvstreams-4.4/urlget/wvhttppool.cc	2007-08-17 23:07:41.000000000 +0300
-@@ -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-uniconfd-ini.patch b/net-libs/wvstreams/files/wvstreams-4.4-uniconfd-ini.patch
deleted file mode 100644
index e6b8c48edb95..000000000000
--- a/net-libs/wvstreams/files/wvstreams-4.4-uniconfd-ini.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -Nru wvstreams-4.4.orig/Makefile wvstreams-4.4/Makefile
---- wvstreams-4.4.orig/Makefile	2007-07-20 19:31:03.000000000 +0300
-+++ wvstreams-4.4/Makefile	2007-08-17 22:39:56.000000000 +0300
-@@ -185,8 +185,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-valgrind.patch b/net-libs/wvstreams/files/wvstreams-4.4-valgrind.patch
deleted file mode 100644
index cc2d0b11c11a..000000000000
--- a/net-libs/wvstreams/files/wvstreams-4.4-valgrind.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-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
--#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-wireless-user.patch b/net-libs/wvstreams/files/wvstreams-4.4-wireless-user.patch
deleted file mode 100644
index 7f3d9cb31704..000000000000
--- a/net-libs/wvstreams/files/wvstreams-4.4-wireless-user.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Nru wvstreams-4.4.orig/linuxstreams/wvinterface.cc wvstreams-4.4/linuxstreams/wvinterface.cc
---- wvstreams-4.4.orig/linuxstreams/wvinterface.cc	2007-07-20 00:22:51.000000000 +0300
-+++ wvstreams-4.4/linuxstreams/wvinterface.cc	2007-08-17 22:38:13.000000000 +0300
-@@ -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-wvconfemu.patch b/net-libs/wvstreams/files/wvstreams-4.4-wvconfemu.patch
deleted file mode 100644
index 6c942c21b9a9..000000000000
--- a/net-libs/wvstreams/files/wvstreams-4.4-wvconfemu.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -Nru wvstreams-4.4.orig/vars.mk wvstreams-4.4/vars.mk
---- wvstreams-4.4.orig/vars.mk	2007-08-18 00:13:15.000000000 +0300
-+++ wvstreams-4.4/vars.mk	2007-08-17 23:39:09.000000000 +0300
-@@ -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.ebuild b/net-libs/wvstreams/wvstreams-4.4.ebuild
deleted file mode 100644
index 2b64f15c722d..000000000000
--- a/net-libs/wvstreams/wvstreams-4.4.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2010 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.13 2010/01/04 16:10:51 ssuominen Exp $
-
-EAPI=1
-
-WANT_AUTOCONF=latest
-WANT_AUTOMAKE=none
-
-inherit eutils fixheadtails autotools
-
-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="qdbm pam slp doc debug"
-
-RESTRICT="test"
-
-RDEPEND=">=sys-libs/db-4
-	>=sys-libs/zlib-1.2.3
-	>=dev-libs/openssl-0.9.8e
-	>=dev-libs/xplc-0.3.13
-	qdbm? ( dev-db/qdbm )
-	pam? ( virtual/pam )
-	slp? ( >=net-libs/openslp-1.2.1 )"
-
-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}-sane-cflags.patch"
-	epatch "${FILESDIR}/${P}-type-punned.patch"
-	epatch "${FILESDIR}/${P}-sigaction.patch"
-	epatch "${FILESDIR}/${P}-wvconfemu.patch"
-	epatch "${FILESDIR}/${P}-valgrind.patch"
-	epatch "${FILESDIR}/${P}-gcc-4.3.patch"
-
-	epatch "${FILESDIR}/${P}-external-xplc.patch"
-	local XPLC_VER=`best_version dev-libs/xplc`
-	XPLC_VER=${XPLC_VER#*/*-} #reduce it to ${PV}-${PR}
-	XPLC_VER=${XPLC_VER%%[_-]*} # main version without beta/pre/patch/revision
-	sed -i -e "s:^xplc_version=.*:xplc_version='${XPLC_VER}':" "${S}/configure.ac" \
-		|| die "failed to set current xplc version"
-	rm -r "${S}/xplc"
-
-	ht_fix_file "${S}/configure.ac"
-
-	#needed by xplc and as-needed patch:
-	cd "${S}"
-	eautoconf || die "autoconf failed"
-	#without following, the makefile would remove some files and request
-	#you to run ./configure again
-	touch include/wvautoconf.h.in configure
-}
-
-src_compile() {
-	econf \
-		`use_with qdbm` \
-		`use_with pam` \
-		`use_with slp openslp` \
-		--without-qt \
-		`use_enable debug` \
-		--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 CXXOPTS="-fPIC -DPIC" COPTS="-fPIC -DPIC" 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
-}