net-libs/miniupnpc: Version bump, with breaking API change

The new version changes the SOVERSION to 14, and introduces additional
parameters in discovery functions which makes it API-incompatible with
all reverse dependencies. It also carries a few bug fixes, including
renaming declspec.h file that collided with net-libs/libnatpmp.

Fixes: https://bugs.gentoo.org/show_bug.cgi?id=548148

Package-Manager: portage-2.2.20

2 files changed, 55 insertions, 0 deletions

diff --git a/net-libs/miniupnpc/Manifest b/net-libs/miniupnpc/Manifest
index 31c0e459e0ab..8ed240586807 100644
--- a/net-libs/miniupnpc/Manifest
+++ b/net-libs/miniupnpc/Manifest
@@ -3,3 +3,4 @@ DIST miniupnpc-1.6.tar.gz 66454 SHA256 bbd6b756e6af44b5a5b0f9b93eada3fb8922ed1d6
 DIST miniupnpc-1.7.tar.gz 68327 SHA256 16dd2456be9b4bf290667c00eeb38c77ad47eb2107569b2dadcfcee8c9af6337 SHA512 ad2a689e91da068f2e291336cced9933963c2adc619b5e82dbb684e496d3683adba6a4634dd17265bf8dcc9d8f6c783b66aee1803ce63383997c27de3c16b194 WHIRLPOOL e9c7eed931fa1247ecfa8d9064d6890f6acca7ff41d79ec32716568f78317d972e14ecdee005a61e2a01914c984d0e18c63607ef9e79fef5a3974a8ca7586909
 DIST miniupnpc-1.8.tar.gz 70624 SHA256 bc5f73c7b0056252c1888a80e6075787a1e1e9112b808f863a245483ff79859c SHA512 8eedac9ad473fc952ca8896fe534d6da6b1b234e8b6f35f721394d4c71aca84ed287ca6c4f0455b50d97a45e4cd34e27d99a6813386e0864781364aa607e13d4 WHIRLPOOL 5b76ccbb5ed7daa9bb0d481b424b7c31a5f6dc85c5c812ba10175a29aefc0d3924f3db2aa8c3529d1241be59d67d1d4c702d27aad2de8c8a07fecf3857d73169
 DIST miniupnpc-1.9.20150427.tar.gz 78424 SHA256 b3207ddc0b0001887d6a29260e8d609d0ad2c35bec99a2358281bb8951919837 SHA512 463758b3c104cdc768d99e044acdf607d457eaaefec12fc20e0086de523b9c61ed6354dd2269052ae367b22957158fd813440dce4f51a8d60f8d251d2c85f336 WHIRLPOOL e6f635d1dd5e728a75e9852e0f2e0e6b8c3dfb200d479133fd183e8741628d7c0dd016ffacc7d0d2bfb13798cd7d2e57b26b48a36e1555c721b4c58038c1c5ee
+DIST miniupnpc-1.9.20150917.tar.gz 82609 SHA256 3087c32929c1e9db4947d6a184694e06ec604bca29449b75daec295a5d8f11da SHA512 1fe2613d19cbd16b6f6e9c8205e984548fb96d032a71a849f9b25486dc71b07ee270d2bfc324f218abe80c45f0b13b6af00e59cbf3a9e35b83ea5073bb897f65 WHIRLPOOL 60d0e9c94ddf8ef19106217158d01cc2f3edb854f34326c80c6ae694b65b80f1bc6810cc2b24a7b8525ef7c3982324c9859bdbdcb2e2e944747c371ba2015a6a
diff --git a/net-libs/miniupnpc/miniupnpc-1.9.20150917.ebuild b/net-libs/miniupnpc/miniupnpc-1.9.20150917.ebuild
new file mode 100644
index 000000000000..5aa860c22d13
--- /dev/null
+++ b/net-libs/miniupnpc/miniupnpc-1.9.20150917.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils multilib toolchain-funcs
+
+DESCRIPTION="UPnP client library and a simple UPnP client"
+HOMEPAGE="http://miniupnp.free.fr/"
+SRC_URI="http://miniupnp.free.fr/files/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/14"
+KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="ipv6 kernel_linux static-libs"
+
+RDEPEND=""
+DEPEND="kernel_linux? ( sys-apps/lsb-release sys-apps/which )"
+
+src_prepare() {
+	epatch_user
+
+	# These bins are not installed, upnpc-static requires building static lib
+	sed -i -e '/EXECUTABLES =/s/ upnpc-static listdevices//' Makefile || die
+
+	if ! use static-libs; then
+		sed -i \
+			-e '/FILESTOINSTALL =/s/ $(LIBRARY)//' \
+			-e '/$(INSTALL) -m 644 $(LIBRARY) $(DESTDIR)$(INSTALLDIRLIB)/d' \
+			Makefile || die
+	fi
+}
+
+# Upstream cmake causes more trouble than it fixes,
+# so we'll just stay with the Makefile for now.
+
+src_compile() {
+	tc-export CC AR
+	emake upnpc-shared $(use static-libs && echo upnpc-static)
+}
+
+src_test() {
+	emake -j1 HAVE_IPV6=$(usex ipv6 yes no) check
+}
+
+src_install() {
+	emake \
+		PREFIX="${D}" \
+		INSTALLDIRLIB="${D}usr/$(get_libdir)" \
+		install
+
+	dodoc README Changelog.txt
+}