gentoo resync : 15.06.2021

3 files changed, 78 insertions, 18 deletions

diff --git a/net-libs/gupnp/Manifest b/net-libs/gupnp/Manifest
index dfdf55a0759c..1c69028c5563 100644
--- a/net-libs/gupnp/Manifest
+++ b/net-libs/gupnp/Manifest
@@ -1,3 +1,5 @@
 DIST gupnp-1.2.6.tar.xz 142652 BLAKE2B 12f3fd59b6c8616dcbc32ab4feeeccde864af6da0593d0d51b8a9bab045c39b8e4540bc1470a0758f1a0979e647f9dae67bae544d1457e567264d7408d58e06f SHA512 317ff1f0ea1f03476596db6ce2f6c7c86b7c9962a7ddb00da9f487fe7f7bb70ccf8fe64e485583e4a988d90afdb41128730fef459f4ecb757ff2aef44dc4de9c
-EBUILD gupnp-1.2.6.ebuild 2272 BLAKE2B b3d8499d60f38d78858feafcd577e5247a42a306e349c7f8651ac110fd463b6a8bf91798d844ac70168d3b4f6ca01e9b78d288b3ed2d3985e13560a82112940c SHA512 53d62e54e6d0380bd21f20b6c01ea8e043976c29f71635ffa4e40a3cc4264919f2e3147e674664e1ad16aa582847b0e51d0c0a311372e26d8042ffa3100fcf73
+DIST gupnp-1.2.7.tar.xz 142928 BLAKE2B 094e9569c501ae32def1335c8129d5585a2bec37d86c2317a2c9b2d965db5ce0ae6c19017bd44fb718709cf068f93ed75d08ab7e30c5f265e1ce45a9a9352897 SHA512 83d012989f9aab578c9bdb4dd95d316003938a39cc997949622b56523dd7081e09093c48c0016d738ca0040a00b3e6218ba59cad9e49e05f4106213160e7c409
+EBUILD gupnp-1.2.6.ebuild 2065 BLAKE2B 2f76e6584658f65b4bef9beb15c6f39f63204af7aa468955002d6698aba3c00cea9b7d7b468ef4b4fcd7c6688d8693ca1ca4b13178f0cadb3d0f3a97c1364ab2 SHA512 e3add284a70c4d19b9e3978ea5eadfc668f69eddc3128d7f905e85d0609cc444c9a5d5fc46fc16969e0a879004c603f0eba538ddc6a6f59dc3c2f67644e83388
+EBUILD gupnp-1.2.7.ebuild 2069 BLAKE2B ee915d52888eefe8787ea52a3774f10787dcc8472f95911d22caea7290d699504666d330eeea914b5b30b48f87e1aab3ce1761a205ee3eb317ce5130bd34ba11 SHA512 a007a026f7d72acf8f069c0e4830cf0861c3f3840a2dd81fead5fe93b0a030ea8529bebcf9b3cbf44bff2fde4e2e2748556bb2a0fd46a9f44e1dc86f4da0c743
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/net-libs/gupnp/gupnp-1.2.6.ebuild b/net-libs/gupnp/gupnp-1.2.6.ebuild
index 762f6fb77a4c..df4827c9b144 100644
--- a/net-libs/gupnp/gupnp-1.2.6.ebuild
+++ b/net-libs/gupnp/gupnp-1.2.6.ebuild
@@ -6,7 +6,7 @@ VALA_USE_DEPEND="vapigen"
 PYTHON_COMPAT=( python3_{7,8,9} )
 PYTHON_REQ_USE="xml"
 
-inherit gnome.org meson multilib-minimal python-single-r1 vala xdg
+inherit gnome.org meson-multilib python-single-r1 vala xdg
 
 DESCRIPTION="An object-oriented framework for creating UPnP devs and control points"
 HOMEPAGE="https://wiki.gnome.org/Projects/GUPnP"
@@ -58,27 +58,14 @@ multilib_src_configure() {
 
 	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)
+		$(meson_native_use_bool introspection)
+		$(meson_native_use_bool vala vapi)
+		$(meson_native_use_bool gtk-doc gtk_doc)
 		-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
 }
diff --git a/net-libs/gupnp/gupnp-1.2.7.ebuild b/net-libs/gupnp/gupnp-1.2.7.ebuild
new file mode 100644
index 000000000000..ec6826d50b5f
--- /dev/null
+++ b/net-libs/gupnp/gupnp-1.2.7.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+VALA_USE_DEPEND="vapigen"
+PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_REQ_USE="xml"
+
+inherit gnome.org meson-multilib 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.66:2[${MULTILIB_USEDEP}]
+	>=net-libs/gssdp-1.2.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
+	!connman? ( !networkmanager? ( kernel_linux? ( sys-kernel/linux-headers ) ) )
+	vala? ( $(vala_depend)
+		>=net-libs/gssdp-1.2.3:0[vala]
+		net-libs/libsoup:2.4[vala]
+	)
+"
+
+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}
+		$(meson_native_use_bool introspection)
+		$(meson_native_use_bool vala vapi)
+		$(meson_native_use_bool gtk-doc gtk_doc)
+		-Dexamples=false
+	)
+	meson_src_configure
+}
+
+multilib_src_install_all() {
+	python_fix_shebang "${ED}"/usr/bin/gupnp-binding-tool-1.2
+}