Remove older unstable

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0xF52D4BBA

5 files changed, 20 insertions, 172 deletions

diff --git a/net-libs/libnatpmp/ChangeLog b/net-libs/libnatpmp/ChangeLog
index e3fbfb419d63..cde7098c31c8 100644
--- a/net-libs/libnatpmp/ChangeLog
+++ b/net-libs/libnatpmp/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-libs/libnatpmp
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libnatpmp/ChangeLog,v 1.27 2014/04/02 14:06:00 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libnatpmp/ChangeLog,v 1.28 2014/04/02 14:10:55 blueness Exp $
+
+  02 Apr 2014; Anthony G. Basile <blueness@gentoo.org>
+  -files/remove-static-lib-20120821.patch, -files/respect-FLAGS-20120821.patch,
+  -libnatpmp-20120821.ebuild:
+  Remove older unstable
 
 *libnatpmp-20140401 (02 Apr 2014)
 
diff --git a/net-libs/libnatpmp/Manifest b/net-libs/libnatpmp/Manifest
index 7dc022c01ad4..a3e053e9e612 100644
--- a/net-libs/libnatpmp/Manifest
+++ b/net-libs/libnatpmp/Manifest
@@ -1,41 +1,37 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX remove-static-lib-20120821.patch 2213 SHA256 b24009cf1d08b122a84bca8cfbb16c9710684ed1b86112a81ccea63c4a4042a5 SHA512 44e0beafbb51eb74949df52e80b00b966cd8631b5b6933484e874868a259ac61c822a6863f16a8230c86d6d1f267312c0ee28d048854b6bfbd2e78bb45d45464 WHIRLPOOL 46aa66fe4ba9d2c9cc7b6f8ea360fab8315f5823addc53e0b9456c7940884af16b087eed5af1b7a3714571714e969f893d6b2f4574629efb7b7868a5470c82fa
 AUX remove-static-lib-20130911.patch 2345 SHA256 65dbd96a79057f8cc07d17ca78234ee8edd4d823ee0f77ccf7ed7f06ff54143f SHA512 f11580e48c68e28384e99deb98f19feb827cce27143cbf6c5d6cfbfe769545a634dcb5b36ecc2bce1a9b7cf64c3fb04064b1dab9f763b65798fecce8a61c4d76 WHIRLPOOL 88a7013b742bb5c7cebc13ff0aea5b0c79e77b8f16f3582bf58b5e9d6ce73742fc802ab1d4a126adb18896036a4b3efbbe7109f3802e242b7ab1912876e1a339
 AUX remove-static-lib.patch 1343 SHA256 ec07770450f3c4e5428c979a0675a84bec620aee7e73b5d3caa70030f1fc0c13 SHA512 57a029da864b55ef761b7adabe25e757290bc7a9466a650d35e9a3d12266d7b14f01a374b55c735acb87833c8c8ef2e35a7bc1fdd89d6bd20ed426e9a90264bc WHIRLPOOL b3df6ea2d5be654192a3ac20291f8ffeba1f5ac1808a6dbbec357937f1946231e18c4c0cf6eca1ebaa7cc440969530909064e3135e5e9dd7c028dc095e932fe1
-AUX respect-FLAGS-20120821.patch 1346 SHA256 7980f50f525c77ebd6faf65b1af0fc71341009cb2a5bf5ee49f331e58b299b87 SHA512 5bbb9a770baa51ed5213f1624f58acb8cbcfe545c75aa9d3f667a22c2da3b74de0db32b806539db9f575b3e0f3dd079812fb18debe9c84beebc0ba1a32324410 WHIRLPOOL 5f511f31cda233b1e8b73ce571831ad10b3c83c20a0f3bdc60807633b18c8cc3e1ac8b354cd638472c09ed1e2cec97e579ca1eb2491d7596d9058e21f2fb5d89
 AUX respect-FLAGS-20130911.patch 1414 SHA256 477b0b82b4673206fbde1603ac8b0d28b2c9975e5241eb3cfe4e8a9202c6096d SHA512 9ffaadff34a16f41e45f69d1e0bfecb6c8edae98e63b4a84328327113ac32b4460acd16c53f5806b6c9b521ca31c21fd8e47825a0bbcb292c644354fbca11bcd WHIRLPOOL 3b27ef62d0bd8e9f40cbe79e2da3f9624cd5a129dfa27f7458f649ecdba3a48ef6ca8d4727542f66b9bc2f51953278692ebc15d769ea741b35e830a1abb82236
 AUX respect-FLAGS-20140401.patch 1133 SHA256 14b21030f87e0bdadcb40df7c5cac952f9c045d70f923844afc7fe67b3f90f59 SHA512 6bfdfc1e19337748db562ec08b4c4672b08e4870db5479e836b48bb19c7920e7c25bfd7ba667e166911ffac79e5b72e12e63fd7be393e4654b82024b78744c60 WHIRLPOOL b27b8e61edee4d1ada8787fd33cae675ee2477eb72d46f1614bd5ac16053983cc6e920ac7c468a2f27123ab033577d2383106719893e991b39ba323d6b00cb3b
 AUX respect-FLAGS.patch 999 SHA256 d5ef623185db5f9d110b84b11d4bf4ec95be85c0dace4165f96684814226518f SHA512 516651adb0f065ba8b917417ad6db873cc68ad34d8810750d9d1246cec6b372b296ad665dd3ec63e71525c4061b253e31e5c086cee512b0a9d6df597ee058c71 WHIRLPOOL 0b1dcac8df7b1c039a07ff0cf4ceddd1fa991eb5792312c0cdc6f22acbeccac908a36d671ab33160e3ad26ec6895bba0b7cbaf90b792991b041c3e4a36d5506b
 AUX respect-libdir-20120821.patch 671 SHA256 bfc3d254591c59d56c6f95f6a6bf0d4ad0072c1bb82ff1aa5cd8add527f60926 SHA512 7467d851fd53fc72b2c087bac136564c7af634ad8b91cdd1e2cfbde95bed55385fe79f6e20f4ce270ddbbe6e74917977ccedaa4c03f3cb2026ee7b7e75e9851c WHIRLPOOL ec9049b5e8476dff8e8b73c660593c5061001105bc942f7d58dd6f71d743ee45f1890e491de9c959669cee82104826d56804ee3bf644f856daa439299639ef7a
 AUX respect-libdir.patch 522 SHA256 ddef2e53d03b66e1d4db34753595269aeef24627ee3b7d05293f11d449afa840 SHA512 da90c9fcf33064daddb92ec1a6ebd7e598df75d42328c7589383c573a891ae29cae34056b2345557d54f10bb76b387310d187f6ab0132c8aec08413c32353f2a WHIRLPOOL a6696f727c36ba8a778c4c9615fee46ac315506e560114d350334cd6a6bb03f37e9a8e2de405a739be6514cfabce329faa41407c6054f222734afe4248e69124
 DIST libnatpmp-20110808.tar.gz 17762 SHA256 2c306719c8f77027c51161e90fb7fa72e1eb22475288ea6867a133316e944a69 SHA512 1bb4304319a0570602f19e4bf5ea42505de259f4f9d659ffc3f54faf67717e2e28563a50b747556bf5ee279fed6fe92ee798cddec233b7d3b97f3aad697729e2 WHIRLPOOL 2751ba8322e6c5f0b518aed544995d5e138b6f2d05772234783afdd828c18d26c63e1aeac166a8dac8615201243c977b2601da2064c0b41c46256a7e10fac578
-DIST libnatpmp-20120821.tar.gz 17832 SHA256 5b265b3ce5d6d05a33be43aab8f64b0f34a2cc0b01500e63fe167c7f9f44d2b8 SHA512 2f3edaa3db8e7382cc9a622f35965a45ebbe75666d42584521c7fa71cae9b31b8fdc5304bbdf4dd7fc64df3d7bbe03e1606782c9bfb5f008bc7edde040168ef2 WHIRLPOOL 03cf9b8938c5ee5cdf4b0288e7bca993e669a4ae89cee122757639dd5c142e4d57eecc8f946f339206fae96826a67149fbde5ef36dfeea3bbb7a57931245af5a
 DIST libnatpmp-20130911.tar.gz 18744 SHA256 a30d83b9175585cc0f5bff753ce7eb5d83aaecb6222ccac670ed759fea595d7d SHA512 e7dfb3955ccc2c30e7c74c1085bc71bd9318f6171b84fbad2d8ae8bd5a227f7ceed3f60ecb49bd10e6fb838d8be3325bbf467467bf0d04e46883e3a19fa14a2d WHIRLPOOL fafb32c930e21afd8c3e10528638be4b31d03a2bcfdc481b4f2ea682ae4b7fd0cf943f32b8a395f03ceeecf42a41370fcd49a6026bc3cd449b6e4fba39cf191f
 DIST libnatpmp-20131126.tar.gz 22972 SHA256 48f1ffa3cbd3731c087790a5324f386c859100312298c06e7fd89d764a6ec2c4 SHA512 91c95a1dfe00691be65835d04d9dbc71fdbae6a32e4528d41e252068f1cbc72d6e3cef431d949b06b65e64f830390605e6c6b2fd7fafb4d2dd56249fd3ad85ec WHIRLPOOL 4313c10d3cc0b44b9224b7e082a219f7ed0518600b13538666ac99d43c2b3eacb761eb044ca7bc549fa22d66e3a48da77addf3f608e6f01119565eddf1013572
 DIST libnatpmp-20140401.tar.gz 23302 SHA256 b2ce5e626a21c795cba2d118f26e54aaa89de29d4611c440fafc49a2a5bedabb SHA512 12616f07b0a096046a35079954b8a34d474e672d7836ddac9da993a47178902aa2d781786ac76c55c5f16cfdf6a7e7258f92fec3850714ad9cd50208d854c4c2 WHIRLPOOL c12bfbc83d1f30f20162c3fddd5452f53d6ef556452845c6303420718a92568c8e8174939a3ef2702045d7c2061f5aff57bfe81c3516452d84172ef6ecf08849
 EBUILD libnatpmp-20110808-r1.ebuild 879 SHA256 0eba3ba960ef1fca70124a3c0ddbc381a812bdaf0d0772dc142279ddf1bc0d6b SHA512 aec0f8445bf6fef01a6d453a6bef31ffe76e011ff4c7573e70965855c9aa40b701dc09d03466293a8a17839f8d19c5bd2bcd997e3bf61d5307fab7d913513329 WHIRLPOOL 9168fe5cd87929f8f13dab139710b3f119c5563c8535b30c759301a87615a6f5b34a73222bdaaa7af38f7a3914225a8e6bb008b0d68db65bc06c7459f75025c2
-EBUILD libnatpmp-20120821.ebuild 908 SHA256 7ea2615d8275a0a6ca26f7b22cab63a713347c9710e3a496df51de65446694ba SHA512 94dc613bda95cd6644800cea496dbf51e525a0e7bfc8209bfaffbb1ebd36b772e66e663f4353f964fb4340b26be7f0a7131e01d3081a27b1fcd0acba350992bc WHIRLPOOL e0998d09a2c6235243de4b7ae76bd273b762197532e7091567aa1a9a6761783ea2479dac63edb3e38d6b41b7c0500432781ba11c88bfdd3ad3c2c936155e4700
 EBUILD libnatpmp-20130911.ebuild 902 SHA256 b1787fc158abbf7db5bbf50f4a290d997836943ba5b45fba1b1acd8a892e5ecf SHA512 aac5d78e4bf9ca364bce813148f07def29d55c8f491b7c4e6e2518a27dd9edb8f2d89421f9657c2b3637532d742a0dc5c9642e175608034753a86f4729ced030 WHIRLPOOL 2986ad8a18a77b8fbfb6d0fe7cc08e7efd702795951ddc6b2f9d53c5e6e447a507178c26bdde36361a2b7518143d64024638eca759e2d6a0a603ed8a2a50b28b
 EBUILD libnatpmp-20131126.ebuild 918 SHA256 0522b0688d5322d87c6db7f2ba20ceb8a14fe152ac3adfa61ac841dda75eb51c SHA512 4ca49fdeda5a0850f18a6bb49c92f40dd2ec6d40e42020c919920b4e195aa548b0ad86afbfa161cb0b966269540d3b05fec163c8fc76ade981ccc161c6fe34c9 WHIRLPOOL cbb2eb3368ffcbfd548eb68a4906a3efe87aa458ac35d982176a6fce28765fd1cffb9aeec17f10e7e2068a88a82c26c8508920f484e596246a4301c2be668eae
 EBUILD libnatpmp-20140401.ebuild 918 SHA256 ff8b8242ec2016fe21cb9c84bc2751e352ce62f1acc1fe4b1b3f855f888464ee SHA512 97adaf54124d517d3be04c49218abaa971dbea88e337a7af9634ee789683b5299c47e8e30e7905472c8ffe479702d82908c8b0e8c3e4c3f925d58d180f20a776 WHIRLPOOL 0c38ab1fe8440ce03121302fad04be84d9e7468b1a2db235f0eb56bb683e101b22f3c38b3275fff7473fece70ff1540bf25ace48784eaa2d331baca1ce4a8dc8
-MISC ChangeLog 3981 SHA256 c4b94dd3d0d79cef2f1ae9a23a77e6408e3591600b8bfd058bf80e02adc65b1b SHA512 5dc99a8ecd397e6c3b204dae520d7ff45e76a33d174b6f7499ca598581e58417675edf3798c430ca8bff21c1fccafd60878cc040cdad92dad7de8eb91a8ae3ed WHIRLPOOL 3a63ccc5100e184cda1ee366077fc32cfb88f1209d8e5cf65e971d9e9ad289fd2f756d6ea67882a294e1ea8b4de4ce4b149b31e79ff38b06c5e0223c6746855d
+MISC ChangeLog 4171 SHA256 c5d4ce83076199ec0c7ae35f5f9356c81e4f2eaca0ef074f5903a598b167afed SHA512 59bb925c135432dce19ae415e6800f6b024f13e8123a6b3521ed97da2984974b94d78c9304cf3ee1c720bb9e5c94b514ace01f1afe98115811ca0f6680e062fe WHIRLPOOL f418ff8efb30a9f784a6214162f0a3f35470702061f61f7fd053ae72f9a3e6cfe60b690e6ac69625ebe250fc46141c849088c052603ee80d79122f47881d38b2
 MISC metadata.xml 238 SHA256 f13e6e7b65d20beb9ae945d520160ef0dba80c1965754958945904d7e3c0a75f SHA512 3c3d75f1cb90ffcfb98df47481fbde6d451254a29fa87577acd25bc27cbcc3e5dbc0c1efce5974be905428f0b7caf912c8b051417aff92763847fa377493a153 WHIRLPOOL 6ec3d597b87aff99014404b8b732e6f600aafc3c3eeebfab135c9c19cde2e43161cfa23f841bd72826cc3393b724e1dac115c15dcce2b74ace6f1d6ec209dbf3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJTPBmGAAoJEJOE+m71LUu67sUP/3HTcYqNc8abAUqvbDU/RxZ5
-danGyHNdbownnnCSXOmsSB9bngc/xEFCGSkic6OHSl6p9ZuKSVmidvBIDLFgh343
-sCWSn+reGxyggMh7SsakQvkQuVEay2zuitZcS+VjT/DVX4SzmtruQafcaj877pnE
-DgWHjrJeL14C+6uf8FtZ4d05tdn9P1OpIHTtYfvFhdKawEKgVw/ZxyU88Qm7Wl10
-EzE/ou6zo2DzB1EiFgJ6asrXoqcRJE+ceOOHTiWuWa07TyYmsB2r0g8/2sjraOlZ
-XS+dm6N2cxH+fE3EF3aCPB6/mKoKsWcA5GhG7Cwumdi9Ewc2pgEGd2InxZ1FkY3U
-y0yIQVe6rN4djGErHXIMEpjMyXTuzKyIMoF2AupLprmLTtVmtRvnthE8EUi6+oh1
-ZIPc7GoKVJSOM9JdHvyj2m/NSvAIFPnn+E7AygYrCEGdDmH2Pxv5lXYvZAcjwdl6
-8bV5WPIPRniwY/m5Ez+67DG5xfjz3UUqRXh0IoyD1XExO/t/yeq11fKf5lh0Wrr4
-dh/lHcCbDjJkM6bqPRrX6ccSNsIz7KCp5kyo/HIDoVlwgncRkiiD73C6LmYMAsO2
-ehDlNEnsL0hHOrkc+feb1uoKmYdp3bqMll5jBOkxxBxCJ98A5n78Hc1s/aaWcH3j
-XX+d8C9t6gqfq5Q8LhBS
-=9pkE
+iQIcBAEBCAAGBQJTPBqyAAoJEJOE+m71LUu6UH0QAI4xVLd/yfj4ijvd4IHyGhTN
+kHajhISTYIMqO+1TUHJh4FuYlC1D743bGwGFff7/UPi1cw9ZIEiV9C2KZAbfbwMo
+P6OpcuqYO/op6csalQoinCAIuAlNvIZNq9+PrXt/cmIDJcUXm9T3bXDai73gi625
+055fS5XMYuD2E0Rmvtk1pjDB5aP6yT+mWhYYW+yc2qJ8u2BurYznwCUFsv9/zPgs
+99NfItPj8InN4qxHvFfPD2yjdo/9+aC6GrilZdLDJdHqe2BtNStXQXCSbnh5DX9/
+S2zrLmdvy8/ysuh8xJ84panOnz2ZVPEvQx68zqurKRWPEaP5+tIw1+HXjQQVnMo8
+GlBSdv6yqnA/x4BhlHdjGV/f7yda6wKnPtV+WP2n1TZVmkNfzFp4IoDHBYiQkXMI
+yS4ZBA98bFrnOMAjt+0My4SUuIgyHMxqyUwgGyxDXpJpGA7cTW7UMPLv8iwz2Yiz
+nu8SVaveJ9Wg6+NjClc710HUnUvGvyZ4adsSttjdXHJbKtW/RqoMiCb7I9gg/jmz
+yTj1Zk5VA8nKZ6L1cNpdkwLcrTseuwDJG7AmfXM5B52qXFvLSRrt1EmArxkyXNcT
++0dHQ7sxluUbrikS3YgpkV/kgY29bDHE1NFHhX5VNiC5G37CfMeh05m9EpyfB8gT
+FLOVb4DI3G90DEOaiBht
+=x0lY
 -----END PGP SIGNATURE-----
diff --git a/net-libs/libnatpmp/files/remove-static-lib-20120821.patch b/net-libs/libnatpmp/files/remove-static-lib-20120821.patch
deleted file mode 100644
index 89be32d6c414..000000000000
--- a/net-libs/libnatpmp/files/remove-static-lib-20120821.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-diff -Naur libnatpmp-20120821.orig/Makefile libnatpmp-20120821/Makefile
---- libnatpmp-20120821.orig/Makefile	2012-08-26 20:33:51.000000000 -0400
-+++ libnatpmp-20120821/Makefile	2012-08-26 20:36:53.000000000 -0400
-@@ -24,7 +24,6 @@
- 
- OBJS = $(LIBOBJS) testgetgateway.o natpmpc.o
- 
--STATICLIB = libnatpmp.a
- ifeq ($(OS), Darwin)
-   SHAREDLIB = libnatpmp.dylib
-   SONAME = $(basename $(SHAREDLIB)).$(APIVERSION).dylib
-@@ -38,7 +37,7 @@
- 
- HEADERS = natpmp.h
- 
--EXECUTABLES = testgetgateway natpmpc-shared natpmpc-static
-+EXECUTABLES = testgetgateway natpmpc-shared
- 
- INSTALLPREFIX ?= $(PREFIX)/usr
- INSTALLDIRINC = $(INSTALLPREFIX)/include
-@@ -47,9 +46,9 @@
- 
- .PHONY:	all clean depend install cleaninstall installpythonmodule
- 
--all: $(STATICLIB) $(SHAREDLIB) $(EXECUTABLES)
-+all: $(SHAREDLIB) $(EXECUTABLES)
- 
--pythonmodule: $(STATICLIB) libnatpmpmodule.c setup.py
-+pythonmodule: libnatpmpmodule.c setup.py
- 	python setup.py build
- 	touch $@
- 
-@@ -57,18 +56,17 @@
- 	python setup.py install
- 
- clean:
--	$(RM) $(OBJS) $(EXECUTABLES) $(STATICLIB) $(SHAREDLIB)
-+	$(RM) $(OBJS) $(EXECUTABLES) $(SHAREDLIB)
- 	$(RM) pythonmodule
- 	$(RM) -r build/ dist/
- 
- depend:
- 	makedepend -f$(MAKEFILE_LIST) -Y $(OBJS:.o=.c) 2>/dev/null
- 
--install:	$(HEADERS) $(STATICLIB) $(SHAREDLIB) natpmpc-shared
-+install:	$(HEADERS) $(SHAREDLIB) natpmpc-shared
- 	$(INSTALL) -d $(INSTALLDIRINC)
- 	$(INSTALL) -m 644 $(HEADERS) $(INSTALLDIRINC)
- 	$(INSTALL) -d $(INSTALLDIRLIB)
--	$(INSTALL) -m 644 $(STATICLIB) $(INSTALLDIRLIB)
- 	$(INSTALL) -m 644 $(SHAREDLIB) $(INSTALLDIRLIB)/$(SONAME)
- 	$(INSTALL) -d $(INSTALLDIRBIN)
- 	$(INSTALL) -m 755 natpmpc-shared $(INSTALLDIRBIN)/natpmpc
-@@ -78,19 +76,12 @@
- 	$(RM) $(addprefix $(INSTALLDIRINC), $(HEADERS))
- 	$(RM) $(INSTALLDIRLIB)/$(SONAME)
- 	$(RM) $(INSTALLDIRLIB)/$(SHAREDLIB)
--	$(RM) $(INSTALLDIRLIB)/$(STATICLIB)
- 
- testgetgateway:	testgetgateway.o getgateway.o
- 
--natpmpc-static:	natpmpc.o $(STATICLIB)
--	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^
--
- natpmpc-shared:	natpmpc.o $(SHAREDLIB)
- 	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^
- 
--$(STATICLIB):	$(LIBOBJS)
--	$(AR) crs $@ $?
--
- $(SHAREDLIB):	$(LIBOBJS)
- ifeq ($(OS), Darwin)
- 	$(CC) $(CFLAGS) $(LDFLAGS) -dynamiclib -Wl,-install_name,$(SONAME) -o $@ $^
diff --git a/net-libs/libnatpmp/files/respect-FLAGS-20120821.patch b/net-libs/libnatpmp/files/respect-FLAGS-20120821.patch
deleted file mode 100644
index 7c7dc8607d2c..000000000000
--- a/net-libs/libnatpmp/files/respect-FLAGS-20120821.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-diff -Naur libnatpmp-20120821.orig/Makefile libnatpmp-20120821/Makefile
---- libnatpmp-20120821.orig/Makefile	2012-08-21 13:24:15.000000000 -0400
-+++ libnatpmp-20120821/Makefile	2012-08-26 20:22:40.000000000 -0400
-@@ -5,12 +5,13 @@
- # http://miniupnp.free.fr/libnatpmp.html
- 
- OS = $(shell uname -s)
--CC = gcc
-+CC ?= gcc
- INSTALL = install
- 
- # APIVERSION is used in soname
- APIVERSION = 1
- #LDFLAGS = -Wl,--no-undefined
-+GENTOO_CFLAGS := $(CFLAGS)
- CFLAGS = -Os
- #CFLAGS = -g -O0
- CFLAGS += -fPIC
-@@ -32,6 +33,8 @@
-   SONAME = $(SHAREDLIB).$(APIVERSION)
- endif
- 
-+CFLAGS := $(CFLAGS) $(GENTOO_CFLAGS)
-+
- HEADERS = natpmp.h
- 
- EXECUTABLES = testgetgateway natpmpc-shared natpmpc-static
-@@ -79,19 +82,19 @@
- testgetgateway:	testgetgateway.o getgateway.o
- 
- natpmpc-static:	natpmpc.o $(STATICLIB)
--	$(CC) $(LDFLAGS) -o $@ $^
-+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^
- 
- natpmpc-shared:	natpmpc.o $(SHAREDLIB)
--	$(CC) $(LDFLAGS) -o $@ $^
-+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^
- 
- $(STATICLIB):	$(LIBOBJS)
- 	$(AR) crs $@ $?
- 
- $(SHAREDLIB):	$(LIBOBJS)
- ifeq ($(OS), Darwin)
--	$(CC) -dynamiclib -Wl,-install_name,$(SONAME) -o $@ $^
-+	$(CC) $(CFLAGS) $(LDFLAGS) -dynamiclib -Wl,-install_name,$(SONAME) -o $@ $^
- else
--	$(CC) -shared -Wl,-soname,$(SONAME) -o $@ $^
-+	$(CC) $(CFLAGS) $(LDFLAGS) -shared -Wl,-soname,$(SONAME) -o $@ $^
- endif
- 
- # DO NOT DELETE
diff --git a/net-libs/libnatpmp/libnatpmp-20120821.ebuild b/net-libs/libnatpmp/libnatpmp-20120821.ebuild
deleted file mode 100644
index 8f9ffe454ab0..000000000000
--- a/net-libs/libnatpmp/libnatpmp-20120821.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libnatpmp/libnatpmp-20120821.ebuild,v 1.3 2012/12/16 18:23:58 armin76 Exp $
-
-EAPI="4"
-inherit eutils toolchain-funcs multilib
-
-DESCRIPTION="An alternative protocol to UPnP IGD specification"
-HOMEPAGE="http://miniupnp.free.fr/libnatpmp.html"
-SRC_URI="http://miniupnp.free.fr/files/download.php?file=${P}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="static-libs"
-
-src_prepare() {
-	epatch "${FILESDIR}"/respect-FLAGS-${PV}.patch
-	epatch "${FILESDIR}"/respect-libdir-${PV}.patch
-	use static-libs || epatch "${FILESDIR}"/remove-static-lib-${PV}.patch
-	tc-export CC
-}
-
-src_install() {
-	emake PREFIX="${D}" GENTOO_LIBDIR="$(get_libdir)" install
-
-	dodoc Changelog.txt README
-	doman natpmpc.1
-}