gentoo resync : 02.02.2022

4 files changed, 6 insertions, 100 deletions

diff --git a/net-libs/libsoup/Manifest b/net-libs/libsoup/Manifest
index 9f1feebbb51e..25b342bf3978 100644
--- a/net-libs/libsoup/Manifest
+++ b/net-libs/libsoup/Manifest
@@ -1,8 +1,6 @@
 AUX disable-apache-tests.patch 1318 BLAKE2B d922d5613241c96fed46c746dcd0fde704093f910ea4203a2cae8e8e11d141b8ef604292f36023e1b7f307b58b4352651aa0eb65d8a72cccc9040ec2c7940619 SHA512 3030472d05a4075349dabc21bb5fdab32a329a761e20d9e01b70d414a8de20ab9ecb6985376e61ebdc5378e5873bad42b8f3ef41cff4faf285a2593747195095
-DIST libsoup-2.72.0.tar.xz 1477940 BLAKE2B e63a26aa29a4a34c4e4b0a2713818db52b206b04b56d99391648351f87a62dc3455020e8eb0312ef17b2b7d047a7d5731905ecc214085afd4eff25fefa30782b SHA512 ca16772d0d318c4be0c4859db1e32baffa2231b4732f3bf9814aa405febde86395a0fb8bfa1635d70a7b5853d2567403920b9b0d0f5c3c179294352af27e91de
 DIST libsoup-2.74.2.tar.xz 1497356 BLAKE2B b05e5d06e20a95042334c79e3a633ec43db0e7444b425f8577045fbdee7b78bd697e743f4283ed79265bbe538145a541ef2ef55636ae235667a89d00910d5bf2 SHA512 6f9da3296364e210103093cef9ef34fb40f694a8ef90966fc1fbd834c11f3db1031784a0901e9181bf3124e0682708148bd3598a31d60f1cce61eaae2e19ba7a
-DIST libsoup-3.0.3.tar.xz 1525388 BLAKE2B cd515656647bfa9d0bc3b93ade90823803219f11b1ca9688e3b5e6ac62a0d12f72fd7bf9feb6059ced8885c22568768ae5511e270ddc72fe495f078ccecce5a4 SHA512 9ba6f7e9e2a975dff52e5b28b147cad707aa1596a67f45bb1b9feaccf130eca2cb0b80b7ebf0a424388ec4f0b5297578b51142f8b135cddc367ac59d00279094
-EBUILD libsoup-2.72.0-r1.ebuild 2935 BLAKE2B 4d611b5f77df37809765846aae89afe31af53b0d4dfb9b39e45e62dc9b91007442180b92c57e4cd57547d904ff3e6db9ab3ec5cebadbe54f10ba4dbd32ec70ec SHA512 b32dc99e460e040a6aa710d80363dd2fb5f462a36c1b7b79defda746456455e7b1cfce57f68a6bd6f7a940fb917e1ef5c1db1b538bde0637ce8cc0f7b20133c9
-EBUILD libsoup-2.74.2.ebuild 2942 BLAKE2B cac75b9dd4356c6fcc3a2745ce014ca3759d9e99a306f36b7972ee7e406dc45347b9f21437c83d98bf5dfc76ec593721410ff7c882f49775ae9a4046a6c0d810 SHA512 6b798d13d350cb6b9654ef6487a562e07916acf83ac0acfb12d8511575ed8d9ad6e5e228f59864a13de384aef5ec23526afe312950c428f48715feb2a4b53694
-EBUILD libsoup-3.0.3.ebuild 2999 BLAKE2B 6f3950a2cab178a471e94dd3860b3df32ab0d3a5778f01a76bf2449e17f3e020a1f26b9b950f3a69d984350be71d3d64aab382d84f0196cef2172948d22c8c9c SHA512 a5768ec45fdf8dc0f8ebff7da98e93a87a22cc8224691b507d520b4b9fe4871a18a4537ca1b7e9c81995e1a8e96ccf02cc7840c96934fb741dde29e11e2f759c
+DIST libsoup-3.0.4.tar.xz 1523336 BLAKE2B 5df12a2bafdd36905fd2122b1123ce630ffad93de5965eb2f3e47f85f3bc3169e8c005e245ee9ba72433fc735d7b24b304bac55b800bce59506961976a57f634 SHA512 4e6c226dfd8dd3fb2568affdbf88b8f0ad52903198c1dfc808c4cba1c0479442581953b5fb83166a3a198fb861618b62f165a4544b5daaed094bbeeff94a48ff
+EBUILD libsoup-2.74.2.ebuild 2935 BLAKE2B ce060804ba36afb692f75c623715caa3c982c8aff3d31a4c11a5bbe5465da06065f890711ba63c2f3abf90bf339c2c7f15ec89805223a6f43abd157a34231826 SHA512 b1c738b2e82764f3733952b4f6adee85e3c7b86e6107b9f66435042443ff77f3bdff89757604e870684227aa660d1203c3efafa8877e92fde2c3e0e125792886
+EBUILD libsoup-3.0.4.ebuild 2915 BLAKE2B a6746efa0607805d0297627c659d7c9205572a8f38962812a009e638c5f320ebed9ea04cf517734739ef9031627182b394a7b50f9a86c5b3d5316e0ab24374ed SHA512 ce89efaa580533a32c5fec7f992455491af0f49b9118a3980791751979d02722163182b0fa62f183e94fd42d19697ac591c94d1508bd0bc0a2ffa6565473aa08
 MISC metadata.xml 578 BLAKE2B eb74705e02403da0706e9eba5fd7ce416721a8f4eaa7f0548376a11767f8d6f0214b6c696e8a65c3b2b1b9753bd1397bc2c9b5cdd953e89f23c00749884d7966 SHA512 120645b4e9ca76acaba6ae6eb86daca28be6af566576458b443996ff7e2c922eda059db209aa92dda28123d0474640e69e25236908b10d8472f4442608b7a6a2
diff --git a/net-libs/libsoup/libsoup-2.72.0-r1.ebuild b/net-libs/libsoup/libsoup-2.72.0-r1.ebuild
deleted file mode 100644
index af1cd5f7bfd1..000000000000
--- a/net-libs/libsoup/libsoup-2.72.0-r1.ebuild
+++ /dev/null
@@ -1,91 +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 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 sysprof test +vala"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="vala? ( introspection )"
-
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~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}]
-	sysprof? ( >=dev-util/sysprof-capture-3.40.1:4[${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-libs/glib
-	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
-		$(meson_native_use_feature introspection)
-		$(meson_native_use_feature vala vapi)
-		$(meson_native_use_bool gtk-doc gtk_doc)
-		$(meson_use test tests)
-		-Dinstalled_tests=false
-		$(meson_feature sysprof)
-	)
-	meson_src_configure
-}
diff --git a/net-libs/libsoup/libsoup-2.74.2.ebuild b/net-libs/libsoup/libsoup-2.74.2.ebuild
index 5bf1131885f8..c8a8e7e509d1 100644
--- a/net-libs/libsoup/libsoup-2.74.2.ebuild
+++ b/net-libs/libsoup/libsoup-2.74.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -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 ~mips ~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}]
diff --git a/net-libs/libsoup/libsoup-3.0.3.ebuild b/net-libs/libsoup/libsoup-3.0.4.ebuild
index 4628b97f09f5..e6bf69b822a0 100644
--- a/net-libs/libsoup/libsoup-3.0.3.ebuild
+++ b/net-libs/libsoup/libsoup-3.0.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -82,7 +82,6 @@ multilib_src_configure() {
 		$(meson_native_use_feature introspection)
 		$(meson_native_use_feature vala vapi)
 		$(meson_native_use_bool gtk-doc gtk_doc)
-		# TODO: Tests fail with network-sandbox or 32bit (upstream issue #236) for 2.99.9
 		$(meson_use test tests)
 		-Dinstalled_tests=false
 		$(meson_feature sysprof)