reinit the tree, so we can have metadata

13 files changed, 426 insertions, 0 deletions

diff --git a/net-libs/libnatpmp/Manifest b/net-libs/libnatpmp/Manifest
new file mode 100644
index 000000000000..6a24e8dd7fa8
--- /dev/null
+++ b/net-libs/libnatpmp/Manifest
@@ -0,0 +1,18 @@
+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-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-20130911.tar.gz 18744 SHA256 a30d83b9175585cc0f5bff753ce7eb5d83aaecb6222ccac670ed759fea595d7d SHA512 e7dfb3955ccc2c30e7c74c1085bc71bd9318f6171b84fbad2d8ae8bd5a227f7ceed3f60ecb49bd10e6fb838d8be3325bbf467467bf0d04e46883e3a19fa14a2d WHIRLPOOL fafb32c930e21afd8c3e10528638be4b31d03a2bcfdc481b4f2ea682ae4b7fd0cf943f32b8a395f03ceeecf42a41370fcd49a6026bc3cd449b6e4fba39cf191f
+DIST libnatpmp-20140401.tar.gz 23302 SHA256 b2ce5e626a21c795cba2d118f26e54aaa89de29d4611c440fafc49a2a5bedabb SHA512 12616f07b0a096046a35079954b8a34d474e672d7836ddac9da993a47178902aa2d781786ac76c55c5f16cfdf6a7e7258f92fec3850714ad9cd50208d854c4c2 WHIRLPOOL c12bfbc83d1f30f20162c3fddd5452f53d6ef556452845c6303420718a92568c8e8174939a3ef2702045d7c2061f5aff57bfe81c3516452d84172ef6ecf08849
+DIST libnatpmp-20150609.tar.gz 24392 SHA256 e1aa9c4c4219bc06943d6b2130f664daee213fb262fcb94dd355815b8f4536b0 SHA512 e50b1f68ce9254bb2f068ddc37417a3c417b80f7b3fb3d84e3e9af4a144d89e204ab993b54c01657335e855d0124a8fcbbf96ce78db7b9ae0b03b6eb79de2e09 WHIRLPOOL 27243e13e445a8bbe592257e1029264c3535ef1c71ccaf476708e91c8ead39b778a2d07e6bc42500444b910a005d5be092c5a453df225a556975e97f4184b7c7
+EBUILD libnatpmp-20110808-r1.ebuild 722 SHA256 9f75551bd53d6b4cfe6867f911cbe3086d4202e8300e1eb3378a6cef15106fbf SHA512 00fc715e7b04c7ca32ec24bb6fdfb72592745edd2a4ad77c27248d908b567da26b91c108d655b996e24c10f3ed9d383cf72735ec245921683e3625aea3f9840c WHIRLPOOL 0e14a3d41ef272adcf39587e0790dc03ca5ba72e689b98350676ea8475ee7eb0d2a2b1823758c16104984c21771267f99c8e8ec65905aaeb15179382fbd1b680
+EBUILD libnatpmp-20130911.ebuild 786 SHA256 39864f2898a4612d590fb6e41bfc3229d78d5411c6af6eddf1a94dd87910d7bb SHA512 1b698ebab057ef860b759240b133c343ce89cc4696b21250be00fec5050b86c632154d18b3a96925de52fa766a2f702d56b8c53c0252caac364bfe52a5ae914b WHIRLPOOL 7c7cdb34bae6e540cdc517c983ae4423d1fe6d487d68c1f9c87656a95ae56532fbda1d26fb2e7dfd8577a829372c0af76e77322dd059d20eeafcf2c3f33419a9
+EBUILD libnatpmp-20140401-r1.ebuild 882 SHA256 bef4cb87a00c2297ab737895ba5a77b96be25029f2525db349112926239c636c SHA512 ccee86e0aff0d6ee4cc581872019efd4261ca4a4ee33cb651681c77c1900ae49728cdf9effb7f3603a96f74ba22db86657f035c311ffc318ea6f0d5ad95c9925 WHIRLPOOL 722d27b2d2937fad968adf62cd01ab41382766ceb920e2000fda7e77620fedc151413e2c896db35c694d59a9177eaf89c40767c23b5baa2a593067e0a59e15fc
+EBUILD libnatpmp-20150609.ebuild 888 SHA256 aede4769e4b74fa06df15378a89cfefd52931089dabce4a712ff3fdf75785afb SHA512 890fead9eb9beddf4c894edb10bcae213cefee4da4deab6e2153fe1ab8bc0d1c7ad59d4978435bf23ab7de4e98c3a3154e4a55ad943ba60fa15fae8a1f489351 WHIRLPOOL 0484607259da1751000377fe63f88c2eb6d6fe9bc8bdd222f94100a38d50053e77b24924b23adc1c4467257e4354664bfc5b6bd009fd53c9ea941d3f9dfe6dd4
+MISC ChangeLog 2638 SHA256 20c6a2df5e40b47849c3186268f4e318f143951e66c3aaa686ed981e4be82ed1 SHA512 48e6481831ca69f0416593942f64bb7acc24319a6f60f3cb2c6f745a2d0f1531caf381ffe048b9e4c6ef20367c4b106c74d271abac092933074c58ad79b56e24 WHIRLPOOL c2bb784624056f3161b7eb6afce743bed5aec99092902c7100b33b1d055f4d01e6a24a568a6faa311e5fe1cb825d70b508cb4236f0781333dfb1331555a56444
+MISC ChangeLog-2015 5047 SHA256 307f3064a7f601e4b48b67e0c2ed23f2488fc61cd83290a1c1b4db76277bf7fe SHA512 2a2d7a9df24954154bfacd4d2abd56857745bdf2c0305ce71eb0d0cf89a1544bb369fec8bacb70b2ad7b9e3972fe8a24cbae6b569a7fc19536cdbd8cc1197d9e WHIRLPOOL e64f0bb1f6795a0006c6fe44b2ea99889e28a1c3f5b22d23ac669ce8ba3ae4516b12c5f500c1871c4c4b8fbc2a20d48b27bec3696385753b42caf5375ec7675b
+MISC metadata.xml 252 SHA256 a590e5133cd97a615db4f977b0e28e5c60c56cac76eb3d339109cdf379003b60 SHA512 cbda7bf9832872764ae776ce16b2966c37a2ba3a1982d9817006fd6b82d7b17146434cde428bf114062a483e9053d2acdcdd004695e6ebf428d19cdc09937c65 WHIRLPOOL b209a730a169969b9e3c4d4612368bc5b30bfa5fae275d98d83ba96fd0ad01d308a8fed4f7d67a7c9fa417c624dfeb23ce89ab58923a8a0b5b1bd68ee73f288c
diff --git a/net-libs/libnatpmp/files/remove-static-lib-20130911.patch b/net-libs/libnatpmp/files/remove-static-lib-20130911.patch
new file mode 100644
index 000000000000..a2c1f516c363
--- /dev/null
+++ b/net-libs/libnatpmp/files/remove-static-lib-20130911.patch
@@ -0,0 +1,74 @@
+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 @@
+ 
+ OBJS = $(LIBOBJS) testgetgateway.o natpmpc.o natpmp-jni.o
+ 
+-STATICLIB = libnatpmp.a
+ ifeq ($(OS), Darwin)
+   SHAREDLIB = libnatpmp.dylib
+   JNISHAREDLIB = libjninatpmp.dylib
+@@ -58,7 +57,7 @@
+ 
+ HEADERS = natpmp.h
+ 
+-EXECUTABLES = testgetgateway natpmpc-shared natpmpc-static
++EXECUTABLES = testgetgateway natpmpc-shared
+ 
+ INSTALLPREFIX ?= $(PREFIX)/usr
+ INSTALLDIRINC = $(INSTALLPREFIX)/include
+@@ -72,9 +71,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 $@
+ 
+@@ -82,18 +81,17 @@
+ 	python setup.py install
+ 
+ clean:
+-	$(RM) $(OBJS) $(EXECUTABLES) $(STATICLIB) $(SHAREDLIB) $(JAVACLASSES) $(JNISHAREDLIB)
++	$(RM) $(OBJS) $(EXECUTABLES) $(SHAREDLIB) $(JAVACLASSES) $(JNISHAREDLIB)
+ 	$(RM) pythonmodule
+ 	$(RM) -r build/ dist/ libraries/
+ 
+ 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
+@@ -142,20 +140,13 @@
+ 	$(RM) $(addprefix $(INSTALLDIRINC), $(HEADERS))
+ 	$(RM) $(INSTALLDIRLIB)/$(SONAME)
+ 	$(RM) $(INSTALLDIRLIB)/$(SHAREDLIB)
+-	$(RM) $(INSTALLDIRLIB)/$(STATICLIB)
+ 
+ testgetgateway:	testgetgateway.o getgateway.o
+ 	$(CC) $(LDFLAGS) -o $@ $^ $(EXTRA_LD)
+ 
+-natpmpc-static:	natpmpc.o $(STATICLIB)
+-	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(EXTRA_LD)
+-
+ natpmpc-shared:	natpmpc.o $(SHAREDLIB)
+ 	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(EXTRA_LD)
+ 
+-$(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/remove-static-lib.patch b/net-libs/libnatpmp/files/remove-static-lib.patch
new file mode 100644
index 000000000000..dae64601b9cb
--- /dev/null
+++ b/net-libs/libnatpmp/files/remove-static-lib.patch
@@ -0,0 +1,44 @@
+--- 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
new file mode 100644
index 000000000000..df36e2d4a4a0
--- /dev/null
+++ b/net-libs/libnatpmp/files/respect-FLAGS-20130911.patch
@@ -0,0 +1,53 @@
+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
new file mode 100644
index 000000000000..0a007b169a79
--- /dev/null
+++ b/net-libs/libnatpmp/files/respect-FLAGS-20140401.patch
@@ -0,0 +1,36 @@
+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
new file mode 100644
index 000000000000..0338d1810e67
--- /dev/null
+++ b/net-libs/libnatpmp/files/respect-FLAGS.patch
@@ -0,0 +1,40 @@
+--- 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
new file mode 100644
index 000000000000..90b7167a1d4f
--- /dev/null
+++ b/net-libs/libnatpmp/files/respect-libdir-20120821.patch
@@ -0,0 +1,20 @@
+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
new file mode 100644
index 000000000000..07f5d87ddf98
--- /dev/null
+++ b/net-libs/libnatpmp/files/respect-libdir.patch
@@ -0,0 +1,19 @@
+--- 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
new file mode 100644
index 000000000000..7974ad84d71f
--- /dev/null
+++ b/net-libs/libnatpmp/libnatpmp-20110808-r1.ebuild
@@ -0,0 +1,28 @@
+# 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
new file mode 100644
index 000000000000..465682c0de61
--- /dev/null
+++ b/net-libs/libnatpmp/libnatpmp-20130911.ebuild
@@ -0,0 +1,28 @@
+# 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 ~x86-fbsd"
+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
new file mode 100644
index 000000000000..4dea416d72bd
--- /dev/null
+++ b/net-libs/libnatpmp/libnatpmp-20140401-r1.ebuild
@@ -0,0 +1,29 @@
+# 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 ~x86-fbsd"
+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
new file mode 100644
index 000000000000..557cd58f561e
--- /dev/null
+++ b/net-libs/libnatpmp/libnatpmp-20150609.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2017 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 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+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/metadata.xml b/net-libs/libnatpmp/metadata.xml
new file mode 100644
index 000000000000..d920e3ba3e56
--- /dev/null
+++ b/net-libs/libnatpmp/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>blueness@gentoo.org</email>
+		<name>Anthony G. Basile</name>
+	</maintainer>
+</pkgmetadata>