net-libs/libupnp: Version bump, drop 1.10 from 1.8 slot

Package-Manager: Portage-2.3.79, Repoman-2.3.18
Signed-off-by: Ian Whyman <thev00d00@gentoo.org>

4 files changed, 3 insertions, 73 deletions

diff --git a/net-libs/libupnp/Manifest b/net-libs/libupnp/Manifest
index 8f88afcf9229..f631a58b8c47 100644
--- a/net-libs/libupnp/Manifest
+++ b/net-libs/libupnp/Manifest
@@ -1,5 +1,5 @@
-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
+DIST libupnp-1.8.6.tar.gz 784912 BLAKE2B 8b2ac2dbe6b2bae64677d4e47142f42ad6b3c5af61e03faa628a2859afe62a2cb7a16cbfcfa9a0a307db8210f3786e916d3ac12eba3deee68c3c944c98801bb2 SHA512 8224460fcd808ed44e46c1c5dfc9236521b34fd140469d6549f42468b3acce83f46cb20cde41de574f55a865067a5f30ebbda68b500784c19cef354265f5acb7
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