gentoo resync : 05.02.2020

6 files changed, 42 insertions, 102 deletions

diff --git a/net-libs/libupnp/Manifest b/net-libs/libupnp/Manifest
index 6ed3c1f387f3..164d7b891f2b 100644
--- a/net-libs/libupnp/Manifest
+++ b/net-libs/libupnp/Manifest
@@ -1,13 +1,12 @@
+AUX libupnp-1.12.0-cxx-compat.patch 1023 BLAKE2B b45c64616d1b812d203df768e095dbc69c5388988bd4d3d67187effa88fbbc17d34deda58a4d29c4f7d162614d783c0caf22fcd7afa6752549144597850710a8 SHA512 099bf2443e81ae096a7647891a021ed6d5543aadbcb665bc1466f5eb92b4e5ed515a83507902c20635f839d5f76265d99ccfdafca634d4ed6d6b71626e13a514
 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.12.0.tar.gz 786378 BLAKE2B b1b264c8b254cab79c423fd3efa0911b86aa5ce7ccac35ff61dd5d7fefa9a71d7ce2a513f208b83d66a571483ce8fc179978009908e66b8fc3ff2a1df3d8f26e SHA512 998ef22d2af8e4cbc7fa1f87613ae0aa840e636bb72a5656a97327b0820a46b2b3ed2f3200260c018b5339de2fc4be760d42a3c687e49c7fedb58c1ad2287699
 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.6.tar.gz 784912 BLAKE2B 8b2ac2dbe6b2bae64677d4e47142f42ad6b3c5af61e03faa628a2859afe62a2cb7a16cbfcfa9a0a307db8210f3786e916d3ac12eba3deee68c3c944c98801bb2 SHA512 8224460fcd808ed44e46c1c5dfc9236521b34fd140469d6549f42468b3acce83f46cb20cde41de574f55a865067a5f30ebbda68b500784c19cef354265f5acb7
-EBUILD libupnp-1.12.0.ebuild 1060 BLAKE2B da6762f901283ac89b16ac07ce0e4671b7ac1f7f932ecfe6b02e9c2186f406eb0462875230825acb67122a2d5bede8cb9e68ea8a6215b1e110178dccc4e49392 SHA512 3d561a226cf889dac7f015b5153061378a3e0730c09de1cbc568c62e2a5f1e657f8f3d55e29e7754a1252eec4408f6639bd9e72804cca4fb950e81f993e4ded9
-EBUILD libupnp-1.6.21.ebuild 1036 BLAKE2B d3b4077358a8d14b25df794258251bf81ac29d4283714f7d5abb2a974a2265246168986e034d07923675996063db4ff86806fb623895e5c099cfed7a83af114a SHA512 bc71c740ae8b29159960aff843fa3281e1dc4baf93761be4026edaa83ced0195a965b4c58c43f84e16618045935fd1a8ee1f780a4c672535be9b6e36ebf5d108
+EBUILD libupnp-1.12.0-r1.ebuild 1097 BLAKE2B c437a71b47589620ba507ab7bd420eee94fabe02c765a30f047b7adb72009a39aaf34644215dd1660ce617a39d0da881b2c451767c26db3e34eb4094ac024564 SHA512 c3589bb68144b343acd48991a67a2ea51a98faf16e773f25ac606857c232354fe633446593c003ef879d54cc1225174af174ce322bf7c3cc654b45064a69aa3b
+EBUILD libupnp-1.6.21.ebuild 1037 BLAKE2B 7a84b30ca6474853102762473c8d90ae2387c9fd093582d7557253fde74640aaf1aac14309f4cf29706da1a46111f1ab7a794fbc055f42d87d7854820c54436d SHA512 6f7c71520db4796edd65dec42f2de38d0f075d836c25950e59f4c9597c1f09870ac8babc31b7d45a3cd9be1983e4fd539383797b3630e3221c3932e9023a4c03
 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.6.ebuild 1651 BLAKE2B 2d327d553f8709955c68c2f366cfd4f97396e3b236113f749021df86192e168ed4370c1d5e17212a11286286629993686998543bd28866d9235bf97523f3a8c1 SHA512 dc102ff4d1828eca8d10440483edcbfd03a82aa904b1beb31260eac7f53cddd0244cecffd946756a91fdda579e8c19a54ea98e5c0bb86513543c6953d18e4f20
+EBUILD libupnp-1.8.6-r1.ebuild 1060 BLAKE2B da6762f901283ac89b16ac07ce0e4671b7ac1f7f932ecfe6b02e9c2186f406eb0462875230825acb67122a2d5bede8cb9e68ea8a6215b1e110178dccc4e49392 SHA512 3d561a226cf889dac7f015b5153061378a3e0730c09de1cbc568c62e2a5f1e657f8f3d55e29e7754a1252eec4408f6639bd9e72804cca4fb950e81f993e4ded9
 MISC metadata.xml 630 BLAKE2B 9dd1d4fce0c63b8d558e2b377f603fa2070f14e82ffd1b2b4707b654aead28109ab08b38bfbbdb5b1fbce0e4a8053bfbabbe4c77f0a55406c6783cabcc8fddce SHA512 ec914b0598d40bd6c3947ed423d9252379b3e4997ee3632fe0212a19a49b7375cc0c2c1705fa51dd653105807b9b6bca3a1f672b7ab57a18810bad737f022739
diff --git a/net-libs/libupnp/files/libupnp-1.12.0-cxx-compat.patch b/net-libs/libupnp/files/libupnp-1.12.0-cxx-compat.patch
new file mode 100644
index 000000000000..cbb844952be6
--- /dev/null
+++ b/net-libs/libupnp/files/libupnp-1.12.0-cxx-compat.patch
@@ -0,0 +1,33 @@
+From 5a8e93f1a57cce5cead5c8c566a75f7c7c294c97 Mon Sep 17 00:00:00 2001
+From: Ian Whyman <v00d00@v00d00.net>
+Date: Mon, 27 Jan 2020 21:46:47 +0000
+Subject: [PATCH] List: Add extern C for C++ users
+
+---
+ upnp/inc/list.h | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+diff --git a/upnp/inc/list.h b/upnp/inc/list.h
+index 214a53e5..0fbe7efc 100644
+--- a/upnp/inc/list.h
++++ b/upnp/inc/list.h
+@@ -40,6 +40,10 @@
+ 
+ #include "UpnpGlobal.h"
+ 
++#ifdef __cplusplus
++extern "C" {
++#endif /* __cplusplus */
++
+ /** List anchor structure. This should be the *first* entry in list
+  *  member objects, except if you want to do member offset arithmetic
+  *  instead of simple casts (look up "containerof"). The list code itself 
+@@ -71,4 +75,8 @@ EXPORT_SPEC UpnpListIter UpnpListInsert(UpnpListHead *list, UpnpListIter pos,
+ /** Erase element at pos, return next one, or end()*/
+ EXPORT_SPEC UpnpListIter UpnpListErase(UpnpListHead *list, UpnpListIter pos);
+ 
++#ifdef __cplusplus
++}
++#endif /* __cplusplus */
++
+ #endif /* _UPNPLISTH_ */
diff --git a/net-libs/libupnp/libupnp-1.8.4.ebuild b/net-libs/libupnp/libupnp-1.12.0-r1.ebuild
index a1fc1c7d0280..70a82fc72df3 100644
--- a/net-libs/libupnp/libupnp-1.8.4.ebuild
+++ b/net-libs/libupnp/libupnp-1.12.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,14 +10,15 @@ 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"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux"
 IUSE="blocking-tcp debug doc ipv6 +reuseaddr samples static-libs"
 
 DOCS="ChangeLog"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.6.21-cflags.patch
+	"${FILESDIR}"/${P}-cxx-compat.patch
 )
 
 src_prepare() {
@@ -44,27 +45,4 @@ 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.6.21.ebuild b/net-libs/libupnp/libupnp-1.6.21.ebuild
index cf6b5e8cc2d7..196c72e608cd 100644
--- a/net-libs/libupnp/libupnp-1.6.21.ebuild
+++ b/net-libs/libupnp/libupnp-1.6.21.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/pupnp/${P}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ppc ppc64 sparc x86 ~amd64-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ppc ppc64 sparc x86 ~amd64-linux"
 IUSE="debug doc ipv6 static-libs"
 
 DOCS="NEWS README ChangeLog"
diff --git a/net-libs/libupnp/libupnp-1.12.0.ebuild b/net-libs/libupnp/libupnp-1.8.6-r1.ebuild
index 14fc805526fb..14fc805526fb 100644
--- a/net-libs/libupnp/libupnp-1.12.0.ebuild
+++ b/net-libs/libupnp/libupnp-1.8.6-r1.ebuild
diff --git a/net-libs/libupnp/libupnp-1.8.6.ebuild b/net-libs/libupnp/libupnp-1.8.6.ebuild
deleted file mode 100644
index 2d629febf65e..000000000000
--- a/net-libs/libupnp/libupnp-1.8.6.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
-}