diff options
author | Michał Górny <mgorny@gentoo.org> | 2022-02-04 10:19:53 +0100 |
---|---|---|
committer | Michał Górny <mgorny@gentoo.org> | 2022-02-04 11:26:34 +0100 |
commit | 9115b13cfbddb3bf12844cccc2851a5aaeb85e40 (patch) | |
tree | e86d4412caa19c1abf508f640e7523ed73dd94fc /sys-apps/flatpak | |
parent | dev-python/setuptools: Set min dep versions for clean bootstrap (diff) | |
download | gentoo-9115b13cfbddb3bf12844cccc2851a5aaeb85e40.tar.gz gentoo-9115b13cfbddb3bf12844cccc2851a5aaeb85e40.tar.bz2 gentoo-9115b13cfbddb3bf12844cccc2851a5aaeb85e40.zip |
sys-apps/flatpak: Remove old
Remove the versions requiring old dev-python/pyparsing.
Signed-off-by: Michał Górny <mgorny@gentoo.org>
Diffstat (limited to 'sys-apps/flatpak')
-rw-r--r-- | sys-apps/flatpak/Manifest | 3 | ||||
-rw-r--r-- | sys-apps/flatpak/files/flatpak-1.12.2-pyparsing-3.0.2-compat.patch | 42 | ||||
-rw-r--r-- | sys-apps/flatpak/flatpak-1.10.5.ebuild | 102 | ||||
-rw-r--r-- | sys-apps/flatpak/flatpak-1.10.6.ebuild | 102 | ||||
-rw-r--r-- | sys-apps/flatpak/flatpak-1.12.2-r1.ebuild | 106 | ||||
-rw-r--r-- | sys-apps/flatpak/flatpak-1.12.2.ebuild | 102 |
6 files changed, 0 insertions, 457 deletions
diff --git a/sys-apps/flatpak/Manifest b/sys-apps/flatpak/Manifest index 50e0ef4fdc1f..d070145f50f4 100644 --- a/sys-apps/flatpak/Manifest +++ b/sys-apps/flatpak/Manifest @@ -1,5 +1,2 @@ -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 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.2-r1.ebuild b/sys-apps/flatpak/flatpak-1.12.2-r1.ebuild deleted file mode 100644 index 93fb30b800bc..000000000000 --- a/sys-apps/flatpak/flatpak-1.12.2-r1.ebuild +++ /dev/null @@ -1,106 +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,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[${PYTHON_USEDEP}]') -" - -PDEPEND=" - gtk? ( sys-apps/xdg-desktop-portal-gtk ) - 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}]" -} - -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.2.ebuild b/sys-apps/flatpak/flatpak-1.12.2.ebuild deleted file mode 100644 index 23536ed75525..000000000000 --- a/sys-apps/flatpak/flatpak-1.12.2.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,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[@]}" -} |