gentoo resync : 25.11.2020

6 files changed, 2 insertions, 309 deletions

diff --git a/net-libs/gupnp/Manifest b/net-libs/gupnp/Manifest
index 1199efcab11b..f49d95f5f7d7 100644
--- a/net-libs/gupnp/Manifest
+++ b/net-libs/gupnp/Manifest
@@ -1,10 +1,3 @@
-AUX 1.2.2-build-manpage.patch 1447 BLAKE2B b876a44ac3930f087e3c00530d0b5cba2d2836b9b968c4cc34500e6a11a5b04b432c5e8dac1addff6cea85feeab5bf3fe2027b3d87fe2e861a4b9aec2e3e349b SHA512 e232ee5bdb2ae1fcd9b44c63942d1bef9d610e90135ec4fa3224716ca632d513f099638eea58fa67f39d7d80a507db1f7788af5712749417d2c576c8868521ab
-DIST gupnp-1.0.4.tar.xz 427616 BLAKE2B ab5d34e701e253dc48ebafabc908f9aacd7a325805c61b11b5668cfa105d56a37f0d93593eeedd0e63630b986f2a2c18d4d9cdd82b653c9cc7a5d57262a819ef SHA512 54a133ce043e9b3d5ea23041c04fbbf5483aea98a72421cdb59bada0ab2e3ab3fc85452c4c743b794eeb7c929f5ef38bf0e6ba7f9539d86182a77612c898205a
-DIST gupnp-1.2.2.tar.xz 136556 BLAKE2B f38018c76972f1b60b8274353a60d4bb1e4687ead6fd3fb084e050c070e5da4cbb7118807f65d47787c50af3174e7c2b87ff0b920cdcf13e7c5be17f8b156588 SHA512 08a715b06f30b9d9d11b914136f89b0c53d6b07b09dddf622619073fc6f144fc8d711eec28ede80fd14fc71a6addfe88de15740d0748302522ce71555fd18d2a
-DIST gupnp-1.2.3.tar.xz 138428 BLAKE2B 23f7f677ee9d58c43ba69d6e707e26b17efa5b510f4b14b41006b332f196037fcb103b64e6b1f91260383232ad6d19872b1e8d856878b103c5c2612d3bafae63 SHA512 85caa68a4c6f4b1ccf21d910048a59b6db2b21e8bd728404b28eb0f00b588a1ab55f3ff3227e76199a20554b0708128680379e7ffa5fe162cccb4a1e3e322101
 DIST gupnp-1.2.4.tar.xz 139832 BLAKE2B a4d49ea8a3739a2233c9dd4a258a7d0d355ff651b0de85c5b7151f0ffca93b50248a303dd040c2d7e9fb215a0edb0627fa3a8a16835b55d90459c623faaad62b SHA512 cb787264b5a1bcb4f547f7a9d7a5e4e712f91ecbb593f12b2c51aed0607abd6fbfd43e5c42e261eb853d09358685637e172c78e3e9a6059bccdeb1176e6e4ef7
-EBUILD gupnp-1.0.4.ebuild 1936 BLAKE2B 0bd2a5783fe11eb5948b39ab91eae9b8055227add4186eb39f2c25291bb8979d807765d521e617d2cf1eed5621dea26eecd79f8b262b482efba6bd30eea0ee84 SHA512 4d5ca071142bcac84c1c907894d4f8b5c67d7a77c1ad58801ecbac4a4104711eda25cdc19394d51c10ace1d75bc18b3a2f68b35dd96b5c3452217a7d5b85338b
-EBUILD gupnp-1.2.2.ebuild 2382 BLAKE2B e0c3a459602fd8eda64aba8116369a3abb9db1f13c5b367ed4ecd2464f6cd3416a6c54696de17fc6c942c988704aca199c80087def6a5753b2e79f32445d87a4 SHA512 d33f989487371960f7e419d3f8bdd3b14687286aae6741238ae93dbacd14cef28e993c237a380ce7f39ed8d2c013a70f230b7a22c4e40fbc7d58eac78bb9112b
-EBUILD gupnp-1.2.3.ebuild 2272 BLAKE2B 51cdfcd0af4bcc7881d4b3485dbe6abcef5f824991f808722f69561a13d1e788193275536be99ca38a1a8e40a687ea3f772f3fdf43105c4f03881818e594a15d SHA512 3b6e400499d2ef3f026210d2d83a853a1b070237d86abece3d91af5c751913e8a06d4d97d0dcd1f84a455b51161d09b7adc3d5eb92ec2a0a706033124d31f705
-EBUILD gupnp-1.2.4.ebuild 2273 BLAKE2B c60fbb6ae278049efe4d2094ab11b950ed2cf650fc8dc4c932724854a4b3ebfa5d8934222bbcba8e3d401c3538188101c1caf979cd39e8346562df8d37e61828 SHA512 db480d84eb26533be29d07552381d48956c8c77062244a4010aea37f65cb75c1d9b15e812f18f5b07e134fbb27ed15f3474f39f3db3f96e97b4154271f0110bf
+EBUILD gupnp-1.2.4.ebuild 2272 BLAKE2B 51cdfcd0af4bcc7881d4b3485dbe6abcef5f824991f808722f69561a13d1e788193275536be99ca38a1a8e40a687ea3f772f3fdf43105c4f03881818e594a15d SHA512 3b6e400499d2ef3f026210d2d83a853a1b070237d86abece3d91af5c751913e8a06d4d97d0dcd1f84a455b51161d09b7adc3d5eb92ec2a0a706033124d31f705
 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
deleted file mode 100644
index ce03a171b88d..000000000000
--- a/net-libs/gupnp/files/1.2.2-build-manpage.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-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
deleted file mode 100644
index 21d5109ef959..000000000000
--- a/net-libs/gupnp/gupnp-1.0.4.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-VALA_USE_DEPEND="vapigen"
-PYTHON_COMPAT=( python{3_6,3_7} )
-PYTHON_REQ_USE="xml"
-
-inherit gnome2 multilib-minimal python-single-r1 vala
-
-DESCRIPTION="An object-oriented framework for creating UPnP devs and control points"
-HOMEPAGE="https://wiki.gnome.org/Projects/GUPnP"
-
-LICENSE="LGPL-2"
-SLOT="0/4"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ppc64 ~sparc x86"
-
-IUSE="connman +introspection kernel_linux networkmanager"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	?? ( connman networkmanager )
-"
-
-# prefix: uuid dependency can be adapted to non-linux platforms
-RDEPEND="${PYTHON_DEPS}
-	>=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}]
-	>=sys-apps/util-linux-2.24.1-r3[${MULTILIB_USEDEP}]
-	introspection? (
-			>=dev-libs/gobject-introspection-1.36:=
-			$(vala_depend) )
-	connman? ( >=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}] )
-	networkmanager? ( >=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}] )
-	!net-libs/gupnp-vala
-"
-DEPEND="${RDEPEND}
-	dev-util/glib-utils
-	>=dev-util/gtk-doc-am-1.14
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	use introspection && vala_src_prepare
-	gnome2_src_prepare
-}
-
-multilib_src_configure() {
-	local backend=unix
-	use kernel_linux && backend=linux
-	use connman && backend=connman
-	use networkmanager && backend=network-manager
-
-	ECONF_SOURCE=${S} \
-	gnome2_src_configure \
-		$(multilib_native_use_enable introspection) \
-		--disable-static \
-		--with-context-manager=${backend}
-
-	if multilib_is_native_abi; then
-		ln -s "${S}"/doc/html doc/html || die
-	fi
-}
-
-multilib_src_install() {
-	gnome2_src_install
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	python_fix_shebang "${ED}"/usr/bin/gupnp-binding-tool
-}
diff --git a/net-libs/gupnp/gupnp-1.2.2.ebuild b/net-libs/gupnp/gupnp-1.2.2.ebuild
deleted file mode 100644
index b73234a91a5a..000000000000
--- a/net-libs/gupnp/gupnp-1.2.2.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# 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
-	!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
-}
diff --git a/net-libs/gupnp/gupnp-1.2.3.ebuild b/net-libs/gupnp/gupnp-1.2.3.ebuild
deleted file mode 100644
index f95420747be0..000000000000
--- a/net-libs/gupnp/gupnp-1.2.3.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# 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.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}
-		-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
-}
diff --git a/net-libs/gupnp/gupnp-1.2.4.ebuild b/net-libs/gupnp/gupnp-1.2.4.ebuild
index 3fe2d9a3b039..f95420747be0 100644
--- a/net-libs/gupnp/gupnp-1.2.4.ebuild
+++ b/net-libs/gupnp/gupnp-1.2.4.ebuild
@@ -13,7 +13,7 @@ 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"
+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}