gentoo (leap year) resync : 29.02.2020

4 files changed, 149 insertions, 2 deletions

diff --git a/net-libs/gupnp/Manifest b/net-libs/gupnp/Manifest
index 15dc6ab93e2e..da965411e449 100644
--- a/net-libs/gupnp/Manifest
+++ b/net-libs/gupnp/Manifest
@@ -1,3 +1,6 @@
+AUX 1.2.2-build-manpage.patch 1447 BLAKE2B b876a44ac3930f087e3c00530d0b5cba2d2836b9b968c4cc34500e6a11a5b04b432c5e8dac1addff6cea85feeab5bf3fe2027b3d87fe2e861a4b9aec2e3e349b SHA512 e232ee5bdb2ae1fcd9b44c63942d1bef9d610e90135ec4fa3224716ca632d513f099638eea58fa67f39d7d80a507db1f7788af5712749417d2c576c8868521ab
 DIST gupnp-1.0.4.tar.xz 427616 BLAKE2B ab5d34e701e253dc48ebafabc908f9aacd7a325805c61b11b5668cfa105d56a37f0d93593eeedd0e63630b986f2a2c18d4d9cdd82b653c9cc7a5d57262a819ef SHA512 54a133ce043e9b3d5ea23041c04fbbf5483aea98a72421cdb59bada0ab2e3ab3fc85452c4c743b794eeb7c929f5ef38bf0e6ba7f9539d86182a77612c898205a
-EBUILD gupnp-1.0.4.ebuild 1941 BLAKE2B 6f24da0f5b67dad486e73fbe9638e769e17d6a781e98a1d1ce4064edca226a5eaf3b39d08efc0544c51fe6cda09cc5b35bef07d747abce5a8eb47390f420cf0a SHA512 54731be431b0ac10c4c06b4d247b83762537b638fcfde811be13fbac87be681e4311e8f7fd3c9a48839fca1c01c8c824bebef7d1186184198551a573b84bd2ad
+DIST gupnp-1.2.2.tar.xz 136556 BLAKE2B f38018c76972f1b60b8274353a60d4bb1e4687ead6fd3fb084e050c070e5da4cbb7118807f65d47787c50af3174e7c2b87ff0b920cdcf13e7c5be17f8b156588 SHA512 08a715b06f30b9d9d11b914136f89b0c53d6b07b09dddf622619073fc6f144fc8d711eec28ede80fd14fc71a6addfe88de15740d0748302522ce71555fd18d2a
+EBUILD gupnp-1.0.4.ebuild 1963 BLAKE2B 0839c63f1431786e5d256690dbedc58f35e90e65f57f890ab502ce81dcfc54b4eac23133ffee1de727ca5a254f40377dc42887b67e735f786da646097554a0dc SHA512 8bb01a528b8a89602068765bfff9eb377833e7e2ebb39d93a4e78fcb6f29ced1e05f3f73b16de02f95d39bc61b6aa9b03ff937692cecbbc5936219f91bf8e0b5
+EBUILD gupnp-1.2.2.ebuild 2413 BLAKE2B b34cfc02dafb7294fed57fc3229667c4226aad7ccc17b9db161ca2c8957d1b6026360c795c128892521d7ceaced1e5176cc83f2df98bb60f57fc6a71e521aea2 SHA512 c385bf2dafe03ce757bd3d356de4667f2e222b3940b8e0737919748207b2f758b8aaceb26807cff7e8dd17df9de0a88336540d838ccbfdfc86c698cc6e96d955
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/net-libs/gupnp/files/1.2.2-build-manpage.patch b/net-libs/gupnp/files/1.2.2-build-manpage.patch
new file mode 100644
index 000000000000..ce03a171b88d
--- /dev/null
+++ b/net-libs/gupnp/files/1.2.2-build-manpage.patch
@@ -0,0 +1,55 @@
+From 23f54c2a1e8718e836224d68dafded091604a677 Mon Sep 17 00:00:00 2001
+From: Mart Raudsepp <leio@gentoo.org>
+Date: Thu, 20 Feb 2020 12:15:33 +0200
+Subject: [PATCH] build: Always build gupnp-binding-tool manpage
+
+manpage generation shouldn't be dependent on gtk_doc option
+---
+ doc/meson.build | 2 ++
+ meson.build     | 5 +----
+ 2 files changed, 3 insertions(+), 4 deletions(-)
+
+diff --git a/doc/meson.build b/doc/meson.build
+index 478650b..b71b657 100644
+--- a/doc/meson.build
++++ b/doc/meson.build
+@@ -4,6 +4,7 @@ version_xml = configure_file(input: 'version.xml.in',
+                output: 'version.xml', configuration:
+                entities)
+ 
++if get_option('gtk_doc')
+ gnome.gtkdoc('gupnp',
+              main_xml : 'gupnp-docs.xml',
+              src_dir : [join_paths(meson.source_root(), 'libgupnp'),
+@@ -26,6 +27,7 @@ gnome.gtkdoc('gupnp',
+                  'gupnp-types-private.h'
+              ],
+              install : true)
++endif
+ 
+ xsltproc = find_program('xsltproc', required: false)
+ if xsltproc.found()
+diff --git a/meson.build b/meson.build
+index e0dce33..eb3c82d 100644
+--- a/meson.build
++++ b/meson.build
+@@ -31,15 +31,12 @@ dependencies = [
+ subdir('libgupnp')
+ subdir('tests')
+ subdir('tools')
++subdir('doc')
+ 
+ if get_option('vapi') and get_option('introspection')
+     subdir('vala')
+ endif
+ 
+-if get_option('gtk_doc')
+-    subdir('doc')
+-endif
+-
+ if get_option('examples')
+     subdir('examples')
+ endif
+-- 
+2.20.1
+
diff --git a/net-libs/gupnp/gupnp-1.0.4.ebuild b/net-libs/gupnp/gupnp-1.0.4.ebuild
index 24795058c988..a9bc2db8bed5 100644
--- a/net-libs/gupnp/gupnp-1.0.4.ebuild
+++ b/net-libs/gupnp/gupnp-1.0.4.ebuild
@@ -22,7 +22,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}
 
 # prefix: uuid dependency can be adapted to non-linux platforms
 RDEPEND="${PYTHON_DEPS}
-	>=net-libs/gssdp-0.14.15:0=[introspection?,${MULTILIB_USEDEP}]
+	>=net-libs/gssdp-0.14.15:0/3[introspection?,${MULTILIB_USEDEP}]
 	>=net-libs/libsoup-2.48.0:2.4[introspection?,${MULTILIB_USEDEP}]
 	>=dev-libs/glib-2.40:2[${MULTILIB_USEDEP}]
 	>=dev-libs/libxml2-2.9.1-r4[${MULTILIB_USEDEP}]
@@ -35,6 +35,7 @@ RDEPEND="${PYTHON_DEPS}
 	!net-libs/gupnp-vala
 "
 DEPEND="${RDEPEND}
+	dev-util/glib-utils
 	>=dev-util/gtk-doc-am-1.14
 	sys-devel/gettext
 	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
diff --git a/net-libs/gupnp/gupnp-1.2.2.ebuild b/net-libs/gupnp/gupnp-1.2.2.ebuild
new file mode 100644
index 000000000000..3e6efc11b133
--- /dev/null
+++ b/net-libs/gupnp/gupnp-1.2.2.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+VALA_USE_DEPEND="vapigen"
+PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_REQ_USE="xml"
+
+inherit gnome.org meson multilib-minimal python-single-r1 vala xdg
+
+DESCRIPTION="An object-oriented framework for creating UPnP devs and control points"
+HOMEPAGE="https://wiki.gnome.org/Projects/GUPnP"
+
+LICENSE="LGPL-2+ GPL-2+" # gupnp-binding-tool is GPL-2+
+SLOT="0/1.2-0" # <API version>-<soname>
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+IUSE="connman gtk-doc +introspection kernel_linux networkmanager vala"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	?? ( connman networkmanager )
+"
+
+# prefix: uuid dependency can be adapted to non-linux platforms
+RDEPEND="${PYTHON_DEPS}
+	>=dev-libs/glib-2.58:2[${MULTILIB_USEDEP}]
+	>=net-libs/gssdp-1.1.3:0=[introspection?,${MULTILIB_USEDEP}]
+	>=net-libs/libsoup-2.48.0:2.4[introspection?,${MULTILIB_USEDEP}]
+	>=dev-libs/libxml2-2.9.1-r4[${MULTILIB_USEDEP}]
+	>=sys-apps/util-linux-2.24.1-r3[${MULTILIB_USEDEP}]
+	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-util/glib-utils
+	gtk-doc? ( >=dev-util/gtk-doc-1.14
+		app-text/docbook-xml-dtd:4.1.2
+		app-text/docbook-xml-dtd:4.2 )
+	dev-libs/libxslt
+	app-text/docbook-xsl-stylesheets
+	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
+	!connman? ( !networkmanager? ( kernel_linux? ( sys-kernel/linux-headers ) ) )
+	vala? ( $(vala_depend)
+		>=net-libs/gssdp-1.1.3:0[vala]
+		net-libs/libsoup:2.4[vala]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PV}-build-manpage.patch # https://gitlab.gnome.org/GNOME/gupnp/merge_requests/5
+)
+
+src_prepare() {
+	use introspection && vala_src_prepare
+	xdg_src_prepare
+}
+
+multilib_src_configure() {
+	local backend=system
+	use kernel_linux && backend=linux
+	use connman && backend=connman
+	use networkmanager && backend=network-manager
+
+	local emesonargs=(
+		-Dcontext_manager=${backend}
+		-Dintrospection=$(multilib_native_usex introspection true false)
+		-Dvapi=$(multilib_native_usex vala true false)
+		-Dgtk_doc=$(multilib_native_usex gtk-doc true false)
+		-Dexamples=false
+	)
+	meson_src_configure
+}
+
+multilib_src_compile() {
+	meson_src_compile
+}
+
+multilib_src_test() {
+	meson_src_test
+}
+
+multilib_src_install() {
+	meson_src_install
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	python_fix_shebang "${ED}"/usr/bin/gupnp-binding-tool-1.2
+}