gentoo resync : 20.03.2022

8 files changed, 28 insertions, 276 deletions

diff --git a/sys-apps/flatpak/Manifest b/sys-apps/flatpak/Manifest
index f1f1f9a74080..b9157ebdc1f3 100644
--- a/sys-apps/flatpak/Manifest
+++ b/sys-apps/flatpak/Manifest
@@ -1,13 +1,9 @@
-AUX flatpak-1.12.2-pyparsing-3.0.2-compat.patch 1694 BLAKE2B 88c7bd915e670f99c26c7d868fa5f85e2e0b9071b3dd342bb7ba476d0be3747ae7c1713d8a6617a3d57d9f30613c43a7ab1f55daa9de83c8b2b42d4e121a3976 SHA512 a67d011d8be0d1077f47ae561c3a875ac2bb99d908ffba477bc7cb180f52e7fb3c9be10b76563ee5eb129469cf500e92e66b7bf1fe6564fd95f083e0fe0a2845
-DIST flatpak-1.10.5.tar.xz 1511032 BLAKE2B 704ce0b5828728f1bb438dca2c1cd0b84277547fbb08400fe11abf243f5d9b5a6219c79188b362174f2a61eea42ae548d4279646838f3de3e4e75b8782f3dabe SHA512 8c2e365ce442a092c15178a8b39daecf21bfe162078c9a323e68d53194413f174e329812dd01d8da6bbfba3b0087aeb4d92a44067df3f6fa0253e33014d138ae
-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 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 2433 BLAKE2B 1d6e2cb7c0770d77b3c98929c6ac15b0d0e5596131c6287e14393c8f9e153cc7f5b0a6d37019eca25fad404de5875b3854b5a7689c0b30fa61c2eae7a5fcdcf8 SHA512 8806d203c31c2acfa8ea9d401092ab0d393ae660a3e1280db58391f04071ed92e60f35e9a42f2cbafa77cff9e9488e75f7df0150840b31f97965dc7f1df9ca2e
-EBUILD flatpak-1.12.4.ebuild 2436 BLAKE2B 2414593e4dd2d26be03b99047f30b6e8d9683345600138193b580ba4cca97394599034c8e6efb3dd532147c0e64b16f508100c2bd9870dcc3a2ffa12c53f8159 SHA512 57d35b01b1f5c6a8ef6543124ac25612b76b70755e68deefefb8fe3d0ef1841159bf62bfac701d15590774337dec0493aeca0f8eaa9b71af265d7cbf9f417903
+DIST flatpak-1.12.7.tar.xz 1562920 BLAKE2B e0bd3fcf8e0bc329c237ba409f82d6bfad1734101068966c11f03c9e45302680f590162b04e2314b5ed93324e61b4c06c33496dba7ba59778c885f50dd00d9db SHA512 425f9d330c649de1079f3286cb6ad8cf7b6e5838921effa4fd6f51020b9bf7991ded9071566ec7032b9868ef3f7e14d1fb7c2be96f903e3af23a075592b78f50
+DIST flatpak-1.13.1.tar.xz 1626048 BLAKE2B 6dd02bd531a6d10d97ac94d744e7afc7c6a319fe576cd6e3ff882b41320f7ede5cf0d6d92dcf4287b19ae7d3e5ce6afeebd1ea0e517e566f5b218e05bdb2bc10 SHA512 7e0be34535d6e80a1d59bfc937b9a89c3b46acbbddd6a04583c4874a50539978bb493b5c08b083a5697615a3281346bf1770b681fbc27be682caf54ffdca937a
+DIST flatpak-1.13.2.tar.xz 1626616 BLAKE2B a896c1ef5166be9085c7b66bde3df510e4d592f920795706c7d0b68f717ccfd0694b306797a862d3db35c71ced5dcdb71438119d95ff5455b4b6a6b6adfa0d0e SHA512 d7e1d0a9965332220f829caa5724d7547280db10f7428b4e9add87152da1d7dad97edcde85668501d5a50e6a7c1031bfd15e8f4cbc7196e1c0f7cc3d2e333fe1
+EBUILD flatpak-1.12.3.ebuild 2423 BLAKE2B 30c84a139de36094d67b26e0bd7a669683cb1d0e11c00957638d7e00941a3be67451824d9450260feea05a7b660582f953d51fe1a2923424795bdfa4c99c8da8 SHA512 0fb2579114cc939f1d770475196d1840493f12633082179d250de7bd5b7dacdcb641d009ce24b843049a737d460b5c64e15260684e9d426935242284a820f7e9
+EBUILD flatpak-1.12.7.ebuild 2426 BLAKE2B 17ffc286a66e3edec2a40c66bd7e0f2b7a4812a2af2630a39588f902f381a9cc369076bb10a8cefd47595596cea92a5119af7dd24eda8ecf8a4d9889b624af7c SHA512 567a8a9278fdcb48f7593cfadf02e0b111626ce0dfee0c43119cf182856b2bac42d3f49912163b36ee9e0d8a5732b407c4040ca434b0aeabeb3d447bc227c2d7
+EBUILD flatpak-1.13.1.ebuild 2455 BLAKE2B 39e092efee6773bfe2a1ab5ae0e347e610b818a424595a7fa162fdde1f821561c58dc296155635e8b60a3f12728d90c0c9ea8c1ab9a17d59b61a9c8491219bdd SHA512 4cd5664b7120f3c792e197d167e18804da963a3859baee5d9061e66c41a920bae4611b0e67201897c7fb73d3fbe4501be2e702bfb5789271f48aa59c3b4593a7
+EBUILD flatpak-1.13.2.ebuild 2455 BLAKE2B 39e092efee6773bfe2a1ab5ae0e347e610b818a424595a7fa162fdde1f821561c58dc296155635e8b60a3f12728d90c0c9ea8c1ab9a17d59b61a9c8491219bdd SHA512 4cd5664b7120f3c792e197d167e18804da963a3859baee5d9061e66c41a920bae4611b0e67201897c7fb73d3fbe4501be2e702bfb5789271f48aa59c3b4593a7
 MISC metadata.xml 325 BLAKE2B a8ca5c0feaab721a66653a8d5e084d2bba127d75faa0975a4dac7d4d7395801fc69bed88bf13663826188696ee5e25e18afc1b0d5161d27e15f36b9c88487146 SHA512 2736f22e733f2214b80c46b3280f90103e21c3211bea129614bcf372f05803b5d5148d34406e8aa332f7b21090e8aaa698bb1a25d767ccea21d3977f0894f464
diff --git a/sys-apps/flatpak/files/flatpak-1.12.2-pyparsing-3.0.2-compat.patch b/sys-apps/flatpak/files/flatpak-1.12.2-pyparsing-3.0.2-compat.patch
deleted file mode 100644
index 237c659e36f8..000000000000
--- a/sys-apps/flatpak/files/flatpak-1.12.2-pyparsing-3.0.2-compat.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-https://gitlab.gnome.org/alexl/variant-schema-compiler/-/merge_requests/11.patch
-
-From 8850e4d0da76a85c5f9926cd40e148e0b29bddac Mon Sep 17 00:00:00 2001
-From: Phaedrus Leeds <mwleeds@protonmail.com>
-Date: Thu, 16 Dec 2021 10:50:10 -0800
-Subject: [PATCH] Fix runtime error when using pyparsing >= 3.0.2
-
-Ever since this commit
-(https://github.com/pyparsing/pyparsing/commit/4ab17bb55)
-variant-schema-compiler has failed to execute when used by Flatpak like
-this:
-$ variant-schema-compiler/variant-schema-compiler --outfile-header
-common/flatpak-variant-private.h --outfile
-common/flatpak-variant-impl-private.h --prefix var
-./data/flatpak-variants.gv
-
-For some reason our use of leaveWhitespace() to ensure that a named type
-has a ' right before its name no longer works. But fortunately pyparsing
-has a Combine() which does exactly what we want.
-
-See https://github.com/flatpak/flatpak/issues/4534
-
-Fixes https://gitlab.gnome.org/alexl/variant-schema-compiler/-/issues/4
----
- variant-schema-compiler | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/subprojects/variant-schema-compiler/variant-schema-compiler
-+++ b/subprojects/variant-schema-compiler/variant-schema-compiler
-@@ -1740,7 +1740,7 @@ def handleNameableType(toks):
-         add_named_type(typename_prefix + name, type)
-     return type
- 
--nameableType = (Optional((Suppress("'") + ident).leaveWhitespace()) + (arrayType ^ maybeType ^ dictType ^ structType)).setParseAction(handleNameableType)
-+nameableType = (Optional(Combine(Suppress("'") + ident)) + (arrayType ^ maybeType ^ dictType ^ structType)).setParseAction(handleNameableType)
- 
- typeSpec <<= basicType  ^ variantType ^ namedType ^ nameableType
- 
--- 
-GitLab
-
-
diff --git a/sys-apps/flatpak/flatpak-1.10.5.ebuild b/sys-apps/flatpak/flatpak-1.10.5.ebuild
deleted file mode 100644
index 25071038bf1f..000000000000
--- a/sys-apps/flatpak/flatpak-1.10.5.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{8,9} )
-
-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"
-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
-	x11-apps/xauth
-	x11-libs/gdk-pixbuf:2=
-	x11-libs/libXau:=
-	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-3.0.2[${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
-		--enable-xauth
-		--localstatedir="${EPREFIX}"/var
-		--with-system-bubblewrap
-		--with-system-dbus-proxy
-		$(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[@]}"
-}
diff --git a/sys-apps/flatpak/flatpak-1.10.6.ebuild b/sys-apps/flatpak/flatpak-1.10.6.ebuild
deleted file mode 100644
index 35b0d53025bc..000000000000
--- a/sys-apps/flatpak/flatpak-1.10.6.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# 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"
-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
-	x11-apps/xauth
-	x11-libs/gdk-pixbuf:2=
-	x11-libs/libXau:=
-	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-3.0.2[${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
-		--enable-xauth
-		--localstatedir="${EPREFIX}"/var
-		--with-system-bubblewrap
-		--with-system-dbus-proxy
-		$(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[@]}"
-}
diff --git a/sys-apps/flatpak/flatpak-1.12.3.ebuild b/sys-apps/flatpak/flatpak-1.12.3.ebuild
index c7dd25ec5686..6917e77de079 100644
--- a/sys-apps/flatpak/flatpak-1.12.3.ebuild
+++ b/sys-apps/flatpak/flatpak-1.12.3.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 PYTHON_COMPAT=( python3_{8,9,10} )
 
-inherit autotools linux-info python-any-r1
+inherit 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"
diff --git a/sys-apps/flatpak/flatpak-1.12.4.ebuild b/sys-apps/flatpak/flatpak-1.12.7.ebuild
index 1d0d55b00eda..8a8e2987bc67 100644
--- a/sys-apps/flatpak/flatpak-1.12.4.ebuild
+++ b/sys-apps/flatpak/flatpak-1.12.7.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 PYTHON_COMPAT=( python3_{8,9,10} )
 
-inherit autotools linux-info python-any-r1
+inherit 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"
diff --git a/sys-apps/flatpak/flatpak-1.12.2-r1.ebuild b/sys-apps/flatpak/flatpak-1.13.1.ebuild
index 93fb30b800bc..63cc95837935 100644
--- a/sys-apps/flatpak/flatpak-1.12.2-r1.ebuild
+++ b/sys-apps/flatpak/flatpak-1.13.1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 2020-2021 Gentoo Authors
+# 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
+inherit 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"
@@ -13,7 +13,7 @@ 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"
+IUSE="doc gtk kde introspection policykit seccomp systemd X"
 RESTRICT+=" test"
 
 RDEPEND="
@@ -22,6 +22,7 @@ RDEPEND="
 	>=app-arch/libarchive-2.8:=
 	app-arch/zstd:=
 	>=app-crypt/gpgme-1.1.8:=
+	>=dev-libs/appstream-0.12:=
 	>=dev-libs/appstream-glib-0.5.10:=
 	>=dev-libs/glib-2.56:2=
 	>=dev-libs/libxml2-2.4:=
@@ -38,9 +39,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:= )
@@ -67,10 +70,6 @@ PDEPEND="
 	kde? ( kde-plasma/xdg-desktop-portal-kde )
 "
 
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.12.2-pyparsing-3.0.2-compat.patch
-)
-
 python_check_deps() {
 	has_version -b "dev-python/pyparsing[${PYTHON_USEDEP}]"
 }
@@ -90,10 +89,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.2.ebuild b/sys-apps/flatpak/flatpak-1.13.2.ebuild
index 23536ed75525..63cc95837935 100644
--- a/sys-apps/flatpak/flatpak-1.12.2.ebuild
+++ b/sys-apps/flatpak/flatpak-1.13.2.ebuild
@@ -1,10 +1,10 @@
-# Copyright 2020-2021 Gentoo Authors
+# 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
+inherit 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"
@@ -13,7 +13,7 @@ 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"
+IUSE="doc gtk kde introspection policykit seccomp systemd X"
 RESTRICT+=" test"
 
 RDEPEND="
@@ -22,6 +22,7 @@ RDEPEND="
 	>=app-arch/libarchive-2.8:=
 	app-arch/zstd:=
 	>=app-crypt/gpgme-1.1.8:=
+	>=dev-libs/appstream-0.12:=
 	>=dev-libs/appstream-glib-0.5.10:=
 	>=dev-libs/glib-2.56:2=
 	>=dev-libs/libxml2-2.4:=
@@ -38,9 +39,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:= )
@@ -59,7 +62,7 @@ BDEPEND="
 		>=dev-util/gtk-doc-1.20
 		dev-libs/libxslt
 	)
-	$(python_gen_any_dep '<dev-python/pyparsing-3.0.2[${PYTHON_USEDEP}]')
+	$(python_gen_any_dep 'dev-python/pyparsing[${PYTHON_USEDEP}]')
 "
 
 PDEPEND="
@@ -86,10 +89,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)