gentoo resync : 25.08.2020

6 files changed, 2 insertions, 252 deletions

diff --git a/net-libs/libsoup/Manifest b/net-libs/libsoup/Manifest
index a9bd4785779c..5fb6702e1470 100644
--- a/net-libs/libsoup/Manifest
+++ b/net-libs/libsoup/Manifest
@@ -1,10 +1,4 @@
-AUX 2.66.2-meson-ntlm_auth-fix.patch 873 BLAKE2B ea7f36d5cb7d9df048b6f9ecf8cf0ab24424fae6bc918a3130ae6bac8b7c03fc8b69e7c2288e9c7dae2115ecaf48e1ed1c75c2abdc704faf0bdb093f2adde17f SHA512 227015874f95e759eb8850fc139d8340cff1bb05024585d7a8fa2af60f09aca17e497e43ca2a78a15c9ce71c90c7855e5235c1abc9b41e734a922e499a44edab
-AUX 2.66.2-vala-0.46-compat.patch 767 BLAKE2B ff124c8ab2897b2cdbe02e3a4c90e1584f856f9254e320a828daf1d6966c87060fb654d233baa7086e740086935b49640670f2b76ed65204bdc76b66bc2924a6 SHA512 ff218cdd450130fe12e95c3c93f8762ed891444c0a8f9b1d2c77a580717fec96a856b65ff54485ed7353d9fa3e9620acfae87fd77a096f76b647c70b8d74dbfb
 AUX disable-apache-tests.patch 1318 BLAKE2B d922d5613241c96fed46c746dcd0fde704093f910ea4203a2cae8e8e11d141b8ef604292f36023e1b7f307b58b4352651aa0eb65d8a72cccc9040ec2c7940619 SHA512 3030472d05a4075349dabc21bb5fdab32a329a761e20d9e01b70d414a8de20ab9ecb6985376e61ebdc5378e5873bad42b8f3ef41cff4faf285a2593747195095
-DIST libsoup-2.62.3.tar.xz 1851780 BLAKE2B e3a3518f485d4ab1fe133f5b382d32e4b949e720005c4fdbbe963ba68030d5fcfb11deb5103843f47f221b540e96c5d5ea0f7c52f898617dca37d8df9faec669 SHA512 88354728b1da10288472c7380f166263b64d979df3e6e70ebdbc7b61f3c8eb1dc1205d5b1ead16243c6d304940a4dd4e3a9f3b2ce3e1422a1c5032220b16c73b
-DIST libsoup-2.66.4.tar.xz 1451200 BLAKE2B 4ee37592beb9227eb5a61901e4b100b613fef2be512b7c61052a8df17184783e4b6e4e898893d6f63f1fa32b97fac935ad0f4b4d5ae1c56fedd62c0c8f41a8ea SHA512 c1d57c6c5099ac345373409dd3f384dd454e47218cc6bd8be1c6b2de967d7753bfcc3010836f7131f049b1ab9c49318d6ae5203be0bcc0ca5d4b62a0c64f27ad
 DIST libsoup-2.70.0.tar.xz 1494220 BLAKE2B f6bf30c741c7919a31598132ca65c0081d074e7c90d915f3598cb986e1f51f5354538f76dc7117a94d946bd8cd5fe8477ead689f343797757224014932061d28 SHA512 c3e2a963f4b38b2eee5d772b68a325c076fde19c26413bb3ada91824d3c7e108fbc325bfdc49a28141a641233485d3044d18142720c2aebaa7cc820f8718159b
-EBUILD libsoup-2.62.3.ebuild 2890 BLAKE2B 9d9c0060aa274b1d5e67abea2b35a24fb07bbd4b30a629cb81c4e1a77ac386ead50cdb3df7b0cdd18b94a21a40b3249701bada618d59b0e53e4e768f20cdad15 SHA512 73eadf836142720a6c10a9dc0ceb6ec69e2f6ca74d0bc7e0cb40e64e97fbce029f0f09e37a834616d883d9b10434c8aea716f4497afa78fd96360fb4c5bc2c4a
-EBUILD libsoup-2.66.4.ebuild 2749 BLAKE2B d7fbea04e4fc751be302bdfb40c653ef81fcb7cdbe2b07feeaeb217d408b95695946456db1d3a14671ae856c547daf9c9caf1dea275d6b5324f7d1eadcc25ef6 SHA512 7cab373bd4c67b4014207b02ca57be02fdd2b070cdeb646aa26b8826487dee7a992837e81839ca9755584a3a9add95b0c2650586f34e653799b26de34f8066d8
-EBUILD libsoup-2.70.0.ebuild 3001 BLAKE2B 0fcd4079ca32abd96900a964a05b0cc842ce3871081f022d144c680d593dee02b4e5ed3568ddbd05ba72557f096c15c2418bb3ffdda417374d5fab6f8d262eb7 SHA512 fdd5a70067ec1e47073e84ad384f1793e643627ef22ce5e8272b9e1761d54abe0043350be527c90af8ac200052a1e9a9d84d6a26d4e57939ec5092594a4515a7
+EBUILD libsoup-2.70.0.ebuild 3000 BLAKE2B 6896ff81e8d0eb822357c8c198e0774a9e563e239433033049e1b89214df733edec33e3f59eaa966978f9c224ca51afeeee821dae29c544e030c0b0fe44a949e SHA512 fe281bafa2b5ad22f69e55ec6631b05a28382a0cb067dcb2f0f480c04616f712458b7504599a95066ba95730ac0cf1306dc12109b2f7c536a3c52088d8facdec
 MISC metadata.xml 467 BLAKE2B d794fe938763955e050add0d57db197ff4445a7b9d6467cdf0f47ab46ca26e1b9cf4fcebbe0e90df798ab08c8a4d7cdc5b547b347e6caa2f5c83f9be698d0396 SHA512 287cf2cc758d653374e5b58aeab4a96fa45ee0846e902cbc5c7f051e31a6b9300aa4e27814b4a2eb27d6386a2bf0a57cf7032dcac081749141bac1f98851487c
diff --git a/net-libs/libsoup/files/2.66.2-meson-ntlm_auth-fix.patch b/net-libs/libsoup/files/2.66.2-meson-ntlm_auth-fix.patch
deleted file mode 100644
index 04c9cccfeec0..000000000000
--- a/net-libs/libsoup/files/2.66.2-meson-ntlm_auth-fix.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From ecd64363f82eb9d6cea07674f49c2d2869e5b62b Mon Sep 17 00:00:00 2001
-From: Claudio Saavedra <csaavedra@igalia.com>
-Date: Tue, 20 Aug 2019 16:04:06 +0300
-Subject: [PATCH] NTLM: Fix build with ntlm enabled
-
-Just realized that build with NTLM enabled was broken (!?)
-
-(cherry picked from commit bab0db142d508e92e72970db72cbbce3c13a526a)
----
- meson.build | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/meson.build b/meson.build
-index f0e34cb0..346ed2fd 100644
---- a/meson.build
-+++ b/meson.build
-@@ -271,7 +271,7 @@ if host_machine.system() != 'windows'
- 
-     if ntlm_auth.found()
-       add_project_arguments('-DUSE_NTLM_AUTH=1', language : 'c')
--      add_project_arguments('-DNTLM_AUTH=' + ntlm_auth.path(), language : 'c')
-+      add_project_arguments('-DNTLM_AUTH="' + ntlm_auth.path() + '"', language : 'c')
-     endif
-   endif
- endif
--- 
-2.20.1
-
diff --git a/net-libs/libsoup/files/2.66.2-vala-0.46-compat.patch b/net-libs/libsoup/files/2.66.2-vala-0.46-compat.patch
deleted file mode 100644
index ce0e1dc9b620..000000000000
--- a/net-libs/libsoup/files/2.66.2-vala-0.46-compat.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 1c6f47df99cc5b2efe3d629c71c5d85a7871689c Mon Sep 17 00:00:00 2001
-From: Rico Tzschichholz <ricotz@ubuntu.com>
-Date: Tue, 28 May 2019 09:08:35 +0200
-Subject: [PATCH] gir: soup_auth_new is not a constructor
-
----
- libsoup/Soup-2.4.metadata | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/libsoup/Soup-2.4.metadata b/libsoup/Soup-2.4.metadata
-index c0056ec8..1f107eda 100644
---- a/libsoup/Soup-2.4.metadata
-+++ b/libsoup/Soup-2.4.metadata
-@@ -18,6 +18,9 @@ ProxyResolver deprecated_since="2.28" replacement="ProxyURIResolver"
- 
- // Report upstream
- add_* skip=false type="unowned GLib.TimeoutSource"
-+Auth
-+	// Factory method
-+	.new symbol_type="function"
- AuthDomain
- 	.accepts#method name="accepts_authorization"
- AuthDomainBasic.new skip=false
--- 
-2.20.1
-
diff --git a/net-libs/libsoup/libsoup-2.62.3.ebuild b/net-libs/libsoup/libsoup-2.62.3.ebuild
deleted file mode 100644
index d55643d5a8f3..000000000000
--- a/net-libs/libsoup/libsoup-2.62.3.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python3_6 )
-VALA_USE_DEPEND="vapigen"
-
-inherit gnome2 multilib-minimal python-any-r1 vala
-
-DESCRIPTION="An HTTP library implementation in C"
-HOMEPAGE="https://wiki.gnome.org/Projects/libsoup"
-
-LICENSE="LGPL-2+"
-SLOT="2.4"
-
-IUSE="debug gssapi +introspection samba ssl test +vala"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="vala? ( introspection )"
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-RDEPEND="
-	>=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}]
-	>=dev-libs/libxml2-2.9.1-r4:2[${MULTILIB_USEDEP}]
-	>=dev-db/sqlite-3.8.2:3[${MULTILIB_USEDEP}]
-	>=net-libs/glib-networking-2.38.2[ssl?,${MULTILIB_USEDEP}]
-	gssapi? ( virtual/krb5[${MULTILIB_USEDEP}] )
-	introspection? ( >=dev-libs/gobject-introspection-0.9.5:= )
-	samba? ( net-fs/samba )
-"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	dev-util/glib-utils
-	>=dev-util/gtk-doc-am-1.20
-	>=dev-util/intltool-0.35
-	sys-devel/gettext
-	virtual/pkgconfig
-	test? ( >=dev-libs/glib-2.40:2[${MULTILIB_USEDEP}] )
-	vala? ( $(vala_depend) )
-"
-#	test? (	www-servers/apache[ssl,apache2_modules_auth_digest,apache2_modules_alias,apache2_modules_auth_basic,
-#		apache2_modules_authn_file,apache2_modules_authz_host,apache2_modules_authz_user,apache2_modules_dir,
-#		apache2_modules_mime,apache2_modules_proxy,apache2_modules_proxy_http,apache2_modules_proxy_connect]
-#		dev-lang/php[apache2,xmlrpc]
-#		net-misc/curl
-#		net-libs/glib-networking[ssl])"
-
-src_prepare() {
-	if ! use test; then
-		# don't waste time building tests (bug #226271)
-		sed 's/^\(SUBDIRS =.*\)tests\(.*\)$/\1\2/' -i Makefile.am Makefile.in \
-			|| die "sed failed"
-	fi
-
-	# FIXME: workaround upstream not respecting --without-apache-httpd
-	sed -e '/check: start-httpd/d' \
-		-i tests/Makefile.am tests/Makefile.in || die
-
-	use vala && vala_src_prepare
-	gnome2_src_prepare
-}
-
-src_configure() {
-	# FIXME: we need addpredict to workaround bug #324779 until
-	# root cause (bug #249496) is solved
-	addpredict /usr/share/snmp/mibs/.index
-
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	# Disable apache tests until they are usable on Gentoo, bug #326957
-	ECONF_SOURCE=${S} \
-	gnome2_src_configure \
-		--disable-static \
-		--disable-tls-check \
-		--without-gnome \
-		--without-apache-httpd \
-		$(usex debug --enable-debug=yes ' ') \
-		$(multilib_native_use_with gssapi) \
-		$(multilib_native_use_enable introspection) \
-		$(multilib_native_use_enable vala) \
-		$(use_with samba ntlm-auth '${EPREFIX}'/usr/bin/ntlm_auth)
-
-	if multilib_is_native_abi; then
-		# fix gtk-doc
-		ln -s "${S}"/docs/reference/html docs/reference/html || die
-	fi
-}
-
-multilib_src_install() {
-	gnome2_src_install
-}
diff --git a/net-libs/libsoup/libsoup-2.66.4.ebuild b/net-libs/libsoup/libsoup-2.66.4.ebuild
deleted file mode 100644
index c26cf2bfb52c..000000000000
--- a/net-libs/libsoup/libsoup-2.66.4.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-VALA_USE_DEPEND="vapigen"
-
-inherit gnome.org meson multilib-minimal vala xdg
-
-DESCRIPTION="HTTP client/server library for GNOME"
-HOMEPAGE="https://wiki.gnome.org/Projects/libsoup"
-
-LICENSE="LGPL-2.1+"
-SLOT="2.4"
-
-IUSE="gssapi gtk-doc +introspection samba ssl test +vala"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="vala? ( introspection )"
-
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 s390 sparc x86"
-
-DEPEND="
-	>=dev-libs/glib-2.38:2[${MULTILIB_USEDEP}]
-	>=dev-db/sqlite-3.8.2:3[${MULTILIB_USEDEP}]
-	>=dev-libs/libxml2-2.9.1-r4:2[${MULTILIB_USEDEP}]
-	>=net-libs/libpsl-0.20[${MULTILIB_USEDEP}]
-	gssapi? ( virtual/krb5[${MULTILIB_USEDEP}] )
-	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
-	samba? ( net-fs/samba )
-"
-RDEPEND="${DEPEND}
-	>=net-libs/glib-networking-2.38.2[ssl?,${MULTILIB_USEDEP}]
-"
-BDEPEND="
-	dev-util/glib-utils
-	gtk-doc? ( >=dev-util/gtk-doc-1.20
-		app-text/docbook-xml-dtd:4.1.2 )
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	vala? ( $(vala_depend) )
-"
-#	test? (	www-servers/apache[ssl,apache2_modules_auth_digest,apache2_modules_alias,apache2_modules_auth_basic,
-#		apache2_modules_authn_file,apache2_modules_authz_host,apache2_modules_authz_user,apache2_modules_dir,
-#		apache2_modules_mime,apache2_modules_proxy,apache2_modules_proxy_http,apache2_modules_proxy_connect]
-#		dev-lang/php[apache2,xmlrpc]
-#		net-misc/curl
-#		net-libs/glib-networking[ssl])"
-
-PATCHES=(
-	# Disable apache tests until they are usable on Gentoo, bug #326957
-	"${FILESDIR}"/disable-apache-tests.patch
-	# Fix libsoup-2.4.vapi to be compatible with vala:0.46 and onwards. Included in 2.67.2
-	"${FILESDIR}"/2.66.2-vala-0.46-compat.patch
-	"${FILESDIR}"/2.66.2-meson-ntlm_auth-fix.patch
-)
-
-src_prepare() {
-	use vala && vala_src_prepare
-	xdg_src_prepare
-}
-
-src_configure() {
-	# FIXME: we need addpredict to workaround bug #324779 until
-	# root cause (bug #249496) is solved
-	# But necessary while apache tests are disabled
-	#addpredict /usr/share/snmp/mibs/.index
-
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	local emesonargs=(
-		$(meson_use gssapi)
-		-Dkrb5_config="${CHOST}-krb5-config"
-		$(meson_use samba ntlm)
-		-Dntlm_auth="${EPREFIX}/usr/bin/ntlm_auth"
-		-Dtls_check=false # disables check, we still rdep on glib-networking
-		-Dgnome=false
-		-Dintrospection=$(multilib_native_usex introspection true false)
-		-Dvapi=$(multilib_native_usex vala true false)
-		-Dgtk_doc=$(multilib_native_usex gtk-doc true false)
-		$(meson_use test tests)
-	)
-	meson_src_configure
-}
-
-multilib_src_compile() {
-	meson_src_compile
-}
-
-multilib_src_test() {
-	meson_src_test
-}
-
-multilib_src_install() {
-	meson_src_install
-}
diff --git a/net-libs/libsoup/libsoup-2.70.0.ebuild b/net-libs/libsoup/libsoup-2.70.0.ebuild
index 9d39df972428..55d0bc8ab39e 100644
--- a/net-libs/libsoup/libsoup-2.70.0.ebuild
+++ b/net-libs/libsoup/libsoup-2.70.0.ebuild
@@ -17,7 +17,7 @@ IUSE="brotli gssapi gtk-doc +introspection samba ssl test +vala"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="vala? ( introspection )"
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 s390 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 s390 sparc x86"
 
 DEPEND="
 	>=dev-libs/glib-2.58:2[${MULTILIB_USEDEP}]