Remove old versions.

(Portage version: 2.1.1)
 (Signed Manifest commit)

12 files changed, 14 insertions, 575 deletions

diff --git a/net-libs/wvstreams/Manifest b/net-libs/wvstreams/Manifest
index 9de80124d9d9..4671f4041bd0 100644
--- a/net-libs/wvstreams/Manifest
+++ b/net-libs/wvstreams/Manifest
@@ -1,31 +1,6 @@
-AUX wvstreams-4.0.2-MOC-fix.patch 479 RMD160 97a8dd0d22964de2bde0250bc0aceae049b4807c SHA1 a66e0cf352cf75e97e3162ec356ffed5bdfac153 SHA256 01144a9794da9b61cbb114f061543874979e8bec6b7b4a7844fec73ce1de4c5a
-MD5 16733d2b49133ec4fd75fa7dbca890ea files/wvstreams-4.0.2-MOC-fix.patch 479
-RMD160 97a8dd0d22964de2bde0250bc0aceae049b4807c files/wvstreams-4.0.2-MOC-fix.patch 479
-SHA256 01144a9794da9b61cbb114f061543874979e8bec6b7b4a7844fec73ce1de4c5a files/wvstreams-4.0.2-MOC-fix.patch 479
-AUX wvstreams-4.0.2-external-xplc.patch 1659 RMD160 02671504ba3ce252465cb50271759449a50a7e14 SHA1 f9c7dc1830f96ff0f7df402d3689b38e89f512ab SHA256 e57a9ec87155b9eceb4ab6d0fa1c0986ae29277b84c4a0f8192ef7d29c984e2d
-MD5 189d6997246f2943d43b5c18d0a78163 files/wvstreams-4.0.2-external-xplc.patch 1659
-RMD160 02671504ba3ce252465cb50271759449a50a7e14 files/wvstreams-4.0.2-external-xplc.patch 1659
-SHA256 e57a9ec87155b9eceb4ab6d0fa1c0986ae29277b84c4a0f8192ef7d29c984e2d files/wvstreams-4.0.2-external-xplc.patch 1659
-AUX wvstreams-4.0.2-gcc41.patch 698 RMD160 58bb8a92efb51bc8603c77b71124eec7d2384a91 SHA1 27a624e4a8fe6c0ad932d74c05aeba60f90a53e8 SHA256 62933047f456feb71ccf2d4859dc2e28a013feb62dd080080f1e1a6ef1be7c69
-MD5 6448ad9ded98b10b600e0b3386d2c4bf files/wvstreams-4.0.2-gcc41.patch 698
-RMD160 58bb8a92efb51bc8603c77b71124eec7d2384a91 files/wvstreams-4.0.2-gcc41.patch 698
-SHA256 62933047f456feb71ccf2d4859dc2e28a013feb62dd080080f1e1a6ef1be7c69 files/wvstreams-4.0.2-gcc41.patch 698
-AUX wvstreams-4.0.2-linux-serial.patch 6412 RMD160 b984d406bf0934eb02607b98681ee132f0c55c87 SHA1 ec13ea506998ca2454e411020c95e28c53cb9871 SHA256 e788d20f6f510f1c9190401a4de677fa3db5cf4149c2d20ab43ade29206d372e
-MD5 26127f51d3c7e77edb001d4cb33882d0 files/wvstreams-4.0.2-linux-serial.patch 6412
-RMD160 b984d406bf0934eb02607b98681ee132f0c55c87 files/wvstreams-4.0.2-linux-serial.patch 6412
-SHA256 e788d20f6f510f1c9190401a4de677fa3db5cf4149c2d20ab43ade29206d372e files/wvstreams-4.0.2-linux-serial.patch 6412
-AUX wvstreams-4.0.2-speex-const.patch 951 RMD160 9cd575225f9f645734bcf9255ae03c25af6e1214 SHA1 d9379e2ca427cc0af9c5efade212a7eed9b51611 SHA256 bcb3212685dad976930ce9cadd452d8bfb6740fb59924706abe2f863d8007d76
-MD5 b65b1449a0bc6ff06e8c843b37717f05 files/wvstreams-4.0.2-speex-const.patch 951
-RMD160 9cd575225f9f645734bcf9255ae03c25af6e1214 files/wvstreams-4.0.2-speex-const.patch 951
-SHA256 bcb3212685dad976930ce9cadd452d8bfb6740fb59924706abe2f863d8007d76 files/wvstreams-4.0.2-speex-const.patch 951
-AUX wvstreams-4.0.2-tcl_8_4.patch 1022 RMD160 5b6029b441bb64e4c76bf599ecb6ed306388aac0 SHA1 2a12778e72fa5f9452970175e98b3319e28a5927 SHA256 e4dcca87be14e29214ae9ed58892352ddcc916f59acb9b208cb56df733950166
-MD5 0b5b1b03e323747aa3ce30492fe18cc1 files/wvstreams-4.0.2-tcl_8_4.patch 1022
-RMD160 5b6029b441bb64e4c76bf599ecb6ed306388aac0 files/wvstreams-4.0.2-tcl_8_4.patch 1022
-SHA256 e4dcca87be14e29214ae9ed58892352ddcc916f59acb9b208cb56df733950166 files/wvstreams-4.0.2-tcl_8_4.patch 1022
-AUX wvstreams-4.0.2-wireless-user.patch 466 RMD160 cb6851eb7813cfaac08f36df1ba5b74945325223 SHA1 1b7898611bedbdcfcbb70ab3e676bc397dafecf3 SHA256 d1873834bfb196a196626dc0e65fa6daae43e89f3c17dd30ba6670f2df1125e2
-MD5 dbec7770662be21658b4ba9740cf2793 files/wvstreams-4.0.2-wireless-user.patch 466
-RMD160 cb6851eb7813cfaac08f36df1ba5b74945325223 files/wvstreams-4.0.2-wireless-user.patch 466
-SHA256 d1873834bfb196a196626dc0e65fa6daae43e89f3c17dd30ba6670f2df1125e2 files/wvstreams-4.0.2-wireless-user.patch 466
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX wvstreams-4.2.2-MOC-fix.patch 496 RMD160 c535de41919e65ebcdefcb08698dda11ded8d972 SHA1 af28e60552446b408c1751713d7e8b4cebb7a4c8 SHA256 905beab969778d2fa2294bbb3f95a16c40ac295c99c6c76c8e34ce0eecaa8da0
 MD5 d5c8bf76b0489abb5a4462b9d2908ced files/wvstreams-4.2.2-MOC-fix.patch 496
 RMD160 c535de41919e65ebcdefcb08698dda11ded8d972 files/wvstreams-4.2.2-MOC-fix.patch 496
@@ -58,16 +33,7 @@ AUX wvstreams-4.2.2-wireless-user.patch 466 RMD160 1d3d9d5ef17892ba941fddac841b9
 MD5 78cabecec5a214b5919c61cde43ab70c files/wvstreams-4.2.2-wireless-user.patch 466
 RMD160 1d3d9d5ef17892ba941fddac841b908de9303562 files/wvstreams-4.2.2-wireless-user.patch 466
 SHA256 b47b42821695cd8621156e52f89c0205bfd2ab7f5814892c95575eb5047315fa files/wvstreams-4.2.2-wireless-user.patch 466
-DIST wvstreams-4.0.2.tar.gz 1098599 RMD160 8f041f3b8059d20230f114f171f6c31b6ad872f3 SHA1 c613491cff9e002f73ffcf40abb907bea4fc81b7 SHA256 186a576115916598a3786df28aed7689bd9551c0ed3eda1a9f991f3bf5b18bb6
 DIST wvstreams-4.2.2.tar.gz 1269821 RMD160 dece6092e847976d01568f20707701a8241d30d2 SHA1 a44a9ded6339fb2c53eb472d0763e4cf6b0c0534 SHA256 8fa45a6bfe4d6ac3d9a457543844873090d0c7da817991ac0cd547732f475a14
-EBUILD wvstreams-4.0.2-r2.ebuild 2599 RMD160 47975e4856c24e7c9879828c1c82462ec9e41ded SHA1 c10bbb4556e3ebf170e302bd6d5eca6a8453e642 SHA256 2371df059b4b5251879e19799aab109a8609edacb0f4f8afd06f98ea66b3c0fd
-MD5 ea7a9e1b0dfb4af03478f51167572ec6 wvstreams-4.0.2-r2.ebuild 2599
-RMD160 47975e4856c24e7c9879828c1c82462ec9e41ded wvstreams-4.0.2-r2.ebuild 2599
-SHA256 2371df059b4b5251879e19799aab109a8609edacb0f4f8afd06f98ea66b3c0fd wvstreams-4.0.2-r2.ebuild 2599
-EBUILD wvstreams-4.2.2-r1.ebuild 2591 RMD160 ef47391e4f09540cffd12c0d0c9f50f004ad8698 SHA1 ad06304875efa2c89a7fe454cb4ec101ec8f6c6e SHA256 3cffc3c69ed77d3069b35325aecc3cc53e65df44f481505448e1b34831dcf807
-MD5 8b68be64daf0efbb10742bc8e1acd2f2 wvstreams-4.2.2-r1.ebuild 2591
-RMD160 ef47391e4f09540cffd12c0d0c9f50f004ad8698 wvstreams-4.2.2-r1.ebuild 2591
-SHA256 3cffc3c69ed77d3069b35325aecc3cc53e65df44f481505448e1b34831dcf807 wvstreams-4.2.2-r1.ebuild 2591
 EBUILD wvstreams-4.2.2-r2.ebuild 2501 RMD160 5cbae61a26d20d2234160df64009b9c86549fae4 SHA1 5686270c6bca044fbf722712f940c414b26b1a8a SHA256 7eba6e6b030546b58eb40c44dc900916e09024687292cbc9464583c3510d4d35
 MD5 8f737e2ff600fb4bb676f1b6a611c963 wvstreams-4.2.2-r2.ebuild 2501
 RMD160 5cbae61a26d20d2234160df64009b9c86549fae4 wvstreams-4.2.2-r2.ebuild 2501
@@ -76,23 +42,24 @@ EBUILD wvstreams-4.2.2.ebuild 2537 RMD160 93309344254038873a0c706117c850e280e01a
 MD5 bfef0ede67c42cb43776f76d6ec982e3 wvstreams-4.2.2.ebuild 2537
 RMD160 93309344254038873a0c706117c850e280e01ab0 wvstreams-4.2.2.ebuild 2537
 SHA256 01d7807c175eaa446084241b2e123ed87449a3289c62992686f0e37db77b22c3 wvstreams-4.2.2.ebuild 2537
-MISC ChangeLog 15169 RMD160 4325d4950ed1cf1dd846f14a9b8e3a27f8dfd478 SHA1 06af2c7a6940f43c3cf350fb6d3cbc120fd015ae SHA256 7e6b43db553742b006d09301d348332b016fc686a3ef7087c3cee514eff9657f
-MD5 d365ee7f59b8904fdf6b9dffd363d498 ChangeLog 15169
-RMD160 4325d4950ed1cf1dd846f14a9b8e3a27f8dfd478 ChangeLog 15169
-SHA256 7e6b43db553742b006d09301d348332b016fc686a3ef7087c3cee514eff9657f ChangeLog 15169
+MISC ChangeLog 15598 RMD160 63b163e5b4d4f7c8f6deddb8973c41de8fc9dc9a SHA1 90edd975fc5db1e70d16043631cf41af8a063dd0 SHA256 6088ed0feed72d253178b4e95f1fe5a4212aeff6dcc323260466cf0ed324bd82
+MD5 8fef4257ae3ee2ccf3e53398dd015365 ChangeLog 15598
+RMD160 63b163e5b4d4f7c8f6deddb8973c41de8fc9dc9a ChangeLog 15598
+SHA256 6088ed0feed72d253178b4e95f1fe5a4212aeff6dcc323260466cf0ed324bd82 ChangeLog 15598
 MISC metadata.xml 313 RMD160 e543c31d8ddc948a387dcdcc8638a848c587177b SHA1 a40d5fd17e50dc9f983efc63e5cbb8b407b95c7a SHA256 1ec30d4508abc443f3e9c4829b0e7d7e5c588419344203476818a29f71b98a37
 MD5 227de7f678ad662524292836709de75f metadata.xml 313
 RMD160 e543c31d8ddc948a387dcdcc8638a848c587177b metadata.xml 313
 SHA256 1ec30d4508abc443f3e9c4829b0e7d7e5c588419344203476818a29f71b98a37 metadata.xml 313
-MD5 8cc8c894e6b85859553c7e3e0e787601 files/digest-wvstreams-4.0.2-r2 250
-RMD160 203f72f2b9b0ba9b1f8e2c698fde9467e3441073 files/digest-wvstreams-4.0.2-r2 250
-SHA256 424dbc3c65894a87d385cf0706f5285349cba4e7ab6eca875859a5b5bc800535 files/digest-wvstreams-4.0.2-r2 250
 MD5 ce2f63ffae6742f96ede8200eb39c3d1 files/digest-wvstreams-4.2.2 250
 RMD160 ad134621ec5ac0b3b3884506e3abfbf770e34b52 files/digest-wvstreams-4.2.2 250
 SHA256 af8d2d360c3e497dcd8a2f2cc57ec947b2c99a440dff184197b350e60491f451 files/digest-wvstreams-4.2.2 250
-MD5 ce2f63ffae6742f96ede8200eb39c3d1 files/digest-wvstreams-4.2.2-r1 250
-RMD160 ad134621ec5ac0b3b3884506e3abfbf770e34b52 files/digest-wvstreams-4.2.2-r1 250
-SHA256 af8d2d360c3e497dcd8a2f2cc57ec947b2c99a440dff184197b350e60491f451 files/digest-wvstreams-4.2.2-r1 250
 MD5 ce2f63ffae6742f96ede8200eb39c3d1 files/digest-wvstreams-4.2.2-r2 250
 RMD160 ad134621ec5ac0b3b3884506e3abfbf770e34b52 files/digest-wvstreams-4.2.2-r2 250
 SHA256 af8d2d360c3e497dcd8a2f2cc57ec947b2c99a440dff184197b350e60491f451 files/digest-wvstreams-4.2.2-r2 250
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.5 (GNU/Linux)
+
+iD8DBQFFVf2l3sf9c6kjmR8RAsxAAKCuAxX5WqBzKmtkmTfPf0ylvYcGwwCghgQq
+Ji7WH0S8qjvZWHymhGCNPMc=
+=LgUO
+-----END PGP SIGNATURE-----
diff --git a/net-libs/wvstreams/files/digest-wvstreams-4.0.2-r2 b/net-libs/wvstreams/files/digest-wvstreams-4.0.2-r2
deleted file mode 100644
index e769764e3d9e..000000000000
--- a/net-libs/wvstreams/files/digest-wvstreams-4.0.2-r2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 ecb4e74ebaa1f45206f5d88eb34c5623 wvstreams-4.0.2.tar.gz 1098599
-RMD160 8f041f3b8059d20230f114f171f6c31b6ad872f3 wvstreams-4.0.2.tar.gz 1098599
-SHA256 186a576115916598a3786df28aed7689bd9551c0ed3eda1a9f991f3bf5b18bb6 wvstreams-4.0.2.tar.gz 1098599
diff --git a/net-libs/wvstreams/files/digest-wvstreams-4.2.2-r1 b/net-libs/wvstreams/files/digest-wvstreams-4.2.2-r1
deleted file mode 100644
index 02e8894f22b4..000000000000
--- a/net-libs/wvstreams/files/digest-wvstreams-4.2.2-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 103230cb9926cb8f3f4d8dc8584f3b9c wvstreams-4.2.2.tar.gz 1269821
-RMD160 dece6092e847976d01568f20707701a8241d30d2 wvstreams-4.2.2.tar.gz 1269821
-SHA256 8fa45a6bfe4d6ac3d9a457543844873090d0c7da817991ac0cd547732f475a14 wvstreams-4.2.2.tar.gz 1269821
diff --git a/net-libs/wvstreams/files/wvstreams-4.0.2-MOC-fix.patch b/net-libs/wvstreams/files/wvstreams-4.0.2-MOC-fix.patch
deleted file mode 100644
index f72d4a43b7ee..000000000000
--- a/net-libs/wvstreams/files/wvstreams-4.0.2-MOC-fix.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ur wvstreams-4.0.1.orig/wvrules.mk wvstreams-4.0.1/wvrules.mk
---- wvstreams-4.0.1.orig/wvrules.mk	2005-03-05 17:11:10.000000000 +0100
-+++ wvstreams-4.0.1/wvrules.mk	2005-03-05 17:11:57.000000000 +0100
-@@ -284,7 +284,7 @@
- %.E: %.cc;	$(call wvcxx,$@,$<,$*,,-E)
- %.E: %.cpp;	$(call wvcxx,$@,$<,$*,,-E)
- 
--%.moc: %.h;	moc -o $@ $<
-+%.moc: %.h;	$(MOC) -o $@ $<
- 
- ../%.so:;	@echo "Shared library $@ does not exist!"; exit 1
- ../%.a:;	@echo "Library $@ does not exist!"; exit 1
diff --git a/net-libs/wvstreams/files/wvstreams-4.0.2-external-xplc.patch b/net-libs/wvstreams/files/wvstreams-4.0.2-external-xplc.patch
deleted file mode 100644
index 27a356eac6ea..000000000000
--- a/net-libs/wvstreams/files/wvstreams-4.0.2-external-xplc.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-diff -Nru wvstreams-4.0.2.orig/configure.ac wvstreams-4.0.2/configure.ac
---- wvstreams-4.0.2.orig/configure.ac	2005-09-06 23:20:51.000000000 +0300
-+++ wvstreams-4.0.2/configure.ac	2005-09-06 23:23:37.277564368 +0300
-@@ -546,32 +546,25 @@
- 
- # xplc
- if test "$with_xplc" != "no"; then
--    if test "$with_xplc" = ""; then
--	if pkg-config --modversion xplc-0.3.10 2>/dev/null >/dev/null; then
--            WV_APPEND(CPPFLAGS, [`pkg-config --cflags xplc-0.3.10`])
--	    WV_APPEND(LDFLAGS, [`pkg-config --libs xplc-0.3.10`])
-+	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}`])
- 	    AC_CHECK_HEADERS(xplc/core.h,, [with_xplc=no], [#define UNSTABLE])
- 	    AC_CHECK_LIB(xplc, XPLC_getServiceManager,, [with_xplc=no])
- 	    xplc_pc="xplc-${xplc_version}"
- 	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])
--	AC_CHECK_LIB(xplc, XPLC_getServiceManager,, [with_xplc=no])
--	xplc_pc="xplc-${xplc_version}"
--    fi
--    # What if we can't find it?
--    if test "$with_xplc" = "no" && test -d xplc; then
-+
-+	# 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
-+        xplc_pc='wvxplc'
-+	fi
- fi
- 
- # zlib
diff --git a/net-libs/wvstreams/files/wvstreams-4.0.2-gcc41.patch b/net-libs/wvstreams/files/wvstreams-4.0.2-gcc41.patch
deleted file mode 100644
index a3c20831c36a..000000000000
--- a/net-libs/wvstreams/files/wvstreams-4.0.2-gcc41.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- include/wvhttppool.h	2005-03-23 22:01:23.000000000 -0400
-+++ include/wvhttppoolcp.h	2005-11-24 01:20:42.000000000 -0400
-@@ -57,7 +57,7 @@
-     WvString linkname;
-     WvUrl url;
- 
--    WvUrlLink::WvUrlLink(WvStringParm _linkname, WvStringParm _url)
-+    WvUrlLink(WvStringParm _linkname, WvStringParm _url)
- 	: linkname(_linkname), url(_url)
-     {}
- };
---- include/unilistgen.h	2005-03-23 22:01:23.000000000 -0400
-+++ include/unilistgencp.h	2005-11-24 01:28:13.000000000 -0400
-@@ -31,7 +31,7 @@
- {
- public:
-     UniListGen(UniConfGenList *_l);
--    virtual UniListGen::~UniListGen() { delete l; }
-+    virtual ~UniListGen() { delete l; }
- 
-     UniConfGenList *l;
-     UniConfGenList::Iter i;
diff --git a/net-libs/wvstreams/files/wvstreams-4.0.2-linux-serial.patch b/net-libs/wvstreams/files/wvstreams-4.0.2-linux-serial.patch
deleted file mode 100644
index 153d9ff04e2e..000000000000
--- a/net-libs/wvstreams/files/wvstreams-4.0.2-linux-serial.patch
+++ /dev/null
@@ -1,193 +0,0 @@
-diff -Nru wvstreams-4.0.2.orig/config.guess wvstreams-4.0.2/config.guess
---- wvstreams-4.0.2.orig/config.guess	2005-03-24 04:01:23.000000000 +0200
-+++ wvstreams-4.0.2/config.guess	2005-03-29 12:02:45.364438808 +0300
-@@ -3,7 +3,7 @@
- #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
- #   2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
- 
--timestamp='2004-08-13'
-+timestamp='2004-11-12'
- 
- # This file is free software; you can redistribute it and/or modify it
- # under the terms of the GNU General Public License as published by
-@@ -319,6 +319,9 @@
-     *:OS/390:*:*)
- 	echo i370-ibm-openedition
- 	exit 0 ;;
-+    *:z/VM:*:*)
-+	echo s390-ibm-zvmoe
-+	exit 0 ;;
-     *:OS400:*:*)
-         echo powerpc-ibm-os400
- 	exit 0 ;;
-@@ -342,7 +345,7 @@
-     DRS?6000:unix:4.0:6*)
- 	echo sparc-icl-nx6
- 	exit 0 ;;
--    DRS?6000:UNIX_SV:4.2*:7*)
-+    DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*)
- 	case `/usr/bin/uname -p` in
- 	    sparc) echo sparc-icl-nx7 && exit 0 ;;
- 	esac ;;
-@@ -824,6 +827,12 @@
-     cris:Linux:*:*)
- 	echo cris-axis-linux-gnu
- 	exit 0 ;;
-+    crisv32:Linux:*:*)
-+	echo crisv32-axis-linux-gnu
-+	exit 0 ;;
-+    frv:Linux:*:*)
-+    	echo frv-unknown-linux-gnu
-+	exit 0 ;;
-     ia64:Linux:*:*)
- 	echo ${UNAME_MACHINE}-unknown-linux-gnu
- 	exit 0 ;;
-@@ -1241,7 +1250,10 @@
- 	    A*) echo alpha-dec-vms && exit 0 ;;
- 	    I*) echo ia64-dec-vms && exit 0 ;;
- 	    V*) echo vax-dec-vms && exit 0 ;;
--	esac
-+	esac ;;
-+    *:XENIX:*:SysV)
-+	echo i386-pc-xenix
-+	exit 0 ;;
- esac
- 
- #echo '(No uname command or uname output not recognized.)' 1>&2
-diff -Nru wvstreams-4.0.2.orig/config.sub wvstreams-4.0.2/config.sub
---- wvstreams-4.0.2.orig/config.sub	2005-03-24 04:01:23.000000000 +0200
-+++ wvstreams-4.0.2/config.sub	2005-03-29 12:02:45.365438656 +0300
-@@ -3,7 +3,7 @@
- #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
- #   2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
- 
--timestamp='2004-06-24'
-+timestamp='2004-11-30'
- 
- # This file is (in principle) common to ALL GNU software.
- # The presence of a machine in this file suggests that SOME GNU software
-@@ -267,7 +267,7 @@
- 	| tahoe | thumb | tic4x | tic80 | tron \
- 	| v850 | v850e \
- 	| we32k \
--	| x86 | xscale | xstormy16 | xtensa \
-+	| x86 | xscale | xscalee[bl] | xstormy16 | xtensa \
- 	| z8k)
- 		basic_machine=$basic_machine-unknown
- 		;;
-@@ -343,8 +343,8 @@
- 	| tron-* \
- 	| v850-* | v850e-* | vax-* \
- 	| we32k-* \
--	| x86-* | x86_64-* | xps100-* | xscale-* | xstormy16-* \
--	| xtensa-* \
-+	| x86-* | x86_64-* | xps100-* | xscale-* | xscalee[bl]-* \
-+	| xstormy16-* | xtensa-* \
- 	| ymp-* \
- 	| z8k-*)
- 		;;
-@@ -457,6 +457,9 @@
- 	crds | unos)
- 		basic_machine=m68k-crds
- 		;;
-+	crisv32 | crisv32-* | etraxfs*)
-+		basic_machine=crisv32-axis
-+		;;
- 	cris | cris-* | etrax*)
- 		basic_machine=cris-axis
- 		;;
-@@ -486,6 +489,10 @@
- 		basic_machine=m88k-motorola
- 		os=-sysv3
- 		;;
-+	djgpp)
-+		basic_machine=i586-pc
-+		os=-msdosdjgpp
-+		;;
- 	dpx20 | dpx20-*)
- 		basic_machine=rs6000-bull
- 		os=-bosx
-@@ -1026,6 +1033,10 @@
- 		basic_machine=hppa1.1-winbond
- 		os=-proelf
- 		;;
-+	xbox)
-+		basic_machine=i686-pc
-+		os=-mingw32
-+		;;
- 	xps | xps100)
- 		basic_machine=xps100-honeywell
- 		;;
-@@ -1294,6 +1305,9 @@
- 	-kaos*)
- 		os=-kaos
- 		;;
-+	-zvmoe)
-+		os=-zvmoe
-+		;;
- 	-none)
- 		;;
- 	*)
-diff -Nru wvstreams-4.0.2.orig/debian/control wvstreams-4.0.2/debian/control
---- wvstreams-4.0.2.orig/debian/control	2005-03-24 04:01:23.000000000 +0200
-+++ wvstreams-4.0.2/debian/control	2005-03-29 12:02:45.367438352 +0300
-@@ -3,7 +3,7 @@
- Priority: optional
- Maintainer: Simon Law <sfllaw@debian.org>
- Uploaders: James Morrison <phython@debian.org>, Patrick Patterson <ppatters@debian.org>
--Build-Depends: debhelper (>> 4.0.0), fftw-dev, libdb4.2-dev, libfam-dev, libpam0g-dev, libqt3-mt-dev, libslp-dev, libspeex-dev, libssl-dev, libvorbis-dev, libxplc0.3.10-dev, zlib1g-dev
-+Build-Depends: debhelper (>> 4.0.0), fftw-dev, libdb4.2-dev, libfam-dev, libpam0g-dev, libqt3-mt-dev, libslp-dev, libspeex-dev, libssl-dev, libvorbis-dev, libxplc0.3.10-dev, zlib1g-dev, doxygen
- Build-Depends-Indep: doxygen
- Standards-Version: 3.6.1
- 
-@@ -99,7 +99,7 @@
- Package: libwvstreams-dev
- Architecture: any
- Section: libdevel
--Depends: libwvstreams4.0-base, libwvstreams4.0-extras, libuniconf4.0, libwvstreams4.0-fft, libwvstreams4.0-qt, libwvstreams4.0-speex, libwvstreams4.0-vorbis, ${misc:Depends}
-+Depends: libwvstreams4.0-base, libwvstreams4.0-extras, libuniconf4.0, libwvstreams4.0-fft, libwvstreams4.0-qt, libwvstreams4.0-speex, libwvstreams4.0-vorbis, libxplc0.3.10-dev, ${misc:Depends}
- Provides: libwvstreams4.0-dev
- Description: Development libraries and header files for libwvstreams4.0
-  Contains the header files and static libraries for use in rapid 
-diff -Nru wvstreams-4.0.2.orig/streams/wvmodem.cc wvstreams-4.0.2/streams/wvmodem.cc
---- wvstreams-4.0.2.orig/streams/wvmodem.cc	2005-03-24 04:01:23.000000000 +0200
-+++ wvstreams-4.0.2/streams/wvmodem.cc	2005-03-29 12:09:25.258645648 +0300
-@@ -192,22 +192,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)
--	seterr("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)
--	    seterr("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.0.2-speex-const.patch b/net-libs/wvstreams/files/wvstreams-4.0.2-speex-const.patch
deleted file mode 100644
index b20e8d90bb59..000000000000
--- a/net-libs/wvstreams/files/wvstreams-4.0.2-speex-const.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -Nru wvstreams-4.0.2.orig/oggspeex/wvoggspeex.cc wvstreams-4.0.2/oggspeex/wvoggspeex.cc
---- wvstreams-4.0.2.orig/oggspeex/wvoggspeex.cc	2005-03-24 04:01:23.000000000 +0200
-+++ wvstreams-4.0.2/oggspeex/wvoggspeex.cc	2005-03-30 21:23:57.357906840 +0300
-@@ -15,6 +15,10 @@
- 
- #define OGG_SPEEX_DECODER_BUF_SIZE 16384 // at most 16k at once
- 
-+#ifndef MAX_BYTES_PER_FRAME
-+#define MAX_BYTES_PER_FRAME 2000
-+#endif
-+
- /** Extracts a little endian integer from a buffer. */
- static unsigned long int getint_le(WvBuf &inbuf)
- {
-@@ -170,8 +174,7 @@
-     // generate stream header
-     ogg_packet header;
-     SpeexHeader spxheader;
--    SpeexMode *spxmode = speex_mode_list[mode()];
--    speex_init_header(&spxheader, samplingrate(), channels(), spxmode);
-+    speex_init_header(&spxheader, samplingrate(), channels(), speex_mode_list[mode()]);
-     spxheader.vbr = vbr();
-     spxheader.bitrate = nominalbitrate();
-     spxheader.frames_per_packet = 1;
diff --git a/net-libs/wvstreams/files/wvstreams-4.0.2-tcl_8_4.patch b/net-libs/wvstreams/files/wvstreams-4.0.2-tcl_8_4.patch
deleted file mode 100644
index da5fd71b5a34..000000000000
--- a/net-libs/wvstreams/files/wvstreams-4.0.2-tcl_8_4.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -Nru wvstreams-4.0.2.orig/configure.ac wvstreams-4.0.2/configure.ac
---- wvstreams-4.0.2.orig/configure.ac	2005-03-24 04:01:23.000000000 +0200
-+++ wvstreams-4.0.2/configure.ac	2005-03-29 12:11:53.268144784 +0300
-@@ -474,9 +474,9 @@
- # tcl
- if test "$with_tcl" != "no"; then
-     CPPFLAGS_save="$CPPFLAGS"
--    WV_APPEND(CPPFLAGS, -I/usr/include/tcl8.3)
-+    WV_APPEND(CPPFLAGS, -I/usr/include)
-     AC_CHECK_HEADERS(tcl.h,, [with_tcl=no])
--    AC_CHECK_LIB(tcl8.3, TclInterpInit,, [with_tcl=no])
-+    AC_CHECK_LIB(tcl8.4, TclInterpInit,, [with_tcl=no])
-     if test "$with_tcl" != "no"; then
-         CPPFLAGS="$CPPFLAGS_save"
-     fi
-diff -Nru wvstreams-4.0.2.orig/vars.mk wvstreams-4.0.2/vars.mk
---- wvstreams-4.0.2.orig/vars.mk	2005-03-24 04:01:23.000000000 +0200
-+++ wvstreams-4.0.2/vars.mk	2005-03-29 12:11:53.267144936 +0300
-@@ -251,3 +251,5 @@
- 
- libwvgtk.a libwvgtk.so: $(call objects,gtk)
- libwvgtk.so: -lgtk -lgdk libwvstreams.so libwvutils.so
-+
-+libuniconf_tcl.so: bindings/uniconf_tcl.o -ltcl8.4 -luniconf
diff --git a/net-libs/wvstreams/files/wvstreams-4.0.2-wireless-user.patch b/net-libs/wvstreams/files/wvstreams-4.0.2-wireless-user.patch
deleted file mode 100644
index 6ba608656fee..000000000000
--- a/net-libs/wvstreams/files/wvstreams-4.0.2-wireless-user.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Nru wvstreams-4.0.2.orig/linuxstreams/wvinterface.cc wvstreams-4.0.2/linuxstreams/wvinterface.cc
---- wvstreams-4.0.2.orig/linuxstreams/wvinterface.cc	2005-03-24 04:01:23.000000000 +0200
-+++ wvstreams-4.0.2/linuxstreams/wvinterface.cc	2005-04-04 23:06:23.927608040 +0300
-@@ -21,6 +21,7 @@
- #include <errno.h>
- #include <linux/sockios.h>
- 
-+#include <linux/compiler.h>
- #define _LINUX_IF_H /* Hack to prevent loading linux/if.h */
- #include <linux/wireless.h>
- 
diff --git a/net-libs/wvstreams/wvstreams-4.0.2-r2.ebuild b/net-libs/wvstreams/wvstreams-4.0.2-r2.ebuild
deleted file mode 100644
index b2ef28a1f482..000000000000
--- a/net-libs/wvstreams/wvstreams-4.0.2-r2.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/wvstreams/wvstreams-4.0.2-r2.ebuild,v 1.9 2006/10/23 07:46:37 mrness Exp $
-
-inherit eutils
-
-DESCRIPTION="A network programming library in C++"
-HOMEPAGE="http://open.nit.ca/wiki/?page=WvStreams"
-SRC_URI="http://www.csclub.uwaterloo.ca/~ja2morri/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ~hppa ppc sparc x86"
-IUSE="gtk qt3 vorbis speex fam qdbm pam slp doc fftw tcl debug"
-
-RDEPEND="virtual/libc
-	>=sys-libs/db-3
-	>=sys-libs/zlib-1.1.4
-	>=dev-libs/openssl-0.9.7
-	dev-libs/xplc
-	gtk? ( >=x11-libs/gtk+-2.2.0 )
-	qt3? ( =x11-libs/qt-3* )
-	vorbis? ( >=media-libs/libvorbis-1.0 )
-	speex? ( media-libs/speex !=media-libs/speex-1.1.4 )
-	fam? ( virtual/fam )
-	qdbm? ( dev-db/qdbm )
-	pam? ( >=sys-libs/pam-0.75 )
-	slp? ( >=net-libs/openslp-1.0.9a )
-	doc? ( app-doc/doxygen )
-	fftw? ( sci-libs/fftw )
-	tcl? ( >=dev-lang/tcl-8.4 dev-lang/swig )"
-
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	>=sys-devel/autoconf-2.59"
-
-src_unpack() {
-	unpack ${A} ; cd ${S}
-
-	epatch ${FILESDIR}/${P}-gcc41.patch
-	epatch ${FILESDIR}/${P}-linux-serial.patch
-	epatch ${FILESDIR}/${P}-wireless-user.patch
-	epatch ${FILESDIR}/${P}-speex-const.patch
-
-	if useq tcl; then
-		epatch ${FILESDIR}/${P}-tcl_8_4.patch
-	fi
-
-	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"
-
-	useq qt3 && epatch ${FILESDIR}/${P}-MOC-fix.patch
-}
-
-src_compile() {
-	env WANT_AUTOCONF=2.5 autoconf || die "autoconf failed" #needed by xplc and tcl patch
-
-	local myconf
-	if useq qt3; then
-		myconf="--with-qt=/usr/qt/3/"
-		export MOC="/usr/qt/3/bin/moc"
-	else
-		myconf="--without-qt"
-	fi
-	econf ${myconf} \
-		$(use_with gtk) \
-		$(use_with vorbis ogg) \
-		$(use_with vorbis) \
-		$(use_with speex) \
-		$(use_with fam) \
-		$(use_with qdbm) \
-		$(use_with pam) \
-		$(use_with fftw) \
-		$(use_with slp openslp) \
-		$(use_with tcl) \
-		$(use_enable debug) \
-		--enable-verbose \
-		--with-bdb \
-		--with-zlib \
-		--with-openssl \
-		--with-xplc \
-		|| die "configure failed"
-	emake CXXOPTS="-fPIC -DPIC" COPTS="-fPIC -DPIC" || die "compile failed"
-	use doc && doxygen
-}
-
-src_install() {
-	make DESTDIR=${D} install || die "make install failed"
-	dodoc README COPYING.LIB
-	use doc && dohtml -r Docs/doxy-html/*
-}
diff --git a/net-libs/wvstreams/wvstreams-4.2.2-r1.ebuild b/net-libs/wvstreams/wvstreams-4.2.2-r1.ebuild
deleted file mode 100644
index e8f1559d8062..000000000000
--- a/net-libs/wvstreams/wvstreams-4.2.2-r1.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/wvstreams/wvstreams-4.2.2-r1.ebuild,v 1.4 2006/10/23 07:46:37 mrness Exp $
-
-inherit eutils fixheadtails
-
-DESCRIPTION="A network programming library in C++"
-HOMEPAGE="http://open.nit.ca/wiki/?page=WvStreams"
-SRC_URI="http://open.nit.ca/download/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~sparc ~x86"
-IUSE="gtk qt3 qdbm pam slp doc tcl debug"
-
-RDEPEND=">=sys-libs/db-3
-	>=sys-libs/zlib-1.1.4
-	>=dev-libs/openssl-0.9.7
-	>=dev-libs/xplc-0.3.13
-	qt3? ( =x11-libs/qt-3* )
-	qdbm? ( dev-db/qdbm )
-	pam? ( >=sys-libs/pam-0.75 )
-	slp? ( >=net-libs/openslp-1.0.9a )
-	doc? ( app-doc/doxygen )
-	tcl? ( >=dev-lang/tcl-8.4 dev-lang/swig )"
-
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	>=sys-devel/autoconf-2.59"
-
-src_unpack() {
-	unpack ${A}
-
-	epatch "${FILESDIR}/${P}-gcc41.patch"
-	epatch "${FILESDIR}/${P}-linux-serial.patch"
-	epatch "${FILESDIR}/${P}-wireless-user.patch"
-	epatch "${FILESDIR}/${P}-uniconfd-ini.patch"
-
-	if use tcl; then
-		epatch "${FILESDIR}/${P}-tcl_8_4.patch"
-	fi
-
-	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"
-
-	use qt3 && epatch "${FILESDIR}/${P}-MOC-fix.patch"
-
-	ht_fix_file "${S}/configure.ac"
-}
-
-src_compile() {
-	env WANT_AUTOCONF=2.5 autoconf || die "autoconf failed" #needed by xplc and tcl patch
-	#without following, the makefile would remove some files and request 
-	#you to run ./configure again
-	touch include/wvautoconf.h.in configure
-
-	local myconf
-	if use qt3; then
-		myconf="--with-qt=/usr/qt/3/"
-		export MOC="/usr/qt/3/bin/moc"
-	else
-		myconf="--without-qt"
-	fi
-	econf ${myconf} \
-		$(use_with qdbm) \
-		$(use_with pam) \
-		$(use_with slp openslp) \
-		$(use_with tcl) \
-		$(use_enable debug) \
-		--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_test() {
-	ewarn "Test is disabled for this package!"
-}
-
-src_install() {
-	make 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
-}