Stable on sparc wrt #146607 & cleanup

(Portage version: 2.1.1)
 (Signed Manifest commit)

11 files changed, 12 insertions, 484 deletions

diff --git a/net-misc/upnp/Manifest b/net-misc/upnp/Manifest
index ff703e4ac15b..ed3dc7b43ce8 100644
--- a/net-misc/upnp/Manifest
+++ b/net-misc/upnp/Manifest
@@ -1,65 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX libupnp-1.2.1a-fbsd.patch 6469 RMD160 839d612f5f542fd543a3ad84b7a741d2d2ab098b SHA1 95c997bc42adbb57e1438bc0d9b3de5eb8e91017 SHA256 cdc5164c681cea850bfda3ce2010dccedbfc84828eda7dc3f91338cc75f98573
-MD5 c4aa95f0d28d69430c3521a3992e552a files/libupnp-1.2.1a-fbsd.patch 6469
-RMD160 839d612f5f542fd543a3ad84b7a741d2d2ab098b files/libupnp-1.2.1a-fbsd.patch 6469
-SHA256 cdc5164c681cea850bfda3ce2010dccedbfc84828eda7dc3f91338cc75f98573 files/libupnp-1.2.1a-fbsd.patch 6469
-AUX libupnp-1.2.1a-gcc4.patch 666 RMD160 e45d67dffc22ceba77bcb266c8d9e79590c97d5c SHA1 c87f266599178eb32efd6be6aa36840611571c12 SHA256 163c4fabe3911441a50350f8014be4ce37889d559616dbb43d31f7c91a470409
-MD5 821691c8c7f957f184793cb095707b7b files/libupnp-1.2.1a-gcc4.patch 666
-RMD160 e45d67dffc22ceba77bcb266c8d9e79590c97d5c files/libupnp-1.2.1a-gcc4.patch 666
-SHA256 163c4fabe3911441a50350f8014be4ce37889d559616dbb43d31f7c91a470409 files/libupnp-1.2.1a-gcc4.patch 666
-AUX libupnp-1.2.1a-respectflags.patch 1398 RMD160 aac05a6ce685514930df977342a78b79d1e71024 SHA1 5245ac4e4b10ff4fecc997e9895fe2c150c8ad1d SHA256 58757f0e37eb03aa50f2789c0c6fb9b4b2b21d736bf0a8d614bd33f34b30562e
-MD5 5a5138abf3b24355d111f9d6adaaa400 files/libupnp-1.2.1a-respectflags.patch 1398
-RMD160 aac05a6ce685514930df977342a78b79d1e71024 files/libupnp-1.2.1a-respectflags.patch 1398
-SHA256 58757f0e37eb03aa50f2789c0c6fb9b4b2b21d736bf0a8d614bd33f34b30562e files/libupnp-1.2.1a-respectflags.patch 1398
-AUX msmessenger.patch 590 RMD160 e9aee63621cdd1a7b38caac5ca42924f189d7fe9 SHA1 4754048a350faa8827a1855ca8327dd559f0c3b9 SHA256 d90a279e25c830c5b8e05e2695a79cc062f04da87b82abc9d4fb8b9dc9ab4a67
-MD5 d1e8a04f3971c238d992f69d683fe65b files/msmessenger.patch 590
-RMD160 e9aee63621cdd1a7b38caac5ca42924f189d7fe9 files/msmessenger.patch 590
-SHA256 d90a279e25c830c5b8e05e2695a79cc062f04da87b82abc9d4fb8b9dc9ab4a67 files/msmessenger.patch 590
-DIST libupnp-1.2.1a.tar.gz 411423
 DIST libupnp-1.3.1.tar.gz 734692 RMD160 9e02a9189576eedeb336c9af79f068e933d49d55 SHA1 a1fc5a0b250da80e249dbed6aba836b9a2b08972 SHA256 4d0d6a5302222757fb36ee21d8f8e1b3de849c2de658ab1105272f32ff78767d
-DIST upnpsdk-1.0.4.tar.gz 227425
-EBUILD upnp-1.0.4-r1.ebuild 919 RMD160 6535f9679e90556aa971a1ecc69876d36b439ef0 SHA1 9849d1429450de781551f277c89e5052b2375519 SHA256 89b92ee76bf0b08a925db892ffed79d83c232430d2b99f67d4be955fca6faf13
-MD5 1ab317d5868a9b63279d0fd1a2013ff7 upnp-1.0.4-r1.ebuild 919
-RMD160 6535f9679e90556aa971a1ecc69876d36b439ef0 upnp-1.0.4-r1.ebuild 919
-SHA256 89b92ee76bf0b08a925db892ffed79d83c232430d2b99f67d4be955fca6faf13 upnp-1.0.4-r1.ebuild 919
-EBUILD upnp-1.0.4.ebuild 859 RMD160 c48bc0aa136eea2f9da8a49458ab2f16e26fae4c SHA1 5ff11cb945cbc63273e603e8d372b8ca55dce48e SHA256 6537077eb8f07d3fc23ad46da14226c3576fa2ccdb239708ef56d068e5758cb1
-MD5 a0c64a5cb4d40e2ffa38d1a21c8d5915 upnp-1.0.4.ebuild 859
-RMD160 c48bc0aa136eea2f9da8a49458ab2f16e26fae4c upnp-1.0.4.ebuild 859
-SHA256 6537077eb8f07d3fc23ad46da14226c3576fa2ccdb239708ef56d068e5758cb1 upnp-1.0.4.ebuild 859
-EBUILD upnp-1.2.1a.ebuild 1592 RMD160 a790d0d75e44124fb1d9454ec1dbb675e98c6bf4 SHA1 084a7dd059c013af03184a92f491ac7ff2ff43a3 SHA256 b1336279f12ec95b94fefe7cfe351514d2612f70689fbd65026aab3a4c10ad00
-MD5 b613c0ddbf932cafebce2b65c5fbe656 upnp-1.2.1a.ebuild 1592
-RMD160 a790d0d75e44124fb1d9454ec1dbb675e98c6bf4 upnp-1.2.1a.ebuild 1592
-SHA256 b1336279f12ec95b94fefe7cfe351514d2612f70689fbd65026aab3a4c10ad00 upnp-1.2.1a.ebuild 1592
-EBUILD upnp-1.3.1.ebuild 1063 RMD160 05c08aa6d6a8fb2e30770ec53ac2c621ddd59fc3 SHA1 8e3b9ab776d0e858197b85e1a53a2b1944d7d142 SHA256 108f896edfcbde633a58a6949277bbb9f2cfbbe22c0426b2bc2751a9958d6b3d
-MD5 368745cd80201a8075c33a9110936c3c upnp-1.3.1.ebuild 1063
-RMD160 05c08aa6d6a8fb2e30770ec53ac2c621ddd59fc3 upnp-1.3.1.ebuild 1063
-SHA256 108f896edfcbde633a58a6949277bbb9f2cfbbe22c0426b2bc2751a9958d6b3d upnp-1.3.1.ebuild 1063
-MISC ChangeLog 2348 RMD160 366ef45925435cae97a4e9c4ac84a1bd66891fc8 SHA1 0598fd050bcb96c9fdaae2b57c407288a85c9a02 SHA256 caed43b4904f441c674ac714bb7d7b0cd168157d27b12ea8de211bb186d68647
-MD5 703a954a84dc4f04ff950db328c481c5 ChangeLog 2348
-RMD160 366ef45925435cae97a4e9c4ac84a1bd66891fc8 ChangeLog 2348
-SHA256 caed43b4904f441c674ac714bb7d7b0cd168157d27b12ea8de211bb186d68647 ChangeLog 2348
+EBUILD upnp-1.3.1.ebuild 1065 RMD160 5e2ae7431c7f7970480cac071148f11fe43825c6 SHA1 8ca63af8eb15abe84bcdf642a3a4281e300edc4c SHA256 72ad91a1085c6c037deebebb75bc37fb6f75584507428edf91555b5e9ec948ea
+MD5 89e5903503c195964bf5453001e8ecc3 upnp-1.3.1.ebuild 1065
+RMD160 5e2ae7431c7f7970480cac071148f11fe43825c6 upnp-1.3.1.ebuild 1065
+SHA256 72ad91a1085c6c037deebebb75bc37fb6f75584507428edf91555b5e9ec948ea upnp-1.3.1.ebuild 1065
+MISC ChangeLog 2673 RMD160 5a001f059303f2f3b5c35e804fb918e7e0eac1d6 SHA1 6ca45539ec849a058ecdf509d1c92b11560f629a SHA256 3d30bf3c42706cc504545d97c67d4edad8d79d2519d103942a55c4c69def3a20
+MD5 1d07930e5b0b6660a2d0d63987d67aa0 ChangeLog 2673
+RMD160 5a001f059303f2f3b5c35e804fb918e7e0eac1d6 ChangeLog 2673
+SHA256 3d30bf3c42706cc504545d97c67d4edad8d79d2519d103942a55c4c69def3a20 ChangeLog 2673
 MISC metadata.xml 328 RMD160 f308962cfa3170a17c8282b91990d3f2796ea69a SHA1 36afde39e4132faaf65d113401526ea92be3a5e0 SHA256 8fc4b28e4afce8ffd31932e1bd349c3b6642bd3c4cb343d364d3f8f385346ac9
 MD5 ab4917b0c655232761c5fe1c1198cfd6 metadata.xml 328
 RMD160 f308962cfa3170a17c8282b91990d3f2796ea69a metadata.xml 328
 SHA256 8fc4b28e4afce8ffd31932e1bd349c3b6642bd3c4cb343d364d3f8f385346ac9 metadata.xml 328
-MD5 9c84a2a05767ba2a9032b767c32b19d9 files/digest-upnp-1.0.4 65
-RMD160 8d982194115143a0b5fae30bd8f548cb50865d50 files/digest-upnp-1.0.4 65
-SHA256 ea2c4e161f02a77dc9e0be56f0329f0e48ba26c3c00717fa919c44f55ad24db9 files/digest-upnp-1.0.4 65
-MD5 9c84a2a05767ba2a9032b767c32b19d9 files/digest-upnp-1.0.4-r1 65
-RMD160 8d982194115143a0b5fae30bd8f548cb50865d50 files/digest-upnp-1.0.4-r1 65
-SHA256 ea2c4e161f02a77dc9e0be56f0329f0e48ba26c3c00717fa919c44f55ad24db9 files/digest-upnp-1.0.4-r1 65
-MD5 3dbbca36405d3fb80da9e680a2457e1e files/digest-upnp-1.2.1a 66
-RMD160 343b66b4b7f0968fb8b45ef50ccac0d859d996cc files/digest-upnp-1.2.1a 66
-SHA256 c05bb2e39a269d282e3c1bdaa42d7aac7755bbae8ddf0ac53860b63f50dbc68b files/digest-upnp-1.2.1a 66
 MD5 3af4964cccf3c792cf004aefeac38534 files/digest-upnp-1.3.1 241
 RMD160 70500179ca0d3f0e5659b96b9fe1fae79975b0be files/digest-upnp-1.3.1 241
 SHA256 e934736865e2ca5dcc61a2a43d3df2604ef9c2b9c098c097be967b466f46d1e5 files/digest-upnp-1.3.1 241
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5 (GNU/Linux)
+Version: GnuPG v1.4.5-ecc0.1.6 (GNU/Linux)
 
-iD8DBQFFAyUy10xuJSrg3/sRAsm8AJ9qetFgB8i4z38hxKEWeDsXKcb16ACeOq+O
-gb4LibMOb0qRqZjNSFGZqc8=
-=aaXX
+iD8DBQFFCcCnKRy60XGEcJIRAhlpAKCvwKe0gL8kZQyclXattqSMUFOmEgCfUYAt
+y9aWtOWm8KqeXdcRtAz9w70=
+=HIag
 -----END PGP SIGNATURE-----
diff --git a/net-misc/upnp/files/digest-upnp-1.0.4 b/net-misc/upnp/files/digest-upnp-1.0.4
deleted file mode 100644
index 6b71d741358c..000000000000
--- a/net-misc/upnp/files/digest-upnp-1.0.4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 d4ebd84d0c809d90ae36c37e5a2d213c upnpsdk-1.0.4.tar.gz 227425
diff --git a/net-misc/upnp/files/digest-upnp-1.0.4-r1 b/net-misc/upnp/files/digest-upnp-1.0.4-r1
deleted file mode 100644
index 6b71d741358c..000000000000
--- a/net-misc/upnp/files/digest-upnp-1.0.4-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 d4ebd84d0c809d90ae36c37e5a2d213c upnpsdk-1.0.4.tar.gz 227425
diff --git a/net-misc/upnp/files/digest-upnp-1.2.1a b/net-misc/upnp/files/digest-upnp-1.2.1a
deleted file mode 100644
index d49a9db1c296..000000000000
--- a/net-misc/upnp/files/digest-upnp-1.2.1a
+++ /dev/null
@@ -1 +0,0 @@
-MD5 e72b3550bf064eedf080f16f09688891 libupnp-1.2.1a.tar.gz 411423
diff --git a/net-misc/upnp/files/libupnp-1.2.1a-fbsd.patch b/net-misc/upnp/files/libupnp-1.2.1a-fbsd.patch
deleted file mode 100644
index 6bad23e91a5e..000000000000
--- a/net-misc/upnp/files/libupnp-1.2.1a-fbsd.patch
+++ /dev/null
@@ -1,209 +0,0 @@
-Index: libupnp-1.2.1a/upnp/src/api/upnpapi.c
-===================================================================
---- libupnp-1.2.1a.orig/upnp/src/api/upnpapi.c
-+++ libupnp-1.2.1a/upnp/src/api/upnpapi.c
-@@ -43,7 +43,7 @@
- #include "ThreadPool.h"
- #include "membuffer.h"
- #include <sys/ioctl.h>
--#include <linux/if.h>
-+#include <net/if.h>
- #include <sys/utsname.h>
- #include <sys/socket.h>
- #include <netinet/in.h>
-Index: libupnp-1.2.1a/ixml/inc/ixml.h
-===================================================================
---- libupnp-1.2.1a.orig/ixml/inc/ixml.h
-+++ libupnp-1.2.1a/ixml/inc/ixml.h
-@@ -34,7 +34,7 @@
- 
- #include <stdio.h>
- #include <string.h>
--#include <malloc.h>
-+#include <stdlib.h>
- #include <assert.h>
- 
- typedef int BOOL;
-Index: libupnp-1.2.1a/threadutil/inc/FreeList.h
-===================================================================
---- libupnp-1.2.1a.orig/threadutil/inc/FreeList.h
-+++ libupnp-1.2.1a/threadutil/inc/FreeList.h
-@@ -36,8 +36,7 @@
- extern "C" {
- #endif
- 
--#include <malloc.h>
--
-+#include <stdlib.h>
- 
- #include "ithread.h"
- #include <errno.h>
-Index: libupnp-1.2.1a/threadutil/src/LinkedList.c
-===================================================================
---- libupnp-1.2.1a.orig/threadutil/src/LinkedList.c
-+++ libupnp-1.2.1a/threadutil/src/LinkedList.c
-@@ -30,7 +30,7 @@
- ///////////////////////////////////////////////////////////////////////////
- 
- #include "LinkedList.h"
--#include <malloc.h>
-+#include <stdlib.h>
- #include <assert.h>
- 
- static int
-Index: libupnp-1.2.1a/threadutil/src/iasnprintf.c
-===================================================================
---- libupnp-1.2.1a.orig/threadutil/src/iasnprintf.c
-+++ libupnp-1.2.1a/threadutil/src/iasnprintf.c
-@@ -31,7 +31,7 @@
- 
- #include <stdarg.h>
- #include <assert.h>
--#include <malloc.h>
-+#include <stdlib.h>
- #include <stdio.h>
- #include "iasnprintf.h"
- 
-Index: libupnp-1.2.1a/upnp/src/genlib/util/upnp_timeout.c
-===================================================================
---- libupnp-1.2.1a.orig/upnp/src/genlib/util/upnp_timeout.c
-+++ libupnp-1.2.1a/upnp/src/genlib/util/upnp_timeout.c
-@@ -35,7 +35,7 @@
- ************************************************************************/
- 
- #include "upnp_timeout.h"
--#include <malloc.h>
-+#include <stdlib.h>
- 
- /************************************************************************
- *	Function :	free_upnp_timeout
-Index: libupnp-1.2.1a/upnp/src/inc/client_table.h
-===================================================================
---- libupnp-1.2.1a.orig/upnp/src/inc/client_table.h
-+++ libupnp-1.2.1a/upnp/src/inc/client_table.h
-@@ -39,7 +39,7 @@ extern "C" {
- #include "upnp.h"
- 
- #include <stdio.h>
--#include <malloc.h>
-+#include <stdlib.h>
- #include <time.h>
- #include "uri.h"
- #include "service_table.h"
-Index: libupnp-1.2.1a/upnp/src/inc/http_client.h
-===================================================================
---- libupnp-1.2.1a.orig/upnp/src/inc/http_client.h
-+++ libupnp-1.2.1a/upnp/src/inc/http_client.h
-@@ -40,7 +40,6 @@
- #include <fcntl.h>
- #include <string.h>
- #include <sys/types.h>
--#include <malloc.h>
- #include <time.h>
- #include <errno.h>
- #include <ctype.h>
-Index: libupnp-1.2.1a/upnp/src/inc/service_table.h
-===================================================================
---- libupnp-1.2.1a.orig/upnp/src/inc/service_table.h
-+++ libupnp-1.2.1a/upnp/src/inc/service_table.h
-@@ -42,7 +42,7 @@ extern "C" {
- 
- #include "upnp.h"
- #include <stdio.h>
--#include <malloc.h>
-+#include <stdlib.h>
- #include <time.h>
- 
- #define SID_SIZE  41
-Index: libupnp-1.2.1a/upnp/src/inc/uri.h
-===================================================================
---- libupnp-1.2.1a.orig/upnp/src/inc/uri.h
-+++ libupnp-1.2.1a/upnp/src/inc/uri.h
-@@ -39,7 +39,6 @@ extern "C" {
- #include <fcntl.h>
- #include <string.h>
- #include <sys/types.h>
--#include <malloc.h>
- #include <time.h>
- #include <errno.h>
- #include <ctype.h>
-Index: libupnp-1.2.1a/threadutil/src/ThreadPool.c
-===================================================================
---- libupnp-1.2.1a.orig/threadutil/src/ThreadPool.c
-+++ libupnp-1.2.1a/threadutil/src/ThreadPool.c
-@@ -341,7 +341,11 @@ tp->stats.totalJobsLQ++; tp->stats.total
-     struct timeb t;
- 
-     ftime( &t );
--    srand( ( unsigned int )t.millitm + ithread_get_current_thread_id(  ) );
-+    srand( ( unsigned int )t.millitm
-+#ifdef __GLIBC__
-+        + ithread_get_current_thread_id(  )
-+#endif
-+        );
-     }
- 
- /****************************************************************************
-Index: libupnp-1.2.1a/upnp/src/genlib/makefile
-===================================================================
---- libupnp-1.2.1a.orig/upnp/src/genlib/makefile
-+++ libupnp-1.2.1a/upnp/src/genlib/makefile
-@@ -29,7 +29,6 @@
- ##
- ###########################################################################
- 
--MAKE = make
- SUBDIRS = miniserver service_table util client_table net net/http net/uri
- 
- ifeq ($(DEBUG),1)
-Index: libupnp-1.2.1a/upnp/src/genlib/net/sock.c
-===================================================================
---- libupnp-1.2.1a.orig/upnp/src/genlib/net/sock.c
-+++ libupnp-1.2.1a/upnp/src/genlib/net/sock.c
-@@ -48,6 +48,10 @@
- #include <unistd.h>
- #include "unixutil.h"
- 
-+#ifndef MSG_NOSIGNAL
-+#define MSG_NOSIGNAL 0
-+#endif
-+
- /************************************************************************
- *	Function :	sock_init
- *
-Index: libupnp-1.2.1a/upnp/src/inc/sysdep.h
-===================================================================
---- libupnp-1.2.1a.orig/upnp/src/inc/sysdep.h
-+++ libupnp-1.2.1a/upnp/src/inc/sysdep.h
-@@ -19,7 +19,6 @@
- 
- #include <sys/types.h>
- #include <sys/time.h>
--#include <sys/sysinfo.h>
- #include "ithread.h"
- 
- /* change to point to where MD5 .h's live */
-Index: libupnp-1.2.1a/upnp/src/makefile
-===================================================================
---- libupnp-1.2.1a.orig/upnp/src/makefile
-+++ libupnp-1.2.1a/upnp/src/makefile
-@@ -29,7 +29,6 @@
- ##
- ###########################################################################
- 
--MAKE = make
- ifdef TARGET
- DIR_PATH=$(TARGET)/
- CROSS=$(TARGET)-
-Index: libupnp-1.2.1a/upnp/src/uuid/sysdep.c
-===================================================================
---- libupnp-1.2.1a.orig/upnp/src/uuid/sysdep.c
-+++ libupnp-1.2.1a/upnp/src/uuid/sysdep.c
-@@ -144,7 +144,6 @@ get_random_info( char seed[16] )
- {
-     MD5_CTX c;
-     typedef struct {
--        struct sysinfo s;
-         struct timeval t;
-         char hostname[257];
-     } randomness;
diff --git a/net-misc/upnp/files/libupnp-1.2.1a-gcc4.patch b/net-misc/upnp/files/libupnp-1.2.1a-gcc4.patch
deleted file mode 100644
index 2ea3f88052ce..000000000000
--- a/net-misc/upnp/files/libupnp-1.2.1a-gcc4.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Index: libupnp-1.2.1a/ixml/src/element.c
-===================================================================
---- libupnp-1.2.1a.orig/ixml/src/element.c
-+++ libupnp-1.2.1a/ixml/src/element.c
-@@ -454,9 +454,9 @@ ixmlElement_removeAttributeNode( IN IXML
-             element->n.firstAttr = nextSib;
-         }
- 
--        ( IXML_Attr * ) attrNode->parentNode = NULL;
--        ( IXML_Attr * ) attrNode->prevSibling = NULL;
--        ( IXML_Attr * ) attrNode->nextSibling = NULL;
-+        attrNode->parentNode = NULL;
-+        attrNode->prevSibling = NULL;
-+        attrNode->nextSibling = NULL;
-         *rtAttr = ( IXML_Attr * ) attrNode;
-         return IXML_SUCCESS;
- 
diff --git a/net-misc/upnp/files/libupnp-1.2.1a-respectflags.patch b/net-misc/upnp/files/libupnp-1.2.1a-respectflags.patch
deleted file mode 100644
index 91d74c372335..000000000000
--- a/net-misc/upnp/files/libupnp-1.2.1a-respectflags.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-Index: libupnp-1.2.1a/ixml/src/Makefile
-===================================================================
---- libupnp-1.2.1a.orig/ixml/src/Makefile
-+++ libupnp-1.2.1a/ixml/src/Makefile
-@@ -95,7 +95,7 @@ endif
- VERSION=1.2.1
- 
- CFLAGS += -fPIC -c -Wall
--C2FLAGS = -Wall $(DEFS) -shared -Wl,-soname,$(TARGET_OUTPUT)
-+C2FLAGS = -Wall $(DEFS) $(LDFLAGS) -shared -Wl,-soname,$(TARGET_OUTPUT)
- INCLUDES = -I. -I../inc -Iinc
- 
- ifeq ($(EFENCE),1)
-Index: libupnp-1.2.1a/upnp/src/makefile
-===================================================================
---- libupnp-1.2.1a.orig/upnp/src/makefile
-+++ libupnp-1.2.1a/upnp/src/makefile
-@@ -73,7 +73,7 @@ LIBS+= -lefence  
- endif
- 
- INCLUDES = -I inc -I ../inc -I inc/tools
--C2FLAGS = -Wall $(DEFS) -shared -Wl,-soname,libupnp.so
-+C2FLAGS = -Wall $(DEFS) $(LDFLAGS) -shared -Wl,-soname,libupnp.so
- 
- ifeq ($(DEBUG),1)
- DBG=DEBUG=1
-Index: libupnp-1.2.1a/threadutil/src/Makefile
-===================================================================
---- libupnp-1.2.1a.orig/threadutil/src/Makefile
-+++ libupnp-1.2.1a/threadutil/src/Makefile
-@@ -84,7 +84,7 @@ endif
- CXX =$(CROSS_COMPILER)g++
- CFLAGS += -fPIC -Wall -D_REENTRANT -I../inc
- INCLUDE =
--SHAREDFLAGS = -rdynamic -shared -Wl,-soname,
-+SHAREDFLAGS = $(LDFLAGS) -rdynamic -shared -Wl,-soname,
- 
- libthreadutil.so_objects = $(OBJ_DIR)FreeList.o    \
-                            $(OBJ_DIR)LinkedList.o  \
diff --git a/net-misc/upnp/files/msmessenger.patch b/net-misc/upnp/files/msmessenger.patch
deleted file mode 100644
index 9d484b153edb..000000000000
--- a/net-misc/upnp/files/msmessenger.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -urN upnpsdk-1.0.4/src/ssdp/ssdplib.c upnpsdk-1.0.4-modified/src/ssdp/ssdplib.c
---- upnpsdk-1.0.4/src/ssdp/ssdplib.c	2001-08-15 13:17:31.000000000 -0500
-+++ upnpsdk-1.0.4-modified/src/ssdp/ssdplib.c	2003-07-15 02:53:14.000000000 -0500
-@@ -403,7 +403,7 @@
-     bzero((char *)&SelfAddr, sizeof(struct sockaddr_in));
- 
-     SelfAddr.sin_family = AF_INET;
--    SelfAddr.sin_addr.s_addr = inet_addr(SSDP_IP);
-+    SelfAddr.sin_addr.s_addr = htonl(INADDR_ANY);
-     SelfAddr.sin_port = htons(SSDP_PORT);
-     if (bind( SsdpSock, (struct sockaddr *) &SelfAddr, sizeof(SelfAddr)) != 0)
-     {
diff --git a/net-misc/upnp/upnp-1.0.4-r1.ebuild b/net-misc/upnp/upnp-1.0.4-r1.ebuild
deleted file mode 100644
index 480a9c81c14d..000000000000
--- a/net-misc/upnp/upnp-1.0.4-r1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/upnp/upnp-1.0.4-r1.ebuild,v 1.9 2005/04/24 02:47:41 hansmi Exp $
-
-inherit eutils
-
-S="${WORKDIR}/${PN}sdk-${PV}"
-
-DESCRIPTION="Intel's UPnP SDK"
-HOMEPAGE="http://upnp.sourceforge.net"
-SRC_URI="mirror://sourceforge/upnp/${PN}sdk-${PV}.tar.gz"
-RESTRICT="nomirror"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="x86 sparc ppc ~amd64"
-IUSE=""
-
-DEPEND="sys-fs/e2fsprogs"
-
-src_compile() {
-	epatch ${FILESDIR}/msmessenger.patch
-	emake || die "compile problem"
-}
-
-src_install () {
-	dolib.so bin/libupnp.so
-
-	dodir /usr/include/upnp
-	dodir /usr/include/upnp/tools
-	dodir /usr/include/upnp/upnpdom
-
-	insinto /usr/include/upnp
-	doins inc/*.h
-	insinto /usr/include/upnp/tools
-	doins inc/tools/*.h
-	insinto /usr/include/upnp/upnpdom
-	doins inc/upnpdom/*.h
-	docinto sample
-	dodoc LICENSE README
-}
diff --git a/net-misc/upnp/upnp-1.0.4.ebuild b/net-misc/upnp/upnp-1.0.4.ebuild
deleted file mode 100644
index d78c73940974..000000000000
--- a/net-misc/upnp/upnp-1.0.4.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/upnp/upnp-1.0.4.ebuild,v 1.10 2004/07/15 03:42:14 agriffis Exp $
-
-S="${WORKDIR}/${PN}sdk-${PV}"
-
-DESCRIPTION="Intel's UPnP SDK"
-HOMEPAGE="http://upnp.sourceforge.net"
-SRC_URI="mirror://sourceforge/upnp/${PN}sdk-${PV}.tar.gz"
-RESTRICT="nomirror"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="x86 sparc ~ppc"
-IUSE=""
-
-DEPEND="sys-fs/e2fsprogs"
-
-src_compile() {
-	emake || die "compile problem"
-}
-
-src_install () {
-	dolib.so bin/libupnp.so
-
-	dodir /usr/include/upnp
-	dodir /usr/include/upnp/tools
-	dodir /usr/include/upnp/upnpdom
-
-	insinto /usr/include/upnp
-	doins inc/*.h
-	insinto /usr/include/upnp/tools
-	doins inc/tools/*.h
-	insinto /usr/include/upnp/upnpdom
-	doins inc/upnpdom/*.h
-	docinto sample
-	dodoc LICENSE README
-}
diff --git a/net-misc/upnp/upnp-1.2.1a.ebuild b/net-misc/upnp/upnp-1.2.1a.ebuild
deleted file mode 100644
index 43a7cef12c14..000000000000
--- a/net-misc/upnp/upnp-1.2.1a.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/upnp/upnp-1.2.1a.ebuild,v 1.7 2006/05/08 13:28:16 corsair Exp $
-
-inherit eutils toolchain-funcs
-
-MY_P="lib${P}"
-
-DESCRIPTION="Intel's UPnP SDK"
-HOMEPAGE="http://upnp.sourceforge.net"
-SRC_URI="mirror://sourceforge/upnp/${MY_P}.tar.gz"
-RESTRICT="nomirror"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="doc debug"
-
-RDEPEND="sys-fs/e2fsprogs"
-
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doc++
-	       app-text/tetex
-	       virtual/ghostscript )"
-
-S="${WORKDIR}/${MY_P}/upnp"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}/..
-
-	epatch "${FILESDIR}/${MY_P}-gcc4.patch"
-	epatch "${FILESDIR}/${MY_P}-fbsd.patch"
-	epatch "${FILESDIR}/${MY_P}-respectflags.patch"
-}
-
-src_compile() {
-	myconf=""
-
-	if use debug; then
-		myconf="DEBUG=1"
-	fi
-
-	# Fix for distcc/crosscompile, and make sure it doesn't strip
-	emake ${myconf} \
-		CC=$(tc-getCC) \
-		AR=$(tc-getAR) \
-		LD=$(tc-getLD) \
-		STRIP=true \
-		|| die "Compile failed!"
-
-	if use doc; then
-		emake doc || die "Documentation generation failed!"
-	fi
-}
-
-src_install () {
-	if use debug; then
-		dolib.so bin/debug/libupnp.so
-		dolib.so bin/debug/libixml.so
-		dolib.so bin/debug/libthreadutil_dbg.so
-	else
-		dolib.so bin/libupnp.so
-		dolib.so bin/libixml.so
-		dolib.so bin/libthreadutil.so
-	fi
-
-	dodir /usr/include/upnp
-	insinto /usr/include/upnp
-	doins inc/*.h
-
-	dodoc LICENSE ../README doc/UPnP_Programming_Guide.pdf
-	if use doc; then
-		dodoc doc/ixml.pdf doc/upnpsdk.pdf
-		dohtml doc/html/*
-	fi
-}