gentoo resync : 27.10.2018

3 files changed, 75 insertions, 3 deletions

diff --git a/net-libs/libupnp/Manifest b/net-libs/libupnp/Manifest
index 5c47dd57ec2f..2b09e38b4c1e 100644
--- a/net-libs/libupnp/Manifest
+++ b/net-libs/libupnp/Manifest
@@ -1,11 +1,13 @@
 AUX libupnp-1.6.19-docs-install.patch 387 BLAKE2B 0b9718be9e26b2e72b5c276d851ce6c4f66d2e41863569ac0ff49ddee95a4858f2f60d4c792439aeb3969bec83f0dede2631298cb6c6d46a76b317282f967d77 SHA512 b9c3ff0014f3b0d4f62b4b52948356581e09b5beefa548ddbe9a93084d2df0708557c22fafe919c867a9e48e5c19d09bfdded2619c8dde67cc44a3c12721671c
 AUX libupnp-1.6.21-cflags.patch 905 BLAKE2B 576747e560b4612fbd3432187c9fe8106bbbca2d8f19eb4b76315809dfe77e492570058997e39cbb530069013f01c5683c1beb63436142c3ed4733526a6e4d7c SHA512 3ecc83863e4cf35b9f0ba10b7982aaa103bb2eea7e0f256757fc5ef6a912a57dfdc237e6b20f29cc948f38816f1a57aff88aa0da7d7263658f584eb27ef7c8fe
 DIST libupnp-1.6.21.tar.bz2 1245353 BLAKE2B ca9ff07f88cfc77c3e3f7250ec1de6fb8c1ad3a918f556a7d37a6e994b67d825608edd3fd788a5b5979de72e3b25288225af3b5b8c58f54395682eef50bfc2d2 SHA512 65a2989497b941dfa1f7ac09fe44267de4a5231af25a304f0f6e754c7cbb578bdcb3c500188b5ebfbff9f579099db7501817d45e1724ef8e384d6d918bcdcdeb
-DIST libupnp-1.6.24.tar.bz2 721962 BLAKE2B ac878b30ce073999ac85d5f16ddd8299275674698f95726250d62369bfc2d3e9e57d172db46a6961144b45f80e0e38ce26ac22f7862e7dfdade90f2eb20f83cb SHA512 91ebe5cf1f9d5d1015f82250d82297afd2d67475cba442e435821a87a41774c56f326469e84d8c10a2fcd00c38be1c3c08af85a397db2b592fb0aad1b38f8084
+DIST libupnp-1.6.25.tar.bz2 722731 BLAKE2B 7f1850a235683ecd19bc377cd5c80c9d7ee8f0ded123dfc00d29551d2fd97fb873ce4c30ce0d26d562c57470c266a573c37fed4c0db159c65c56c673271adf92 SHA512 c1426c2f855f34a56b96761602a35989867918b556ecf9784c9ce9580f6c6083950004909831bad331f3a4dfb70ef1bd287e026c71bbfde2613f77fe05ab9e1f
 DIST libupnp-1.8.2.tar.gz 1379953 BLAKE2B 472851bfd25530ead4c113657f0e30cf7a3a1a4c88b86864676a2b7096817c1780718710a9535068904901c21d70d92fb267f295e88531e3eeef7d9a0cee58f3 SHA512 026f2568a1ffa56a3a0ebc823b126dceabb7e821acb6db52fbca02c4c02febd5508cb644cd2ac51f65397c3248a22340b3673069951e97dcdd22d4cc321d4511
 DIST libupnp-1.8.3.tar.gz 1382278 BLAKE2B 65774d46633d81fcc810f01339e0eac5d7c7313f69c1a467e6c0bbb26eeee03fdb4d8330f46e86346737cc17c1c953ef26045526bc9fe438f7e917928a3a3d0e SHA512 592a719614492ee1dad3630e5de2dca1dbe369faa3c87ba20fb939334c9d24f9dc869a457f5903cd28c5f7662145d1db4eeb512ee93b47adad4fc9b7d9171507
+DIST libupnp-1.8.4.tar.gz 783896 BLAKE2B 483ae5344b0677441a02d4666476090e00d0f7b7798e24a7dbe7ea10cd68f02644851ba17cff06033714dc9f2ddf7d9c5588e5a54693f14ad1a9782a7751480d SHA512 6d96dc0dcf187a425f3b60f4e750102331bd0a5bd452007e345eeacb63e9287ac213574c8071294809283ff8d8795433706ed2a14bae3d451605bf7a75e5a5bb
 EBUILD libupnp-1.6.21.ebuild 1055 BLAKE2B 5d99da65caf585e6e7905f8259f2e51afabcc5c31ad2bd97898cb3d7300e11966fc794829ea48defa2d5bba1d9dffff24129ddc885f55a7f2dbc21e9d91b61d7 SHA512 f2c5bb67af69945c261e8ccce5b0f247e585505924df9c0ad7785dca7febce2a69e1b1e529664530adc9070a8f72b708f6b793904fe325bb836a9c2c261c12f8
-EBUILD libupnp-1.6.24.ebuild 1063 BLAKE2B 5c2594a273294a9cdae93791ae6091b508200680dc0acc645e29908526ae5e257cadd5707a9e2714aaef536d350465063b41bd37d1bc40b8a4386994dfa727a3 SHA512 f0bdabea95e6d138c44747741c136a3baff104e33177495a49c5b2919413d987003cf4c35cdef3e28c932917db2378b6cc31c4ebe439dd5f5b7cc61a3605fda4
+EBUILD libupnp-1.6.25.ebuild 1060 BLAKE2B c729c01a2101d6d765da7ce04117746fd2da2b8b0bcd938e008d9c0aa6a51bfb0bb7e89889f74c76d74fbb4d9ed6eb0d3bfe1f998aad553b6e4a2bd15e590eb4 SHA512 7f6ed27ae13faaa69916cb2b37937cc7d5155317cb8c2099b22062ed971a31b246f6b35f7fc4a9e7fc4cca97c61043bf8e0b9a82ce4b16f1fdd0780ee5fe3ee1
 EBUILD libupnp-1.8.2.ebuild 1716 BLAKE2B a7a63be7eef83a56f8e6e1313d3d8368541d8282cb367834ebdf5854d46a38d723c23b8eabcbe568591af2adcd199a4170c08b6f0404f7e5c1349a1edf95a99c SHA512 2ea16eccfb1e22f4d4f306dd9b5301b2fbf5b913a4e9ac142b7a7412c83e3621f0ad22a74107886e8cef7d58e5353796c478dafad7ac666050f1ca9cf08e55bc
 EBUILD libupnp-1.8.3-r1.ebuild 1773 BLAKE2B 27ae00ecd8c1d01663b071f658dfb42b8eb6bca42087d6774c6139c56095014bd6713fe460eb391bce9e61ce2136c608b368c012e3292f3dd3d28d3525db69bb SHA512 36dc05b2d47a2f8b587cc424dad8d443d3a351ef2ee7d993b16f849f0126008b18b6babebbebe0dacd413f17146932bc4a92bf88b2ba9a7dc84a75ee0c28a83d
+EBUILD libupnp-1.8.4.ebuild 1651 BLAKE2B 5813f83885570663afe15bba333a50aefb2a89d0f3882a94f84e4eac3465cd11a4139a0066bd7dbd8ea11a455c3b696bf8a0fd2dc77cc3308ef5f496f0086026 SHA512 f4e889a07369dd63566f8904893327a9702455915808629394669c317cc55f28695d92b54ab4e8accd928d432f1238de1d1a6b1fff3391ce28d390da579bdc94
 MISC metadata.xml 630 BLAKE2B 9dd1d4fce0c63b8d558e2b377f603fa2070f14e82ffd1b2b4707b654aead28109ab08b38bfbbdb5b1fbce0e4a8053bfbabbe4c77f0a55406c6783cabcc8fddce SHA512 ec914b0598d40bd6c3947ed423d9252379b3e4997ee3632fe0212a19a49b7375cc0c2c1705fa51dd653105807b9b6bca3a1f672b7ab57a18810bad737f022739
diff --git a/net-libs/libupnp/libupnp-1.6.24.ebuild b/net-libs/libupnp/libupnp-1.6.25.ebuild
index e9fff2d786a0..165473d3a932 100644
--- a/net-libs/libupnp/libupnp-1.6.24.ebuild
+++ b/net-libs/libupnp/libupnp-1.6.25.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
diff --git a/net-libs/libupnp/libupnp-1.8.4.ebuild b/net-libs/libupnp/libupnp-1.8.4.ebuild
new file mode 100644
index 000000000000..a1fc1c7d0280
--- /dev/null
+++ b/net-libs/libupnp/libupnp-1.8.4.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils flag-o-matic autotools vcs-snapshot
+
+DESCRIPTION="An Portable Open Source UPnP Development Kit"
+HOMEPAGE="http://pupnp.sourceforge.net/"
+SRC_URI="https://github.com/mrjimenez/pupnp/archive/release-${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="1.8"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="blocking-tcp debug doc ipv6 +reuseaddr samples static-libs"
+
+DOCS="ChangeLog"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.6.21-cflags.patch
+)
+
+src_prepare() {
+	default
+
+	# fix tests
+	chmod +x ixml/test/test_document.sh || die
+
+	eautoreconf
+}
+
+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)
+}
+
+src_install () {
+	default
+
+	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 -e "s#/upnp#/upnp-${SLOT}#" \
+		-e "s#lupnp#lupnp-${SLOT}#" \
+		-e "s#lixml#lixml-${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
+}