gentoo resync : 17.02.2020

12 files changed, 40 insertions, 330 deletions

diff --git a/net-libs/libnatpmp/Manifest b/net-libs/libnatpmp/Manifest
index 70c014fd0061..e408dc959820 100644
--- a/net-libs/libnatpmp/Manifest
+++ b/net-libs/libnatpmp/Manifest
@@ -1,16 +1,4 @@
-AUX remove-static-lib-20130911.patch 2345 BLAKE2B b0d254d45667df6419a4bee950dddc7e0431a69ea14fd877550689da1fb306345f89255bff75e85c612867f9589145bbff75656d4bb895c77c02399d49186823 SHA512 f11580e48c68e28384e99deb98f19feb827cce27143cbf6c5d6cfbfe769545a634dcb5b36ecc2bce1a9b7cf64c3fb04064b1dab9f763b65798fecce8a61c4d76
-AUX remove-static-lib.patch 1343 BLAKE2B 9d816815b72f2fe8d0f8b62c732357b9a63a15219b70639100e44769c84772adcae78b30adec4aef68a69b04f18e695fab38624a7689fc03bbbb989da3ee583c SHA512 57a029da864b55ef761b7adabe25e757290bc7a9466a650d35e9a3d12266d7b14f01a374b55c735acb87833c8c8ef2e35a7bc1fdd89d6bd20ed426e9a90264bc
-AUX respect-FLAGS-20130911.patch 1414 BLAKE2B 8d3ea79b6e7563002dfbb6468a3204d36ffc6c57aca671d3ed1f2688bc158458ffa22d3f49ef9e2a0b3a882a110acb8e92e26df340909f4b0b7af1e101f34363 SHA512 9ffaadff34a16f41e45f69d1e0bfecb6c8edae98e63b4a84328327113ac32b4460acd16c53f5806b6c9b521ca31c21fd8e47825a0bbcb292c644354fbca11bcd
-AUX respect-FLAGS-20140401.patch 1133 BLAKE2B d1c0717679f9bc99aa36d27b7e9482b6c18d0aefda325b247df9a3d3827fda9da723bd1f726cadc0ddbbd6281efa75621d63d9eb1cfd418e6dda2f5a71c53546 SHA512 6bfdfc1e19337748db562ec08b4c4672b08e4870db5479e836b48bb19c7920e7c25bfd7ba667e166911ffac79e5b72e12e63fd7be393e4654b82024b78744c60
-AUX respect-FLAGS.patch 999 BLAKE2B b91322494893301cd4d8a3116518c1cce40d75656187ff0b5ac18376808594ba68f2aa54aa7958e077dd9144a31bf911444ddde649a2bbac23e99f89b50a781f SHA512 516651adb0f065ba8b917417ad6db873cc68ad34d8810750d9d1246cec6b372b296ad665dd3ec63e71525c4061b253e31e5c086cee512b0a9d6df597ee058c71
-AUX respect-libdir-20120821.patch 671 BLAKE2B af5839632a50f4deb2aeeba895b8ba08d2703d8560fd50d717800ceadbf982dee591f85b09fed61227566d2cadd57f83bdcbd9dfb7cd2e4bb146a15d2d1e9e95 SHA512 7467d851fd53fc72b2c087bac136564c7af634ad8b91cdd1e2cfbde95bed55385fe79f6e20f4ce270ddbbe6e74917977ccedaa4c03f3cb2026ee7b7e75e9851c
-AUX respect-libdir.patch 522 BLAKE2B 950db0f2a8e1ae2d4b1e0e262412c6e171b375405f6e26dba42b278c527a73fa00aa8814f02d16750c59f82137272b88e7f4010e92c3690abda9db9bdaf24fbf SHA512 da90c9fcf33064daddb92ec1a6ebd7e598df75d42328c7589383c573a891ae29cae34056b2345557d54f10bb76b387310d187f6ab0132c8aec08413c32353f2a
-DIST libnatpmp-20110808.tar.gz 17762 BLAKE2B f9559dd2d90b4dc662b5569e2a941415f075c97964988c4d06db64fce6f2446d32e2231f46120498fb8b6d9b7ecc9e83932ef1fec9dace23145f702c24a96af5 SHA512 1bb4304319a0570602f19e4bf5ea42505de259f4f9d659ffc3f54faf67717e2e28563a50b747556bf5ee279fed6fe92ee798cddec233b7d3b97f3aad697729e2
-DIST libnatpmp-20130911.tar.gz 18744 BLAKE2B c24a0cb158d9d40049292bfcae8d919bbe8ec6ea63dfd59ba8a8f2c85a9eaaebb96cf4f70f2c40c456169f63a8c2aff4736d952899d15ad7e7f687e13a4e77b3 SHA512 e7dfb3955ccc2c30e7c74c1085bc71bd9318f6171b84fbad2d8ae8bd5a227f7ceed3f60ecb49bd10e6fb838d8be3325bbf467467bf0d04e46883e3a19fa14a2d
-DIST libnatpmp-20140401.tar.gz 23302 BLAKE2B 85f2b1045ad3b8b122bc9db6a12d332642e11bd62cd5fa264e141bb75d2dae2920678ce8c240009272593f81f385277d7f911298667896babbc43c8393a8963b SHA512 12616f07b0a096046a35079954b8a34d474e672d7836ddac9da993a47178902aa2d781786ac76c55c5f16cfdf6a7e7258f92fec3850714ad9cd50208d854c4c2
+AUX libnatpmp-20150609-gentoo.patch 2811 BLAKE2B 2125f030a90a20845616d28ecbf0554953408856b8e78d61a020d7ce95c357397f50263e7838c034510221dd6627e066bed19b1c75cb468a97f2517bee79b744 SHA512 ef3717dcc5b0f83522f45d7799fdec539f6148c24ea6d2800c601a5d0847c9c26f848b9654464d23e140426b32ed3aeed0030e7ade600e974129aef729786436
 DIST libnatpmp-20150609.tar.gz 24392 BLAKE2B 0a8df6badf222328a24ae94a97386593c42bcda58cada97d37a2cf74f6f6b5e27189753590552187ed7afce66d34d204b9d18ecd38ac0bcbadf8c8129a3b44ad SHA512 e50b1f68ce9254bb2f068ddc37417a3c417b80f7b3fb3d84e3e9af4a144d89e204ab993b54c01657335e855d0124a8fcbbf96ce78db7b9ae0b03b6eb79de2e09
-EBUILD libnatpmp-20110808-r1.ebuild 722 BLAKE2B bdace565e17460df38361f3b7e7bbe6c83be72d0a7b863b0f989108aa02196c175b2fcc7a454b08d21992924de6a458bd8ed750e407d8bfdb91c357e2e04a9e4 SHA512 00fc715e7b04c7ca32ec24bb6fdfb72592745edd2a4ad77c27248d908b567da26b91c108d655b996e24c10f3ed9d383cf72735ec245921683e3625aea3f9840c
-EBUILD libnatpmp-20130911.ebuild 776 BLAKE2B a82ac0c79c2825717d3e4003bcbe256dd177d05b6810606371745972a3c0ba1c75b9b7211f465df52ce1beb4d330beeaafb00dc52a330f75bfa1d8044f2181f1 SHA512 1e6d69662525d6336aecfc136a1b8a6960b15b656a8bb37fbbdf75d4a2f9ff482ec2ca09d1755902450f99cb01c4886d57306e3291f591b978fac2264d924a8c
-EBUILD libnatpmp-20140401-r1.ebuild 872 BLAKE2B 5819e67094a71aa5a6d83460a747e75d740e97bfd5a89e07c8cbb5c8ae19cd4ca8c50f01e9beb5dd49ead5aa6c8df31a7fd8134c3f820c05c9bd952dd74950b1 SHA512 3542090fefcb135a0aebfa289205cc6593a758bf34eeac8a4377dce424a5b5fd329ccc63d3699f11a7ba4608758d2371f0f33241d3f08ea85c615b00b1b810b2
-EBUILD libnatpmp-20150609.ebuild 821 BLAKE2B 7ad1cd8505ff19aac6a04b534ef21bbc9360301b877186facb28dc8206a6dca818e4158b4faeb0e9aa76faa652ee31e7af1efeeccb57acdc38691f1d0091de0f SHA512 94f34a2b69d5964b047ad7262c9fa3daf05aed0444d703e66108a65838d54af7fb12fa6c06291f13ab62a9cfc73a9444f190328ab8ea92f88fbb14b414299a49
+EBUILD libnatpmp-20150609.ebuild 721 BLAKE2B 57f738d7169fd341e78efc588c2cd37ad8fc474136a79f2b6ae9981d4d63977b97d643b3e0d032215cdfa17dfea3e7c5388eb5366f11918d03aa4baacfac4cce SHA512 b01f7576c5c731f1fe70dd719fa5607fa77b60904187ba4ff05a44372801825b34b44989e9f665f13571a8c8087d4ba51929909c5b0f1cf65ff31f03a1190c43
 MISC metadata.xml 252 BLAKE2B f6282e2a99df668246ea8570c72345463f06d282b6adc6d9de2a08ef0827cf4572332c580caa594aad5ba8e200870d8d25494549ee4413798025f0d885b61a68 SHA512 cbda7bf9832872764ae776ce16b2966c37a2ba3a1982d9817006fd6b82d7b17146434cde428bf114062a483e9053d2acdcdd004695e6ebf428d19cdc09937c65
diff --git a/net-libs/libnatpmp/files/remove-static-lib-20130911.patch b/net-libs/libnatpmp/files/libnatpmp-20150609-gentoo.patch
index a2c1f516c363..41593a041582 100644
--- a/net-libs/libnatpmp/files/remove-static-lib-20130911.patch
+++ b/net-libs/libnatpmp/files/libnatpmp-20150609-gentoo.patch
@@ -1,7 +1,17 @@
-diff -Naur libnatpmp-20130911.orig/Makefile libnatpmp-20130911/Makefile
---- libnatpmp-20130911.orig/Makefile	2013-09-13 07:00:55.874343916 -0400
-+++ libnatpmp-20130911/Makefile	2013-09-13 07:03:33.733351101 -0400
-@@ -35,7 +35,6 @@
+--- a/Makefile
++++ b/Makefile
+@@ -4,8 +4,9 @@
+ # (c) 2007-2013 Thomas Bernard
+ # http://miniupnp.free.fr/libnatpmp.html
+ 
++GENTOO_LIBDIR ?= lib
+ OS = $(shell uname -s)
+-CC = gcc
++CC ?= gcc
+ INSTALL = install -p
+ ARCH = $(shell uname -m | sed -e s/i.86/i686/)
+ VERSION = $(shell cat VERSION)
+@@ -35,7 +36,6 @@
  
  OBJS = $(LIBOBJS) testgetgateway.o natpmpc.o natpmp-jni.o
  
@@ -9,7 +19,7 @@ diff -Naur libnatpmp-20130911.orig/Makefile libnatpmp-20130911/Makefile
  ifeq ($(OS), Darwin)
    SHAREDLIB = libnatpmp.dylib
    JNISHAREDLIB = libjninatpmp.dylib
-@@ -58,7 +57,7 @@
+@@ -58,11 +58,11 @@
  
  HEADERS = natpmp.h
  
@@ -18,7 +28,12 @@ diff -Naur libnatpmp-20130911.orig/Makefile libnatpmp-20130911/Makefile
  
  INSTALLPREFIX ?= $(PREFIX)/usr
  INSTALLDIRINC = $(INSTALLPREFIX)/include
-@@ -72,9 +71,9 @@
+-INSTALLDIRLIB = $(INSTALLPREFIX)/lib
++INSTALLDIRLIB = $(INSTALLPREFIX)/$(GENTOO_LIBDIR)
+ INSTALLDIRBIN = $(INSTALLPREFIX)/bin
+ 
+ JAVA ?= java
+@@ -74,9 +74,9 @@
  
  .PHONY:	all clean depend install cleaninstall installpythonmodule
  
@@ -30,7 +45,7 @@ diff -Naur libnatpmp-20130911.orig/Makefile libnatpmp-20130911/Makefile
  	python setup.py build
  	touch $@
  
-@@ -82,18 +81,17 @@
+@@ -84,18 +84,17 @@
  	python setup.py install
  
  clean:
@@ -51,7 +66,7 @@ diff -Naur libnatpmp-20130911.orig/Makefile libnatpmp-20130911/Makefile
  	$(INSTALL) -m 644 $(SHAREDLIB) $(INSTALLDIRLIB)/$(SONAME)
  	$(INSTALL) -d $(INSTALLDIRBIN)
  	$(INSTALL) -m 755 natpmpc-shared $(INSTALLDIRBIN)/natpmpc
-@@ -142,20 +140,13 @@
+@@ -147,25 +146,18 @@
  	$(RM) $(addprefix $(INSTALLDIRINC), $(HEADERS))
  	$(RM) $(INSTALLDIRLIB)/$(SONAME)
  	$(RM) $(INSTALLDIRLIB)/$(SHAREDLIB)
@@ -61,14 +76,22 @@ diff -Naur libnatpmp-20130911.orig/Makefile libnatpmp-20130911/Makefile
  	$(CC) $(LDFLAGS) -o $@ $^ $(EXTRA_LD)
  
 -natpmpc-static:	natpmpc.o $(STATICLIB)
--	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(EXTRA_LD)
+-	$(CC) $(LDFLAGS) -o $@ $^ $(EXTRA_LD)
 -
  natpmpc-shared:	natpmpc.o $(SHAREDLIB)
- 	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(EXTRA_LD)
- 
+-	$(CC) $(LDFLAGS) -o $@ $^ $(EXTRA_LD)
+-
 -$(STATICLIB):	$(LIBOBJS)
 -	$(AR) crs $@ $?
--
++	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(EXTRA_LD)
+ 
  $(SHAREDLIB):	$(LIBOBJS)
  ifeq ($(OS), Darwin)
- 	$(CC) $(CFLAGS) $(LDFLAGS) -dynamiclib -Wl,-install_name,$(SONAME) -o $@ $^
+-	$(CC) -dynamiclib -Wl,-install_name,$(SONAME) -o $@ $^
++	$(CC) $(CFLAGS) $(LDFLAGS) -dynamiclib -Wl,-install_name,$(SONAME) -o $@ $^
+ else
+-	$(CC) -shared -Wl,-soname,$(SONAME) -o $@ $^ $(EXTRA_LD)
++	$(CC) $(CFLAGS) $(LDFLAGS) -shared -Wl,-soname,$(SONAME) -o $@ $^ $(EXTRA_LD)
+ endif
+ 
+ 
diff --git a/net-libs/libnatpmp/files/remove-static-lib.patch b/net-libs/libnatpmp/files/remove-static-lib.patch
deleted file mode 100644
index dae64601b9cb..000000000000
--- a/net-libs/libnatpmp/files/remove-static-lib.patch
+++ /dev/null
@@ -1,44 +0,0 @@
---- libnatpmp-20110715/Makefile
-+++ libnatpmp-20110715/Makefile
-@@ -33,7 +32,7 @@
- 
- HEADERS = natpmp.h
- 
--EXECUTABLES = testgetgateway natpmpc-shared natpmpc-static
-+EXECUTABLES = testgetgateway natpmpc-shared
- 
- INSTALLPREFIX ?= $(PREFIX)/usr
- INSTALLDIRINC = $(INSTALLPREFIX)/include
-@@ -45,9 +44,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 $@
- 
-@@ -55,11 +54,10 @@
- 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
-@@ -76,7 +74,6 @@
- 	$(RM) $(addprefix $(INSTALLDIRINC), $(HEADERS))
- 	$(RM) $(INSTALLDIRLIB)/$(SONAME)
- 	$(RM) $(INSTALLDIRLIB)/$(SHAREDLIB)
--	$(RM) $(INSTALLDIRLIB)/$(STATICLIB)
- 
- testgetgateway:	testgetgateway.o getgateway.o
- 
diff --git a/net-libs/libnatpmp/files/respect-FLAGS-20130911.patch b/net-libs/libnatpmp/files/respect-FLAGS-20130911.patch
deleted file mode 100644
index df36e2d4a4a0..000000000000
--- a/net-libs/libnatpmp/files/respect-FLAGS-20130911.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-diff -Naur libnatpmp-20130911.orig/Makefile libnatpmp-20130911/Makefile
---- libnatpmp-20130911.orig/Makefile	2013-09-10 16:15:06.000000000 -0400
-+++ libnatpmp-20130911/Makefile	2013-09-12 13:20:29.191447842 -0400
-@@ -5,7 +5,7 @@
- # http://miniupnp.free.fr/libnatpmp.html
- 
- OS = $(shell uname -s)
--CC = gcc
-+CC ?= gcc
- INSTALL = install
- VERSION = $(shell cat VERSION)
- 
-@@ -22,6 +22,7 @@
- # APIVERSION is used in soname
- APIVERSION = 1
- #LDFLAGS = -Wl,--no-undefined
-+GENTOO_CFLAGS := $(CFLAGS)
- CFLAGS = -Os
- #CFLAGS = -g -O0
- CFLAGS += -fPIC
-@@ -52,6 +53,8 @@
- endif
- endif
- 
-+CFLAGS := $(CFLAGS) $(GENTOO_CFLAGS)
-+
- HEADERS = natpmp.h
- 
- EXECUTABLES = testgetgateway natpmpc-shared natpmpc-static
-@@ -144,19 +147,19 @@
- 	$(CC) $(LDFLAGS) -o $@ $^ $(EXTRA_LD)
- 
- natpmpc-static:	natpmpc.o $(STATICLIB)
--	$(CC) $(LDFLAGS) -o $@ $^ $(EXTRA_LD)
-+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(EXTRA_LD)
- 
- natpmpc-shared:	natpmpc.o $(SHAREDLIB)
--	$(CC) $(LDFLAGS) -o $@ $^ $(EXTRA_LD)
-+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(EXTRA_LD)
- 
- $(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 $@ $^ $(EXTRA_LD)
-+	$(CC) $(CFLAGS) $(LDFLAGS) -shared -Wl,-soname,$(SONAME) -o $@ $^ $(EXTRA_LD)
- endif
- 
- 
diff --git a/net-libs/libnatpmp/files/respect-FLAGS-20140401.patch b/net-libs/libnatpmp/files/respect-FLAGS-20140401.patch
deleted file mode 100644
index 0a007b169a79..000000000000
--- a/net-libs/libnatpmp/files/respect-FLAGS-20140401.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff -Naur libnatpmp-20140401.orig/Makefile libnatpmp-20140401/Makefile
---- libnatpmp-20140401.orig/Makefile	2013-12-09 15:52:28.000000000 -0500
-+++ libnatpmp-20140401/Makefile	2014-04-02 10:03:42.128609226 -0400
-@@ -5,7 +5,7 @@
- # http://miniupnp.free.fr/libnatpmp.html
- 
- OS = $(shell uname -s)
--CC = gcc
-+CC ?= gcc
- INSTALL = install -p
- ARCH = $(shell uname -m | sed -e s/i.86/i686/)
- VERSION = $(shell cat VERSION)
-@@ -153,19 +153,19 @@
- 	$(CC) $(LDFLAGS) -o $@ $^ $(EXTRA_LD)
- 
- natpmpc-static:	natpmpc.o $(STATICLIB)
--	$(CC) $(LDFLAGS) -o $@ $^ $(EXTRA_LD)
-+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(EXTRA_LD)
- 
- natpmpc-shared:	natpmpc.o $(SHAREDLIB)
--	$(CC) $(LDFLAGS) -o $@ $^ $(EXTRA_LD)
-+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(EXTRA_LD)
- 
- $(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 $@ $^ $(EXTRA_LD)
-+	$(CC) $(CFLAGS) $(LDFLAGS) -shared -Wl,-soname,$(SONAME) -o $@ $^ $(EXTRA_LD)
- endif
- 
- 
diff --git a/net-libs/libnatpmp/files/respect-FLAGS.patch b/net-libs/libnatpmp/files/respect-FLAGS.patch
deleted file mode 100644
index 0338d1810e67..000000000000
--- a/net-libs/libnatpmp/files/respect-FLAGS.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- libnatpmp-20110808/Makefile
-+++ libnatpmp-20110808/Makefile
-@@ -4,13 +4,12 @@
- # 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
--CFLAGS = -O -fPIC -Wall -DENABLE_STRNATPMPERR
-+CFLAGS := -Wall -DENABLE_STRNATPMPERR $(CFLAGS)
- 
- LIBOBJS = natpmp.o getgateway.o
- 
-@@ -75,16 +75,18 @@
- testgetgateway:	testgetgateway.o getgateway.o
- 
- natpmpc-shared:	natpmpc.o $(SHAREDLIB)
--	$(CC) $(LDFLAGS) -o $@ $^
-+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^
-+
-+getgateway.o natpmp.o: CFLAGS += -fPIC
- 
- $(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/files/respect-libdir-20120821.patch b/net-libs/libnatpmp/files/respect-libdir-20120821.patch
deleted file mode 100644
index 90b7167a1d4f..000000000000
--- a/net-libs/libnatpmp/files/respect-libdir-20120821.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff -Naur libnatpmp-20120821.orig/Makefile libnatpmp-20120821/Makefile
---- libnatpmp-20120821.orig/Makefile	2012-08-26 20:26:27.000000000 -0400
-+++ libnatpmp-20120821/Makefile	2012-08-26 20:27:07.000000000 -0400
-@@ -4,6 +4,7 @@
- # (c) 2007-2011 Thomas Bernard
- # http://miniupnp.free.fr/libnatpmp.html
- 
-+GENTOO_LIBDIR ?= lib
- OS = $(shell uname -s)
- CC ?= gcc
- INSTALL = install
-@@ -41,7 +42,7 @@
- 
- INSTALLPREFIX ?= $(PREFIX)/usr
- INSTALLDIRINC = $(INSTALLPREFIX)/include
--INSTALLDIRLIB = $(INSTALLPREFIX)/lib
-+INSTALLDIRLIB = $(INSTALLPREFIX)/$(GENTOO_LIBDIR)
- INSTALLDIRBIN = $(INSTALLPREFIX)/bin
- 
- .PHONY:	all clean depend install cleaninstall installpythonmodule
diff --git a/net-libs/libnatpmp/files/respect-libdir.patch b/net-libs/libnatpmp/files/respect-libdir.patch
deleted file mode 100644
index 07f5d87ddf98..000000000000
--- a/net-libs/libnatpmp/files/respect-libdir.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- libnatpmp-20110808/Makefile
-+++ libnatpmp-20110808/Makefile
-@@ -6,6 +6,7 @@
- # (c) 2007-2011 Thomas Bernard
- # http://miniupnp.free.fr/libnatpmp.html
- 
-+GENTOO_LIBDIR ?= lib
- OS = $(shell uname -s)
- CC ?= gcc
- INSTALL = install
-@@ -36,7 +37,7 @@
- 
- INSTALLPREFIX ?= $(PREFIX)/usr
- INSTALLDIRINC = $(INSTALLPREFIX)/include
--INSTALLDIRLIB = $(INSTALLPREFIX)/lib
-+INSTALLDIRLIB = $(INSTALLPREFIX)/$(GENTOO_LIBDIR)
- INSTALLDIRBIN = $(INSTALLPREFIX)/bin
- 
- .PHONY:	all clean depend install cleaninstall installpythonmodule
diff --git a/net-libs/libnatpmp/libnatpmp-20110808-r1.ebuild b/net-libs/libnatpmp/libnatpmp-20110808-r1.ebuild
deleted file mode 100644
index 7974ad84d71f..000000000000
--- a/net-libs/libnatpmp/libnatpmp-20110808-r1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-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="sparc"
-IUSE="static-libs"
-
-src_prepare() {
-	epatch "${FILESDIR}"/respect-FLAGS.patch
-	epatch "${FILESDIR}"/respect-libdir.patch
-	use static-libs || epatch "${FILESDIR}"/remove-static-lib.patch
-	tc-export CC
-}
-
-src_install() {
-	emake PREFIX="${D}" GENTOO_LIBDIR="$(get_libdir)" install
-
-	dodoc Changelog.txt README
-	doman natpmpc.1
-}
diff --git a/net-libs/libnatpmp/libnatpmp-20130911.ebuild b/net-libs/libnatpmp/libnatpmp-20130911.ebuild
deleted file mode 100644
index 87dec82d0ac5..000000000000
--- a/net-libs/libnatpmp/libnatpmp-20130911.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-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"
-IUSE="static-libs"
-
-src_prepare() {
-	epatch "${FILESDIR}"/respect-FLAGS-${PV}.patch
-	epatch "${FILESDIR}"/respect-libdir-20120821.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
-}
diff --git a/net-libs/libnatpmp/libnatpmp-20140401-r1.ebuild b/net-libs/libnatpmp/libnatpmp-20140401-r1.ebuild
deleted file mode 100644
index 3b9b76199533..000000000000
--- a/net-libs/libnatpmp/libnatpmp-20140401-r1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-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"
-IUSE="static-libs"
-
-src_prepare() {
-	epatch "${FILESDIR}"/respect-FLAGS-20140401.patch
-	epatch "${FILESDIR}"/respect-libdir-20120821.patch
-	use static-libs || epatch "${FILESDIR}"/remove-static-lib-20130911.patch
-	tc-export CC
-}
-
-src_install() {
-	# Override HEADERS for missing declspec.h wrt #506832
-	emake HEADERS='declspec.h natpmp.h' PREFIX="${D}" GENTOO_LIBDIR="$(get_libdir)" install
-
-	dodoc Changelog.txt README
-	doman natpmpc.1
-}
diff --git a/net-libs/libnatpmp/libnatpmp-20150609.ebuild b/net-libs/libnatpmp/libnatpmp-20150609.ebuild
index dacd2137cb04..4c214c0cc10d 100644
--- a/net-libs/libnatpmp/libnatpmp-20150609.ebuild
+++ b/net-libs/libnatpmp/libnatpmp-20150609.ebuild
@@ -11,13 +11,9 @@ SRC_URI="http://miniupnp.free.fr/files/download.php?file=${P}.tar.gz -> ${P}.tar
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 arm ~arm64 ~hppa ~mips ppc ppc64 sparc x86"
 
-PATCHES=(
-	"${FILESDIR}"/respect-FLAGS-20140401.patch
-	"${FILESDIR}"/respect-libdir-20120821.patch
-	"${FILESDIR}"/remove-static-lib-20130911.patch
-)
+PATCHES=( "${FILESDIR}"/${PN}-20150609-gentoo.patch )
 
 src_configure() {
 	tc-export CC