commit: 96adb37528fcb695210522f8bcd68d3bab61a9a1 Author: Matt Turner <mattst88 <AT> gentoo <DOT> org> AuthorDate: Tue May 31 18:49:22 2022 +0000 Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org> CommitDate: Tue May 31 18:52:06 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=96adb375
Revert "gnome-base/gvfs: Drop old versions" This reverts commit 22102a2cce8afe3af433ecf3bd417693ace4c427. dev-libs/totem-pl-parser needs gvfs[http], which is masked on versions 1.50+ due to the libsoup:3 dependency. Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org> gnome-base/gvfs/Manifest | 2 + gnome-base/gvfs/files/meson-0.61.patch | 33 +++++++ gnome-base/gvfs/gvfs-1.48.1-r1.ebuild | 152 +++++++++++++++++++++++++++++++++ gnome-base/gvfs/gvfs-1.50.0.ebuild | 149 ++++++++++++++++++++++++++++++++ 4 files changed, 336 insertions(+) diff --git a/gnome-base/gvfs/Manifest b/gnome-base/gvfs/Manifest index 9d1a834d621a..1bd1661714df 100644 --- a/gnome-base/gvfs/Manifest +++ b/gnome-base/gvfs/Manifest @@ -1,2 +1,4 @@ +DIST gvfs-1.48.1.tar.xz 1225916 BLAKE2B f2c46d94ba68065fcaef93cfaf25d5d6cc2fbbf4c1842452d30a9fec2ac5259b440fe569411cf3a874d3464f8d001ef2d04a705230a21b381ff1c3abe9c0f16e SHA512 19a642bcfce37eaa0d2d9f509fed6c67abfea0f79f5be9a17074d20e9ba71252a13583a2e08de88718cb141c5e79e34c84c765c87160351fe21291a8f88abe8c +DIST gvfs-1.50.0.tar.xz 1213456 BLAKE2B a560794677693f449fd71f314d18a8ad8bb38ce6ac6eb312d020fd4ed2b55c9e1939cecc993869b3f489c0ebddfa057bf76af04e6c6f700323dc7b99fa052af1 SHA512 6eea3c59b239fe9674a83db4e182c0ea2ab7d56e29f5d5c4a7af9cb3cb0fd9222721796754f2f502291049c158e8bd3771cbc5262d10bfa684c207cb3281dcce DIST gvfs-1.50.1.tar.xz 1214536 BLAKE2B 678c89d08255e577afb3a4999cef341fc5449c5ab615c5e089b14cbd2d0a882830dff71af6ab7a978d8b23a3aaeea197badd21d8c4e702588e626f3b4d917c55 SHA512 7a1ea47658dbd74673e1aea7c344d3f9e8a26fab844a26220cedcb19da6b4a0cac6b369d2b5107f649d6e7b2331894c89df04c6dce3630be4b289e23f56127a5 DIST gvfs-1.50.2.tar.xz 1214464 BLAKE2B 3fbd461cd640fcb956158e6fce97cb6cb7c30e444c5955ee197f827273271b876de62469daee994586b2bfe6ab7ab41d8a9eb2f346a0b9ed45289d9d516f5bf5 SHA512 980ff8a857ad4dc820685a9331d875274f893aebf8aca406c8ee06e2a25026fc51572515f3ccaa06062314f7f5f8d1982c5813d235bd7d81b975874e1796ca04 diff --git a/gnome-base/gvfs/files/meson-0.61.patch b/gnome-base/gvfs/files/meson-0.61.patch new file mode 100644 index 000000000000..20e03388d7c6 --- /dev/null +++ b/gnome-base/gvfs/files/meson-0.61.patch @@ -0,0 +1,33 @@ +https://bugs.gentoo.org/831840 +https://gitlab.gnome.org/GNOME/gvfs/-/merge_requests/133 + +From 1522bf6a9741cf6f1fe16eaf50fd20af46882873 Mon Sep 17 00:00:00 2001 +From: Ondrej Holy <oh...@redhat.com> +Date: Fri, 21 Jan 2022 08:32:31 +0100 +Subject: [PATCH] build: Remove incorrect i18n.merge_file argument + +The positional argument was being silently ignored until meson 0.60.0 where +it fails with "ERROR: Function does not take positional arguments". + +Related: https://github.com/mesonbuild/meson/issues/9441 +Fixes: https://gitlab.gnome.org/GNOME/gvfs/-/issues/599 +(cherry picked from commit 17a067b9b823a0d54e061eae45ff8e2c7e4a88d0) +--- + daemon/meson.build | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/daemon/meson.build b/daemon/meson.build +index dffeef3e..bdc506fe 100644 +--- a/daemon/meson.build ++++ b/daemon/meson.build +@@ -366,7 +366,6 @@ if enable_admin + ) + + i18n.merge_file( +- policy, + input: policy_in, + output: '@BASENAME@', + po_dir: po_dir, +-- +2.34.1 + diff --git a/gnome-base/gvfs/gvfs-1.48.1-r1.ebuild b/gnome-base/gvfs/gvfs-1.48.1-r1.ebuild new file mode 100644 index 000000000000..38deee759bc2 --- /dev/null +++ b/gnome-base/gvfs/gvfs-1.48.1-r1.ebuild @@ -0,0 +1,152 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +TMPFILES_OPTIONAL=1 +inherit gnome.org gnome2-utils meson systemd tmpfiles xdg + +DESCRIPTION="Virtual filesystem implementation for GIO" +HOMEPAGE="https://wiki.gnome.org/Projects/gvfs"; + +LICENSE="LGPL-2+" +SLOT="0" + +IUSE="afp archive bluray cdda elogind fuse google gnome-keyring gnome-online-accounts gphoto2 +http ios mtp nfs policykit samba systemd test +udev udisks zeroconf" +RESTRICT="!test? ( test )" +# elogind/systemd only relevant to udisks (in v1.38.1) +REQUIRED_USE=" + ?? ( elogind systemd ) + cdda? ( udev ) + google? ( gnome-online-accounts ) + gphoto2? ( udev ) + mtp? ( udev ) + udisks? ( udev ) +" +KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris" + +RDEPEND=" + >=dev-libs/glib-2.65.1:2 + >=gnome-base/gsettings-desktop-schemas-3.33.0 + afp? ( >=dev-libs/libgcrypt-1.2.2:0= ) + sys-apps/dbus + app-crypt/gcr:= + policykit? ( + >=sys-auth/polkit-0.114 + sys-libs/libcap + ) + http? ( + dev-libs/libxml2:2 + >=net-libs/libsoup-2.58.0:2.4 + ) + zeroconf? ( >=net-dns/avahi-0.6[dbus] ) + udev? ( >=dev-libs/libgudev-147:= ) + fuse? ( + >=sys-fs/fuse-3.0.0:3 + virtual/tmpfiles + ) + udisks? ( >=sys-fs/udisks-1.97:2 ) + systemd? ( >=sys-apps/systemd-206:0= ) + elogind? ( >=sys-auth/elogind-229:0= ) + ios? ( + >=app-pda/libimobiledevice-1.2:= + >=app-pda/libplist-1:= + ) + gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.17.1:= ) + gnome-keyring? ( app-crypt/libsecret ) + bluray? ( media-libs/libbluray:= ) + mtp? ( + virtual/libusb:1 + >=media-libs/libmtp-1.1.15 + ) + samba? ( >=net-fs/samba-4[client] ) + archive? ( app-arch/libarchive:= ) + cdda? ( + dev-libs/libcdio:0= + >=dev-libs/libcdio-paranoia-0.78.2 + ) + google? ( >=dev-libs/libgdata-0.18.0:=[crypt,gnome-online-accounts] ) + gphoto2? ( >=media-libs/libgphoto2-2.5.0:= ) + nfs? ( >=net-fs/libnfs-1.9.8 ) + net-misc/openssh +" +DEPEND="${RDEPEND}" +BDEPEND=" + dev-util/glib-utils + app-text/docbook-xsl-stylesheets + app-text/docbook-xml-dtd:4.2 + dev-libs/libxslt + >=sys-devel/gettext-0.19.8 + virtual/pkgconfig + dev-util/gdbus-codegen + test? ( dev-libs/libgdata ) +" + +PATCHES=( + "${FILESDIR}/meson-0.61.patch" +) + +src_configure() { + local enable_logind="false" + if use systemd || use elogind; then + enable_logind="true" + fi + + local enable_gcrypt="false" + if use afp; then # currently HAVE_GCRYPT and linkage only used with afp; check it on big bumps (grep for HAVE_GCRYPT and enable_gcrypt); adjust depends if changes + enable_gcrypt="true" + fi + + local enable_libusb="false" + if use mtp; then # currently HAVE_LIBUSB and linkage only used with mtp; check it on big bumps (grep for HAVE_LIBUSB and enable_libusb); adjust depends if changes + enable_libusb="true" + fi + + local emesonargs=( + -Dsystemduserunitdir="$(systemd_get_userunitdir)" + -Dtmpfilesdir="${EPREFIX}"/usr/lib/tmpfiles.d + $(meson_use policykit admin) + $(meson_use ios afc) + $(meson_use afp) + $(meson_use archive) + $(meson_use cdda) + $(meson_use zeroconf dnssd) + $(meson_use gnome-online-accounts goa) + $(meson_use google) + $(meson_use gphoto2) + $(meson_use http) + $(meson_use mtp) + $(meson_use nfs) + -Dsftp=true + $(meson_use samba smb) + $(meson_use udisks udisks2) + $(meson_use bluray) + $(meson_use fuse) + -Dgcr=true + -Dgcrypt=${enable_gcrypt} + $(meson_use udev gudev) + $(meson_use gnome-keyring keyring) + -Dlogind=${enable_logind} + -Dlibusb=${enable_libusb} + -Ddevel_utils=false # wouldn't install any of it as of 1.38.1; some tests need it, but they aren't automated tests in v1.38.1 + -Dinstalled_tests=false + -Dman=true + ) + meson_src_configure +} + +pkg_postinst() { + if use fuse; then + tmpfiles_process gvfsd-fuse-tmpfiles.conf + fi + + xdg_pkg_postinst + gnome2_schemas_update + gnome2_giomodule_cache_update +} + +pkg_postrm() { + xdg_pkg_postrm + gnome2_schemas_update + gnome2_giomodule_cache_update +} diff --git a/gnome-base/gvfs/gvfs-1.50.0.ebuild b/gnome-base/gvfs/gvfs-1.50.0.ebuild new file mode 100644 index 000000000000..61a64ed1d03f --- /dev/null +++ b/gnome-base/gvfs/gvfs-1.50.0.ebuild @@ -0,0 +1,149 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +TMPFILES_OPTIONAL=1 +inherit gnome.org gnome2-utils meson systemd tmpfiles xdg + +DESCRIPTION="Virtual filesystem implementation for GIO" +HOMEPAGE="https://wiki.gnome.org/Projects/gvfs"; + +LICENSE="LGPL-2+" +SLOT="0" + +IUSE="afp archive bluray cdda elogind fuse google gnome-keyring gnome-online-accounts gphoto2 +http ios mtp nfs policykit samba systemd test +udev udisks zeroconf" +RESTRICT="!test? ( test )" +# elogind/systemd only relevant to udisks (in v1.38.1) +REQUIRED_USE=" + ?? ( elogind systemd ) + cdda? ( udev ) + google? ( gnome-online-accounts ) + gphoto2? ( udev ) + mtp? ( udev ) + udisks? ( udev ) +" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris" + +RDEPEND=" + >=dev-libs/glib-2.70.0:2 + >=gnome-base/gsettings-desktop-schemas-3.33.0 + afp? ( >=dev-libs/libgcrypt-1.2.2:0= ) + sys-apps/dbus + app-crypt/gcr:= + policykit? ( + >=sys-auth/polkit-0.114 + sys-libs/libcap + ) + http? ( + dev-libs/libxml2:2 + >=net-libs/libsoup-3.0.0:3.0 + ) + zeroconf? ( >=net-dns/avahi-0.6[dbus] ) + udev? ( >=dev-libs/libgudev-147:= ) + fuse? ( + >=sys-fs/fuse-3.0.0:3 + virtual/tmpfiles + ) + udisks? ( >=sys-fs/udisks-1.97:2 ) + systemd? ( >=sys-apps/systemd-206:0= ) + elogind? ( >=sys-auth/elogind-229:0= ) + ios? ( + >=app-pda/libimobiledevice-1.2:= + >=app-pda/libplist-1:= + ) + gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.17.1:= ) + gnome-keyring? ( app-crypt/libsecret ) + bluray? ( media-libs/libbluray:= ) + mtp? ( + virtual/libusb:1 + >=media-libs/libmtp-1.1.15 + ) + samba? ( >=net-fs/samba-4[client] ) + archive? ( app-arch/libarchive:= ) + cdda? ( + dev-libs/libcdio:0= + >=dev-libs/libcdio-paranoia-0.78.2 + ) + google? ( >=dev-libs/libgdata-0.18.0:=[crypt,gnome-online-accounts] ) + gphoto2? ( >=media-libs/libgphoto2-2.5.0:= ) + nfs? ( >=net-fs/libnfs-1.9.8 ) + net-misc/openssh +" +DEPEND="${RDEPEND}" +BDEPEND=" + dev-util/glib-utils + app-text/docbook-xsl-stylesheets + app-text/docbook-xml-dtd:4.2 + dev-libs/libxslt + >=sys-devel/gettext-0.19.8 + virtual/pkgconfig + dev-util/gdbus-codegen + test? ( dev-libs/libgdata ) +" + +src_configure() { + local enable_logind="false" + if use systemd || use elogind; then + enable_logind="true" + fi + + local enable_gcrypt="false" + if use afp; then # currently HAVE_GCRYPT and linkage only used with afp; check it on big bumps (grep for HAVE_GCRYPT and enable_gcrypt); adjust depends if changes + enable_gcrypt="true" + fi + + local enable_libusb="false" + if use mtp; then # currently HAVE_LIBUSB and linkage only used with mtp; check it on big bumps (grep for HAVE_LIBUSB and enable_libusb); adjust depends if changes + enable_libusb="true" + fi + + local emesonargs=( + -Dsystemduserunitdir="$(systemd_get_userunitdir)" + -Dtmpfilesdir="${EPREFIX}"/usr/lib/tmpfiles.d + $(meson_use policykit admin) + $(meson_use ios afc) + $(meson_use afp) + $(meson_use archive) + $(meson_use cdda) + $(meson_use zeroconf dnssd) + $(meson_use gnome-online-accounts goa) + $(meson_use google) + $(meson_use gphoto2) + $(meson_use http) + $(meson_use mtp) + $(meson_use nfs) + -Dsftp=true + $(meson_use samba smb) + $(meson_use udisks udisks2) + $(meson_use bluray) + $(meson_use fuse) + -Dgcr=true + -Dgcrypt=${enable_gcrypt} + $(meson_use udev gudev) + $(meson_use gnome-keyring keyring) + -Dlogind=${enable_logind} + -Dlibusb=${enable_libusb} + -Ddevel_utils=false # wouldn't install any of it as of 1.38.1; some tests need it, but they aren't automated tests in v1.38.1 + -Dinstalled_tests=false + -Dman=true + -Dprivileged_group=wheel + ) + meson_src_configure +} + +pkg_postinst() { + if use fuse; then + tmpfiles_process gvfsd-fuse-tmpfiles.conf + fi + + xdg_pkg_postinst + gnome2_schemas_update + gnome2_giomodule_cache_update +} + +pkg_postrm() { + xdg_pkg_postrm + gnome2_schemas_update + gnome2_giomodule_cache_update +}
