gentoo resync : 02.02.2022

4 files changed, 116 insertions, 8 deletions

diff --git a/sys-apps/flatpak/Manifest b/sys-apps/flatpak/Manifest
index e734e3c8e70d..f1f1f9a74080 100644
--- a/sys-apps/flatpak/Manifest
+++ b/sys-apps/flatpak/Manifest
@@ -3,9 +3,11 @@ DIST flatpak-1.10.5.tar.xz 1511032 BLAKE2B 704ce0b5828728f1bb438dca2c1cd0b842775
 DIST flatpak-1.10.6.tar.xz 1517800 BLAKE2B 517251ff75fe8f44ed5a7d2b69301ceb801265854c3570d5349da3e3bac0f4f416163226db0b518e3e2b67427ccb57f9e47b6ed5a6d8ea6a86af146e779a3525 SHA512 a6fd46eaaea8510c74671b365e633cd782a02ad05c54ff107226573e3333ae2e9bd9b2ed76dbed401383e784d9530079c80beebb9d8512738815a16cabbe278c
 DIST flatpak-1.12.2.tar.xz 1541068 BLAKE2B 78162c9ccf0b7b18e69c2594865999fc052a507b255b855f3879cdac0c86dbfcabc6a282f0a4de548d3e85142b0b3c8c26d21825f35e6a2f25ebc1aa13ff2b8b SHA512 4887fe540a821f2c8539fbe1fd89b1cc350126a6fa90c1acf070e08db0de1073406a061f5483bc7a7ef9b07f73409beb7bc02d055d4b3ae1c33ba5c318e11b6f
 DIST flatpak-1.12.3.tar.xz 1555340 BLAKE2B 512b3f6abfb06d242aedad2c27c9870750254a9d0a3769999739f8885bbf1740b649e2a41f2c079532b049fcce8b58529572ea35e930437ed6b62194a73bcbb6 SHA512 2f39665457b4c3b99e32ebc88cf5b70202dba6118887617d3d7faa20f688f3f3fc14e343b70c0d11eb15ee743a68d07078e6cda14fd91aa10ca375797cfc95bc
+DIST flatpak-1.12.4.tar.xz 1556548 BLAKE2B 1347b4667b3b8e02309582c1819be7e052382bfca8f6bcdb8b578011e3931e18e8c358c9759b204c8c4f82ffe9f5157fda3c9c967cf1ad0bef2bfc39c4be2a8c SHA512 441c29c43dec6cb224f677e2d9b3dd09e95f4ca6e06d24ee30de1b931522502f903b0bbd3ead4886d16c25d8236a876ffb95ec907690aa7f55cd7ed31c5dd71b
 EBUILD flatpak-1.10.5.ebuild 2417 BLAKE2B c6101934112c06a45808d798916d8bbbb422b945671d3b57f958f59030e7b4f7e5143de10a3955263c51b50060cc8ea8ed3b83af5cd95c6ecb4a58ed215fe73c SHA512 3da93b5a0a7581d4dd8e15970834b9044f17ecca60304c24143fc06280c710197ab8c11981e49a10d9c8cba54c0093e3074c16e30c1b963ea707850c9353e606
-EBUILD flatpak-1.10.6.ebuild 2421 BLAKE2B 54a83418c803c5a62dfdb806bd9103431fdbd9c19b8c9a10b276b97dba2a259cfefbf001ba7eff6954d4bec2a9366d0b2e27168aea51787f77c63de62772f176 SHA512 bc9928086cac8774c3081530492474daae0a61dcda68a843d525190f0ab0507307c39b59f0bbf4b969510bfdde687dfd33d2a6ab153ebecc991bcd66035b02ae
+EBUILD flatpak-1.10.6.ebuild 2420 BLAKE2B 7cd174ff857f8e3846a20c22388fa6a5984acb7dc58fb0467b30712d53e618d9be1ddd7b972451cffc74f2552e5fe2b78dba24a883fc65ec6eff85970a86399a SHA512 caacc5afad303f74be760d48d088e16037b25ccff21baaa630b101000a07f1d484d6d33f1b838f25f6f26ba5574e50420ac1a2c3c65503885fe4d8a8e52f852a
 EBUILD flatpak-1.12.2-r1.ebuild 2486 BLAKE2B 9115921fb2e836293ef37565803d2592469f703123fd9a46522dc6dba0475ee99c3c9cad2e8ffe771b6f665330e14a804876557fb1556b0f501f8810bb775c9d SHA512 3840079a8ff08b9deb741e314b35a01cd60ba6621e723d77afb5ba8424f7caa8c09faedca807d20c043cf31c88d68fde10918cd6f0c72e9913c0fa68abd64324
 EBUILD flatpak-1.12.2.ebuild 2423 BLAKE2B 0c40f9666929437cd0d6656143c41568c5a968dcd3215a9117fae3f1a84c9d2eb9f9833ae5db1b5b36de1c4913dc6f3e2d51ead94f28c7d4e4b816f4d398492b SHA512 7c579099711ab8033fba546c2ed922b02a56b4aafb51e45021fff81ceb31b635950d629e8743eb25bf763341c57d1da4e61bb9b7e64c5d20c427c6fbce70e965
-EBUILD flatpak-1.12.3.ebuild 2416 BLAKE2B 340209f6c8e81bca5388438b9585364c4e2d29dd6c2d4f326eb51e4e774291d8649d86b874ab116745a88471ca5d0e332f8efe307a359f4aa80bc4744000ec9d SHA512 e6902114b6cc33838fe8a597392dd5dd092f7af98f017df86e4a11aaee5be591b95e6aefe19995c520f68edcd5484e53e07a4e53468f09b365810e70d92ca0be
+EBUILD flatpak-1.12.3.ebuild 2433 BLAKE2B 1d6e2cb7c0770d77b3c98929c6ac15b0d0e5596131c6287e14393c8f9e153cc7f5b0a6d37019eca25fad404de5875b3854b5a7689c0b30fa61c2eae7a5fcdcf8 SHA512 8806d203c31c2acfa8ea9d401092ab0d393ae660a3e1280db58391f04071ed92e60f35e9a42f2cbafa77cff9e9488e75f7df0150840b31f97965dc7f1df9ca2e
+EBUILD flatpak-1.12.4.ebuild 2436 BLAKE2B 2414593e4dd2d26be03b99047f30b6e8d9683345600138193b580ba4cca97394599034c8e6efb3dd532147c0e64b16f508100c2bd9870dcc3a2ffa12c53f8159 SHA512 57d35b01b1f5c6a8ef6543124ac25612b76b70755e68deefefb8fe3d0ef1841159bf62bfac701d15590774337dec0493aeca0f8eaa9b71af265d7cbf9f417903
 MISC metadata.xml 325 BLAKE2B a8ca5c0feaab721a66653a8d5e084d2bba127d75faa0975a4dac7d4d7395801fc69bed88bf13663826188696ee5e25e18afc1b0d5161d27e15f36b9c88487146 SHA512 2736f22e733f2214b80c46b3280f90103e21c3211bea129614bcf372f05803b5d5148d34406e8aa332f7b21090e8aaa698bb1a25d767ccea21d3977f0894f464
diff --git a/sys-apps/flatpak/flatpak-1.10.6.ebuild b/sys-apps/flatpak/flatpak-1.10.6.ebuild
index fb5079a71c10..35b0d53025bc 100644
--- a/sys-apps/flatpak/flatpak-1.10.6.ebuild
+++ b/sys-apps/flatpak/flatpak-1.10.6.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://flatpak.org/"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
 IUSE="doc gtk kde introspection policykit seccomp systemd"
 RESTRICT+=" test"
 
diff --git a/sys-apps/flatpak/flatpak-1.12.3.ebuild b/sys-apps/flatpak/flatpak-1.12.3.ebuild
index fcab58d20289..c7dd25ec5686 100644
--- a/sys-apps/flatpak/flatpak-1.12.3.ebuild
+++ b/sys-apps/flatpak/flatpak-1.12.3.ebuild
@@ -12,8 +12,8 @@ HOMEPAGE="https://flatpak.org/"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-IUSE="doc gtk kde introspection policykit seccomp systemd"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
+IUSE="doc gtk kde introspection policykit seccomp systemd X"
 RESTRICT+=" test"
 
 RDEPEND="
@@ -38,9 +38,11 @@ RDEPEND="
 	sys-apps/dbus
 	>=sys-fs/fuse-2.9.9:0=
 	sys-apps/xdg-dbus-proxy
-	x11-apps/xauth
+	X? (
+		x11-apps/xauth
+		x11-libs/libXau:=
+	)
 	x11-libs/gdk-pixbuf:2=
-	x11-libs/libXau:=
 	policykit? ( >=sys-auth/polkit-0.98:= )
 	seccomp? ( sys-libs/libseccomp:= )
 	systemd? ( sys-apps/systemd:= )
@@ -86,10 +88,10 @@ src_prepare() {
 src_configure() {
 	local myeconfargs=(
 		--enable-sandboxed-triggers
-		--enable-xauth
 		--localstatedir="${EPREFIX}"/var
 		--with-system-bubblewrap
 		--with-system-dbus-proxy
+		$(use_enable X xauth)
 		$(use_enable doc documentation)
 		$(use_enable doc gtk-doc)
 		$(use_enable introspection)
diff --git a/sys-apps/flatpak/flatpak-1.12.4.ebuild b/sys-apps/flatpak/flatpak-1.12.4.ebuild
new file mode 100644
index 000000000000..1d0d55b00eda
--- /dev/null
+++ b/sys-apps/flatpak/flatpak-1.12.4.ebuild
@@ -0,0 +1,104 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{8,9,10} )
+
+inherit autotools linux-info python-any-r1
+
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.xz"
+DESCRIPTION="Linux application sandboxing and distribution framework"
+HOMEPAGE="https://flatpak.org/"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="doc gtk kde introspection policykit seccomp systemd X"
+RESTRICT+=" test"
+
+RDEPEND="
+	acct-group/flatpak
+	acct-user/flatpak
+	>=app-arch/libarchive-2.8:=
+	app-arch/zstd:=
+	>=app-crypt/gpgme-1.1.8:=
+	>=dev-libs/appstream-glib-0.5.10:=
+	>=dev-libs/glib-2.56:2=
+	>=dev-libs/libxml2-2.4:=
+	dev-libs/json-glib:=
+	dev-libs/libassuan:=
+	>=dev-util/ostree-2020.8:=[gpg(+)]
+	|| (
+		dev-util/ostree[curl]
+		dev-util/ostree[soup]
+	)
+	>=gnome-base/dconf-0.26:=
+	>=net-libs/libsoup-2.4:=
+	sys-apps/bubblewrap
+	sys-apps/dbus
+	>=sys-fs/fuse-2.9.9:0=
+	sys-apps/xdg-dbus-proxy
+	X? (
+		x11-apps/xauth
+		x11-libs/libXau:=
+	)
+	x11-libs/gdk-pixbuf:2=
+	policykit? ( >=sys-auth/polkit-0.98:= )
+	seccomp? ( sys-libs/libseccomp:= )
+	systemd? ( sys-apps/systemd:= )
+"
+
+DEPEND="${RDEPEND}"
+# pyparsing version pinned for https://bugs.gentoo.org/825230
+BDEPEND="
+	>=sys-devel/automake-1.13.4
+	>=sys-devel/gettext-0.18.2
+	virtual/pkgconfig
+	dev-util/gdbus-codegen
+	sys-devel/bison
+	introspection? ( >=dev-libs/gobject-introspection-1.40 )
+	doc? (
+		>=dev-util/gtk-doc-1.20
+		dev-libs/libxslt
+	)
+	$(python_gen_any_dep 'dev-python/pyparsing[${PYTHON_USEDEP}]')
+"
+
+PDEPEND="
+	gtk? ( sys-apps/xdg-desktop-portal-gtk )
+	kde? ( kde-plasma/xdg-desktop-portal-kde )
+"
+
+python_check_deps() {
+	has_version -b "dev-python/pyparsing[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	local CONFIG_CHECK="~USER_NS"
+	linux-info_pkg_setup
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+	# This line fails because locales are in /usr/lib/locale/locale-archive.
+	sed -i 's:^cp -r /usr/lib/locale/C.*:#\0:' tests/make-test-runtime.sh || die
+}
+
+src_configure() {
+	local myeconfargs=(
+		--enable-sandboxed-triggers
+		--localstatedir="${EPREFIX}"/var
+		--with-system-bubblewrap
+		--with-system-dbus-proxy
+		$(use_enable X xauth)
+		$(use_enable doc documentation)
+		$(use_enable doc gtk-doc)
+		$(use_enable introspection)
+		$(use_enable policykit system-helper)
+		$(use_enable seccomp)
+		$(use_with systemd)
+	)
+
+	econf "${myeconfargs[@]}"
+}