gentoo resync : 15.12.2019

4 files changed, 5 insertions, 76 deletions

diff --git a/net-libs/libupnp/Manifest b/net-libs/libupnp/Manifest
index c35c5eb7547f..f0b019d6fd34 100644
--- a/net-libs/libupnp/Manifest
+++ b/net-libs/libupnp/Manifest
@@ -1,14 +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.10.0.tar.gz 786215 BLAKE2B b652251fe4f91179b855d5231466e026ce4a232a7b6196a3a1f01fb7163b0cf953a1cffeb4330c9734f001014cda2a0a1c3ac2d3600bcd78ad8eeb42b062ea61 SHA512 d42a42ace366a781ff29db4b91d1b0dc27138c60028629dae1608335085fbab0e22bcfa5744a8e6890d948f86b642945721226204a09f8ba3c9a49e1a5b6b2b5
+DIST libupnp-1.10.1.tar.gz 786273 BLAKE2B d01515783f2fac185998419d9f249d087ca4433c9547537fe77d3a57e41926d0a4e7e97a88e25c9d2614fcb43498ae94992868bddcb5507c518d3f89059255f0 SHA512 f85053670e696e2216ca8e5a90e862f6868a0043aa855278ef2788417cdf2195067c79c4fe593b49a5444cc33fe31ad2073106c6d8cb67c8352e3321dce0a08c
 DIST libupnp-1.6.21.tar.bz2 1245353 BLAKE2B ca9ff07f88cfc77c3e3f7250ec1de6fb8c1ad3a918f556a7d37a6e994b67d825608edd3fd788a5b5979de72e3b25288225af3b5b8c58f54395682eef50bfc2d2 SHA512 65a2989497b941dfa1f7ac09fe44267de4a5231af25a304f0f6e754c7cbb578bdcb3c500188b5ebfbff9f579099db7501817d45e1724ef8e384d6d918bcdcdeb
 DIST libupnp-1.6.25.tar.bz2 722731 BLAKE2B 7f1850a235683ecd19bc377cd5c80c9d7ee8f0ded123dfc00d29551d2fd97fb873ce4c30ce0d26d562c57470c266a573c37fed4c0db159c65c56c673271adf92 SHA512 c1426c2f855f34a56b96761602a35989867918b556ecf9784c9ce9580f6c6083950004909831bad331f3a4dfb70ef1bd287e026c71bbfde2613f77fe05ab9e1f
 DIST libupnp-1.8.4.tar.gz 783896 BLAKE2B 483ae5344b0677441a02d4666476090e00d0f7b7798e24a7dbe7ea10cd68f02644851ba17cff06033714dc9f2ddf7d9c5588e5a54693f14ad1a9782a7751480d SHA512 6d96dc0dcf187a425f3b60f4e750102331bd0a5bd452007e345eeacb63e9287ac213574c8071294809283ff8d8795433706ed2a14bae3d451605bf7a75e5a5bb
-DIST libupnp-1.8.5.tar.gz 785053 BLAKE2B 3ffb2568b6b56678732a9784254ba6b5f36dbed3b36a97dfecf8879bf75c1f2643e66ec590625a8060ca18af1ec84cf165ea0e87fecb99c4c1d98429709ea2f5 SHA512 0a29a3a05d7ad2a249d17a2b476addf56c64368fddd4e973851e652109ca3ccb7e30e92a97cdc03da3057eec93ea189c71803dbd6a282b70a744c7cfac3bee5b
-EBUILD libupnp-1.10.0-r100.ebuild 1047 BLAKE2B 0b8ca4e4d2d424db711f78e3c325f9d9fa4bad09c0fc99209d30ffc55c8bc68512af4f245e0913e0ff1f6d268c99eb2d2592107b641d1d18991884bbd0d25a39 SHA512 af38347e5010ebfc1a0121c0348d7f9b8b8cfeba9986c31a7e5e43907b080b538bcb741fe20186ffcb9b5cdad9765f23a8e1a0fe299ec5527e615170f0f42784
-EBUILD libupnp-1.10.0.ebuild 1651 BLAKE2B 2d327d553f8709955c68c2f366cfd4f97396e3b236113f749021df86192e168ed4370c1d5e17212a11286286629993686998543bd28866d9235bf97523f3a8c1 SHA512 dc102ff4d1828eca8d10440483edcbfd03a82aa904b1beb31260eac7f53cddd0244cecffd946756a91fdda579e8c19a54ea98e5c0bb86513543c6953d18e4f20
+DIST libupnp-1.8.6.tar.gz 784912 BLAKE2B 8b2ac2dbe6b2bae64677d4e47142f42ad6b3c5af61e03faa628a2859afe62a2cb7a16cbfcfa9a0a307db8210f3786e916d3ac12eba3deee68c3c944c98801bb2 SHA512 8224460fcd808ed44e46c1c5dfc9236521b34fd140469d6549f42468b3acce83f46cb20cde41de574f55a865067a5f30ebbda68b500784c19cef354265f5acb7
+EBUILD libupnp-1.10.1.ebuild 1060 BLAKE2B cd4c5cb72e16af878bde6092fb5b0d228596f7dc8035c7bf00c6a3123811200aebe881ae117feee1b4f71de406e5720ea4f7a981c9b033614376b269414febe3 SHA512 cbf1c4aae916c0358dc26af22276af0651a2178d5cb8e092fb0421688f33293fc23b878ec30a478436a487c856f3a30b52ff21acb7aa7c6f820202be99d7a516
 EBUILD libupnp-1.6.21.ebuild 1036 BLAKE2B d3b4077358a8d14b25df794258251bf81ac29d4283714f7d5abb2a974a2265246168986e034d07923675996063db4ff86806fb623895e5c099cfed7a83af114a SHA512 bc71c740ae8b29159960aff843fa3281e1dc4baf93761be4026edaa83ced0195a965b4c58c43f84e16618045935fd1a8ee1f780a4c672535be9b6e36ebf5d108
 EBUILD libupnp-1.6.25.ebuild 1038 BLAKE2B 5ff0fa549ca82029feeb59b0c67edb10fa46a73c62476a751d1e89a070de94fb563a6bc38ebe604be429e54d66162069695f04df20e225dc22d6b0f8801ea549 SHA512 2d335e95edd391006d6f9cd9324702dbf3380c4e22b56895d919d812b6195f094fed0bb464e8b38ad6e55701c06385f1bc8af803ceef77b2453036c047961ff5
 EBUILD libupnp-1.8.4.ebuild 1651 BLAKE2B 5813f83885570663afe15bba333a50aefb2a89d0f3882a94f84e4eac3465cd11a4139a0066bd7dbd8ea11a455c3b696bf8a0fd2dc77cc3308ef5f496f0086026 SHA512 f4e889a07369dd63566f8904893327a9702455915808629394669c317cc55f28695d92b54ab4e8accd928d432f1238de1d1a6b1fff3391ce28d390da579bdc94
-EBUILD libupnp-1.8.5.ebuild 1651 BLAKE2B 2d327d553f8709955c68c2f366cfd4f97396e3b236113f749021df86192e168ed4370c1d5e17212a11286286629993686998543bd28866d9235bf97523f3a8c1 SHA512 dc102ff4d1828eca8d10440483edcbfd03a82aa904b1beb31260eac7f53cddd0244cecffd946756a91fdda579e8c19a54ea98e5c0bb86513543c6953d18e4f20
+EBUILD libupnp-1.8.6.ebuild 1651 BLAKE2B 2d327d553f8709955c68c2f366cfd4f97396e3b236113f749021df86192e168ed4370c1d5e17212a11286286629993686998543bd28866d9235bf97523f3a8c1 SHA512 dc102ff4d1828eca8d10440483edcbfd03a82aa904b1beb31260eac7f53cddd0244cecffd946756a91fdda579e8c19a54ea98e5c0bb86513543c6953d18e4f20
 MISC metadata.xml 630 BLAKE2B 9dd1d4fce0c63b8d558e2b377f603fa2070f14e82ffd1b2b4707b654aead28109ab08b38bfbbdb5b1fbce0e4a8053bfbabbe4c77f0a55406c6783cabcc8fddce SHA512 ec914b0598d40bd6c3947ed423d9252379b3e4997ee3632fe0212a19a49b7375cc0c2c1705fa51dd653105807b9b6bca3a1f672b7ab57a18810bad737f022739
diff --git a/net-libs/libupnp/libupnp-1.10.0-r100.ebuild b/net-libs/libupnp/libupnp-1.10.1.ebuild
index 5d4c9a581d9b..e06f186c5a5e 100644
--- a/net-libs/libupnp/libupnp-1.10.0-r100.ebuild
+++ b/net-libs/libupnp/libupnp-1.10.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/mrjimenez/pupnp/archive/release-${PV}.tar.gz -> ${P}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux"
 IUSE="blocking-tcp debug doc ipv6 +reuseaddr samples static-libs"
 
 DOCS="ChangeLog"
diff --git a/net-libs/libupnp/libupnp-1.8.5.ebuild b/net-libs/libupnp/libupnp-1.8.5.ebuild
deleted file mode 100644
index 2d629febf65e..000000000000
--- a/net-libs/libupnp/libupnp-1.8.5.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2019 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
-}
diff --git a/net-libs/libupnp/libupnp-1.10.0.ebuild b/net-libs/libupnp/libupnp-1.8.6.ebuild
index 2d629febf65e..2d629febf65e 100644
--- a/net-libs/libupnp/libupnp-1.10.0.ebuild
+++ b/net-libs/libupnp/libupnp-1.8.6.ebuild