gentoo resync : 31.05.2021

3 files changed, 2 insertions, 104 deletions

diff --git a/net-libs/libsoup/Manifest b/net-libs/libsoup/Manifest
index 969d5f126d0d..ec26dd811e47 100644
--- a/net-libs/libsoup/Manifest
+++ b/net-libs/libsoup/Manifest
@@ -1,6 +1,4 @@
 AUX disable-apache-tests.patch 1318 BLAKE2B d922d5613241c96fed46c746dcd0fde704093f910ea4203a2cae8e8e11d141b8ef604292f36023e1b7f307b58b4352651aa0eb65d8a72cccc9040ec2c7940619 SHA512 3030472d05a4075349dabc21bb5fdab32a329a761e20d9e01b70d414a8de20ab9ecb6985376e61ebdc5378e5873bad42b8f3ef41cff4faf285a2593747195095
-DIST libsoup-2.70.0.tar.xz 1494220 BLAKE2B f6bf30c741c7919a31598132ca65c0081d074e7c90d915f3598cb986e1f51f5354538f76dc7117a94d946bd8cd5fe8477ead689f343797757224014932061d28 SHA512 c3e2a963f4b38b2eee5d772b68a325c076fde19c26413bb3ada91824d3c7e108fbc325bfdc49a28141a641233485d3044d18142720c2aebaa7cc820f8718159b
 DIST libsoup-2.72.0.tar.xz 1477940 BLAKE2B e63a26aa29a4a34c4e4b0a2713818db52b206b04b56d99391648351f87a62dc3455020e8eb0312ef17b2b7d047a7d5731905ecc214085afd4eff25fefa30782b SHA512 ca16772d0d318c4be0c4859db1e32baffa2231b4732f3bf9814aa405febde86395a0fb8bfa1635d70a7b5853d2567403920b9b0d0f5c3c179294352af27e91de
-EBUILD libsoup-2.70.0.ebuild 3001 BLAKE2B f169f2ba7739d75aa7fd76078727aefd623fd86f43c7e666a2b5c86fda169c54626623cb7d6abf33304b56a7012cf5b9a3b7ad2dbb136ca0db0e10a3c785277b SHA512 17c345485bd99b036af6487369afb7566576f8e2963c1e5fc7cb75003a0ade7206dfcf9ec969ec7df511d3288172af856a3d2d7e14836f55ab4a0cfb843d69fe
-EBUILD libsoup-2.72.0.ebuild 3118 BLAKE2B 4d00e99941c176401a5f218a60765e6c3ccd12415b081525f01afed555d5b13f757213118c1175645ffcaebd1a8332ce7deeabd93946e1a18765604489bef3fa SHA512 fb6bea7d90da5967aa97d0358463e6cf6d4dea4a0b4120eebfbe784e5defd603edcba3e6bcaab576030c70d34163742ef95c6532f3445781b29253ad30b4c02e
+EBUILD libsoup-2.72.0.ebuild 3117 BLAKE2B 791f9bef929a9e8db3ff589e1af16399b6b49f667c674d5018ea7b94604e0f6fa9c613d6d66dc8d8e78d7c13f584b739cce7b2311ed1eb212c2d4cd5f9bb2a7e SHA512 9452b210f1fa4219cecd26306dad30d6733dfbb360d93eb9bd808a52b384f63ed1b61ab3f9974919eed80d3dc11371ef8c78fadaa774bcf67abed99090a57a8d
 MISC metadata.xml 577 BLAKE2B ce68b60f9438bad0b1fb848dada28796f4c9a8f6ed119b29c26139bf7c146edb7e701f7565e425c27587a911e62bd1ed15cb6d120696ab1ac0f631f9f8145cc4 SHA512 a2937c0036d3decd995f8e83321b7b1e2bd9f6a5fe83ff7061dc1443ef5cfb4714d38c32689cd46065a7efbb5c8f120eed5ebfad650e7ccf4f1d98d9d45afb0d
diff --git a/net-libs/libsoup/libsoup-2.70.0.ebuild b/net-libs/libsoup/libsoup-2.70.0.ebuild
deleted file mode 100644
index fb3e43069562..000000000000
--- a/net-libs/libsoup/libsoup-2.70.0.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2021 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"
-
-# TODO: Default enable brotli at some point? But in 2.70.0 not advertised to servers yet - https://gitlab.gnome.org/GNOME/libsoup/issues/146
-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"
-
-DEPEND="
-	>=dev-libs/glib-2.58:2[${MULTILIB_USEDEP}]
-	>=dev-db/sqlite-3.8.2:3[${MULTILIB_USEDEP}]
-	>=dev-libs/libxml2-2.9.1-r4:2[${MULTILIB_USEDEP}]
-	brotli? ( >=app-arch/brotli-1.0.6-r1:=[${MULTILIB_USEDEP}] )
-	>=net-libs/libpsl-0.20[${MULTILIB_USEDEP}]
-	sys-libs/zlib
-	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
-)
-
-src_prepare() {
-	use vala && vala_src_prepare
-	xdg_src_prepare
-	# https://gitlab.gnome.org/GNOME/libsoup/issues/159 - could work with libnss-myhostname
-	sed -e '/hsts/d' -i tests/meson.build || die
-}
-
-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_feature gssapi)
-		-Dkrb5_config="${CHOST}-krb5-config"
-		$(meson_feature samba ntlm)
-		$(meson_feature brotli)
-		-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 enabled disabled)
-		-Dvapi=$(multilib_native_usex vala enabled disabled)
-		-Dgtk_doc=$(multilib_native_usex gtk-doc true false)
-		$(meson_use test tests)
-		-Dinstalled_tests=false
-	)
-	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.72.0.ebuild b/net-libs/libsoup/libsoup-2.72.0.ebuild
index 2374db53ddcb..5baaf04a13d2 100644
--- a/net-libs/libsoup/libsoup-2.72.0.ebuild
+++ b/net-libs/libsoup/libsoup-2.72.0.ebuild
@@ -17,7 +17,7 @@ IUSE="brotli gssapi gtk-doc +introspection samba ssl sysprof test +vala"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="vala? ( introspection )"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 DEPEND="
 	>=dev-libs/glib-2.58:2[${MULTILIB_USEDEP}]