Rev bump, bugs 395039, 395041, 395043

(Portage version: 2.1.10.11/cvs/Linux x86_64)

4 files changed, 46 insertions, 21 deletions

diff --git a/net-libs/libnatpmp/ChangeLog b/net-libs/libnatpmp/ChangeLog
index 2d89ee17d8f8..ac8891fff6c8 100644
--- a/net-libs/libnatpmp/ChangeLog
+++ b/net-libs/libnatpmp/ChangeLog
@@ -1,5 +1,12 @@
 
 
+*libnatpmp-20110808-r1 (17 Dec 2011)
+
+  17 Dec 2011; Anthony G. Basile <blueness@gentoo.org>
+  -libnatpmp-20110808.ebuild, +libnatpmp-20110808-r1.ebuild,
+  +files/respect-libdir.patch, files/respect-FLAGS.patch:
+  Rev bump, bugs 395039, 395041, 395043
+
   17 Dec 2011; Anthony G. Basile <blueness@gentoo.org>
   -libnatpmp-20110715-r1.ebuild:
   Removed older version
diff --git a/net-libs/libnatpmp/files/respect-FLAGS.patch b/net-libs/libnatpmp/files/respect-FLAGS.patch
index c5b856e01de6..6de270af0016 100644
--- a/net-libs/libnatpmp/files/respect-FLAGS.patch
+++ b/net-libs/libnatpmp/files/respect-FLAGS.patch
@@ -1,7 +1,7 @@
-diff -Naur libnatpmp-20110715.orig//Makefile libnatpmp-20110715/Makefile
---- libnatpmp-20110715.orig//Makefile	2011-06-22 18:28:00.000000000 -0400
-+++ libnatpmp-20110715/Makefile	2011-07-22 12:30:48.000000000 -0400
-@@ -4,6 +4,9 @@
+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
  # http://miniupnp.free.fr/libnatpmp.html
  
@@ -9,23 +9,16 @@ diff -Naur libnatpmp-20110715.orig//Makefile libnatpmp-20110715/Makefile
 +GENTOO_LDFLAGS := $(LDFLAGS)
 +
  OS = $(shell uname -s)
- CC = gcc
+-CC = gcc
++CC ?= gcc
  INSTALL = install
-@@ -11,6 +14,7 @@
+ 
  # APIVERSION is used in soname
  APIVERSION = 1
- #LDFLAGS = -Wl,--no-undefined
-+LDFLAGS =
- CFLAGS = -O -fPIC -Wall -DENABLE_STRNATPMPERR
+-#LDFLAGS = -Wl,--no-undefined
+-CFLAGS = -O -fPIC -Wall -DENABLE_STRNATPMPERR
++LDFLAGS = $(GENTOO_LDFLAGS)
++CFLAGS = -O -fPIC -Wall -DENABLE_STRNATPMPERR $(GENTOO_CFLAGS)
  
  LIBOBJS = natpmp.o getgateway.o
-@@ -36,6 +40,9 @@
- INSTALLDIRLIB = $(INSTALLPREFIX)/lib
- INSTALLDIRBIN = $(INSTALLPREFIX)/bin
- 
-+CFLAGS += $(GENTOO_CFLAGS)
-+LDFLAGS += $(GENTOO_LDFLAGS)
-+
- .PHONY:	all clean depend install cleaninstall installpythonmodule
  
- all: $(STATICLIB) $(SHAREDLIB) $(EXECUTABLES)
diff --git a/net-libs/libnatpmp/files/respect-libdir.patch b/net-libs/libnatpmp/files/respect-libdir.patch
new file mode 100644
index 000000000000..f56155a7207a
--- /dev/null
+++ b/net-libs/libnatpmp/files/respect-libdir.patch
@@ -0,0 +1,20 @@
+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
+@@ -6,6 +6,7 @@
+ 
+ GENTOO_CFLAGS := $(CFLAGS)
+ GENTOO_LDFLAGS := $(LDFLAGS)
++GENTOO_LIBDIR ?= "lib"
+ 
+ OS = $(shell uname -s)
+ CC ?= gcc
+@@ -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.ebuild b/net-libs/libnatpmp/libnatpmp-20110808-r1.ebuild
index 0d11a7575f73..525e6222323b 100644
--- a/net-libs/libnatpmp/libnatpmp-20110808.ebuild
+++ b/net-libs/libnatpmp/libnatpmp-20110808-r1.ebuild
@@ -1,10 +1,10 @@
 # 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-20110808.ebuild,v 1.1 2011/08/09 11:52:18 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libnatpmp/libnatpmp-20110808-r1.ebuild,v 1.1 2011/12/17 13:58:05 blueness Exp $
 
 EAPI=4
 
-inherit eutils
+inherit eutils toolchain-funcs multilib
 
 DESCRIPTION="An alternative protocol to UPnP IGD specification."
 HOMEPAGE="http://miniupnp.free.fr/libnatpmp.html"
@@ -20,11 +20,16 @@ RDEPEND="${DEPEND}"
 
 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)"
+}
+
 src_install() {
-	emake PREFIX="${D}" install
+	emake PREFIX="${D}" GENTOO_LIBDIR="$(get_libdir)" install
 
 	dodoc Changelog.txt README
 	doman natpmpc.1