1 |
commit: ed9a34fe8a9d45e8e9d5e3ca832b5ff67a58cfaf |
2 |
Author: Mart Raudsepp <leio <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Jan 2 07:13:56 2020 +0000 |
4 |
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Jan 2 16:46:20 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ed9a34fe |
7 |
|
8 |
gnome-base/gvfs: remove old |
9 |
|
10 |
Package-Manager: Portage-2.3.79, Repoman-2.3.12 |
11 |
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org> |
12 |
|
13 |
gnome-base/gvfs/Manifest | 1 - |
14 |
.../gvfs/files/1.38.3-gvfsdaemon-rpath.patch | 35 ------ |
15 |
gnome-base/gvfs/gvfs-1.38.3.ebuild | 137 --------------------- |
16 |
3 files changed, 173 deletions(-) |
17 |
|
18 |
diff --git a/gnome-base/gvfs/Manifest b/gnome-base/gvfs/Manifest |
19 |
index 564a0ea6549..f57bd2ca2bb 100644 |
20 |
--- a/gnome-base/gvfs/Manifest |
21 |
+++ b/gnome-base/gvfs/Manifest |
22 |
@@ -1,4 +1,3 @@ |
23 |
DIST gvfs-1.32.2-patchset.tar.xz 22152 BLAKE2B 46371e4da9f3259ae1be6e7900aa9c3fa83913cf1f5ac80c485abc6a10bd77667e7fad29a09eb160af39212da31c00ccccbc3e47b4ed79780e254ff78d4b7130 SHA512 d7a17a33b737d8ac679e259055b57f63ef18f783dd7887c726502f8c05cb9339addd8728ee180ed15dc7d067ff45cc1888bc42a8ca45f9734717cfcde53f3e45 |
24 |
DIST gvfs-1.32.2.tar.xz 1820100 BLAKE2B a12209f8d1f1350edfc470bb8181d68172580909764899a20b248e5dca673e5904aef0562f3244336dd8eff66cbae926d4fb2ebcccc30125328e15aeb622b481 SHA512 2fecb7103917f976528a75d317ddb6c9a71c2787cd1bd442c42a40177b74a026e37c9794117f802ebf608091d446ac58eb80d1a618df619180bb3920a98a9457 |
25 |
-DIST gvfs-1.38.3.tar.xz 1202280 BLAKE2B fb4d4f6d0187f4f1bdfdff42f496402c64077958816d1a07d1689b8d477538c11ce26ef5caba1ff8ed16f1188ff5e59d92ce807f4adbf7d9749fe59da6a0e2dc SHA512 4497d04942881e7e7fe6541fc5951bcc03c89305dc975ed1cd0368acf382ac66a532f3b7c781c4dec5662bf71dd6346a93378096c0cbec5f6331d75c85b96175 |
26 |
DIST gvfs-1.40.2.tar.xz 1204824 BLAKE2B beaf9ba603d035a81ab21dc3fe438dfe77cc0cb1d38d0457d079be80b7ec93ab6adbe9992dd0030510fb816ce14da5ef03c3f865e32bdd69956bc0181da09af2 SHA512 aec525091553e793e10ad9747e29080c92401b9d2a0b8dff98994c071d67057796628dc2a53c0ede46c53f2b149abb55e57c3ddd75e11a93c2f168713e5fb61c |
27 |
|
28 |
diff --git a/gnome-base/gvfs/files/1.38.3-gvfsdaemon-rpath.patch b/gnome-base/gvfs/files/1.38.3-gvfsdaemon-rpath.patch |
29 |
deleted file mode 100644 |
30 |
index f3fe513d06e..00000000000 |
31 |
--- a/gnome-base/gvfs/files/1.38.3-gvfsdaemon-rpath.patch |
32 |
+++ /dev/null |
33 |
@@ -1,35 +0,0 @@ |
34 |
-From 57010ebb148b9b14e40140c7a8ce133a72128cf6 Mon Sep 17 00:00:00 2001 |
35 |
-From: Robby Workman <rworkman@×××××××××.com> |
36 |
-Date: Thu, 18 Jul 2019 03:38:41 -0500 |
37 |
-Subject: [PATCH] daemon/meson.build: define gvfs_rpath for libgvfsdaemon.so |
38 |
- |
39 |
-On Slackware development branch with gvfs-1.40.2, I just noticed this: |
40 |
- # ldd /usr/lib64/gvfs/libgvfsdaemon.so | grep "not found" |
41 |
- libgvfscommon.so => not found |
42 |
- |
43 |
-After some backtracking, it seems that this first occurred in the |
44 |
-switchover from autotools to meson in the 1.36.x --> 1.38.x bump. |
45 |
- |
46 |
-Big thanks to Cogitri in #gnome/irc.gnome.org for the patience and |
47 |
-assistance with troubleshooting this. |
48 |
- |
49 |
-Signed-off-by: Robby Workman <rworkman@×××××××××.com> |
50 |
---- |
51 |
- daemon/meson.build | 1 + |
52 |
- 1 file changed, 1 insertion(+) |
53 |
- |
54 |
-diff --git a/daemon/meson.build b/daemon/meson.build |
55 |
-index 7f2608bd..0006f35e 100644 |
56 |
---- a/daemon/meson.build |
57 |
-+++ b/daemon/meson.build |
58 |
-@@ -121,6 +121,7 @@ libgvfsdaemon = shared_library( |
59 |
- dependencies: deps, |
60 |
- c_args: cflags, |
61 |
- install: true, |
62 |
-+ install_rpath: gvfs_rpath, |
63 |
- install_dir: gvfs_pkglibdir |
64 |
- ) |
65 |
- |
66 |
--- |
67 |
-2.20.1 |
68 |
- |
69 |
|
70 |
diff --git a/gnome-base/gvfs/gvfs-1.38.3.ebuild b/gnome-base/gvfs/gvfs-1.38.3.ebuild |
71 |
deleted file mode 100644 |
72 |
index 5cd798af734..00000000000 |
73 |
--- a/gnome-base/gvfs/gvfs-1.38.3.ebuild |
74 |
+++ /dev/null |
75 |
@@ -1,137 +0,0 @@ |
76 |
-# Copyright 1999-2019 Gentoo Authors |
77 |
-# Distributed under the terms of the GNU General Public License v2 |
78 |
- |
79 |
-EAPI=6 |
80 |
- |
81 |
-inherit gnome.org gnome2-utils meson systemd xdg |
82 |
- |
83 |
-DESCRIPTION="Virtual filesystem implementation for GIO" |
84 |
-HOMEPAGE="https://wiki.gnome.org/Projects/gvfs" |
85 |
- |
86 |
-LICENSE="LGPL-2+" |
87 |
-SLOT="0" |
88 |
- |
89 |
-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" |
90 |
-RESTRICT="!test? ( test )" |
91 |
-# elogind/systemd only relevant to udisks (in v1.38.1) |
92 |
-REQUIRED_USE=" |
93 |
- ?? ( elogind systemd ) |
94 |
- cdda? ( udev ) |
95 |
- google? ( gnome-online-accounts ) |
96 |
- gphoto2? ( udev ) |
97 |
- mtp? ( udev ) |
98 |
- udisks? ( udev ) |
99 |
-" |
100 |
-KEYWORDS="alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris" |
101 |
- |
102 |
-RDEPEND=" |
103 |
- >=dev-libs/glib-2.57.2:2 |
104 |
- afp? ( >=dev-libs/libgcrypt-1.2.2:0= ) |
105 |
- sys-apps/dbus |
106 |
- app-crypt/gcr:= |
107 |
- policykit? ( |
108 |
- >=sys-auth/polkit-0.114 |
109 |
- sys-libs/libcap ) |
110 |
- http? ( |
111 |
- dev-libs/libxml2:2 |
112 |
- >=net-libs/libsoup-2.42.0:2.4 ) |
113 |
- zeroconf? ( >=net-dns/avahi-0.6[dbus] ) |
114 |
- udev? ( >=dev-libs/libgudev-147:= ) |
115 |
- fuse? ( >=sys-fs/fuse-2.8.0:0 ) |
116 |
- udisks? ( >=sys-fs/udisks-1.97:2 ) |
117 |
- systemd? ( >=sys-apps/systemd-206:0= ) |
118 |
- elogind? ( >=sys-auth/elogind-229:0= ) |
119 |
- ios? ( |
120 |
- >=app-pda/libimobiledevice-1.2:= |
121 |
- >=app-pda/libplist-1:= ) |
122 |
- gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.17.1:= ) |
123 |
- gnome-keyring? ( app-crypt/libsecret ) |
124 |
- bluray? ( media-libs/libbluray:= ) |
125 |
- mtp? ( |
126 |
- >=dev-libs/libusb-1.0.21 |
127 |
- >=media-libs/libmtp-1.1.15 ) |
128 |
- samba? ( >=net-fs/samba-4[client] ) |
129 |
- archive? ( app-arch/libarchive:= ) |
130 |
- cdda? ( |
131 |
- dev-libs/libcdio:0= |
132 |
- >=dev-libs/libcdio-paranoia-0.78.2 ) |
133 |
- google? ( >=dev-libs/libgdata-0.17.9:=[crypt,gnome-online-accounts] ) |
134 |
- gphoto2? ( >=media-libs/libgphoto2-2.5.0:= ) |
135 |
- nfs? ( >=net-fs/libnfs-1.9.8 ) |
136 |
- net-misc/openssh |
137 |
-" |
138 |
-DEPEND="${RDEPEND} |
139 |
- dev-util/glib-utils |
140 |
- app-text/docbook-xsl-stylesheets |
141 |
- app-text/docbook-xml-dtd:4.2 |
142 |
- dev-libs/libxslt |
143 |
- >=sys-devel/gettext-0.19.4 |
144 |
- virtual/pkgconfig |
145 |
- dev-util/gdbus-codegen |
146 |
-" |
147 |
- |
148 |
-PATCHES=( |
149 |
- # from gnome-3-30 branch, fixes RPATH of libgvfsdaemon.so |
150 |
- "${FILESDIR}"/${PV}-gvfsdaemon-rpath.patch |
151 |
-) |
152 |
- |
153 |
-src_configure() { |
154 |
- local enable_logind="false" |
155 |
- if use systemd || use elogind; then |
156 |
- enable_logind="true" |
157 |
- fi |
158 |
- |
159 |
- local enable_gcrypt="false" |
160 |
- 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 |
161 |
- enable_gcrypt="true" |
162 |
- fi |
163 |
- |
164 |
- local enable_libusb="false" |
165 |
- 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 |
166 |
- enable_libusb="true" |
167 |
- fi |
168 |
- |
169 |
- local emesonargs=( |
170 |
- -Dsystemduserunitdir="$(systemd_get_userunitdir)" |
171 |
- -Dtmpfilesdir="${EPREFIX}"/usr/lib/tmpfiles.d |
172 |
- $(meson_use policykit admin) |
173 |
- $(meson_use ios afc) |
174 |
- $(meson_use afp) |
175 |
- $(meson_use archive) |
176 |
- $(meson_use cdda) |
177 |
- $(meson_use zeroconf dnssd) |
178 |
- $(meson_use gnome-online-accounts goa) |
179 |
- $(meson_use google) |
180 |
- $(meson_use gphoto2) |
181 |
- $(meson_use http) |
182 |
- $(meson_use mtp) |
183 |
- $(meson_use nfs) |
184 |
- -Dsftp=true |
185 |
- $(meson_use samba smb) |
186 |
- $(meson_use udisks udisks2) |
187 |
- $(meson_use bluray) |
188 |
- $(meson_use fuse) |
189 |
- -Dgcr=true |
190 |
- -Dgcrypt=${enable_gcrypt} |
191 |
- $(meson_use udev gudev) |
192 |
- $(meson_use gnome-keyring keyring) |
193 |
- -Dlogind=${enable_logind} |
194 |
- -Dlibusb=${enable_libusb} |
195 |
- -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 |
196 |
- -Dinstalled_tests=false |
197 |
- -Dman=true |
198 |
- ) |
199 |
- meson_src_configure |
200 |
-} |
201 |
- |
202 |
-pkg_postinst() { |
203 |
- xdg_pkg_postinst |
204 |
- gnome2_schemas_update |
205 |
- gnome2_giomodule_cache_update |
206 |
-} |
207 |
- |
208 |
-pkg_postrm() { |
209 |
- xdg_pkg_postrm |
210 |
- gnome2_schemas_update |
211 |
- gnome2_giomodule_cache_update |
212 |
-} |