From 21435953e16cda318a82334ddbadb3b5c36d9ea7 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 15 Jan 2020 15:51:32 +0000 Subject: gentoo resync : 15.01.2020 --- gnome-base/gvfs/Manifest | 9 +- .../gvfs/files/1.38.3-gvfsdaemon-rpath.patch | 35 ------ gnome-base/gvfs/files/gvfs-1.30.2-sysmacros.patch | 21 ---- gnome-base/gvfs/gvfs-1.32.2.ebuild | 135 -------------------- gnome-base/gvfs/gvfs-1.38.3.ebuild | 137 --------------------- gnome-base/gvfs/gvfs-1.40.2.ebuild | 4 +- 6 files changed, 3 insertions(+), 338 deletions(-) delete mode 100644 gnome-base/gvfs/files/1.38.3-gvfsdaemon-rpath.patch delete mode 100644 gnome-base/gvfs/files/gvfs-1.30.2-sysmacros.patch delete mode 100644 gnome-base/gvfs/gvfs-1.32.2.ebuild delete mode 100644 gnome-base/gvfs/gvfs-1.38.3.ebuild (limited to 'gnome-base/gvfs') diff --git a/gnome-base/gvfs/Manifest b/gnome-base/gvfs/Manifest index a7bdae0353fd..03a7499048eb 100644 --- a/gnome-base/gvfs/Manifest +++ b/gnome-base/gvfs/Manifest @@ -1,11 +1,4 @@ -AUX 1.38.3-gvfsdaemon-rpath.patch 1075 BLAKE2B ccb99b16418e8d08bbbb4fe211b69b388d3995c0d28d8d33f1ceffaf5ef4384cefd19e7337dfbd95c31a7406f873448c9ea3343d5afa787b2df9050d204cb61f SHA512 18794d7081a6d4e6cbd7994a5ff683ecab4df677d5b37419144cdb39d800569d620b76fc931b849a7d05421effc66bf76b193a28f9ca8d653867784ad666b13a AUX 1.40.2-gvfsdaemon-rpath.patch 1076 BLAKE2B eb268a3500c06aaefa0365b525d530a94c1332c393ebce3047b42ec250b7ac59d6a0c7a573ffc0616617a32e1163ad424042389af055a84803b3830ec5ad8e36 SHA512 b3c1e33e87e033efc3c23524494857858f70ef7b76b88a13bf595006cd1b1f8fdcca875cf8ebe8cba7ce536fe92fed460a957a9136f5b56b393420124fd3e013 -AUX gvfs-1.30.2-sysmacros.patch 525 BLAKE2B 27337a06b02aea544e98b5726ac5a1ae29c8632150c373ce85f0f601c368e0f1430217ee729de5494e15162a05423c738e0756431a46c87b62ac647615b6273d SHA512 9b06683ed3b8ceea1b330e86308c396581ab4c85aa22199ce92acad915bb28f0fed8997558c08b18cb9c5f1bab45e46a1365831acaf1c194e7134e185849dba2 -DIST gvfs-1.32.2-patchset.tar.xz 22152 BLAKE2B 46371e4da9f3259ae1be6e7900aa9c3fa83913cf1f5ac80c485abc6a10bd77667e7fad29a09eb160af39212da31c00ccccbc3e47b4ed79780e254ff78d4b7130 SHA512 d7a17a33b737d8ac679e259055b57f63ef18f783dd7887c726502f8c05cb9339addd8728ee180ed15dc7d067ff45cc1888bc42a8ca45f9734717cfcde53f3e45 -DIST gvfs-1.32.2.tar.xz 1820100 BLAKE2B a12209f8d1f1350edfc470bb8181d68172580909764899a20b248e5dca673e5904aef0562f3244336dd8eff66cbae926d4fb2ebcccc30125328e15aeb622b481 SHA512 2fecb7103917f976528a75d317ddb6c9a71c2787cd1bd442c42a40177b74a026e37c9794117f802ebf608091d446ac58eb80d1a618df619180bb3920a98a9457 -DIST gvfs-1.38.3.tar.xz 1202280 BLAKE2B fb4d4f6d0187f4f1bdfdff42f496402c64077958816d1a07d1689b8d477538c11ce26ef5caba1ff8ed16f1188ff5e59d92ce807f4adbf7d9749fe59da6a0e2dc SHA512 4497d04942881e7e7fe6541fc5951bcc03c89305dc975ed1cd0368acf382ac66a532f3b7c781c4dec5662bf71dd6346a93378096c0cbec5f6331d75c85b96175 DIST gvfs-1.40.2.tar.xz 1204824 BLAKE2B beaf9ba603d035a81ab21dc3fe438dfe77cc0cb1d38d0457d079be80b7ec93ab6adbe9992dd0030510fb816ce14da5ef03c3f865e32bdd69956bc0181da09af2 SHA512 aec525091553e793e10ad9747e29080c92401b9d2a0b8dff98994c071d67057796628dc2a53c0ede46c53f2b149abb55e57c3ddd75e11a93c2f168713e5fb61c -EBUILD gvfs-1.32.2.ebuild 3796 BLAKE2B 74cc69a5d735f3c28d565727020bf56bec85734d3a0c22ba7b84fd6e3c422e971cd477c685e3bfa02fe31bb181a0df9eee3bb37ab4127c6c32d7abb626069175 SHA512 c1b5d293de4333a27af132c203904ba878d7e74ec07713eea56ebba822a4b9f4deb8d62ddc5ff7cef800efa11f67c11fc51800c5364fde170fbe39c7fb9ba242 -EBUILD gvfs-1.38.3.ebuild 3781 BLAKE2B 66fae9248f9a6af8d83f47cdce6d032869720d7e07b71e62c532744864793bf00f6097b99eb32bd5fe5d5ea8fd60c8c6414057310fcacf2ed7c93f14b91f98b7 SHA512 4b39e655d21457b515a707c32ffb20f36d403f86fc1869a0eaabbfb7f7ace501af97f3a8016284dc88a81f0fee5bf7235183bc155e7806497f2379637b870975 -EBUILD gvfs-1.40.2.ebuild 3815 BLAKE2B f82ff072ee8722bd68fa9ccf21d689c421098252ca1a98a01408b1e68d8c85ea0aba6c3b580c2fc208f6e0715ef75ec54ad7d715a97ebf21cf875532c19a6acf SHA512 c96827626528e6e0717fc00e77da3dd1677138e9c9384ae114beff629a90658b8f9abb51bb4b6d4a43d404b57c52288bf282cf0e214e51b86cd4a00f98184474 +EBUILD gvfs-1.40.2.ebuild 3814 BLAKE2B 21fec4dbd80147f4464bb7e7c96b37e77188242aabbe2aec60bddeaea2ccc7c74087ea0f037a14f00c9fcdd8248cec680bf4e4922762eeeedaa1c513cdd38d81 SHA512 91e35d8243b8178ae68c13a7f63714f28f25bed5b675c5fe0e1d012841c60f002bc9e9d446ba7e26d40c24c0751f9b3623bf445531ce668192b96b18128845e9 MISC metadata.xml 1699 BLAKE2B b3e9365770c3e8c8d96ec4f2243cb9c69289019f8db552cbc3b294e439400aa6181842dee7534c9b031681fcbc193ed81118d6620b6fc6d13815274e78265d79 SHA512 c16bd5fbecef94c4c56af439c04e63506cea25751982cb02edec80610fd565cb9c54371547ab3d6c414106efa7b8d7c6dffd00635706f70880f922b62a8c8db7 diff --git a/gnome-base/gvfs/files/1.38.3-gvfsdaemon-rpath.patch b/gnome-base/gvfs/files/1.38.3-gvfsdaemon-rpath.patch deleted file mode 100644 index f3fe513d06e1..000000000000 --- a/gnome-base/gvfs/files/1.38.3-gvfsdaemon-rpath.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 57010ebb148b9b14e40140c7a8ce133a72128cf6 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 7f2608bd..0006f35e 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/files/gvfs-1.30.2-sysmacros.patch b/gnome-base/gvfs/files/gvfs-1.30.2-sysmacros.patch deleted file mode 100644 index b2d2a91f5a76..000000000000 --- a/gnome-base/gvfs/files/gvfs-1.30.2-sysmacros.patch +++ /dev/null @@ -1,21 +0,0 @@ -https://bugzilla.gnome.org/show_bug.cgi?id=776532 -https://bugs.gentoo.org/580234 - ---- a/metadata/meta-daemon.c -+++ b/metadata/meta-daemon.c -@@ -27,6 +27,7 @@ - #include - #include - #include -+#include - #include "metatree.h" - #include "gvfsdaemonprotocol.h" - #include "metadata-dbus.h" ---- a/metadata/metatree.c -+++ b/metadata/metatree.c -@@ -1,4 +1,5 @@ - #include "config.h" -+#include - #include - #include - #include diff --git a/gnome-base/gvfs/gvfs-1.32.2.ebuild b/gnome-base/gvfs/gvfs-1.32.2.ebuild deleted file mode 100644 index 627cbbe441e5..000000000000 --- a/gnome-base/gvfs/gvfs-1.32.2.ebuild +++ /dev/null @@ -1,135 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -GNOME2_LA_PUNT="yes" -GNOME2_EAUTORECONF="yes" - -inherit gnome2 systemd - -DESCRIPTION="Virtual filesystem implementation for gio" -HOMEPAGE="https://wiki.gnome.org/Projects/gvfs" -SRC_URI+=" https://dev.gentoo.org/~leio/distfiles/${P}-patchset.tar.xz" - -LICENSE="LGPL-2+" -SLOT="0" - -IUSE="afp archive bluray cdda elogind fuse google gnome-keyring gnome-online-accounts gphoto2 gtk +http ios mtp nfs policykit samba systemd test +udev udisks zeroconf" -REQUIRED_USE=" - cdda? ( udev ) - elogind? ( !systemd udisks ) - google? ( gnome-online-accounts ) - mtp? ( udev ) - udisks? ( udev ) - systemd? ( !elogind udisks ) -" -KEYWORDS="alpha amd64 arm ~arm64 ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris" - -RDEPEND=" - app-crypt/gcr:= - >=dev-libs/glib-2.51:2 - dev-libs/libxml2:2 - net-misc/openssh - afp? ( >=dev-libs/libgcrypt-1.2.2:0= ) - archive? ( app-arch/libarchive:= ) - bluray? ( media-libs/libbluray:= ) - elogind? ( >=sys-auth/elogind-229:0= ) - fuse? ( >=sys-fs/fuse-2.8.0:0 ) - gnome-keyring? ( app-crypt/libsecret ) - gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.7.1:= ) - google? ( - >=dev-libs/libgdata-0.17.7:=[crypt,gnome-online-accounts] - >=net-libs/gnome-online-accounts-3.17.1:= ) - gphoto2? ( >=media-libs/libgphoto2-2.5.0:= ) - gtk? ( >=x11-libs/gtk+-3.0:3 ) - http? ( >=net-libs/libsoup-2.42:2.4 ) - ios? ( - >=app-pda/libimobiledevice-1.2:= - >=app-pda/libplist-1:= ) - mtp? ( - >=dev-libs/libusb-1.0.21 - >=media-libs/libmtp-1.1.12 ) - nfs? ( >=net-fs/libnfs-1.9.8 ) - policykit? ( - sys-auth/polkit - sys-libs/libcap ) - samba? ( >=net-fs/samba-4[client] ) - systemd? ( >=sys-apps/systemd-206:0= ) - udev? ( - cdda? ( dev-libs/libcdio-paranoia ) - >=dev-libs/libgudev-147:= - virtual/libudev:= ) - udisks? ( >=sys-fs/udisks-1.97:2 ) - zeroconf? ( >=net-dns/avahi-0.6[dbus] ) -" -DEPEND="${RDEPEND} - app-text/docbook-xsl-stylesheets - dev-libs/libxslt - >=sys-devel/gettext-0.19.4 - virtual/pkgconfig - dev-util/gdbus-codegen - dev-util/glib-utils - dev-util/gtk-doc-am - test? ( - >=dev-python/twisted-16 - || ( - net-analyzer/netcat - net-analyzer/netcat6 ) ) - !udev? ( >=dev-libs/libgcrypt-1.2.2:0 ) -" -# libgcrypt.m4, provided by libgcrypt, needed for eautoreconf, bug #399043 -# test dependencies needed per https://bugzilla.gnome.org/700162 - -# Tests with multiple failures, this is being handled upstream at: -# https://bugzilla.gnome.org/700162 -RESTRICT="test" - -PATCHES=( - "${WORKDIR}"/patches/ #599482, 641522, gnome-3-24 backports - "${FILESDIR}"/${PN}-1.30.2-sysmacros.patch #580234 -) - -src_prepare() { - if ! use udev; then - sed -e 's/gvfsd-burn/ /' \ - -e 's/burn.mount.in/ /' \ - -e 's/burn.mount/ /' \ - -i daemon/Makefile.am || die - fi - - gnome2_src_prepare -} - -src_configure() { - # --enable-documentation installs man pages - # --disable-obexftp, upstream bug #729945 - gnome2_src_configure \ - --disable-gdu \ - --enable-documentation \ - --enable-gcr \ - --with-dbus-service-dir="${EPREFIX}"/usr/share/dbus-1/services \ - --with-systemduserunitdir="$(systemd_get_userunitdir)" \ - $(use_enable afp) \ - $(use_enable archive) \ - $(use_enable bluray) \ - $(use_enable cdda) \ - $(use_enable elogind libelogind) \ - $(use_enable fuse) \ - $(use_enable gnome-keyring keyring) \ - $(use_enable gnome-online-accounts goa) \ - $(use_enable google) \ - $(use_enable gphoto2) \ - $(use_enable gtk) \ - $(use_enable http) \ - $(use_enable ios afc) \ - $(use_enable mtp libmtp) \ - $(use_enable mtp libusb) \ - $(use_enable nfs) \ - $(use_enable policykit admin) \ - $(use_enable samba) \ - $(use_enable systemd libsystemd-login) \ - $(use_enable udev gudev) \ - $(use_enable udev) \ - $(use_enable udisks udisks2) \ - $(use_enable zeroconf avahi) -} diff --git a/gnome-base/gvfs/gvfs-1.38.3.ebuild b/gnome-base/gvfs/gvfs-1.38.3.ebuild deleted file mode 100644 index 5cd798af7346..000000000000 --- a/gnome-base/gvfs/gvfs-1.38.3.ebuild +++ /dev/null @@ -1,137 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -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 ~sh 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.42.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} - dev-util/glib-utils - app-text/docbook-xsl-stylesheets - app-text/docbook-xml-dtd:4.2 - dev-libs/libxslt - >=sys-devel/gettext-0.19.4 - virtual/pkgconfig - dev-util/gdbus-codegen -" - -PATCHES=( - # from gnome-3-30 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.40.2.ebuild b/gnome-base/gvfs/gvfs-1.40.2.ebuild index e86efb195624..dceebc1716b3 100644 --- a/gnome-base/gvfs/gvfs-1.40.2.ebuild +++ b/gnome-base/gvfs/gvfs-1.40.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -22,7 +22,7 @@ REQUIRED_USE=" mtp? ( udev ) udisks? ( udev ) " -KEYWORDS="alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris" +KEYWORDS="alpha amd64 arm arm64 ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris" RDEPEND=" >=dev-libs/glib-2.57.2:2 -- cgit v1.2.3