old

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

10 files changed, 0 insertions, 416 deletions

diff --git a/net-libs/wvstreams/Manifest b/net-libs/wvstreams/Manifest
index a6c7a0c37343..da698f2f5b07 100644
--- a/net-libs/wvstreams/Manifest
+++ b/net-libs/wvstreams/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
-
 AUX wvstreams-4.4-MOC-fix.patch 488 RMD160 aae0965e0b0dd7767c1183daf3005074089791be SHA1 2a9ea9c18329f6494c981cbc176e09a6e7b1b3ec SHA256 38127fc658a2b8342f1241fe3a8c775bb7a5e866a8b00bb89ad96778d6c187d0
 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
@@ -14,33 +11,12 @@ AUX wvstreams-4.4-valgrind.patch 573 RMD160 abc34078cb400dcc47ab517e74604709770b
 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.4.1-MOC-fix.patch 496 RMD160 0f3522b6ca395f7062c53cf78b73a2bc12adb1b8 SHA1 d608e73fc19c64810ff635adfa44f086515a5aeb SHA256 69023b7f07e183fb5b2ea62f7126c4a76696a9a7d359ef400b5e8c91c2bc931c
-AUX wvstreams-4.5-configure.patch 640 RMD160 dcfb55f5319670b6fa66c827f47e9b8ed0f84e39 SHA1 c0a35eeee3c996932a475a18eeffc2737501e91f SHA256 dd8d03edcf193dcc2cf2ff50c041a5785076b12cd53a56e0a71fbd0d6297fa76
-AUX wvstreams-4.5-dbus-configure-fix.patch 840 RMD160 73b2b926ee202eacf65cae739c19b511ab5950a8 SHA1 f01708af49e63415585f403213705571cb928dab SHA256 e3d2d3131d97bc33e4c79a1306e30c143d16e5fc0ab223e2a8f9b566304e6b6a
-AUX wvstreams-4.5-gcc43.patch 2560 RMD160 38f1d2ade668c4303637fe77413b51f760632bec SHA1 7180cfb7495e3abda9ffa6b366bb604c8cc22fe8 SHA256 bb0020abb731e1499b12e509a19454c14cd8a8c346820bc476058892b6cb5110
-AUX wvstreams-4.5-glibc.patch 1911 RMD160 1ef5609d69a2f8e3f221cf5d1f638425874df879 SHA1 15677d52e4b02a7e22a9a69c54729a6f261772aa SHA256 eb745dd38971fc376071fc8be76c07daddc33787f9837311382bdf2bb93af420
-AUX wvstreams-4.5-no_sarestorer.patch 642 RMD160 96b677c8a8cd930f80f6a235bf9e209875c4b0fc SHA1 e5c7b2e3a91cc1e98af27eb392b6d130744a9958 SHA256 acbd41200c3093dd3611b6ed0b06fbcc2f3943ae59412494957522b090126eaa
-AUX wvstreams-4.5-parallel-make.patch 2168 RMD160 ac2362b49f536c2e3d9ca5e8973886afe359040e SHA1 c249e7b9b48e7f92c5f9c51b6d268933e7475308 SHA256 7be478e1c35a1bca912966f7f77485f571d04395098950ce3eaf13c9ff8e65fa
-AUX wvstreams-4.5-qt-fixup.patch 824 RMD160 f8fd56ab82198660af76d85419fedbb52b5fae67 SHA1 ad0472b4bf2973d1fcbcdd3f32295e08d3ba769c SHA256 20059308afe2e4ad501b6f4f575f9d3bd8b42c6fe357d755c4f9815632665c6c
-AUX wvstreams-4.5-valgrind-optional.patch 1263 RMD160 d40fe9430e5692c9955488b73b3c3019191b6911 SHA1 fb3f08c3122c5a5efa2921da6706812a99731ac0 SHA256 ffac9d6172556280d764e5d3491fb3d7081a60aa9532b2c5eb5f324bae1028dd
 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.5.tar.gz 1076353 RMD160 615a17b95f09a10f315daf01639179bcfdc0f5c6 SHA1 237bda88c417432be52b7a792065a35beb5f671c SHA256 fb67df069c647420908da62697587e115a27a2a760d5710e1e40494c21902268
 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.5.ebuild 2601 RMD160 eee9439f106086dc798ff32cd922ef02ca5f9e12 SHA1 286de4d4737645c32aa43637ec5c738c895149a1 SHA256 f52a9d989886243614c0e09e501233ddfd42569b2b1cd6a97d3ed09a567bcac2
 EBUILD wvstreams-4.6.1-r1.ebuild 2130 RMD160 46aa4200e5aab02ae4456c9a236f12f52446a000 SHA1 6d6e416e62875230206b6d0e199e2ceadf58e759 SHA256 67d6a174ce3f36bd8b2345773798125f06a877715c85c5af83b1bb2e540fb13f
 EBUILD wvstreams-4.6.1.ebuild 2083 RMD160 905054653f61ce4b94b7197b0cee9acf87df7dd7 SHA1 331052743ea46d90ceb2efcc3ab566445987bb8a SHA256 74437d3f04e534ca8069ceff6b64e99bbc448676e3cbffaa804518d0be770a4f
 MISC ChangeLog 24031 RMD160 1822f09d9715b22de739b6eb2da52b346277776e SHA1 594a096118d727aa5bad9c2218533c41c3a9dad3 SHA256 9d73536a452d7dafb0e4f9af0322e56dba4d591864728b0ee9b95da57df4ea9a
 MISC metadata.xml 228 RMD160 62154bc737c6b25b3d4d0b938cb62a241c83ad15 SHA1 0bb4f84f2396dc72009f54c9efdadf50e203ae8e SHA256 98b56a813b3de314223d7193a3a055e191c9647a2f6887bf8dc7b05f8d0ec610
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.15 (GNU/Linux)
-
-iQEcBAEBCgAGBQJMCPeCAAoJEAWF714uGAc6pG4H/jDLO/NDSiDKku/fj8w5bIi3
-r43V2qBWzmLWzl+huzvqRLvH+MhYpO4zwWp4f0peUD3hq/Yg+kAC+tsBkIkFtQp2
-tZ1u1zkpd/3O2wdwdB5lkvDYG4ZeThlyvQrE8UOn1ZgXN6orERJqps0fcMVZZsAV
-hBoHQNqCO+H6Cxb+7p4TaU5QCXkoPZr5P9Xo+BHVWdgF21onurKVBd1ubDs83CT2
-0d+OKi5P6Xv1byunb5XdW01coEfKHq4cX2P9xbPHJbN8xVwm6BqpEtqNTNh3c6IL
-mzFoLKXyTKJhdvZ0hdky17GKRFS3IauHM6KSG03NuBjud9WRcA5cLQwlODKnSNU=
-=Voih
------END PGP SIGNATURE-----
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])
diff --git a/net-libs/wvstreams/wvstreams-4.5.ebuild b/net-libs/wvstreams/wvstreams-4.5.ebuild
deleted file mode 100644
index 687cb0cd26a2..000000000000
--- a/net-libs/wvstreams/wvstreams-4.5.ebuild
+++ /dev/null
@@ -1,97 +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.5.ebuild,v 1.4 2010/01/04 16:10:51 ssuominen Exp $
-
-EAPI=2
-
-inherit autotools toolchain-funcs 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="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
-	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 requires the active gcc to be at least version 4.1"
-			eerror "or >=dev-libs/boost-1.34.1 must 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"
-	# glibc 2.10 fix
-	epatch "${FILESDIR}/${P}-glibc.patch"
-	eautoreconf || die "eautoreconf failed"
-}
-
-src_configure() {
-	export CXX=$(tc-getCXX)
-
-	econf	$(use_with pam) \
-		--without-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
-}