gentoo resync : 29.12.2022

4 files changed, 2 insertions, 189 deletions

diff --git a/net-libs/libsoup/Manifest b/net-libs/libsoup/Manifest
index 49a2d12afbda..060aab164302 100644
--- a/net-libs/libsoup/Manifest
+++ b/net-libs/libsoup/Manifest
@@ -1,10 +1,6 @@
 AUX disable-apache-tests.patch 1318 BLAKE2B d922d5613241c96fed46c746dcd0fde704093f910ea4203a2cae8e8e11d141b8ef604292f36023e1b7f307b58b4352651aa0eb65d8a72cccc9040ec2c7940619 SHA512 3030472d05a4075349dabc21bb5fdab32a329a761e20d9e01b70d414a8de20ab9ecb6985376e61ebdc5378e5873bad42b8f3ef41cff4faf285a2593747195095
 DIST libsoup-2.74.2.tar.xz 1497356 BLAKE2B b05e5d06e20a95042334c79e3a633ec43db0e7444b425f8577045fbdee7b78bd697e743f4283ed79265bbe538145a541ef2ef55636ae235667a89d00910d5bf2 SHA512 6f9da3296364e210103093cef9ef34fb40f694a8ef90966fc1fbd834c11f3db1031784a0901e9181bf3124e0682708148bd3598a31d60f1cce61eaae2e19ba7a
-DIST libsoup-3.0.4.tar.xz 1523336 BLAKE2B 5df12a2bafdd36905fd2122b1123ce630ffad93de5965eb2f3e47f85f3bc3169e8c005e245ee9ba72433fc735d7b24b304bac55b800bce59506961976a57f634 SHA512 4e6c226dfd8dd3fb2568affdbf88b8f0ad52903198c1dfc808c4cba1c0479442581953b5fb83166a3a198fb861618b62f165a4544b5daaed094bbeeff94a48ff
-DIST libsoup-3.0.5.tar.xz 1528824 BLAKE2B 952b72e81d61d4aca2a5c035bafa37deb3ddd26a35a285aa2c09731b60b675a9f90bc185abd4787c16e8e9fb1007ae633a6f91c6e58df9eddb04249b503adc13 SHA512 38d1ba57bcd390385950cf79cfe6781d9ad59e5f75f2c080adac976f2fcfa020cbada1e63fedd780b1efe33a53fb7563b73fd38f011c462d92a90988e4fed9b8
 DIST libsoup-3.0.6.tar.xz 1527232 BLAKE2B 28a2aec2323686af692bfcee3126c76b8506c7721b81bd3beb276b488ec6c26498e4b1396ea6d3537cf00a203cbca2798ea414c4d2227f9c520660fc61459804 SHA512 4de84b3c251b6fe75903b1cd2647ac22055f799382a186efe6f45d3f75bf6c82040f0aaceb40d0019769cf1c0295511eb0afbbc7236e93b168ed70c2ae975a89
-EBUILD libsoup-2.74.2.ebuild 2935 BLAKE2B ce060804ba36afb692f75c623715caa3c982c8aff3d31a4c11a5bbe5465da06065f890711ba63c2f3abf90bf339c2c7f15ec89805223a6f43abd157a34231826 SHA512 b1c738b2e82764f3733952b4f6adee85e3c7b86e6107b9f66435042443ff77f3bdff89757604e870684227aa660d1203c3efafa8877e92fde2c3e0e125792886
-EBUILD libsoup-3.0.4.ebuild 2915 BLAKE2B a6746efa0607805d0297627c659d7c9205572a8f38962812a009e638c5f320ebed9ea04cf517734739ef9031627182b394a7b50f9a86c5b3d5316e0ab24374ed SHA512 ce89efaa580533a32c5fec7f992455491af0f49b9118a3980791751979d02722163182b0fa62f183e94fd42d19697ac591c94d1508bd0bc0a2ffa6565473aa08
-EBUILD libsoup-3.0.5.ebuild 2924 BLAKE2B 4edf981426806b0998b339da797b1f212b49601bc843d1e1e2ecf50fa923d89753498c47f228196c1d7ff0f63cb51f702aca9b1fdb335241683b2b902cf84ffc SHA512 909656228775b3bdf03f050d2dccd29b07f1013840fc61f865a917dac36bbdbaeb4f2b3be2c5c9a6a8b1daafd0abc39d619aa2917170d32a18b36705fa2e3be9
+EBUILD libsoup-2.74.2.ebuild 2942 BLAKE2B 83795dff978db6701967be68903382ce13f25a138a7d851cdaf25c18d0a21813ef8366c38102ed9cad349b2a4aae3492e89830029128a7ac3c7e4c64b46f780c SHA512 4d018f152a378112785f6af8d040a969a3ba8bcb81423261126f3971d8118e4e5ea550690b1d48b9b3f1c7ecd98271d0f30334264b5ac7281c6ce24e2c3ef005
 EBUILD libsoup-3.0.6.ebuild 2924 BLAKE2B 4edf981426806b0998b339da797b1f212b49601bc843d1e1e2ecf50fa923d89753498c47f228196c1d7ff0f63cb51f702aca9b1fdb335241683b2b902cf84ffc SHA512 909656228775b3bdf03f050d2dccd29b07f1013840fc61f865a917dac36bbdbaeb4f2b3be2c5c9a6a8b1daafd0abc39d619aa2917170d32a18b36705fa2e3be9
 MISC metadata.xml 578 BLAKE2B eb74705e02403da0706e9eba5fd7ce416721a8f4eaa7f0548376a11767f8d6f0214b6c696e8a65c3b2b1b9753bd1397bc2c9b5cdd953e89f23c00749884d7966 SHA512 120645b4e9ca76acaba6ae6eb86daca28be6af566576458b443996ff7e2c922eda059db209aa92dda28123d0474640e69e25236908b10d8472f4442608b7a6a2
diff --git a/net-libs/libsoup/libsoup-2.74.2.ebuild b/net-libs/libsoup/libsoup-2.74.2.ebuild
index c8a8e7e509d1..7cb4a1169afb 100644
--- a/net-libs/libsoup/libsoup-2.74.2.ebuild
+++ b/net-libs/libsoup/libsoup-2.74.2.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 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~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.4.ebuild b/net-libs/libsoup/libsoup-3.0.4.ebuild
deleted file mode 100644
index e6bf69b822a0..000000000000
--- a/net-libs/libsoup/libsoup-3.0.4.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-VALA_MIN_API_VERSION="0.54" # requires gio-2.0.vapi generated from glib-2.70+
-
-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="3.0"
-
-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.69.1:2[${MULTILIB_USEDEP}]
-	net-libs/nghttp2:=[${MULTILIB_USEDEP}]
-	>=dev-db/sqlite-3.8.2:3[${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.70_alpha[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? ( >=net-libs/gnutls-3.6.0[pkcs11] )
-"
-#	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 unnecessary 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
-		$(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_feature test pkcs11_tests)
-	)
-	meson_src_configure
-}
diff --git a/net-libs/libsoup/libsoup-3.0.5.ebuild b/net-libs/libsoup/libsoup-3.0.5.ebuild
deleted file mode 100644
index 84e2cca340d9..000000000000
--- a/net-libs/libsoup/libsoup-3.0.5.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-VALA_MIN_API_VERSION="0.54" # requires gio-2.0.vapi generated from glib-2.70+
-
-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="3.0"
-
-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.69.1:2[${MULTILIB_USEDEP}]
-	net-libs/nghttp2:=[${MULTILIB_USEDEP}]
-	>=dev-db/sqlite-3.8.2:3[${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.70_alpha[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? ( >=net-libs/gnutls-3.6.0[pkcs11] )
-"
-#	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() {
-	default
-	use vala && vala_setup
-	xdg_environment_reset
-	# 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 unnecessary 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
-		$(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_feature test pkcs11_tests)
-	)
-	meson_src_configure
-}