sys-apps/flatpak: bump to 1.8.0

- generally all modifications from ::fosero overlay included
- compile & run tested

Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: David Heidelberg <david@ixit.cz>

2 files changed, 32 insertions, 23 deletions

diff --git a/sys-apps/flatpak/Manifest b/sys-apps/flatpak/Manifest
index dd04d79cf..ab18c1dfa 100644
--- a/sys-apps/flatpak/Manifest
+++ b/sys-apps/flatpak/Manifest
@@ -1 +1 @@
-DIST flatpak-1.6.3.tar.xz 1340936 BLAKE2B ed697161a6ea10de7910438ef19d3a27d6bc4fc6b4ab8d14a955fb0ba6299950d13b25bf356b9b3341395441d378c0d0f3000dc0dd983a922090372d8e67a30d SHA512 8527914dd728d6bc4d28fcc7740514a370aad7c49c65e6126cdc237886dc3a5cb173a7fa69d8374a7502e08b1429b69bf24ee700a7d723fc090f9661534ca7b4
+DIST flatpak-1.8.0.tar.xz 1401336 BLAKE2B d606e56abf3e2db98b4a38e3dd5bf64bcf4a9aa818fcd32fa27c9fad94d7df222853910efea8fa66549c581d00f890b619f2379553777339a1132a03c1415681 SHA512 2955eadddcea2baecb36b45a638a33735a934641dd99793d22d7193d58ffd02910ae1239d9450f9b4c5bf648e6aa0f29efcc17a2bc7bd26936a9ea7b53af3f72
diff --git a/sys-apps/flatpak/flatpak-1.6.3.ebuild b/sys-apps/flatpak/flatpak-1.8.0.ebuild
index 3ba1b5003..0d6f0a5b8 100644
--- a/sys-apps/flatpak/flatpak-1.6.3.ebuild
+++ b/sys-apps/flatpak/flatpak-1.8.0.ebuild
@@ -2,8 +2,9 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+PYTHON_COMPAT=( python3_{7,8,9} )
 
-inherit autotools linux-info
+inherit autotools linux-info python-any-r1
 
 SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.xz"
 DESCRIPTION="Application distribution framework"
@@ -12,54 +13,61 @@ HOMEPAGE="https://flatpak.org/"
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE="doc gtk introspection kde policykit seccomp"
+IUSE="doc gtk introspection kde policykit seccomp systemd"
 
-# restrict until fixed. Bug: 721906
-RESTRICT="test"
-
-# FIXME: systemd is automagic dep.
+# FIXME: Automagic dep on app-arch/zstd
 RDEPEND="
 	acct-group/flatpak
 	acct-user/flatpak
+	>=app-arch/libarchive-2.8
+	>=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-util/ostree-2019.5[gpg(+)]
 	|| ( dev-util/ostree[curl]
 		 dev-util/ostree[soup] )
-	>=net-libs/libsoup-2.4
 	>=gnome-base/dconf-0.26
-	>=dev-libs/appstream-glib-0.5.10
-	x11-libs/gdk-pixbuf:2
-	>=dev-libs/glib-2.56:2
-	>=dev-libs/libxml2-2.4
+	>=net-libs/libsoup-2.4
 	sys-apps/dbus
-	dev-libs/json-glib
-	x11-apps/xauth
-	>=app-arch/libarchive-2.8
-	>=app-crypt/gpgme-1.1.8
 	>=sys-fs/fuse-2.9.9:0
+	x11-apps/xauth
+	x11-libs/gdk-pixbuf:2
 	policykit? ( >=sys-auth/polkit-0.98 )
 	seccomp? ( sys-libs/libseccomp )
+	systemd? ( sys-apps/systemd )
 "
-DEPEND="${RDEPEND}
+
+# NOTE: pyparsing for variant-schema-compiler submodule (build time)
+DEPEND="${RDEPEND}"
+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}]
+	')
 "
-BDEPEND="
-	>=sys-devel/automake-1.13.4
-	sys-devel/bison
-	virtual/pkgconfig
-"
+# FIXME: is there a nicer way to do this?
 PDEPEND="
 	gtk? ( >=sys-apps/xdg-desktop-portal-0.10
 	       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_configure() {
@@ -77,7 +85,8 @@ src_configure() {
 		$(use_enable doc gtk-doc) \
 		$(use_enable introspection) \
 		$(use_enable policykit system-helper) \
-		$(use_enable seccomp)
+		$(use_enable seccomp) \
+		$(use_with systemd)
 	)
 
 	econf "${myeconfargs[@]}"