From feb0daf81d888e9160f9f94502de09b66f2a63fd Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 21 Jun 2020 17:50:24 +0100 Subject: gentoo resync : 21.06.2020 --- gnome-base/gvfs/Manifest | 5 +- .../gvfs/files/1.40.2-gvfsdaemon-rpath.patch | 35 ------ gnome-base/gvfs/gvfs-1.40.2.ebuild | 139 --------------------- gnome-base/gvfs/gvfs-1.42.2.ebuild | 2 +- 4 files changed, 2 insertions(+), 179 deletions(-) delete mode 100644 gnome-base/gvfs/files/1.40.2-gvfsdaemon-rpath.patch delete mode 100644 gnome-base/gvfs/gvfs-1.40.2.ebuild (limited to 'gnome-base/gvfs') diff --git a/gnome-base/gvfs/Manifest b/gnome-base/gvfs/Manifest index fb7335afcf70..0e26de3e4e36 100644 --- a/gnome-base/gvfs/Manifest +++ b/gnome-base/gvfs/Manifest @@ -1,7 +1,4 @@ -AUX 1.40.2-gvfsdaemon-rpath.patch 1076 BLAKE2B eb268a3500c06aaefa0365b525d530a94c1332c393ebce3047b42ec250b7ac59d6a0c7a573ffc0616617a32e1163ad424042389af055a84803b3830ec5ad8e36 SHA512 b3c1e33e87e033efc3c23524494857858f70ef7b76b88a13bf595006cd1b1f8fdcca875cf8ebe8cba7ce536fe92fed460a957a9136f5b56b393420124fd3e013 -DIST gvfs-1.40.2.tar.xz 1204824 BLAKE2B beaf9ba603d035a81ab21dc3fe438dfe77cc0cb1d38d0457d079be80b7ec93ab6adbe9992dd0030510fb816ce14da5ef03c3f865e32bdd69956bc0181da09af2 SHA512 aec525091553e793e10ad9747e29080c92401b9d2a0b8dff98994c071d67057796628dc2a53c0ede46c53f2b149abb55e57c3ddd75e11a93c2f168713e5fb61c DIST gvfs-1.42.2-patchset.tar.xz 23932 BLAKE2B 6957c5a8a200ecff9c3294a7fb7304ae1be147e45dae1838121690a3a20b1d2557681b4efe5f722811d5302b8270d0058eedac7f8a95029cd872df3db14cc541 SHA512 0494fb36e093d06bb278a75ecbf3bc17460d5d20302a9c1d2c5b74a0b65c2a259141b515b3e80c57c3e1125df74b3cf6d2a91ae70c8e2e0af3bbca285417b9f0 DIST gvfs-1.42.2.tar.xz 1204972 BLAKE2B ebc1c4a4ae69a809ee7c556e65f87f968806ef057cfb7f7a7d2f18614443197c1feaad79099fd5b04640035e7ab306683018676ce109a7d718e3c8d35676be7c SHA512 b786ae2e493099a0a1ab2756efba3690f0e241a53995013e2632b2d7e01628d52d72b47298c7a2b913c8d50f135c191b2963a7ffc0e768fc5c96a89f93401e3c -EBUILD gvfs-1.40.2.ebuild 3812 BLAKE2B ca7a091366e5c9672a1ef26e77ae1a52e77e8dd56ec4b5583173c93f438c60242cfd3df5765f1cc08f06927f0a2548a6585dab7f652da816511b555647fabdd4 SHA512 86723b0572972a468824f3363321724f4fcaf4fc3a03d48a81b0938a5b3df0ac212a8744d101719f94c7e54ff68a3faaf6f41c69b8e068e45577a3fdc8b60e8b -EBUILD gvfs-1.42.2.ebuild 3852 BLAKE2B e173a71b321be9b1ef4d6e343688886538409a05aa5870790d57642fdf334c8566c80b66bb7ed71c5bcdcf5963f633578cea48963191171f08e5a6b7c67e6b46 SHA512 b2324cbe9fa35f170c637f333892b425ab7abef2c8ddd80dc62bcbf8b04d7fa591a926ce6ffebacbc3ad5899430e767eed0201d76413f92153db7e52628ec486 +EBUILD gvfs-1.42.2.ebuild 3851 BLAKE2B 97775a41744d5ec07cd3571c0aebca51690a06264164d97eddd641f943f454f95b78e6677e1622c35d563a1d9b75a17463cf89b749726339c2a66dab0ce96aea SHA512 bb04c71b2c39a01a742a46da0b31f5473701cb17a892f56567d5f133754b5e2eb8991193de0cef387bc0b00530259ac8d5102409a536240db47904e97883fdac MISC metadata.xml 1699 BLAKE2B b3e9365770c3e8c8d96ec4f2243cb9c69289019f8db552cbc3b294e439400aa6181842dee7534c9b031681fcbc193ed81118d6620b6fc6d13815274e78265d79 SHA512 c16bd5fbecef94c4c56af439c04e63506cea25751982cb02edec80610fd565cb9c54371547ab3d6c414106efa7b8d7c6dffd00635706f70880f922b62a8c8db7 diff --git a/gnome-base/gvfs/files/1.40.2-gvfsdaemon-rpath.patch b/gnome-base/gvfs/files/1.40.2-gvfsdaemon-rpath.patch deleted file mode 100644 index e5d579418932..000000000000 --- a/gnome-base/gvfs/files/1.40.2-gvfsdaemon-rpath.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 4fd68eb29aaf010468e154c737a03e04465aabb5 Mon Sep 17 00:00:00 2001 -From: Robby Workman -Date: Thu, 18 Jul 2019 03:38:41 -0500 -Subject: [PATCH] daemon/meson.build: define gvfs_rpath for libgvfsdaemon.so - -On Slackware development branch with gvfs-1.40.2, I just noticed this: - # ldd /usr/lib64/gvfs/libgvfsdaemon.so | grep "not found" - libgvfscommon.so => not found - -After some backtracking, it seems that this first occurred in the -switchover from autotools to meson in the 1.36.x --> 1.38.x bump. - -Big thanks to Cogitri in #gnome/irc.gnome.org for the patience and -assistance with troubleshooting this. - -Signed-off-by: Robby Workman ---- - daemon/meson.build | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/daemon/meson.build b/daemon/meson.build -index 0ce0c204..f3ed404a 100644 ---- a/daemon/meson.build -+++ b/daemon/meson.build -@@ -121,6 +121,7 @@ libgvfsdaemon = shared_library( - dependencies: deps, - c_args: cflags, - install: true, -+ install_rpath: gvfs_rpath, - install_dir: gvfs_pkglibdir, - ) - --- -2.20.1 - diff --git a/gnome-base/gvfs/gvfs-1.40.2.ebuild b/gnome-base/gvfs/gvfs-1.40.2.ebuild deleted file mode 100644 index faf79aa4527d..000000000000 --- a/gnome-base/gvfs/gvfs-1.40.2.ebuild +++ /dev/null @@ -1,139 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit gnome.org gnome2-utils meson systemd 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 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris" - -RDEPEND=" - >=dev-libs/glib-2.57.2:2 - 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-2.8.0:0 ) - 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? ( - >=dev-libs/libusb-1.0.21 - >=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.17.9:=[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/meson-0.49 - 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 -" - -PATCHES=( - # from gnome-3-32 branch, fixes RPATH of libgvfsdaemon.so - "${FILESDIR}"/${PV}-gvfsdaemon-rpath.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() { - 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.42.2.ebuild b/gnome-base/gvfs/gvfs-1.42.2.ebuild index cbb51bd5ae0d..9d564417391f 100644 --- a/gnome-base/gvfs/gvfs-1.42.2.ebuild +++ b/gnome-base/gvfs/gvfs-1.42.2.ebuild @@ -23,7 +23,7 @@ REQUIRED_USE=" mtp? ( udev ) udisks? ( udev ) " -KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris" RDEPEND=" >=dev-libs/glib-2.57.2:2 -- cgit v1.2.3