Gentoo Archives: gentoo-commits

From: Gilles Dartiguelongue <eva@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-misc/tracker/files/, app-misc/tracker/
Date: Tue, 01 Nov 2016 23:58:31
Message-Id: 1478044668.7278ccf972ff85dc414d3def94c832efbfc22627.eva@gentoo
1 commit: 7278ccf972ff85dc414d3def94c832efbfc22627
2 Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
3 AuthorDate: Tue Nov 1 17:04:54 2016 +0000
4 Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
5 CommitDate: Tue Nov 1 23:57:48 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7278ccf9
7
8 app-misc/tracker: cleanup old revision
9
10 Package-Manager: portage-2.3.2
11
12 app-misc/tracker/Manifest | 1 -
13 .../tracker/files/tracker-1.6.2-include-path.patch | 64 -----
14 .../files/tracker-1.6.2-sqlite-underlinking.patch | 58 -----
15 app-misc/tracker/tracker-1.6.2.ebuild | 266 ---------------------
16 4 files changed, 389 deletions(-)
17
18 diff --git a/app-misc/tracker/Manifest b/app-misc/tracker/Manifest
19 index 582a24f..7ba0741 100644
20 --- a/app-misc/tracker/Manifest
21 +++ b/app-misc/tracker/Manifest
22 @@ -1,3 +1,2 @@
23 DIST tracker-1.10.1.tar.xz 5027912 SHA256 67ea78cca8ebbd6633dddcdd40b5205683cc886b872cde987e2a8bae171f4191 SHA512 aa523fad1c577926ec1f33692314afe673bdc6a84917c4ed506d29e8d0ec17dfacf0a6694cd794d140fc1498770b58d640ed4886c2827644665c92461764d7ce WHIRLPOOL 6947aef1420f15c879ae26a7c5e17ce0a34316077cba20b12dbb5be7e5f55ea840d6d0e145d3c19f47f3db640e07b043a6a25a7bd810bd6ac9a3de336f30f6d3
24 -DIST tracker-1.6.2.tar.xz 6128492 SHA256 d3583f32e6a06ccb1146ca31939710edb630d7ffe3da37b01f893b45f4480045 SHA512 280f2feab5c6af611c77ce90db925ecb6278eb4b516f22ac9f8b44ebfd87806fdbca51985ca28eccdabb503ee15ac76ded31d9380ea448cb2dc3fdd1ee4d5914 WHIRLPOOL d5ceca74daf114a3d09b2975d2ae3d21891c2f0a6cb9923ceda89e9f57b5fe049c9f23164f6f5c00806c664b98cc01dc5e8760fe6dcf5046125b520530924852
25 DIST tracker-1.8.0.tar.xz 4961488 SHA256 a11f31a373bfec3abae38ae719d0a59f666f1f067d8789ade2ed7032a152907d SHA512 c7d0600cfcf5485188167d237e22a00a5777b97b96c8735ba3efcef67288a8d9db9476f05289cf1498c50432981a4bc932973241138ea116a18e421576ed3cdd WHIRLPOOL 2941ab228ccaae96abf8ad1387d898981aae9611aaaa64425df21fb941ca4f49e485dfb094b191b1ec46f1b83f5e248fbce700b18b232209866fdb248b4bba53
26
27 diff --git a/app-misc/tracker/files/tracker-1.6.2-include-path.patch b/app-misc/tracker/files/tracker-1.6.2-include-path.patch
28 deleted file mode 100644
29 index 18f62b8..00000000
30 --- a/app-misc/tracker/files/tracker-1.6.2-include-path.patch
31 +++ /dev/null
32 @@ -1,64 +0,0 @@
33 -From a0be9abc0bffdaedd1e64a45da0eb12509b1ab72 Mon Sep 17 00:00:00 2001
34 -From: David King <amigadave@×××××××××.com>
35 -Date: Wed, 2 Mar 2016 11:10:51 +0000
36 -Subject: Ensure embedded sqlite.h is in the include path
37 -
38 -https://bugzilla.gnome.org/show_bug.cgi?id=762976
39 ----
40 - src/libtracker-data/Makefile.am | 1 +
41 - src/libtracker-fts/Makefile.am | 1 +
42 - src/plugins/evolution/Makefile.am | 1 +
43 - src/tracker-store/Makefile.am | 1 +
44 - 4 files changed, 4 insertions(+)
45 -
46 -diff --git a/src/libtracker-data/Makefile.am b/src/libtracker-data/Makefile.am
47 -index 7835d1f..6ad4c7f 100644
48 ---- a/src/libtracker-data/Makefile.am
49 -+++ b/src/libtracker-data/Makefile.am
50 -@@ -12,6 +12,7 @@ AM_VALAFLAGS = \
51 - AM_CPPFLAGS = \
52 - $(BUILD_VALACFLAGS) \
53 - -I$(top_srcdir)/src \
54 -+ -I$(top_srcdir)/src/sqlite \
55 - -I$(top_builddir)/src \
56 - -DSHAREDIR=\""$(datadir)"\" \
57 - $(LIBTRACKER_DATA_CFLAGS)
58 -diff --git a/src/libtracker-fts/Makefile.am b/src/libtracker-fts/Makefile.am
59 -index bcb2802..27ff127 100644
60 ---- a/src/libtracker-fts/Makefile.am
61 -+++ b/src/libtracker-fts/Makefile.am
62 -@@ -1,6 +1,7 @@
63 - AM_CPPFLAGS = \
64 - $(BUILD_CFLAGS) \
65 - -I$(top_srcdir)/src \
66 -+ -I$(top_srcdir)/src/sqlite \
67 - -DNDEBUG \
68 - $(LIBTRACKER_FTS_CFLAGS)
69 -
70 -diff --git a/src/plugins/evolution/Makefile.am b/src/plugins/evolution/Makefile.am
71 -index dcdd886..9448b2f 100644
72 ---- a/src/plugins/evolution/Makefile.am
73 -+++ b/src/plugins/evolution/Makefile.am
74 -@@ -1,6 +1,7 @@
75 - AM_CPPFLAGS = \
76 - $(BUILD_CFLAGS) \
77 - -I$(top_srcdir)/src \
78 -+ -I$(top_srcdir)/src/sqlite \
79 - -I$(top_builddir)/src \
80 - -DGETTEXT_PACKAGE="\"$(GETTEXT_PACKAGE)\"" \
81 - -DLOCALEDIR="\"$(localedir)\"" \
82 -diff --git a/src/tracker-store/Makefile.am b/src/tracker-store/Makefile.am
83 -index 83cb77e..26d8a06 100644
84 ---- a/src/tracker-store/Makefile.am
85 -+++ b/src/tracker-store/Makefile.am
86 -@@ -5,6 +5,7 @@ AM_CPPFLAGS = \
87 - -DMAIL_MODULES_DIR=\""$(libdir)"/tracker-$(TRACKER_API_VERSION)/mail-modules\" \
88 - -DPUSH_MODULES_DIR=\""$(libdir)/tracker-$(TRACKER_API_VERSION)/push-modules/daemon"\" \
89 - -I$(top_srcdir)/src \
90 -+ -I$(top_srcdir)/src/sqlite \
91 - -I$(top_builddir)/src \
92 - $(TRACKER_STORE_CFLAGS) \
93 - -include config.h \
94 ---
95 -cgit v0.12
96 -
97
98 diff --git a/app-misc/tracker/files/tracker-1.6.2-sqlite-underlinking.patch b/app-misc/tracker/files/tracker-1.6.2-sqlite-underlinking.patch
99 deleted file mode 100644
100 index 4d3e20a..00000000
101 --- a/app-misc/tracker/files/tracker-1.6.2-sqlite-underlinking.patch
102 +++ /dev/null
103 @@ -1,58 +0,0 @@
104 -From f69ece17fd3d6414ef2634336c7e780207b0f4a7 Mon Sep 17 00:00:00 2001
105 -From: Alexandre Rostovtsev <tetromino@g.o>
106 -Date: Sun, 15 May 2016 15:15:50 -0400
107 -Subject: [PATCH] build: embedded copy of SQLite requires -ldl and -pthread
108 -
109 -https://bugzilla.gnome.org/show_bug.cgi?id=766487
110 ----
111 - configure.ac | 8 ++++++++
112 - src/sqlite/Makefile.am | 9 +++++++--
113 - 2 files changed, 15 insertions(+), 2 deletions(-)
114 -
115 -diff --git a/configure.ac b/configure.ac
116 -index 2ccda7a..b6c978a 100644
117 ---- a/configure.ac
118 -+++ b/configure.ac
119 -@@ -719,6 +719,14 @@ if test "x$enable_journal" = "xno" ; then
120 - AC_DEFINE(DISABLE_JOURNAL, 1, [Define if we disable the journal])
121 - fi
122 -
123 -+####################################################################
124 -+# Check for SQLite
125 -+####################################################################
126 -+
127 -+# Our copy of sqlite requires libdl on some platforms
128 -+AC_CHECK_LIB(dl, dlsym, [LIBDL=-ldl], [LIBDL=])
129 -+AC_SUBST(LIBDL)
130 -+
131 - ##################################################################
132 - # Check for libtracker-common, make sure libstemmer exists
133 - ##################################################################
134 -diff --git a/src/sqlite/Makefile.am b/src/sqlite/Makefile.am
135 -index 8b0ac18..354f054 100644
136 ---- a/src/sqlite/Makefile.am
137 -+++ b/src/sqlite/Makefile.am
138 -@@ -3,7 +3,8 @@ AM_CPPFLAGS = \
139 - -I$(top_srcdir)/src \
140 - -DSQLITE_THREADSAFE=1 \
141 - -DSQLITE_ENABLE_FTS4 \
142 -- -DSQLITE_ENABLE_FTS3_TOKENIZER
143 -+ -DSQLITE_ENABLE_FTS3_TOKENIZER \
144 -+ -pthread
145 -
146 - noinst_LTLIBRARIES = libtracker-sqlite.la
147 -
148 -@@ -12,5 +13,9 @@ libtracker_sqlite_la_SOURCES = \
149 - sqlite3.h \
150 - sqlite3ext.h
151 -
152 -+libtracker_sqlite_la_LDFLAGS = \
153 -+ -pthread
154 -+
155 - libtracker_sqlite_la_LIBADD = \
156 -- $(BUILD_LIBS)
157 -+ $(BUILD_LIBS) \
158 -+ $(LIBDL)
159 ---
160 -2.8.2
161 -
162
163 diff --git a/app-misc/tracker/tracker-1.6.2.ebuild b/app-misc/tracker/tracker-1.6.2.ebuild
164 deleted file mode 100644
165 index 4ade202..00000000
166 --- a/app-misc/tracker/tracker-1.6.2.ebuild
167 +++ /dev/null
168 @@ -1,266 +0,0 @@
169 -# Copyright 1999-2016 Gentoo Foundation
170 -# Distributed under the terms of the GNU General Public License v2
171 -# $Id$
172 -
173 -EAPI="5"
174 -GCONF_DEBUG="no"
175 -GNOME2_LA_PUNT="yes"
176 -PYTHON_COMPAT=( python2_7 )
177 -
178 -inherit autotools bash-completion-r1 eutils gnome2 linux-info multilib python-any-r1 vala versionator virtualx
179 -
180 -DESCRIPTION="A tagging metadata database, search tool and indexer"
181 -HOMEPAGE="https://wiki.gnome.org/Projects/Tracker"
182 -
183 -LICENSE="GPL-2+ LGPL-2.1+"
184 -SLOT="0/100"
185 -IUSE="cue eds elibc_glibc exif ffmpeg firefox-bookmarks flac gif gsf
186 -gstreamer gtk iptc +iso +jpeg libav +miner-fs mp3 nautilus networkmanager
187 -pdf playlist rss stemmer test thunderbird +tiff upnp-av upower +vorbis +xml xmp xps"
188 -
189 -KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
190 -
191 -REQUIRED_USE="
192 - ?? ( gstreamer ffmpeg )
193 - cue? ( gstreamer )
194 - upnp-av? ( gstreamer )
195 - !miner-fs? ( !cue !exif !flac !gif !gsf !iptc !iso !jpeg !mp3 !pdf !playlist !tiff !vorbis !xml !xmp !xps )
196 -"
197 -
198 -# According to NEWS, introspection is non-optional
199 -# glibc-2.12 needed for SCHED_IDLE (see bug #385003)
200 -RDEPEND="
201 - >=app-i18n/enca-1.9
202 - >=dev-libs/glib-2.40:2
203 - >=dev-libs/gobject-introspection-0.9.5:=
204 - >=dev-libs/icu-4.8.1.1:=
205 - || (
206 - >=media-gfx/imagemagick-5.2.1[png,jpeg?]
207 - media-gfx/graphicsmagick[imagemagick,png,jpeg?] )
208 - >=media-libs/libpng-1.2:0=
209 - >=media-libs/libmediaart-1.9:2.0
210 - >=x11-libs/pango-1:=
211 - sys-apps/util-linux
212 -
213 - cue? ( media-libs/libcue )
214 - eds? (
215 - >=mail-client/evolution-3.3.5:=
216 - >=gnome-extra/evolution-data-server-3.3.5:=
217 - <mail-client/evolution-3.5.3
218 - <gnome-extra/evolution-data-server-3.5.3 )
219 - elibc_glibc? ( >=sys-libs/glibc-2.12 )
220 - exif? ( >=media-libs/libexif-0.6 )
221 - ffmpeg? (
222 - libav? ( media-video/libav:= )
223 - !libav? ( media-video/ffmpeg:0= )
224 - )
225 - firefox-bookmarks? ( || (
226 - >=www-client/firefox-4.0
227 - >=www-client/firefox-bin-4.0 ) )
228 - flac? ( >=media-libs/flac-1.2.1 )
229 - gif? ( media-libs/giflib:= )
230 - gsf? ( >=gnome-extra/libgsf-1.14.24 )
231 - gstreamer? (
232 - media-libs/gstreamer:1.0
233 - media-libs/gst-plugins-base:1.0 )
234 - gtk? (
235 - >=dev-libs/libgee-0.3:0.8
236 - >=x11-libs/gtk+-3:3 )
237 - iptc? ( media-libs/libiptcdata )
238 - iso? ( >=sys-libs/libosinfo-0.2.9:= )
239 - jpeg? ( virtual/jpeg:0 )
240 - upower? ( || ( >=sys-power/upower-0.9 sys-power/upower-pm-utils ) )
241 - mp3? ( >=media-libs/taglib-1.6 )
242 - networkmanager? ( >=net-misc/networkmanager-0.8 )
243 - pdf? (
244 - >=x11-libs/cairo-1:=
245 - >=app-text/poppler-0.16:=[cairo,utils]
246 - >=x11-libs/gtk+-2.12:2 )
247 - playlist? ( >=dev-libs/totem-pl-parser-3 )
248 - rss? ( >=net-libs/libgrss-0.7:0 )
249 - stemmer? ( dev-libs/snowball-stemmer )
250 - thunderbird? ( || (
251 - >=mail-client/thunderbird-5.0
252 - >=mail-client/thunderbird-bin-5.0 ) )
253 - tiff? ( media-libs/tiff:0 )
254 - upnp-av? ( >=media-libs/gupnp-dlna-0.9.4:2.0 )
255 - vorbis? ( >=media-libs/libvorbis-0.22 )
256 - xml? ( >=dev-libs/libxml2-2.6 )
257 - xmp? ( >=media-libs/exempi-2.1 )
258 - xps? ( app-text/libgxps )
259 - !gstreamer? ( !ffmpeg? ( || ( media-video/totem media-video/mplayer ) ) )
260 -"
261 -DEPEND="${RDEPEND}
262 - ${PYTHON_DEPS}
263 - $(vala_depend)
264 - dev-util/gdbus-codegen
265 - >=dev-libs/libxslt-1
266 - >=dev-util/gtk-doc-am-1.8
267 - >=dev-util/intltool-0.40.0
268 - >=sys-devel/gettext-0.17
269 - virtual/pkgconfig
270 - gtk? ( >=dev-libs/libgee-0.3:0.8 )
271 - test? (
272 - >=dev-libs/dbus-glib-0.82-r1
273 - >=sys-apps/dbus-1.3.1[X] )
274 -"
275 -PDEPEND="nautilus? ( ~gnome-extra/nautilus-tracker-tags-${PV} )"
276 -
277 -function inotify_enabled() {
278 - if linux_config_exists; then
279 - if ! linux_chkconfig_present INOTIFY_USER; then
280 - ewarn "You should enable the INOTIFY support in your kernel."
281 - ewarn "Check the 'Inotify support for userland' under the 'File systems'"
282 - ewarn "option. It is marked as CONFIG_INOTIFY_USER in the config"
283 - die 'missing CONFIG_INOTIFY'
284 - fi
285 - else
286 - einfo "Could not check for INOTIFY support in your kernel."
287 - fi
288 -}
289 -
290 -pkg_setup() {
291 - linux-info_pkg_setup
292 - inotify_enabled
293 -
294 - python-any-r1_pkg_setup
295 -}
296 -
297 -src_prepare() {
298 - # Don't run 'firefox --version' or 'thunderbird --version'; it results in
299 - # access violations on some setups (bug #385347, #385495).
300 - create_version_script "www-client/firefox" "Mozilla Firefox" firefox-version.sh
301 - create_version_script "mail-client/thunderbird" "Mozilla Thunderbird" thunderbird-version.sh
302 -
303 - # Looks like sorting got fixed but not test reference files
304 - sort "${S}"/tests/libtracker-data/functions/functions-tracker-1.out \
305 - -o "${S}"/tests/libtracker-data/functions/functions-tracker-1.out || die
306 - sort "${S}"/tests/libtracker-data/functions/functions-tracker-2.out \
307 - -o "${S}"/tests/libtracker-data/functions/functions-tracker-2.out || die
308 -
309 - # Ensure embedded sqlite.h is in the include path (from 1.6 branch)
310 - epatch "${FILESDIR}"/${P}-include-path.patch
311 -
312 - # embedded sqlite underlinking, https://bugzilla.gnome.org/show_bug.cgi?id=766487
313 - epatch "${FILESDIR}"/${P}-sqlite-underlinking.patch
314 -
315 - eautoreconf # See bug #367975
316 - gnome2_src_prepare
317 - vala_src_prepare
318 -}
319 -
320 -src_configure() {
321 - local myconf=""
322 -
323 - if use gstreamer ; then
324 - myconf="${myconf} --enable-generic-media-extractor=gstreamer"
325 - if use upnp-av; then
326 - myconf="${myconf} --with-gstreamer-backend=gupnp-dlna"
327 - else
328 - myconf="${myconf} --with-gstreamer-backend=discoverer"
329 - fi
330 - elif use ffmpeg ; then
331 - myconf="${myconf} --enable-generic-media-extractor=libav"
332 - else
333 - myconf="${myconf} --enable-generic-media-extractor=external"
334 - fi
335 -
336 - # unicode-support: libunistring, libicu or glib ?
337 - # According to NEWS, introspection is required
338 - # is not being generated
339 - # nautilus extension is in a separate package, nautilus-tracker-tags
340 - gnome2_src_configure \
341 - --disable-hal \
342 - --disable-nautilus-extension \
343 - --disable-static \
344 - --enable-abiword \
345 - --enable-artwork \
346 - --enable-cfg-man-pages \
347 - --enable-dvi \
348 - --enable-enca \
349 - --enable-guarantee-metadata \
350 - --enable-icon \
351 - --enable-introspection \
352 - --enable-libmediaart \
353 - --enable-libpng \
354 - --enable-miner-apps \
355 - --enable-miner-user-guides \
356 - --enable-ps \
357 - --enable-text \
358 - --enable-tracker-writeback \
359 - --with-unicode-support=libicu \
360 - --with-bash-completion-dir="$(get_bashcompdir)" \
361 - $(use_enable cue libcue) \
362 - $(use_enable eds miner-evolution) \
363 - $(use_enable exif libexif) \
364 - $(use_enable firefox-bookmarks miner-firefox) \
365 - $(use_with firefox-bookmarks firefox-plugin-dir "${EPREFIX}"/usr/$(get_libdir)/firefox/extensions) \
366 - FIREFOX="${S}"/firefox-version.sh \
367 - $(use_enable flac libflac) \
368 - $(use_enable gif libgif) \
369 - $(use_enable gsf libgsf) \
370 - $(use_enable gtk tracker-needle) \
371 - $(use_enable gtk tracker-preferences) \
372 - $(use_enable iptc libiptcdata) \
373 - $(use_enable iso libosinfo) \
374 - $(use_enable jpeg libjpeg) \
375 - $(use_enable upower upower) \
376 - $(use_enable miner-fs) \
377 - $(use_enable mp3 taglib) \
378 - $(use_enable mp3) \
379 - $(use_enable networkmanager network-manager) \
380 - $(use_enable pdf poppler) \
381 - $(use_enable playlist) \
382 - $(use_enable rss miner-rss) \
383 - $(use_enable stemmer libstemmer) \
384 - $(use_enable test functional-tests) \
385 - $(use_enable test unit-tests) \
386 - $(use_enable thunderbird miner-thunderbird) \
387 - $(use_with thunderbird thunderbird-plugin-dir "${EPREFIX}"/usr/$(get_libdir)/thunderbird/extensions) \
388 - THUNDERBIRD="${S}"/thunderbird-version.sh \
389 - $(use_enable tiff libtiff) \
390 - $(use_enable vorbis libvorbis) \
391 - $(use_enable xml libxml2) \
392 - $(use_enable xmp exempi) \
393 - $(use_enable xps libgxps) \
394 - ${myconf}
395 -}
396 -
397 -src_test() {
398 - # G_MESSAGES_DEBUG, upstream bug #699401#c1
399 - Xemake check TESTS_ENVIRONMENT="dbus-run-session" G_MESSAGES_DEBUG="all"
400 -}
401 -
402 -src_install() {
403 - gnome2_src_install
404 -
405 - # Manually symlink extensions for {firefox,thunderbird}-bin
406 - if use firefox-bookmarks; then
407 - dosym /usr/share/xul-ext/trackerfox \
408 - /usr/$(get_libdir)/firefox-bin/extensions/trackerfox@×××××××.org
409 - fi
410 -
411 - if use thunderbird; then
412 - dosym /usr/share/xul-ext/trackerbird \
413 - /usr/$(get_libdir)/thunderbird-bin/extensions/trackerbird@×××××××.org
414 - fi
415 -}
416 -
417 -create_version_script() {
418 - # Create script $3 that prints "$2 MAX(VERSION($1), VERSION($1-bin))"
419 -
420 - local v=$(best_version ${1})
421 - v=${v#${1}-}
422 - local vbin=$(best_version ${1}-bin)
423 - vbin=${vbin#${1}-bin-}
424 -
425 - if [[ -z ${v} ]]; then
426 - v=${vbin}
427 - else
428 - version_compare ${v} ${vbin}
429 - [[ $? -eq 1 ]] && v=${vbin}
430 - fi
431 -
432 - echo -e "#!/bin/sh\necho $2 $v" > "$3" || die
433 - chmod +x "$3" || die
434 -}