Diff libsoup-2.74.3 with a libsoup-3.4.2

/usr/portage/net-libs/libsoup/libsoup-3.4.2.ebuild 2023-10-09 14:52:34.592368479 +0300
1
# Copyright 1999-2022 Gentoo Authors
1
# Copyright 1999-2023 Gentoo Authors
2 2
# Distributed under the terms of the GNU General Public License v2
3 3

  
4
EAPI=7
5
VALA_USE_DEPEND="vapigen"
4
EAPI=8
6 5

  
7 6
inherit gnome.org meson-multilib vala xdg
8 7

  
......
10 9
HOMEPAGE="https://wiki.gnome.org/Projects/libsoup"
11 10

  
12 11
LICENSE="LGPL-2.1+"
13
SLOT="2.4"
12
SLOT="3.0"
14 13

  
15
# 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
16
IUSE="brotli gssapi gtk-doc +introspection samba ssl sysprof test +vala"
14
IUSE="+brotli gssapi gtk-doc +introspection samba ssl sysprof test +vala"
17 15
RESTRICT="!test? ( test )"
18 16
REQUIRED_USE="vala? ( introspection )"
19 17

  
20 18
KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
21 19

  
22 20
DEPEND="
23
	>=dev-libs/glib-2.58:2[${MULTILIB_USEDEP}]
21
	>=dev-libs/glib-2.69.1:2[${MULTILIB_USEDEP}]
22
	net-libs/nghttp2:=[${MULTILIB_USEDEP}]
24 23
	>=dev-db/sqlite-3.8.2:3[${MULTILIB_USEDEP}]
25
	>=dev-libs/libxml2-2.9.1-r4:2[${MULTILIB_USEDEP}]
26 24
	brotli? ( >=app-arch/brotli-1.0.6-r1:=[${MULTILIB_USEDEP}] )
27 25
	>=net-libs/libpsl-0.20[${MULTILIB_USEDEP}]
28 26
	sysprof? ( >=dev-util/sysprof-capture-3.40.1:4[${MULTILIB_USEDEP}] )
......
32 30
	samba? ( net-fs/samba )
33 31
"
34 32
RDEPEND="${DEPEND}
35
	>=net-libs/glib-networking-2.38.2[ssl?,${MULTILIB_USEDEP}]
33
	>=net-libs/glib-networking-2.70_alpha[ssl?,${MULTILIB_USEDEP}]
36 34
"
37 35
BDEPEND="
38 36
	dev-libs/glib
39 37
	dev-util/glib-utils
40
	gtk-doc? ( >=dev-util/gtk-doc-1.20
41
		app-text/docbook-xml-dtd:4.1.2 )
38
	gtk-doc? (
39
		>=dev-util/gi-docgen-2021.1
40
		app-text/docbook-xml-dtd:4.1.2
41
	)
42 42
	>=sys-devel/gettext-0.19.8
43 43
	virtual/pkgconfig
44 44
	vala? ( $(vala_depend) )
45
	test? ( >=net-libs/gnutls-3.6.0[pkcs11] )
45 46
"
46 47
#	test? (	www-servers/apache[ssl,apache2_modules_auth_digest,apache2_modules_alias,apache2_modules_auth_basic,
47 48
#		apache2_modules_authn_file,apache2_modules_authz_host,apache2_modules_authz_user,apache2_modules_dir,
......
56 57
)
57 58

  
58 59
src_prepare() {
59
	use vala && vala_src_prepare
60
	xdg_src_prepare
60
	default
61
	use vala && vala_setup
62
	xdg_environment_reset
61 63
	# https://gitlab.gnome.org/GNOME/libsoup/issues/159 - could work with libnss-myhostname
62 64
	sed -e '/hsts/d' -i tests/meson.build || die
63 65
}
......
65 67
src_configure() {
66 68
	# FIXME: we need addpredict to workaround bug #324779 until
67 69
	# root cause (bug #249496) is solved
68
	# But necessary while apache tests are disabled
70
	# But unnecessary while apache tests are disabled
69 71
	#addpredict /usr/share/snmp/mibs/.index
70 72

  
71 73
	multilib-minimal_src_configure
......
73 75

  
74 76
multilib_src_configure() {
75 77
	local emesonargs=(
76
		# Avoid automagic, built-in feature of meson
78
		# Avoid auto-magic, built-in feature of meson
77 79
		-Dauto_features=enabled
78 80

  
79 81
		$(meson_feature gssapi)
......
82 84
		$(meson_feature brotli)
83 85
		-Dntlm_auth="${EPREFIX}/usr/bin/ntlm_auth"
84 86
		-Dtls_check=false # disables check, we still rdep on glib-networking
85
		-Dgnome=false
86 87
		$(meson_native_use_feature introspection)
87 88
		$(meson_native_use_feature vala vapi)
88
		$(meson_native_use_bool gtk-doc gtk_doc)
89
		$(meson_native_use_feature gtk-doc docs)
90
		-Ddoc_tests=false
89 91
		$(meson_use test tests)
92
		-Dautobahn=disabled
90 93
		-Dinstalled_tests=false
91 94
		$(meson_feature sysprof)
95
		$(meson_feature test pkcs11_tests)
92 96
	)
93 97
	meson_src_configure
94 98
}
99

  
100
multilib_src_install_all() {
101
	if use gtk-doc; then
102
		mkdir -p "${ED}"/usr/share/gtk-doc/html/ || die
103
		mv "${ED}"/usr/share/doc/libsoup-3.0 "${ED}"/usr/share/gtk-doc/html/ || die
104
	fi
105
}
Thank you!