Added Use='static-libs'

Package-Manager: portage-2.1.10.3/cvs/Linux x86_64

4 files changed, 113 insertions, 4 deletions

diff --git a/net-libs/libnatpmp/ChangeLog b/net-libs/libnatpmp/ChangeLog
index d0c35e003629..2780f0b84c63 100644
--- a/net-libs/libnatpmp/ChangeLog
+++ b/net-libs/libnatpmp/ChangeLog
@@ -1,5 +1,11 @@
 
 
+*libnatpmp-20110715-r1 (23 Jul 2011)
+
+  23 Jul 2011; Anthony G. Basile <blueness@gentoo.org>
+  +libnatpmp-20110715-r1.ebuild, +files/remove-static-lib.patch:
+  Added USE="static-libs"
+
 *libnatpmp-20110715 (22 Jul 2011)
 
   22 Jul 2011; Anthony G. Basile <blueness@gentoo.org>
diff --git a/net-libs/libnatpmp/Manifest b/net-libs/libnatpmp/Manifest
index dd84b65f6688..2093a4a5def5 100644
--- a/net-libs/libnatpmp/Manifest
+++ b/net-libs/libnatpmp/Manifest
@@ -1,15 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX remove-static-lib.patch 2174 RMD160 11dffa0ac65728c4cb25d91d10fa274ccf95de0e SHA1 5bc4d77a7adc6506478e708d850f891359faa471 SHA256 8cf17c151af16d23dd3c85d39456c0029d4a6ce206b247cd237d24577632fc3b
 AUX respect-FLAGS.patch 882 RMD160 6f19e7341b35b5b199ef836dbbc1ad9707478a40 SHA1 c46c9449c5f76632fa68c842da736c02bbcc3c20 SHA256 e9c6987c529d9d3a574d0ecf60cd504d5eec7d431a7872d433993d7fd9d57df6
 DIST libnatpmp-20110715.tar.gz 17943 RMD160 df9c656fdaa2782863670c334c840ff2ceab3e6b SHA1 87338bbbe07c627d33c5935b92b9f2c7622fe885 SHA256 853364242b2ad21ada841de484ad702f609d822690816a0c04a324f5963bed58
+EBUILD libnatpmp-20110715-r1.ebuild 726 RMD160 f57c9846e4cf35411edce99b4b03650f887d11a8 SHA1 0206f7f16f7dbb684668161d1cc5969c1bb71ded SHA256 9af98b5a7a3995a8b01a60b7ecb338444103614e28a2da1771380fe4f07a5682
 EBUILD libnatpmp-20110715.ebuild 646 RMD160 9eac59677dffb78c787bb57bd771514a7ef6abdd SHA1 f9cf1d283c315cbc2fbf2e68044b670aece001a2 SHA256 6fc4442c6c98affd846334bc893f1a94de63a4f1d2e287b7f4bf623805e9fda4
-MISC ChangeLog 217 RMD160 2e7c46b8b6ecbdf8b0cf449fa058e235c5114e63 SHA1 7fff43d420105cbdbef76e77cca96cf12b3b1224 SHA256 197de8b4f419848b97724477c13aa1dce517921e56e663685dbd795bb02d9d2b
+MISC ChangeLog 402 RMD160 91cd88b768c4b2f955de2ea695d7842f5a6d69d8 SHA1 d48015594d15d39a5b1b8d160c79a152e44e3d55 SHA256 90bb2d6eeb15e29f31f12128b1934783151b2f9529981d05a8959c1c4b5848d6
 MISC metadata.xml 260 RMD160 fbefa5d68419d2a2c7f16e2be1b7d32bdf550da6 SHA1 2ae3d90be714fe96cb79937e2e9ecc1a7b4bf7a1 SHA256 7b301cfccb3820f218f51a1a3acafb5a640a92dff1155c2ad4cc955b6c3351fb
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEAREIAAYFAk4pxVQACgkQl5yvQNBFVTXoTwCfWNCp6pPDyIL4ULq0NniPsBRH
-hF0AnREsaR8KtRtWn8bN6TvCfJLHeQpp
-=PE5E
+iEYEAREIAAYFAk4qo4AACgkQl5yvQNBFVTVdlwCeINvp4nyaVos9AqVXj+0t/5nR
+sSgAnjsvHtNznRkFmhBxC0GT97I+mJlG
+=4BhL
 -----END PGP SIGNATURE-----
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..b24aae4c3962
--- /dev/null
+++ b/net-libs/libnatpmp/files/remove-static-lib.patch
@@ -0,0 +1,73 @@
+diff -Naur libnatpmp-20110715.orig//Makefile libnatpmp-20110715/Makefile
+--- libnatpmp-20110715.orig//Makefile	2011-07-22 14:57:49.000000000 -0400
++++ libnatpmp-20110715/Makefile	2011-07-22 14:59:41.000000000 -0400
+@@ -21,7 +21,6 @@
+ 
+ OBJS = $(LIBOBJS) testgetgateway.o natpmpc.o
+ 
+-STATICLIB = libnatpmp.a
+ ifeq ($(OS), Darwin)
+   SHAREDLIB = libnatpmp.dylib
+   SONAME = $(basename $(SHAREDLIB)).$(APIVERSION).dylib
+@@ -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,18 +54,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
+@@ -76,19 +74,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) $(LDFLAGS) -o $@ $^
+-
+ natpmpc-shared:	natpmpc.o $(SHAREDLIB)
+ 	$(CC) $(LDFLAGS) -o $@ $^
+ 
+-$(STATICLIB):	$(LIBOBJS)
+-	$(AR) crs $@ $?
+-
+ $(SHAREDLIB):	$(LIBOBJS)
+ ifeq ($(OS), Darwin)
+ 	$(CC) -dynamiclib -Wl,-install_name,$(SONAME) -o $@ $^
diff --git a/net-libs/libnatpmp/libnatpmp-20110715-r1.ebuild b/net-libs/libnatpmp/libnatpmp-20110715-r1.ebuild
new file mode 100644
index 000000000000..424c95c68c85
--- /dev/null
+++ b/net-libs/libnatpmp/libnatpmp-20110715-r1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libnatpmp/libnatpmp-20110715-r1.ebuild,v 1.1 2011/07/23 10:33:26 blueness Exp $
+
+EAPI=4
+
+inherit eutils
+
+DESCRIPTION="An alternative protocol to UPnP IGD specification."
+HOMEPAGE="http://miniupnp.free.fr/nat-pmp.html"
+SRC_URI="http://miniupnp.free.fr/files/download.php?file=${P}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="static-libs"
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/respect-FLAGS.patch
+	use !static-libs && epatch "${FILESDIR}"/remove-static-lib.patch
+}
+
+src_install() {
+	emake PREFIX="${D}" install
+}