| 1 |
commit: f0ded51f571c17f15ebfa52301fd9f36ded97bf4 |
| 2 |
Author: David Heidelberg <david <AT> ixit <DOT> cz> |
| 3 |
AuthorDate: Wed Jul 1 13:14:50 2020 +0000 |
| 4 |
Commit: David Heidelberg <david <AT> ixit <DOT> cz> |
| 5 |
CommitDate: Wed Jul 1 13:14:50 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=f0ded51f |
| 7 |
|
| 8 |
sys-apps/flatpak: bump to 1.8.0 |
| 9 |
|
| 10 |
- generally all modifications from ::fosero overlay included |
| 11 |
- compile & run tested |
| 12 |
|
| 13 |
Package-Manager: Portage-2.3.103, Repoman-2.3.23 |
| 14 |
Signed-off-by: David Heidelberg <david <AT> ixit.cz> |
| 15 |
|
| 16 |
sys-apps/flatpak/Manifest | 2 +- |
| 17 |
.../{flatpak-1.6.3.ebuild => flatpak-1.8.0.ebuild} | 53 +++++++++++++--------- |
| 18 |
2 files changed, 32 insertions(+), 23 deletions(-) |
| 19 |
|
| 20 |
diff --git a/sys-apps/flatpak/Manifest b/sys-apps/flatpak/Manifest |
| 21 |
index dd04d79..ab18c1d 100644 |
| 22 |
--- a/sys-apps/flatpak/Manifest |
| 23 |
+++ b/sys-apps/flatpak/Manifest |
| 24 |
@@ -1 +1 @@ |
| 25 |
-DIST flatpak-1.6.3.tar.xz 1340936 BLAKE2B ed697161a6ea10de7910438ef19d3a27d6bc4fc6b4ab8d14a955fb0ba6299950d13b25bf356b9b3341395441d378c0d0f3000dc0dd983a922090372d8e67a30d SHA512 8527914dd728d6bc4d28fcc7740514a370aad7c49c65e6126cdc237886dc3a5cb173a7fa69d8374a7502e08b1429b69bf24ee700a7d723fc090f9661534ca7b4 |
| 26 |
+DIST flatpak-1.8.0.tar.xz 1401336 BLAKE2B d606e56abf3e2db98b4a38e3dd5bf64bcf4a9aa818fcd32fa27c9fad94d7df222853910efea8fa66549c581d00f890b619f2379553777339a1132a03c1415681 SHA512 2955eadddcea2baecb36b45a638a33735a934641dd99793d22d7193d58ffd02910ae1239d9450f9b4c5bf648e6aa0f29efcc17a2bc7bd26936a9ea7b53af3f72 |
| 27 |
|
| 28 |
diff --git a/sys-apps/flatpak/flatpak-1.6.3.ebuild b/sys-apps/flatpak/flatpak-1.8.0.ebuild |
| 29 |
similarity index 74% |
| 30 |
rename from sys-apps/flatpak/flatpak-1.6.3.ebuild |
| 31 |
rename to sys-apps/flatpak/flatpak-1.8.0.ebuild |
| 32 |
index 3ba1b50..0d6f0a5 100644 |
| 33 |
--- a/sys-apps/flatpak/flatpak-1.6.3.ebuild |
| 34 |
+++ b/sys-apps/flatpak/flatpak-1.8.0.ebuild |
| 35 |
@@ -2,8 +2,9 @@ |
| 36 |
# Distributed under the terms of the GNU General Public License v2 |
| 37 |
|
| 38 |
EAPI=7 |
| 39 |
+PYTHON_COMPAT=( python3_{7,8,9} ) |
| 40 |
|
| 41 |
-inherit autotools linux-info |
| 42 |
+inherit autotools linux-info python-any-r1 |
| 43 |
|
| 44 |
SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.xz" |
| 45 |
DESCRIPTION="Application distribution framework" |
| 46 |
@@ -12,54 +13,61 @@ HOMEPAGE="https://flatpak.org/" |
| 47 |
LICENSE="LGPL-2.1" |
| 48 |
SLOT="0" |
| 49 |
KEYWORDS="~amd64" |
| 50 |
-IUSE="doc gtk introspection kde policykit seccomp" |
| 51 |
+IUSE="doc gtk introspection kde policykit seccomp systemd" |
| 52 |
|
| 53 |
-# restrict until fixed. Bug: 721906 |
| 54 |
-RESTRICT="test" |
| 55 |
- |
| 56 |
-# FIXME: systemd is automagic dep. |
| 57 |
+# FIXME: Automagic dep on app-arch/zstd |
| 58 |
RDEPEND=" |
| 59 |
acct-group/flatpak |
| 60 |
acct-user/flatpak |
| 61 |
+ >=app-arch/libarchive-2.8 |
| 62 |
+ >=app-crypt/gpgme-1.1.8 |
| 63 |
+ >=dev-libs/appstream-glib-0.5.10 |
| 64 |
+ >=dev-libs/glib-2.56:2 |
| 65 |
+ >=dev-libs/libxml2-2.4 |
| 66 |
+ dev-libs/json-glib |
| 67 |
>=dev-util/ostree-2019.5[gpg(+)] |
| 68 |
|| ( dev-util/ostree[curl] |
| 69 |
dev-util/ostree[soup] ) |
| 70 |
- >=net-libs/libsoup-2.4 |
| 71 |
>=gnome-base/dconf-0.26 |
| 72 |
- >=dev-libs/appstream-glib-0.5.10 |
| 73 |
- x11-libs/gdk-pixbuf:2 |
| 74 |
- >=dev-libs/glib-2.56:2 |
| 75 |
- >=dev-libs/libxml2-2.4 |
| 76 |
+ >=net-libs/libsoup-2.4 |
| 77 |
sys-apps/dbus |
| 78 |
- dev-libs/json-glib |
| 79 |
- x11-apps/xauth |
| 80 |
- >=app-arch/libarchive-2.8 |
| 81 |
- >=app-crypt/gpgme-1.1.8 |
| 82 |
>=sys-fs/fuse-2.9.9:0 |
| 83 |
+ x11-apps/xauth |
| 84 |
+ x11-libs/gdk-pixbuf:2 |
| 85 |
policykit? ( >=sys-auth/polkit-0.98 ) |
| 86 |
seccomp? ( sys-libs/libseccomp ) |
| 87 |
+ systemd? ( sys-apps/systemd ) |
| 88 |
" |
| 89 |
-DEPEND="${RDEPEND} |
| 90 |
+ |
| 91 |
+# NOTE: pyparsing for variant-schema-compiler submodule (build time) |
| 92 |
+DEPEND="${RDEPEND}" |
| 93 |
+BDEPEND=">=sys-devel/automake-1.13.4 |
| 94 |
>=sys-devel/gettext-0.18.2 |
| 95 |
+ virtual/pkgconfig |
| 96 |
dev-util/gdbus-codegen |
| 97 |
+ sys-devel/bison |
| 98 |
introspection? ( >=dev-libs/gobject-introspection-1.40 ) |
| 99 |
doc? ( >=dev-util/gtk-doc-1.20 |
| 100 |
dev-libs/libxslt ) |
| 101 |
+ $(python_gen_any_dep ' |
| 102 |
+ dev-python/pyparsing[${PYTHON_USEDEP}] |
| 103 |
+ ') |
| 104 |
" |
| 105 |
-BDEPEND=" |
| 106 |
- >=sys-devel/automake-1.13.4 |
| 107 |
- sys-devel/bison |
| 108 |
- virtual/pkgconfig |
| 109 |
-" |
| 110 |
+# FIXME: is there a nicer way to do this? |
| 111 |
PDEPEND=" |
| 112 |
gtk? ( >=sys-apps/xdg-desktop-portal-0.10 |
| 113 |
sys-apps/xdg-desktop-portal-gtk ) |
| 114 |
kde? ( kde-plasma/xdg-desktop-portal-kde ) |
| 115 |
" |
| 116 |
|
| 117 |
+python_check_deps() { |
| 118 |
+ has_version -b "dev-python/pyparsing[${PYTHON_USEDEP}]" |
| 119 |
+} |
| 120 |
+ |
| 121 |
pkg_setup() { |
| 122 |
local CONFIG_CHECK="~USER_NS" |
| 123 |
linux-info_pkg_setup |
| 124 |
+ python-any-r1_pkg_setup |
| 125 |
} |
| 126 |
|
| 127 |
src_configure() { |
| 128 |
@@ -77,7 +85,8 @@ src_configure() { |
| 129 |
$(use_enable doc gtk-doc) \ |
| 130 |
$(use_enable introspection) \ |
| 131 |
$(use_enable policykit system-helper) \ |
| 132 |
- $(use_enable seccomp) |
| 133 |
+ $(use_enable seccomp) \ |
| 134 |
+ $(use_with systemd) |
| 135 |
) |
| 136 |
|
| 137 |
econf "${myeconfargs[@]}" |
Archives