[gentoo-commits] repo/gentoo:master commit in: net-libs/libupnp/

[Ian Whyman]

commit:     314ba2db86847b8db5c0fcb9393b9845b7fb5e2e
Author:     Ian Whyman <thev00d00 <AT> gentoo <DOT> org>
AuthorDate: Mon Dec  4 20:46:10 2017 +0000
Commit:     Ian Whyman <thev00d00 <AT> gentoo <DOT> org>
CommitDate: Mon Dec  4 20:46:24 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=314ba2db

net-libs/libupnp: Version bumps: 1.8.3 & 1.6.24

Package-Manager: Portage-2.3.14, Repoman-2.3.6

 net-libs/libupnp/Manifest                          |  6 ++---
 ...libupnp-1.6.22.ebuild => libupnp-1.6.24.ebuild} |  0
 .../{libupnp-1.8.1.ebuild => libupnp-1.8.3.ebuild} | 31 +++++++++++++++++++---
 3 files changed, 30 insertions(+), 7 deletions(-)

diff --git a/net-libs/libupnp/Manifest b/net-libs/libupnp/Manifest
index 7f605e1fa02..2075c552ded 100644
--- a/net-libs/libupnp/Manifest
+++ b/net-libs/libupnp/Manifest
@@ -1,4 +1,4 @@
 DIST libupnp-1.6.21.tar.bz2 1245353 SHA256 
af3f3c0846a1d75baeadae4aa5a2bda427567e2a1fb4559bf73ccff0a4f9a39b SHA512 
65a2989497b941dfa1f7ac09fe44267de4a5231af25a304f0f6e754c7cbb578bdcb3c500188b5ebfbff9f579099db7501817d45e1724ef8e384d6d918bcdcdeb
 WHIRLPOOL 
b4869189054ac00d57394e0919ad2f672af64f2c2b0ecc676c2b3fc4a3c22caa25ac38b57bbb5cf1ef12a5857b4cdfd450c6bd5955a5eacaf8bdf95a058c9dab
-DIST libupnp-1.6.22.tar.bz2 1242211 SHA256 
0bdfacb7fa8d99b78343b550800ff193264f92c66ef67852f87f042fd1a1ebbc SHA512 
abf7265155fb819e971e27dd25fd3f8143c04d6373b1b4a2769de9fadbbd3a012758acda866511a443f7e159b66068d9f7f99072c509a8fa06bcfe1275bdd9af
 WHIRLPOOL 
e3bfd207adff942d1a60337fb5ff00d2e4a4d52073724fb19415f14aa2def746706d863360779b00d842756ea6d809d5cf2f3cde910a3863398cbcfe49957bec
-DIST libupnp-1.8.1.tar.gz 1363979 SHA256 
0569e6afd979baa4e533312cb682394cea5b2638b8b412623e28943103593ea0 SHA512 
7dd90f0c0332e7171d96a37a50223e18d5325ac1dd8dbe04fadac4655ad7c4d8443c52f904aaa35d3f12d2abd9ee2690ba990d0a93b15cbebb4d3de35d25ffe4
 WHIRLPOOL 
184e8844fab6a7a04d902d77c9b28141cdb15e4026b1b45105aabcf7616c2f6bbffa81fe14a1e6ddcd3f6494d9505f8f2cf190bf00fa341ca7192668e46e732d
-DIST libupnp-1.8.2.tar.gz 1379953 SHA256 
438ad86bfd933cb1e9be1c41bf3bd69f049daba11d71bbb5d715336e00106cb4 SHA512 
026f2568a1ffa56a3a0ebc823b126dceabb7e821acb6db52fbca02c4c02febd5508cb644cd2ac51f65397c3248a22340b3673069951e97dcdd22d4cc321d4511
 WHIRLPOOL 
f1c1c18300ff597cf57837def8f35289aca7a85fa0e86d8307e3859c8eb55a011bf3c37b372aaebb73c79f95283d0f6964a555ba1353ab28f6c706bbf30fd8ad
+DIST libupnp-1.6.24.tar.bz2 721962 BLAKE2B 
ac878b30ce073999ac85d5f16ddd8299275674698f95726250d62369bfc2d3e9e57d172db46a6961144b45f80e0e38ce26ac22f7862e7dfdade90f2eb20f83cb
 SHA512 
91ebe5cf1f9d5d1015f82250d82297afd2d67475cba442e435821a87a41774c56f326469e84d8c10a2fcd00c38be1c3c08af85a397db2b592fb0aad1b38f8084
+DIST libupnp-1.8.2.tar.gz 1379953 BLAKE2B 
472851bfd25530ead4c113657f0e30cf7a3a1a4c88b86864676a2b7096817c1780718710a9535068904901c21d70d92fb267f295e88531e3eeef7d9a0cee58f3
 SHA512 
026f2568a1ffa56a3a0ebc823b126dceabb7e821acb6db52fbca02c4c02febd5508cb644cd2ac51f65397c3248a22340b3673069951e97dcdd22d4cc321d4511
+DIST libupnp-1.8.3.tar.gz 1382278 BLAKE2B 
65774d46633d81fcc810f01339e0eac5d7c7313f69c1a467e6c0bbb26eeee03fdb4d8330f46e86346737cc17c1c953ef26045526bc9fe438f7e917928a3a3d0e
 SHA512 
592a719614492ee1dad3630e5de2dca1dbe369faa3c87ba20fb939334c9d24f9dc869a457f5903cd28c5f7662145d1db4eeb512ee93b47adad4fc9b7d9171507

diff --git a/net-libs/libupnp/libupnp-1.6.22.ebuild 
b/net-libs/libupnp/libupnp-1.6.24.ebuild
similarity index 100%
rename from net-libs/libupnp/libupnp-1.6.22.ebuild
rename to net-libs/libupnp/libupnp-1.6.24.ebuild

diff --git a/net-libs/libupnp/libupnp-1.8.1.ebuild 
b/net-libs/libupnp/libupnp-1.8.3.ebuild
similarity index 55%
rename from net-libs/libupnp/libupnp-1.8.1.ebuild
rename to net-libs/libupnp/libupnp-1.8.3.ebuild
index 908431b950b..1de9d5f72d4 100644
--- a/net-libs/libupnp/libupnp-1.8.1.ebuild
+++ b/net-libs/libupnp/libupnp-1.8.3.ebuild
@@ -12,12 +12,12 @@ 
SRC_URI="https://github.com/mrjimenez/pupnp/archive/release-${PV}.tar.gz -> ${P}
 LICENSE="BSD"
 SLOT="1.8"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE="debug doc reuseaddr ipv6 static-libs"
+IUSE="blocking-tcp debug doc ipv6 +reuseaddr samples static-libs"
 
-DOCS="NEWS README.md ChangeLog"
+DOCS="NEWS ChangeLog"
 
 PATCHES=(
-       "${FILESDIR}"/${PN}-1.8.0-docs-install.patch
+       "${FILESDIR}"/${PN}-1.6.19-docs-install.patch
        "${FILESDIR}"/${PN}-1.6.21-cflags.patch
 )
 
@@ -34,14 +34,37 @@ src_configure() {
        use x86-fbsd && append-flags -O1
        # w/o docdir to avoid sandbox violations
        econf $(use_enable debug) \
+               $(use_enable blocking-tcp blocking-tcp-connections) \
                $(use_enable ipv6) \
                $(use_enable reuseaddr) \
                $(use_enable static-libs static) \
+               $(use_enable samples) \
                $(use_with doc documentation "${EPREFIX}/usr/share/doc/${PF}")
 }
 
 src_install () {
        default
-       dobin upnp/sample/.libs/tv_{combo,ctrlpt,device}-1.8
+
        use static-libs || prune_libtool_files
+
+       # Slot samples
+       if $(use samples); then
+               for bin in combo ctrlpt device ; do
+                       newbin "upnp/sample/.libs/tv_$bin" "tv_$bin-${SLOT}"
+               done
+       fi
+
+       # Slot includes
+       cd "${D}/usr/include" || die
+       mv upnp "upnp-${SLOT}" || die
+
+       # Slot pkgconfig
+       cd "${D}/usr/$(get_libdir)/pkgconfig" || die
+       mv libupnp.pc "libupnp-${SLOT}.pc" || die
+       sed -i "s#/upnp#/upnp-${SLOT}#" "libupnp-${SLOT}.pc" || die
+
+       # Slot symlinks
+       cd "${D}/usr/$(get_libdir)" || die
+       mv libupnp.so "libupnp-${SLOT}.so" || die
+       mv libixml.so "libixml-${SLOT}.so" || die
 }