Clean up patches a bit to respect LDFLAGS and not over use -fPIC.

Package-Manager: portage-2.2.0_alpha86/cvs/Linux x86_64

6 files changed, 63 insertions, 65 deletions

diff --git a/net-libs/libnatpmp/ChangeLog b/net-libs/libnatpmp/ChangeLog
index c6ee420f500a..e74866a78a97 100644
--- a/net-libs/libnatpmp/ChangeLog
+++ b/net-libs/libnatpmp/ChangeLog
@@ -1,5 +1,10 @@
 
 
+  09 Mar 2012; Mike Frysinger <vapier@gentoo.org> libnatpmp-20110808-r1.ebuild,
+  files/remove-static-lib.patch, files/respect-FLAGS.patch,
+  files/respect-libdir.patch:
+  Clean up patches a bit to respect LDFLAGS and not over use -fPIC.
+
   03 Mar 2012; Markus Meier <maekke@gentoo.org> libnatpmp-20110808-r1.ebuild:
   add ~arm, bug #400929
 
diff --git a/net-libs/libnatpmp/Manifest b/net-libs/libnatpmp/Manifest
index fd9d9cff684d..0c235be37d24 100644
--- a/net-libs/libnatpmp/Manifest
+++ b/net-libs/libnatpmp/Manifest
@@ -1,17 +1,27 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX remove-static-lib.patch 2174 RMD160 11dffa0ac65728c4cb25d91d10fa274ccf95de0e SHA1 5bc4d77a7adc6506478e708d850f891359faa471 SHA256 8cf17c151af16d23dd3c85d39456c0029d4a6ce206b247cd237d24577632fc3b
-AUX respect-FLAGS.patch 685 RMD160 5359179f77266a167d13e0b00d8c1afa589760f4 SHA1 d17f5565525ad28576d91d8effd3bb8193c0dac3 SHA256 6a55e769a9a25b52f97a3d1489d4bc35d14a02d2d7126f6ac313a39f5fb4f516
-AUX respect-libdir.patch 642 RMD160 218635eec2c26316410998f46a3aa21e9e39ca32 SHA1 1302cda153daa4d0c589832e64eb51711cf57f5e SHA256 9472836febef37193f38e4fef879cbccb4185b7e037b2c89f930a68e5c1c9432
+AUX remove-static-lib.patch 1343 RMD160 5305b013a6970012f1f7f3914865bd5ef7fbaf29 SHA1 38f548473d32c6bcea1899dfb20492b70411f924 SHA256 ec07770450f3c4e5428c979a0675a84bec620aee7e73b5d3caa70030f1fc0c13
+AUX respect-FLAGS.patch 999 RMD160 c57551de6a0db8c8238548c2051f5762c689cf34 SHA1 d4e32294df3dcc25c47e6b88f0d57e111e21509d SHA256 d5ef623185db5f9d110b84b11d4bf4ec95be85c0dace4165f96684814226518f
+AUX respect-libdir.patch 522 RMD160 9f9a4ef5f48c262240d30d848cb172691eb7d4c9 SHA1 a3c354369d1f876acedab80b705f76cb7b8bbac2 SHA256 ddef2e53d03b66e1d4db34753595269aeef24627ee3b7d05293f11d449afa840
 DIST libnatpmp-20110808.tar.gz 17762 RMD160 265e04f2282bfc4a48c1e797591478338a33d14f SHA1 3763ab0e612710ce7348e7e37bb7c1b5ac7932e3 SHA256 2c306719c8f77027c51161e90fb7fa72e1eb22475288ea6867a133316e944a69
-EBUILD libnatpmp-20110808-r1.ebuild 898 RMD160 38e9d8161845e626e909ebb2f9a04faf54131a83 SHA1 5012dac25e82bf64d834824bee5402d97e866582 SHA256 07402f0a99f790a7f4f863d4791e2715e1b576689e713854a42d59d2fb2c389e
-MISC ChangeLog 1418 RMD160 e4a4aa17e1bbfdae84571c8406cdd5a4531dd2bc SHA1 83c1e813737cad6e6b877cd76e86b4fbcac9978b SHA256 64bfdee3c360809f4a683cb607685170f858dc411dfc385cdfe61a38ffde41d0
+EBUILD libnatpmp-20110808-r1.ebuild 867 RMD160 096635a1f0d9b94bdaf8b2ed029030ec1a4d9cae SHA1 5a2826282a23d12da777e635be6d2b762149faaf SHA256 f4c2adfa050924e931d404fd8151a2fb0b15638c63f8f35c92ea1088680ba321
+MISC ChangeLog 1657 RMD160 c9790738a07487c784a8ee02158e8e80d9e9c86c SHA1 133abda2cd810f0cc52eb1fba2fa1947dd6ad3a8 SHA256 8831a71a3fb6565041a5776e66a862d3f96eb612be968391f24ac319033f5342
 MISC metadata.xml 238 RMD160 6401efde1642c40e91d5a41a966b9dbff0512eab SHA1 9751c07b46aec3d4f96133758cdd23a3e2ca2835 SHA256 f13e6e7b65d20beb9ae945d520160ef0dba80c1965754958945904d7e3c0a75f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk9SPGEACgkQkKaRLQcq0GK7owCfehoE46cjVeuZxRf7TBOH+diL
-o0wAn1duuV0MWqndtbHSdrOv4UOkZMrC
-=XePT
+iQIcBAEBAgAGBQJPWX2UAAoJELEHsLL7fEFWtCQQAJOscCf/ezU5mKe87BBLfe6c
+EVAsefaH0Tg5cA4tdxt9JH31RA40Xg4nKxAxSkz6xEAWY61k+eMoZY4o3Qa8Iy6Y
+2ntKy4LFjPdNDGkx/CfOFsCAxwcZF/pb7UTpwumIKlcZLdHNFKiyIOBLdlKxAOjf
+escwb6Xfnp1A24hf6kSp6/DbDBMHgufa2S30Z1TlALoDbBiKQICOHxq+MDdbCvFc
+9IXpOhJ6+5NYx767lwDF46atLh0Csw6ReNwvXErbg5679GxWwerf/5oSs6Dr+jYN
+w2a9X1YKSu8hTSNTjJ3jv0iDSmzipPmogALVyPcg62qJKSFzAEtX02QHzRyO72fK
+fyJGxG5YeZelfJANN4SQKMn7l4bj/8k196wblrfn5geeYr1aTulejfhYxAn7NwB5
+LO6uinSHbFUWS45SCB2yO9qEP2Zf5sipBSulRibsTjzpQJGNAlyBeyKMH9S2J0Dx
+qCOKWKMtDodHbT7JWBgOtTCmwTsR8kmibOS+89axdAhilO8L47M+24NFne8hLGzf
+R/kWFqDkSrz7yvsNbqQJOAXsorQWpfyOXy8ZAPwSuIyLkgwy7C5/ViNip/pAKCIH
+gbbry+uh3J7hVpkzj7fSp/lwZyo4jOycRFCvonC10tMYW40Bd7+dutB7V9s6Dg1b
+0xyf1QisUhI0KVN37R3f
+=bsqX
 -----END PGP SIGNATURE-----
diff --git a/net-libs/libnatpmp/files/remove-static-lib.patch b/net-libs/libnatpmp/files/remove-static-lib.patch
index b24aae4c3962..dae64601b9cb 100644
--- a/net-libs/libnatpmp/files/remove-static-lib.patch
+++ b/net-libs/libnatpmp/files/remove-static-lib.patch
@@ -1,14 +1,5 @@
-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
+--- libnatpmp-20110715/Makefile
++++ libnatpmp-20110715/Makefile
 @@ -33,7 +32,7 @@
  
  HEADERS = natpmp.h
@@ -30,15 +21,7 @@ diff -Naur libnatpmp-20110715.orig//Makefile libnatpmp-20110715/Makefile
  	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/
- 
+@@ -55,11 +54,10 @@
  depend:
  	makedepend -f$(MAKEFILE_LIST) -Y $(OBJS:.o=.c) 2>/dev/null
  
@@ -51,7 +34,7 @@ diff -Naur libnatpmp-20110715.orig//Makefile libnatpmp-20110715/Makefile
  	$(INSTALL) -m 644 $(SHAREDLIB) $(INSTALLDIRLIB)/$(SONAME)
  	$(INSTALL) -d $(INSTALLDIRBIN)
  	$(INSTALL) -m 755 natpmpc-shared $(INSTALLDIRBIN)/natpmpc
-@@ -76,19 +74,12 @@
+@@ -76,7 +74,6 @@
  	$(RM) $(addprefix $(INSTALLDIRINC), $(HEADERS))
  	$(RM) $(INSTALLDIRLIB)/$(SONAME)
  	$(RM) $(INSTALLDIRLIB)/$(SHAREDLIB)
@@ -59,15 +42,3 @@ diff -Naur libnatpmp-20110715.orig//Makefile libnatpmp-20110715/Makefile
  
  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/files/respect-FLAGS.patch b/net-libs/libnatpmp/files/respect-FLAGS.patch
index 6de270af0016..0338d1810e67 100644
--- a/net-libs/libnatpmp/files/respect-FLAGS.patch
+++ b/net-libs/libnatpmp/files/respect-FLAGS.patch
@@ -1,13 +1,8 @@
-diff -Naur libnatpmp-20110808.1//Makefile libnatpmp-20110808/Makefile
---- libnatpmp-20110808.1//Makefile	2011-06-22 18:28:00.000000000 -0400
-+++ libnatpmp-20110808/Makefile	2011-12-17 06:41:21.000000000 -0500
-@@ -4,14 +4,17 @@
- # (c) 2007-2011 Thomas Bernard
+--- libnatpmp-20110808/Makefile
++++ libnatpmp-20110808/Makefile
+@@ -4,13 +4,12 @@
  # http://miniupnp.free.fr/libnatpmp.html
  
-+GENTOO_CFLAGS := $(CFLAGS)
-+GENTOO_LDFLAGS := $(LDFLAGS)
-+
  OS = $(shell uname -s)
 -CC = gcc
 +CC ?= gcc
@@ -17,8 +12,29 @@ diff -Naur libnatpmp-20110808.1//Makefile libnatpmp-20110808/Makefile
  APIVERSION = 1
 -#LDFLAGS = -Wl,--no-undefined
 -CFLAGS = -O -fPIC -Wall -DENABLE_STRNATPMPERR
-+LDFLAGS = $(GENTOO_LDFLAGS)
-+CFLAGS = -O -fPIC -Wall -DENABLE_STRNATPMPERR $(GENTOO_CFLAGS)
++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.patch b/net-libs/libnatpmp/files/respect-libdir.patch
index f56155a7207a..07f5d87ddf98 100644
--- a/net-libs/libnatpmp/files/respect-libdir.patch
+++ b/net-libs/libnatpmp/files/respect-libdir.patch
@@ -1,14 +1,13 @@
-diff -Naur libnatpmp-20110808.orig//Makefile libnatpmp-20110808/Makefile
---- libnatpmp-20110808.orig//Makefile	2011-12-17 06:58:13.000000000 -0500
-+++ libnatpmp-20110808/Makefile	2011-12-17 06:58:54.000000000 -0500
+--- libnatpmp-20110808/Makefile
++++ libnatpmp-20110808/Makefile
 @@ -6,6 +6,7 @@
+ # (c) 2007-2011 Thomas Bernard
+ # http://miniupnp.free.fr/libnatpmp.html
  
- GENTOO_CFLAGS := $(CFLAGS)
- GENTOO_LDFLAGS := $(LDFLAGS)
-+GENTOO_LIBDIR ?= "lib"
- 
++GENTOO_LIBDIR ?= lib
  OS = $(shell uname -s)
  CC ?= gcc
+ INSTALL = install
 @@ -36,7 +37,7 @@
  
  INSTALLPREFIX ?= $(PREFIX)/usr
diff --git a/net-libs/libnatpmp/libnatpmp-20110808-r1.ebuild b/net-libs/libnatpmp/libnatpmp-20110808-r1.ebuild
index b97dcf1fc360..be7d0bf30e0e 100644
--- a/net-libs/libnatpmp/libnatpmp-20110808-r1.ebuild
+++ b/net-libs/libnatpmp/libnatpmp-20110808-r1.ebuild
@@ -1,11 +1,11 @@
 # 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-20110808-r1.ebuild,v 1.3 2012/03/03 15:41:53 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libnatpmp/libnatpmp-20110808-r1.ebuild,v 1.4 2012/03/09 03:48:22 vapier Exp $
 
 EAPI=4
 inherit eutils toolchain-funcs multilib
 
-DESCRIPTION="An alternative protocol to UPnP IGD specification."
+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"
 
@@ -17,11 +17,8 @@ IUSE="static-libs"
 src_prepare() {
 	epatch "${FILESDIR}"/respect-FLAGS.patch
 	epatch "${FILESDIR}"/respect-libdir.patch
-	use !static-libs && epatch "${FILESDIR}"/remove-static-lib.patch
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)"
+	use static-libs || epatch "${FILESDIR}"/remove-static-lib.patch
+	tc-export CC
 }
 
 src_install() {