Gentoo Archives: gentoo-commits

From: Gilles Dartiguelongue <eva@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: gnome-base/nautilus/files/, gnome-base/nautilus/
Date: Tue, 01 Nov 2016 17:32:29
Message-Id: 1478019982.c373c12a1e4bf1b5d41db6a60acd3ae0cb4ebccf.eva@gentoo
1 commit: c373c12a1e4bf1b5d41db6a60acd3ae0cb4ebccf
2 Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
3 AuthorDate: Tue Nov 1 15:29:06 2016 +0000
4 Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
5 CommitDate: Tue Nov 1 17:06:22 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c373c12a
7
8 gnome-base/nautilus: cleanup old revisions
9
10 Package-Manager: portage-2.3.2
11
12 gnome-base/nautilus/Manifest | 2 -
13 .../files/nautilus-3.18.2-automagic-selinux.patch | 47 --------
14 gnome-base/nautilus/nautilus-3.18.5.ebuild | 127 ---------------------
15 gnome-base/nautilus/nautilus-3.20.2.ebuild | 111 ------------------
16 4 files changed, 287 deletions(-)
17
18 diff --git a/gnome-base/nautilus/Manifest b/gnome-base/nautilus/Manifest
19 index c931f24..7145211 100644
20 --- a/gnome-base/nautilus/Manifest
21 +++ b/gnome-base/nautilus/Manifest
22 @@ -1,4 +1,2 @@
23 -DIST nautilus-3.18.5.tar.xz 3349312 SHA256 60a927c0522b4cced9d8f62baed2ee5e2fd4305be4523eb5bc44805971a6cc15 SHA512 60ec5c1eb7ba90caed2f536a0fd78d8686b6f7372db36d526d634d727ac03719edee894ca0ff1d90a0974cc0bc76f05bf0f8d4db22845ae3585470aa8e7b8ca6 WHIRLPOOL 02bbd1c1f9f97c4ffd983cb8503a95aa549bbe9105094aeb76a12b89b6daa460377f4c3cf984989a16cadd426e138ecdda6e8089790bad5ebef20236eac596b9
24 -DIST nautilus-3.20.2.tar.xz 3447216 SHA256 8d6e679b880dc78c0c2e2dabf6025e6da34ff279dee501f7c75f3649c1a6caae SHA512 1c93f7821b2a14b94a4bc548ff5350a741f823b50a543136010d63e95374a31731004f8ee70cb4beabd9917b4fa05a2f4909ef90982969c5618fe40f42762d8a WHIRLPOOL 6d5f64f63f98b858f45705fda74f566d3ff41a66db603137a58db4eef0cb83298de39ced4e33c1525f81b7493f5e81f75c6713c59c31a8fe2f3de535d32497f2
25 DIST nautilus-3.20.3.tar.xz 3437224 SHA256 46600a2361a022a0170304aef7167caa29c0d52232063a3556bec6a77881310e SHA512 dbd23fd88f66b80056970f3e189e85aadf4c8ecb7ee1e103acda2da2b1aef99cb40d1dbfaa1dc905a8adda4bb9e591badb1b6b9762c6dc5b6d9b9f175747959b WHIRLPOOL 0036c7fe7e1d4494926c872bbec2a180cb262783c1e1a58c0f2f580dec8fcbeba56590060fda70a6fbd40b20282879afa1263bffaf998a529e3205b382370e4f
26 DIST nautilus-3.22.1.tar.xz 5139460 SHA256 17e37ffecebb2cf29e6bfb52111a951f0c67534b9dabf0210c12d15abb7dbddc SHA512 cb27b1c476a6a19959050bf1ea6ae34a4e7136ea261efd922fc03e362ba1357f4709547ed8bbff9e1d4f8892aff5f08a9e03aadc8c52a6202c1d6d7f201e51f0 WHIRLPOOL 3687d2a8a52f512c6c5e47f20f096e6ed750cf83202714cae8b755df520373527292e4ca1e565226f145bf43ac33b035e0a1dc390711457635d6015763f73481
27
28 diff --git a/gnome-base/nautilus/files/nautilus-3.18.2-automagic-selinux.patch b/gnome-base/nautilus/files/nautilus-3.18.2-automagic-selinux.patch
29 deleted file mode 100644
30 index 0f769fc..00000000
31 --- a/gnome-base/nautilus/files/nautilus-3.18.2-automagic-selinux.patch
32 +++ /dev/null
33 @@ -1,47 +0,0 @@
34 -From bfdedc2f762027ec9a50fda659d66720718bb28d Mon Sep 17 00:00:00 2001
35 -From: Gilles Dartiguelongue <eva@g.o>
36 -Date: Wed, 25 Nov 2015 09:23:51 +0100
37 -Subject: [PATCH] Make libselinux dependency controllable by configure switch
38 -
39 ----
40 - configure.ac | 23 ++++++++++++-----------
41 - 1 file changed, 12 insertions(+), 11 deletions(-)
42 -
43 -diff --git a/configure.ac b/configure.ac
44 -index 777ff84..37a65ba 100644
45 ---- a/configure.ac
46 -+++ b/configure.ac
47 -@@ -140,18 +140,19 @@ dnl ==========================================================================
48 - dnl ****************************
49 - dnl *** Check for libselinux ***
50 - dnl ****************************
51 --
52 --SELINUX_LIBS=
53 -+
54 - msg_selinux=no
55 --AC_CHECK_LIB(selinux, is_selinux_enabled,
56 -- [AC_CHECK_HEADERS(selinux/selinux.h,
57 -- [AC_SEARCH_LIBS(selinux_raw_to_trans_context, selinux,
58 -- [AC_DEFINE(HAVE_SELINUX, 1, [Define to 1 if libselinux is available])
59 -- SELINUX_LIBS="-lselinux"
60 -- msg_selinux=yes])
61 -- ])
62 -- ])
63 --AC_SUBST(SELINUX_LIBS)
64 -+
65 -+AC_ARG_ENABLE([selinux],
66 -+ [AS_HELP_STRING([--enable-selinux],
67 -+ [Enable selinux support])])
68 -+AS_IF([test "$enable_selinux" != "no"],
69 -+ [PKG_CHECK_MODULES([SELINUX], [libselinux >= 2.0],
70 -+ [
71 -+ AC_DEFINE([HAVE_SELINUX], [1], [Define to 1 if libselinux is available])
72 -+ msg_selinux=yes
73 -+ ])
74 -+ ])
75 -
76 -
77 - AC_ARG_ENABLE(empty_view,
78 ---
79 -2.6.3
80 -
81
82 diff --git a/gnome-base/nautilus/nautilus-3.18.5.ebuild b/gnome-base/nautilus/nautilus-3.18.5.ebuild
83 deleted file mode 100644
84 index 6809ba6..00000000
85 --- a/gnome-base/nautilus/nautilus-3.18.5.ebuild
86 +++ /dev/null
87 @@ -1,127 +0,0 @@
88 -# Copyright 1999-2016 Gentoo Foundation
89 -# Distributed under the terms of the GNU General Public License v2
90 -# $Id$
91 -
92 -EAPI="5"
93 -GCONF_DEBUG="no"
94 -GNOME2_LA_PUNT="yes" # Needed with USE 'sendto'
95 -
96 -inherit autotools eutils gnome2 readme.gentoo virtualx
97 -
98 -DESCRIPTION="A file manager for the GNOME desktop"
99 -HOMEPAGE="https://wiki.gnome.org/Apps/Nautilus"
100 -
101 -LICENSE="GPL-2+ LGPL-2+ FDL-1.1"
102 -SLOT="0"
103 -
104 -IUSE="exif gnome +introspection packagekit +previewer selinux sendto tracker xmp"
105 -KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux"
106 -
107 -# FIXME: tests fails under Xvfb, but pass when building manually
108 -# "FAIL: check failed in nautilus-file.c, line 8307"
109 -# need org.gnome.SessionManager service (aka gnome-session) but cannot find it
110 -RESTRICT="test"
111 -
112 -# Require {glib,gdbus-codegen}-2.30.0 due to GDBus API changes between 2.29.92
113 -# and 2.30.0
114 -COMMON_DEPEND="
115 - >=dev-libs/glib-2.45.7:2[dbus]
116 - >=x11-libs/pango-1.28.3
117 - >=x11-libs/gtk+-3.18.5:3[introspection?]
118 - >=dev-libs/libxml2-2.7.8:2
119 - >=gnome-base/gnome-desktop-3:3=
120 -
121 - gnome-base/dconf
122 - >=gnome-base/gsettings-desktop-schemas-3.8.0
123 - x11-libs/libX11
124 - x11-libs/libXext
125 - x11-libs/libXrender
126 -
127 - exif? ( >=media-libs/libexif-0.6.20 )
128 - introspection? ( >=dev-libs/gobject-introspection-0.6.4:= )
129 - selinux? ( >=sys-libs/libselinux-2 )
130 - tracker? ( >=app-misc/tracker-0.16:= )
131 - xmp? ( >=media-libs/exempi-2.1.0 )
132 -"
133 -DEPEND="${COMMON_DEPEND}
134 - >=dev-lang/perl-5
135 - >=dev-util/gdbus-codegen-2.33
136 - >=dev-util/gtk-doc-am-1.10
137 - >=dev-util/intltool-0.40.1
138 - sys-devel/gettext
139 - virtual/pkgconfig
140 - x11-proto/xproto
141 -"
142 -RDEPEND="${COMMON_DEPEND}
143 - packagekit? ( app-admin/packagekit-base )
144 - sendto? ( !<gnome-extra/nautilus-sendto-3.0.1 )
145 -"
146 -
147 -# For eautoreconf
148 -# gnome-base/gnome-common
149 -# dev-util/gtk-doc-am"
150 -
151 -PDEPEND="
152 - gnome? (
153 - >=x11-themes/gnome-icon-theme-1.1.91
154 - x11-themes/gnome-icon-theme-symbolic )
155 - tracker? ( >=gnome-extra/nautilus-tracker-tags-0.12 )
156 - previewer? ( >=gnome-extra/sushi-0.1.9 )
157 - sendto? ( >=gnome-extra/nautilus-sendto-3.0.1 )
158 - >=gnome-base/gvfs-1.14[gtk]
159 -"
160 -# Need gvfs[gtk] for recent:/// support
161 -
162 -src_prepare() {
163 - if use previewer; then
164 - DOC_CONTENTS="nautilus uses gnome-extra/sushi to preview media files.
165 - To activate the previewer, select a file and press space; to
166 - close the previewer, press space again."
167 - fi
168 -
169 - # Control selinux support
170 - # https://bugzilla.gnome.org/show_bug.cgi?id=758632
171 - epatch "${FILESDIR}"/${PN}-3.18.2-automagic-selinux.patch
172 -
173 - eautoreconf
174 -
175 - # Remove -D*DEPRECATED flags. Don't leave this for eclass! (bug #448822)
176 - sed -e 's/DISABLE_DEPRECATED_CFLAGS=.*/DISABLE_DEPRECATED_CFLAGS=/' \
177 - -i configure || die "sed failed"
178 -
179 - gnome2_src_prepare
180 -}
181 -
182 -src_configure() {
183 - DOCS="AUTHORS HACKING MAINTAINERS NEWS README* THANKS"
184 - gnome2_src_configure \
185 - --disable-profiling \
186 - --disable-update-mimedb \
187 - $(use_enable exif libexif) \
188 - $(use_enable introspection) \
189 - $(use_enable packagekit) \
190 - $(use_enable sendto nst-extension) \
191 - $(use_enable selinux) \
192 - $(use_enable tracker) \
193 - $(use_enable xmp)
194 -}
195 -
196 -src_test() {
197 - gnome2_environment_reset
198 - Xemake check
199 -}
200 -
201 -src_install() {
202 - use previewer && readme.gentoo_create_doc
203 - gnome2_src_install
204 -}
205 -
206 -pkg_postinst() {
207 - gnome2_pkg_postinst
208 -
209 - if use previewer; then
210 - readme.gentoo_print_elog
211 - else
212 - elog "To preview media files, emerge nautilus with USE=previewer"
213 - fi
214 -}
215
216 diff --git a/gnome-base/nautilus/nautilus-3.20.2.ebuild b/gnome-base/nautilus/nautilus-3.20.2.ebuild
217 deleted file mode 100644
218 index bcff81b..00000000
219 --- a/gnome-base/nautilus/nautilus-3.20.2.ebuild
220 +++ /dev/null
221 @@ -1,111 +0,0 @@
222 -# Copyright 1999-2016 Gentoo Foundation
223 -# Distributed under the terms of the GNU General Public License v2
224 -# $Id$
225 -
226 -EAPI=6
227 -GNOME2_LA_PUNT="yes" # Needed with USE 'sendto'
228 -
229 -inherit gnome2 readme.gentoo-r1 virtualx
230 -
231 -DESCRIPTION="A file manager for the GNOME desktop"
232 -HOMEPAGE="https://wiki.gnome.org/Apps/Nautilus"
233 -
234 -LICENSE="GPL-2+ LGPL-2+ FDL-1.1"
235 -SLOT="0"
236 -IUSE="exif gnome +introspection packagekit +previewer selinux sendto tracker xmp"
237 -
238 -KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux"
239 -
240 -# FIXME: tests fails under Xvfb, but pass when building manually
241 -# "FAIL: check failed in nautilus-file.c, line 8307"
242 -# need org.gnome.SessionManager service (aka gnome-session) but cannot find it
243 -RESTRICT="test"
244 -
245 -# Require {glib,gdbus-codegen}-2.30.0 due to GDBus API changes between 2.29.92
246 -# and 2.30.0
247 -COMMON_DEPEND="
248 - >=dev-libs/glib-2.45.7:2[dbus]
249 - >=x11-libs/pango-1.28.3
250 - >=x11-libs/gtk+-3.19.12:3[introspection?]
251 - >=dev-libs/libxml2-2.7.8:2
252 - >=gnome-base/gnome-desktop-3:3=
253 -
254 - gnome-base/dconf
255 - >=gnome-base/gsettings-desktop-schemas-3.8.0
256 - x11-libs/libX11
257 - x11-libs/libXext
258 - x11-libs/libXrender
259 -
260 - exif? ( >=media-libs/libexif-0.6.20 )
261 - introspection? ( >=dev-libs/gobject-introspection-0.6.4:= )
262 - selinux? ( >=sys-libs/libselinux-2 )
263 - tracker? ( >=app-misc/tracker-0.16:= )
264 - xmp? ( >=media-libs/exempi-2.1.0 )
265 -"
266 -DEPEND="${COMMON_DEPEND}
267 - >=dev-lang/perl-5
268 - >=dev-util/gdbus-codegen-2.33
269 - >=dev-util/gtk-doc-am-1.10
270 - >=dev-util/intltool-0.50
271 - sys-devel/gettext
272 - virtual/pkgconfig
273 - x11-proto/xproto
274 -"
275 -RDEPEND="${COMMON_DEPEND}
276 - packagekit? ( app-admin/packagekit-base )
277 - sendto? ( !<gnome-extra/nautilus-sendto-3.0.1 )
278 -"
279 -
280 -# For eautoreconf
281 -# gnome-base/gnome-common
282 -# dev-util/gtk-doc-am"
283 -
284 -PDEPEND="
285 - gnome? ( x11-themes/adwaita-icon-theme )
286 - tracker? ( >=gnome-extra/nautilus-tracker-tags-0.12 )
287 - previewer? ( >=gnome-extra/sushi-0.1.9 )
288 - sendto? ( >=gnome-extra/nautilus-sendto-3.0.1 )
289 - >=gnome-base/gvfs-1.14[gtk]
290 -"
291 -# Need gvfs[gtk] for recent:/// support
292 -
293 -src_prepare() {
294 - if use previewer; then
295 - DOC_CONTENTS="nautilus uses gnome-extra/sushi to preview media files.
296 - To activate the previewer, select a file and press space; to
297 - close the previewer, press space again."
298 - fi
299 - gnome2_src_prepare
300 -}
301 -
302 -src_configure() {
303 - gnome2_src_configure \
304 - --disable-profiling \
305 - --disable-update-mimedb \
306 - $(use_enable exif libexif) \
307 - $(use_enable introspection) \
308 - $(use_enable packagekit) \
309 - $(use_enable sendto nst-extension) \
310 - $(use_enable selinux) \
311 - $(use_enable tracker) \
312 - $(use_enable xmp)
313 -}
314 -
315 -src_test() {
316 - virtx emake check
317 -}
318 -
319 -src_install() {
320 - use previewer && readme.gentoo_create_doc
321 - gnome2_src_install
322 -}
323 -
324 -pkg_postinst() {
325 - gnome2_pkg_postinst
326 -
327 - if use previewer; then
328 - readme.gentoo_print_elog
329 - else
330 - elog "To preview media files, emerge nautilus with USE=previewer"
331 - fi
332 -}