Diff flatpak-1.14.10 with a flatpak-1.16.3

/usr/portage/sys-apps/flatpak/flatpak-1.16.3.ebuild 2026-01-27 11:18:04.668427293 +0300
2 2
# Distributed under the terms of the GNU General Public License v2
3 3

  
4 4
EAPI=8
5
PYTHON_COMPAT=( python3_{10..13} )
5
PYTHON_COMPAT=( python3_{11..14} )
6 6

  
7
inherit linux-info python-any-r1 systemd tmpfiles
7
inherit linux-info meson python-any-r1 systemd tmpfiles
8 8

  
9 9
DESCRIPTION="Linux application sandboxing and distribution framework"
10 10
HOMEPAGE="https://flatpak.org/"
......
12 12

  
13 13
LICENSE="LGPL-2.1+"
14 14
SLOT="0"
15
KEYWORDS="amd64 arm arm64 ~loong ~ppc64 ~riscv x86"
16
IUSE="doc introspection policykit seccomp systemd X"
17
RESTRICT="test"
15
KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
16
IUSE="doc introspection policykit seccomp systemd test X"
17
RESTRICT="!test? ( test )"
18 18

  
19 19
RDEPEND="
20 20
	acct-group/flatpak
......
23 23
	app-arch/zstd:=
24 24
	>=app-crypt/gpgme-1.1.8:=
25 25
	>=dev-libs/appstream-0.12:=
26
	>=dev-libs/appstream-glib-0.5.10:=
27
	>=dev-libs/glib-2.56:2=
26
	>=dev-libs/glib-2.56:2
28 27
	>=dev-libs/libxml2-2.4:=
29
	dev-libs/json-glib:=
28
	dev-libs/json-glib
30 29
	dev-libs/libassuan:=
31 30
	>=dev-util/ostree-2020.8:=[gpg(+)]
32 31
	dev-util/ostree[curl]
33
	>=gnome-base/dconf-0.26:=
32
	>=gnome-base/dconf-0.26
34 33
	gnome-base/gsettings-desktop-schemas
35
	net-misc/curl:=
34
	net-misc/curl
35
	net-misc/socat
36 36
	>=sys-apps/bubblewrap-0.10.0
37 37
	sys-apps/dbus
38 38
	>=sys-fs/fuse-3.1.1:3=
39 39
	sys-apps/xdg-dbus-proxy
40
	policykit? ( sys-auth/polkit )
40 41
	X? (
41 42
		x11-apps/xauth
42 43
		x11-libs/libXau:=
43 44
	)
44 45
	x11-libs/gdk-pixbuf:2=
45
	policykit? ( >=sys-auth/polkit-0.98:= )
46
	seccomp? ( sys-libs/libseccomp:= )
47
	systemd? ( sys-apps/systemd:= )
46
	seccomp? ( sys-libs/libseccomp )
47
	systemd? ( sys-apps/systemd )
48 48
"
49 49

  
50 50
DEPEND="${RDEPEND}"
......
54 54
	virtual/pkgconfig
55 55
	>=dev-util/gdbus-codegen-2.80.5-r1
56 56
	dev-util/glib-utils
57
	dev-util/gtk-doc
57 58
	app-alternatives/yacc
58 59
	$(python_gen_any_dep 'dev-python/pyparsing[${PYTHON_USEDEP}]')
59 60
	introspection? ( >=dev-libs/gobject-introspection-1.82.0-r2 )
......
61 62
		app-text/xmlto
62 63
		dev-libs/libxslt
63 64
	)
65
	test? (
66
		net-misc/socat
67
		sys-auth/polkit
68
	)
64 69
"
65 70

  
66 71
PDEPEND="sys-apps/xdg-desktop-portal"
67 72

  
68
PATCHES=(
69
	"${FILESDIR}"/${PN}-1.14.4-fuse-3-slotted.patch
70
)
71

  
72 73
python_check_deps() {
73 74
	python_has_version "dev-python/pyparsing[${PYTHON_USEDEP}]"
74 75
}
......
83 84
	default
84 85
	# This line fails because locales are in /usr/lib/locale/locale-archive.
85 86
	sed -i 's:^cp -r /usr/lib/locale/C.*:#\0:' tests/make-test-runtime.sh || die
87

  
88
	# QA Notice: The ebuild is installing to one or more unexpected directories:
89
	# /usr/share/doc/flatpak
90
	sed -i "s|docdir = get_option('datadir') / 'doc' / 'flatpak'|docdir = get_option('datadir') / 'flatpak'|g" \
91
		meson.build || die
86 92
}
87 93

  
88 94
src_configure() {
89
	local myeconfargs=(
90
		--enable-sandboxed-triggers
95
	local emesonargs=(
91 96
		--localstatedir="${EPREFIX}"/var
92
		--with-system-bubblewrap
93
		--with-system-dbus-proxy
94
		--with-tmpfilesdir="/usr/lib/tmpfiles.d"
95
		$(use_enable X xauth)
96
		$(use_enable doc documentation)
97
		$(use_enable doc docbook-docs)
98
		$(use_enable introspection)
99
		$(use_enable policykit system-helper)
100
		$(use_enable seccomp)
101
		$(use_with systemd)
97
		-Ddbus_config_dir=/usr/share/dbus-1/system.d
98
		-Dsystem_bubblewrap=bwrap
99
		-Dsystem_dbus_proxy=xdg-dbus-proxy
100
		-Dtmpfilesdir=/usr/lib/tmpfiles.d
101
		$(meson_use policykit tests)
102
		$(meson_use test tests)
103
		$(meson_feature policykit system_helper)
104
		$(meson_feature introspection gir)
105
		$(meson_feature X xauth)
106
		$(meson_feature doc docbook_docs)
107
		$(meson_feature seccomp seccomp)
108
		$(meson_feature systemd systemd)
102 109
	)
103 110

  
104
	econf "${myeconfargs[@]}"
111
	meson_src_configure
105 112
}
106 113

  
107 114
src_install() {
108
	default
115
	meson_src_install
109 116
	# https://projects.gentoo.org/qa/policy-guide/installed-files.html#pg0303
110 117
	find "${ED}" -name '*.la' -delete || die
111 118
	# resolve conflict with acct-user/flatpak for #856706
Thank you!