Version bump

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

6 files changed, 197 insertions, 21 deletions

diff --git a/net-libs/libnatpmp/ChangeLog b/net-libs/libnatpmp/ChangeLog
index a5441c01c0ef..39206bfafe1c 100644
--- a/net-libs/libnatpmp/ChangeLog
+++ b/net-libs/libnatpmp/ChangeLog
@@ -1,4 +1,12 @@
 
+
+*libnatpmp-20120821 (27 Aug 2012)
+
+  27 Aug 2012; Anthony G. Basile <blueness@gentoo.org>
+  +libnatpmp-20120821.ebuild, +files/remove-static-lib-20120821.patch,
+  +files/respect-FLAGS-20120821.patch, +files/respect-libdir-20120821.patch:
+  Version bump
+
   25 Mar 2012; Naohiro Aota <naota@gentoo.org> libnatpmp-20110808-r1.ebuild:
   Add ~x86-fbsd. #400929
 
diff --git a/net-libs/libnatpmp/Manifest b/net-libs/libnatpmp/Manifest
index 0c829988dcb1..ebc3bb06125c 100644
--- a/net-libs/libnatpmp/Manifest
+++ b/net-libs/libnatpmp/Manifest
@@ -1,27 +1,22 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-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 872 RMD160 5028ae91b66590559c1f69cb9e13808e51b18e33 SHA1 98170826355b7355d5dd9cf51cbb0640fc4960a6 SHA256 126a6df3f5aef4aa978fa5fa8664aa7a1293aa4931600ffcf74ceaad1c4a854a
-MISC ChangeLog 1995 RMD160 97de7d6e100fd7490376cdd80a4be1cbec069a9b SHA1 fdf743e07269468e3ba146d7f567e48da3e03221 SHA256 5facd5eb0fa419479b804109c70ba03cc56dca1a5da8c0e3c8e5e157d4f9f8c7
-MISC metadata.xml 238 RMD160 6401efde1642c40e91d5a41a966b9dbff0512eab SHA1 9751c07b46aec3d4f96133758cdd23a3e2ca2835 SHA256 f13e6e7b65d20beb9ae945d520160ef0dba80c1965754958945904d7e3c0a75f
+AUX remove-static-lib-20120821.patch 2213 SHA256 b24009cf1d08b122a84bca8cfbb16c9710684ed1b86112a81ccea63c4a4042a5 SHA512 44e0beafbb51eb74949df52e80b00b966cd8631b5b6933484e874868a259ac61c822a6863f16a8230c86d6d1f267312c0ee28d048854b6bfbd2e78bb45d45464 WHIRLPOOL 46aa66fe4ba9d2c9cc7b6f8ea360fab8315f5823addc53e0b9456c7940884af16b087eed5af1b7a3714571714e969f893d6b2f4574629efb7b7868a5470c82fa
+AUX remove-static-lib.patch 1343 SHA256 ec07770450f3c4e5428c979a0675a84bec620aee7e73b5d3caa70030f1fc0c13 SHA512 57a029da864b55ef761b7adabe25e757290bc7a9466a650d35e9a3d12266d7b14f01a374b55c735acb87833c8c8ef2e35a7bc1fdd89d6bd20ed426e9a90264bc WHIRLPOOL b3df6ea2d5be654192a3ac20291f8ffeba1f5ac1808a6dbbec357937f1946231e18c4c0cf6eca1ebaa7cc440969530909064e3135e5e9dd7c028dc095e932fe1
+AUX respect-FLAGS-20120821.patch 1346 SHA256 7980f50f525c77ebd6faf65b1af0fc71341009cb2a5bf5ee49f331e58b299b87 SHA512 5bbb9a770baa51ed5213f1624f58acb8cbcfe545c75aa9d3f667a22c2da3b74de0db32b806539db9f575b3e0f3dd079812fb18debe9c84beebc0ba1a32324410 WHIRLPOOL 5f511f31cda233b1e8b73ce571831ad10b3c83c20a0f3bdc60807633b18c8cc3e1ac8b354cd638472c09ed1e2cec97e579ca1eb2491d7596d9058e21f2fb5d89
+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-20120821.tar.gz 17832 SHA256 5b265b3ce5d6d05a33be43aab8f64b0f34a2cc0b01500e63fe167c7f9f44d2b8 SHA512 2f3edaa3db8e7382cc9a622f35965a45ebbe75666d42584521c7fa71cae9b31b8fdc5304bbdf4dd7fc64df3d7bbe03e1606782c9bfb5f008bc7edde040168ef2 WHIRLPOOL 03cf9b8938c5ee5cdf4b0288e7bca993e669a4ae89cee122757639dd5c142e4d57eecc8f946f339206fae96826a67149fbde5ef36dfeea3bbb7a57931245af5a
+EBUILD libnatpmp-20110808-r1.ebuild 872 SHA256 126a6df3f5aef4aa978fa5fa8664aa7a1293aa4931600ffcf74ceaad1c4a854a SHA512 90ef093984f2d2d2afddc6f9198537623a74bf41b381646f38cbc51d9f0965b32157d082e0831c378f85fe73fff56eaa787eabae972964fb64496fff85b45ba3 WHIRLPOOL d78377bd9b5e91ed7560d5179265320eb759aa1dd18455581fcdc98754002677e2cd7c13585f766b9f13606d87eebe0754ddbf0a3d100961a7c312040618ae59
+EBUILD libnatpmp-20120821.ebuild 896 SHA256 46ba7eb98a5be24360ce32ac1a9c01bc848709f26baf388007ab4c68086d3d89 SHA512 553ac7477075fb2e229000fdfd83e9eaa4bbb0754f3803351b6e9d13c0a0409cac1e17fc69130e914ff53c43424f2620ee37be29366fc181dd6e018c6659f812 WHIRLPOOL 0a2dc760e1e4647bc5e8d969e953f2d1a09b8734f84faa7904f812cc85074c864e0d7cfcc5460342a3fc4b390585fae540c239f8ee488102f4c7399c816c167b
+MISC ChangeLog 2250 SHA256 b54eac38a0affb18e40cc09bcc721e2b7044de649aabe8f2f17a159977a15e5b SHA512 dfc946ff7d0baa3220501f2caa49782d5f6b1f26fc451dd97fc3d6dd33538a906b205ea84bedc1dfba7b74d4dfda85f8108205f2984ef7acd3cf1c4243d29468 WHIRLPOOL 489b045ed8f7dc555404614df6fee29d2867399237c823111eb84e80245fa5f3b3d81cc4c4e6b4e15442bf9894e90635c25cf86f2eff19f1e41668b6e4b2a70c
+MISC metadata.xml 238 SHA256 f13e6e7b65d20beb9ae945d520160ef0dba80c1965754958945904d7e3c0a75f SHA512 3c3d75f1cb90ffcfb98df47481fbde6d451254a29fa87577acd25bc27cbcc3e5dbc0c1efce5974be905428f0b7caf912c8b051417aff92763847fa377493a153 WHIRLPOOL 6ec3d597b87aff99014404b8b732e6f600aafc3c3eeebfab135c9c19cde2e43161cfa23f841bd72826cc3393b724e1dac115c15dcce2b74ace6f1d6ec209dbf3
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJPb6NPAAoJEDYO1FT4VRUU03kQAJ0ArFeudzWGjo8mx1kVpY8m
-dvBTwTVNXjFMGIgnImcz7Prb5RgCLHircjoiVMNfYPZCnD+EGHeNu9xFSU0572eZ
-EOL6y9CZbxYYtAHrDRPbenWt6kg1ct+RMnoMVAjnHf+wn760GNfWSxACx3q49mPh
-SNuveHVpzaW2R2z52Q1P5dUh/mGF7eEm+JOKPqIeL8llGLTcuNt6NBA3/1rrtyL5
-CHm0PsxyjeB2BGbGdckEhnngYHuz6/yrDEcPQ912gYUAJy+vfyP+wuTHacL1e5Ls
-4a1xhlf9p51e712XTcKpKeofro3+b1yS2xEMdGMwgSlQCuZl0LlINlpAqnP7uR1n
-GrPZm57nL3taPkp745fBbqyRMThTnmdN81kGPRzKliDYRGvY4d1WHSicIuWlf0G9
-nkxAj9FuuWR47KjcxZsTw3Ok2FZ/VO+fk65t2LVK6bqxpWwTbrACRiU2935ELlHD
-jW6KINazZ4s6iwr10EsZ0Q7Mfg2d45vI1GjR95hVKBCIz+thj3419ifoikggy73b
-7uPqmeMRNCMCM7D8YFrgdPDW0j9YZNR0gEq752+TanztgZ6oMPjA+PGSW6nOzoUe
-FxL9P1ChtM6GSKArIcwXI4UeapEo36mB8aZX1P5UDDgeAsh1dPfDmJyeFJuhKz3v
-K2MdNsnyema611B1IQa4
-=A54X
+iEYEAREIAAYFAlA6wisACgkQl5yvQNBFVTW4awCgj8UbOqbvy3xl3ABPpDww2isM
+79cAn2iKQfPVOT65G/Eb9SzttG+NAhKn
+=xM71
 -----END PGP SIGNATURE-----
diff --git a/net-libs/libnatpmp/files/remove-static-lib-20120821.patch b/net-libs/libnatpmp/files/remove-static-lib-20120821.patch
new file mode 100644
index 000000000000..89be32d6c414
--- /dev/null
+++ b/net-libs/libnatpmp/files/remove-static-lib-20120821.patch
@@ -0,0 +1,73 @@
+diff -Naur libnatpmp-20120821.orig/Makefile libnatpmp-20120821/Makefile
+--- libnatpmp-20120821.orig/Makefile	2012-08-26 20:33:51.000000000 -0400
++++ libnatpmp-20120821/Makefile	2012-08-26 20:36:53.000000000 -0400
+@@ -24,7 +24,6 @@
+ 
+ OBJS = $(LIBOBJS) testgetgateway.o natpmpc.o
+ 
+-STATICLIB = libnatpmp.a
+ ifeq ($(OS), Darwin)
+   SHAREDLIB = libnatpmp.dylib
+   SONAME = $(basename $(SHAREDLIB)).$(APIVERSION).dylib
+@@ -38,7 +37,7 @@
+ 
+ HEADERS = natpmp.h
+ 
+-EXECUTABLES = testgetgateway natpmpc-shared natpmpc-static
++EXECUTABLES = testgetgateway natpmpc-shared
+ 
+ INSTALLPREFIX ?= $(PREFIX)/usr
+ INSTALLDIRINC = $(INSTALLPREFIX)/include
+@@ -47,9 +46,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 $@
+ 
+@@ -57,18 +56,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
+@@ -78,19 +76,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) $(CFLAGS) $(LDFLAGS) -o $@ $^
+-
+ natpmpc-shared:	natpmpc.o $(SHAREDLIB)
+ 	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^
+ 
+-$(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/respect-FLAGS-20120821.patch b/net-libs/libnatpmp/files/respect-FLAGS-20120821.patch
new file mode 100644
index 000000000000..7c7dc8607d2c
--- /dev/null
+++ b/net-libs/libnatpmp/files/respect-FLAGS-20120821.patch
@@ -0,0 +1,51 @@
+diff -Naur libnatpmp-20120821.orig/Makefile libnatpmp-20120821/Makefile
+--- libnatpmp-20120821.orig/Makefile	2012-08-21 13:24:15.000000000 -0400
++++ libnatpmp-20120821/Makefile	2012-08-26 20:22:40.000000000 -0400
+@@ -5,12 +5,13 @@
+ # 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
++GENTOO_CFLAGS := $(CFLAGS)
+ CFLAGS = -Os
+ #CFLAGS = -g -O0
+ CFLAGS += -fPIC
+@@ -32,6 +33,8 @@
+   SONAME = $(SHAREDLIB).$(APIVERSION)
+ endif
+ 
++CFLAGS := $(CFLAGS) $(GENTOO_CFLAGS)
++
+ HEADERS = natpmp.h
+ 
+ EXECUTABLES = testgetgateway natpmpc-shared natpmpc-static
+@@ -79,19 +82,19 @@
+ testgetgateway:	testgetgateway.o getgateway.o
+ 
+ natpmpc-static:	natpmpc.o $(STATICLIB)
+-	$(CC) $(LDFLAGS) -o $@ $^
++	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^
+ 
+ natpmpc-shared:	natpmpc.o $(SHAREDLIB)
+-	$(CC) $(LDFLAGS) -o $@ $^
++	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^
+ 
+ $(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/libnatpmp-20120821.ebuild b/net-libs/libnatpmp/libnatpmp-20120821.ebuild
new file mode 100644
index 000000000000..1cfea26abf8b
--- /dev/null
+++ b/net-libs/libnatpmp/libnatpmp-20120821.ebuild
@@ -0,0 +1,29 @@
+# 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-20120821.ebuild,v 1.1 2012/08/27 00:41:25 blueness Exp $
+
+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="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd"
+IUSE="static-libs"
+
+src_prepare() {
+	epatch "${FILESDIR}"/respect-FLAGS-${PV}.patch
+	epatch "${FILESDIR}"/respect-libdir-${PV}.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
+}