From 27e5574c9ed56a2633e25f7fa8f591554266a1b4 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 3 Jan 2023 20:27:24 +0000 Subject: gentoo auto-resync : 03:01:2023 - 20:27:24 --- gnome-base/gvfs/Manifest | 3 - gnome-base/gvfs/files/meson-0.61.patch | 33 ------- gnome-base/gvfs/gvfs-1.48.1-r2.ebuild | 152 --------------------------------- 3 files changed, 188 deletions(-) delete mode 100644 gnome-base/gvfs/files/meson-0.61.patch delete mode 100644 gnome-base/gvfs/gvfs-1.48.1-r2.ebuild (limited to 'gnome-base/gvfs') diff --git a/gnome-base/gvfs/Manifest b/gnome-base/gvfs/Manifest index 19d6613138c8..9bac509d5606 100644 --- a/gnome-base/gvfs/Manifest +++ b/gnome-base/gvfs/Manifest @@ -1,6 +1,3 @@ -AUX meson-0.61.patch 985 BLAKE2B 39f9a905a69f1cc724a04ce5c994f00ccf4272ac4038d95ea1afba42bb85d29624bcd7c1b573496c6eebf2541c224cd978eff6e6b7b9640a58b0d9361a7b919e SHA512 ceb03541b0c1991ec1f4d933e7b6c0741cb8d36b3083945763a8ea91bfe271c3395e715e52f9a6724a132baf7792fbfcd97a0e43050eaeaa72d50a6388d61e3a -DIST gvfs-1.48.1.tar.xz 1225916 BLAKE2B f2c46d94ba68065fcaef93cfaf25d5d6cc2fbbf4c1842452d30a9fec2ac5259b440fe569411cf3a874d3464f8d001ef2d04a705230a21b381ff1c3abe9c0f16e SHA512 19a642bcfce37eaa0d2d9f509fed6c67abfea0f79f5be9a17074d20e9ba71252a13583a2e08de88718cb141c5e79e34c84c765c87160351fe21291a8f88abe8c DIST gvfs-1.50.2.tar.xz 1214464 BLAKE2B 3fbd461cd640fcb956158e6fce97cb6cb7c30e444c5955ee197f827273271b876de62469daee994586b2bfe6ab7ab41d8a9eb2f346a0b9ed45289d9d516f5bf5 SHA512 980ff8a857ad4dc820685a9331d875274f893aebf8aca406c8ee06e2a25026fc51572515f3ccaa06062314f7f5f8d1982c5813d235bd7d81b975874e1796ca04 -EBUILD gvfs-1.48.1-r2.ebuild 3918 BLAKE2B 6250f10bd9de0db9a23707bb8ab3e97c18886b51a6076edc635aeda25c9d157926ae558b93015dcc039bdf2c27cdf3045e7a47104b3a6cfc99913cf403c5f047 SHA512 0c199aad98c83b0fc6a845e5f49dcdd8deb7372cab9ed6422065f51db373f49e6077a7f6c6fd2ebf6df839b15a3d3c3fae72c0889dd58e67b13f8578a2756036 EBUILD gvfs-1.50.2-r1.ebuild 3908 BLAKE2B 8c277a085fbdaf12f7667c8c27079f0da1966e2b6a213f109e5adb974f649a9610287845d89c8b64c9c3405b6d01d8bcdc09715423d2678b8437d230924ff851 SHA512 afbabfd1b5be102d375c372e96db748f9e92cdd7b9177869b0ed4ae832f8ff5dff0451f694c5f973aa44a17d4e61fc06aa6ece18452a0e9a0292ddb302162262 MISC metadata.xml 1857 BLAKE2B ecd1ccd9d258829723b274a45c4d831755032988e60edad0294c2c313addd274f4f9c7b3b3fb6db4e705a9694dd07f5963440b1bed00a51a4266b6f1c638d11b SHA512 8f45e74dbd38fdfbae9bd51734ffdc516f2fd55ed964d03bd3ee8bb809bf0d858d7b93bc17894a446d5e4a4299da4cc65062d52f49cf4cb60c72d26d45d26dc1 diff --git a/gnome-base/gvfs/files/meson-0.61.patch b/gnome-base/gvfs/files/meson-0.61.patch deleted file mode 100644 index 20e03388d7c6..000000000000 --- a/gnome-base/gvfs/files/meson-0.61.patch +++ /dev/null @@ -1,33 +0,0 @@ -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 -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-r2.ebuild b/gnome-base/gvfs/gvfs-1.48.1-r2.ebuild deleted file mode 100644 index 305bbb54a8d6..000000000000 --- a/gnome-base/gvfs/gvfs-1.48.1-r2.ebuild +++ /dev/null @@ -1,152 +0,0 @@ -# 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:0= - 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 -} -- cgit v1.2.3