diff options
| -rw-r--r-- | net-libs/libnatpmp/ChangeLog | 7 | ||||
| -rw-r--r-- | net-libs/libnatpmp/Manifest | 13 | ||||
| -rw-r--r-- | net-libs/libnatpmp/files/respect-FLAGS.patch | 29 | ||||
| -rw-r--r-- | net-libs/libnatpmp/files/respect-libdir.patch | 20 | ||||
| -rw-r--r-- | net-libs/libnatpmp/libnatpmp-20110808-r1.ebuild (renamed from net-libs/libnatpmp/libnatpmp-20110808.ebuild) | 11 |
5 files changed, 53 insertions, 27 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/Manifest b/net-libs/libnatpmp/Manifest index d0967eac2d49..373cb36ee056 100644 --- a/net-libs/libnatpmp/Manifest +++ b/net-libs/libnatpmp/Manifest @@ -2,15 +2,16 @@ 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 +AUX respect-FLAGS.patch 685 RMD160 5359179f77266a167d13e0b00d8c1afa589760f4 SHA1 d17f5565525ad28576d91d8effd3bb8193c0dac3 SHA256 6a55e769a9a25b52f97a3d1489d4bc35d14a02d2d7126f6ac313a39f5fb4f516 +AUX respect-libdir.patch 642 RMD160 218635eec2c26316410998f46a3aa21e9e39ca32 SHA1 1302cda153daa4d0c589832e64eb51711cf57f5e SHA256 9472836febef37193f38e4fef879cbccb4185b7e037b2c89f930a68e5c1c9432 DIST libnatpmp-20110808.tar.gz 17762 RMD160 265e04f2282bfc4a48c1e797591478338a33d14f SHA1 3763ab0e612710ce7348e7e37bb7c1b5ac7932e3 SHA256 2c306719c8f77027c51161e90fb7fa72e1eb22475288ea6867a133316e944a69 -EBUILD libnatpmp-20110808.ebuild 771 RMD160 597971447a0e97e204cafbf24d4fef6b08b8eb43 SHA1 6ba162cdd7240678bfd563003570f5d73f55af57 SHA256 8a50cfd55902370820a3ff8b2438f8b05f652eff13ee084bf6e32cffeb00b6b5 -MISC ChangeLog 907 RMD160 92e64c2d9b2b810af0530969f9274866f9d739ec SHA1 fdee5e063eabd90695702b9d42b858e4f25ba4e5 SHA256 b2144d0b327aa35236766c3774fc739aa6ced0740d973e241d82c93fc81fd066 +EBUILD libnatpmp-20110808-r1.ebuild 915 RMD160 1e1f43426322f0525f3727ec44a5e65b3506882c SHA1 a54c94d105d66a84fd0ee50d775c8af9fdbe61fa SHA256 daf045ff9aad19498e358ccf1553408768b3f3dd94f02125541e262fd6b66485 +MISC ChangeLog 1160 RMD160 076eddb3c4563e9cb84aadcaf298984862356d47 SHA1 bb4932946087b8ce3bde2489a418b2308ca540cd SHA256 a379805a92092dda1ee47e01e6937695871652ec3e9160f4ee3bb1c33ced68fa MISC metadata.xml 238 RMD160 6401efde1642c40e91d5a41a966b9dbff0512eab SHA1 9751c07b46aec3d4f96133758cdd23a3e2ca2835 SHA256 f13e6e7b65d20beb9ae945d520160ef0dba80c1965754958945904d7e3c0a75f -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) -iEYEAREIAAYFAk7snfoACgkQl5yvQNBFVTW88QCcDnSXIFLQN5VctdvEzlloleiJ -BucAnj27PieH5BxMyQjr+LWMAGzt+IdZ -=vJGG +iEYEAREIAAYFAk7sn/cACgkQl5yvQNBFVTW0AACfTv2Pz3OfY4+9jnaDOPM17qZ9 +WDsAnRcXgWo4rv9i4afp/eA0HpORE+Zh +=AQKQ -----END PGP SIGNATURE----- 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 |