commit: 7278ccf972ff85dc414d3def94c832efbfc22627 Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org> AuthorDate: Tue Nov 1 17:04:54 2016 +0000 Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org> CommitDate: Tue Nov 1 23:57:48 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7278ccf9
app-misc/tracker: cleanup old revision Package-Manager: portage-2.3.2 app-misc/tracker/Manifest | 1 - .../tracker/files/tracker-1.6.2-include-path.patch | 64 ----- .../files/tracker-1.6.2-sqlite-underlinking.patch | 58 ----- app-misc/tracker/tracker-1.6.2.ebuild | 266 --------------------- 4 files changed, 389 deletions(-) diff --git a/app-misc/tracker/Manifest b/app-misc/tracker/Manifest index 582a24f..7ba0741 100644 --- a/app-misc/tracker/Manifest +++ b/app-misc/tracker/Manifest @@ -1,3 +1,2 @@ DIST tracker-1.10.1.tar.xz 5027912 SHA256 67ea78cca8ebbd6633dddcdd40b5205683cc886b872cde987e2a8bae171f4191 SHA512 aa523fad1c577926ec1f33692314afe673bdc6a84917c4ed506d29e8d0ec17dfacf0a6694cd794d140fc1498770b58d640ed4886c2827644665c92461764d7ce WHIRLPOOL 6947aef1420f15c879ae26a7c5e17ce0a34316077cba20b12dbb5be7e5f55ea840d6d0e145d3c19f47f3db640e07b043a6a25a7bd810bd6ac9a3de336f30f6d3 -DIST tracker-1.6.2.tar.xz 6128492 SHA256 d3583f32e6a06ccb1146ca31939710edb630d7ffe3da37b01f893b45f4480045 SHA512 280f2feab5c6af611c77ce90db925ecb6278eb4b516f22ac9f8b44ebfd87806fdbca51985ca28eccdabb503ee15ac76ded31d9380ea448cb2dc3fdd1ee4d5914 WHIRLPOOL d5ceca74daf114a3d09b2975d2ae3d21891c2f0a6cb9923ceda89e9f57b5fe049c9f23164f6f5c00806c664b98cc01dc5e8760fe6dcf5046125b520530924852 DIST tracker-1.8.0.tar.xz 4961488 SHA256 a11f31a373bfec3abae38ae719d0a59f666f1f067d8789ade2ed7032a152907d SHA512 c7d0600cfcf5485188167d237e22a00a5777b97b96c8735ba3efcef67288a8d9db9476f05289cf1498c50432981a4bc932973241138ea116a18e421576ed3cdd WHIRLPOOL 2941ab228ccaae96abf8ad1387d898981aae9611aaaa64425df21fb941ca4f49e485dfb094b191b1ec46f1b83f5e248fbce700b18b232209866fdb248b4bba53 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 deleted file mode 100644 index 18f62b8..00000000 --- a/app-misc/tracker/files/tracker-1.6.2-include-path.patch +++ /dev/null @@ -1,64 +0,0 @@ -From a0be9abc0bffdaedd1e64a45da0eb12509b1ab72 Mon Sep 17 00:00:00 2001 -From: David King <[email protected]> -Date: Wed, 2 Mar 2016 11:10:51 +0000 -Subject: Ensure embedded sqlite.h is in the include path - -https://bugzilla.gnome.org/show_bug.cgi?id=762976 ---- - src/libtracker-data/Makefile.am | 1 + - src/libtracker-fts/Makefile.am | 1 + - src/plugins/evolution/Makefile.am | 1 + - src/tracker-store/Makefile.am | 1 + - 4 files changed, 4 insertions(+) - -diff --git a/src/libtracker-data/Makefile.am b/src/libtracker-data/Makefile.am -index 7835d1f..6ad4c7f 100644 ---- a/src/libtracker-data/Makefile.am -+++ b/src/libtracker-data/Makefile.am -@@ -12,6 +12,7 @@ AM_VALAFLAGS = \ - AM_CPPFLAGS = \ - $(BUILD_VALACFLAGS) \ - -I$(top_srcdir)/src \ -+ -I$(top_srcdir)/src/sqlite \ - -I$(top_builddir)/src \ - -DSHAREDIR=\""$(datadir)"\" \ - $(LIBTRACKER_DATA_CFLAGS) -diff --git a/src/libtracker-fts/Makefile.am b/src/libtracker-fts/Makefile.am -index bcb2802..27ff127 100644 ---- a/src/libtracker-fts/Makefile.am -+++ b/src/libtracker-fts/Makefile.am -@@ -1,6 +1,7 @@ - AM_CPPFLAGS = \ - $(BUILD_CFLAGS) \ - -I$(top_srcdir)/src \ -+ -I$(top_srcdir)/src/sqlite \ - -DNDEBUG \ - $(LIBTRACKER_FTS_CFLAGS) - -diff --git a/src/plugins/evolution/Makefile.am b/src/plugins/evolution/Makefile.am -index dcdd886..9448b2f 100644 ---- a/src/plugins/evolution/Makefile.am -+++ b/src/plugins/evolution/Makefile.am -@@ -1,6 +1,7 @@ - AM_CPPFLAGS = \ - $(BUILD_CFLAGS) \ - -I$(top_srcdir)/src \ -+ -I$(top_srcdir)/src/sqlite \ - -I$(top_builddir)/src \ - -DGETTEXT_PACKAGE="\"$(GETTEXT_PACKAGE)\"" \ - -DLOCALEDIR="\"$(localedir)\"" \ -diff --git a/src/tracker-store/Makefile.am b/src/tracker-store/Makefile.am -index 83cb77e..26d8a06 100644 ---- a/src/tracker-store/Makefile.am -+++ b/src/tracker-store/Makefile.am -@@ -5,6 +5,7 @@ AM_CPPFLAGS = \ - -DMAIL_MODULES_DIR=\""$(libdir)"/tracker-$(TRACKER_API_VERSION)/mail-modules\" \ - -DPUSH_MODULES_DIR=\""$(libdir)/tracker-$(TRACKER_API_VERSION)/push-modules/daemon"\" \ - -I$(top_srcdir)/src \ -+ -I$(top_srcdir)/src/sqlite \ - -I$(top_builddir)/src \ - $(TRACKER_STORE_CFLAGS) \ - -include config.h \ --- -cgit v0.12 - 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 deleted file mode 100644 index 4d3e20a..00000000 --- a/app-misc/tracker/files/tracker-1.6.2-sqlite-underlinking.patch +++ /dev/null @@ -1,58 +0,0 @@ -From f69ece17fd3d6414ef2634336c7e780207b0f4a7 Mon Sep 17 00:00:00 2001 -From: Alexandre Rostovtsev <[email protected]> -Date: Sun, 15 May 2016 15:15:50 -0400 -Subject: [PATCH] build: embedded copy of SQLite requires -ldl and -pthread - -https://bugzilla.gnome.org/show_bug.cgi?id=766487 ---- - configure.ac | 8 ++++++++ - src/sqlite/Makefile.am | 9 +++++++-- - 2 files changed, 15 insertions(+), 2 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 2ccda7a..b6c978a 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -719,6 +719,14 @@ if test "x$enable_journal" = "xno" ; then - AC_DEFINE(DISABLE_JOURNAL, 1, [Define if we disable the journal]) - fi - -+#################################################################### -+# Check for SQLite -+#################################################################### -+ -+# Our copy of sqlite requires libdl on some platforms -+AC_CHECK_LIB(dl, dlsym, [LIBDL=-ldl], [LIBDL=]) -+AC_SUBST(LIBDL) -+ - ################################################################## - # Check for libtracker-common, make sure libstemmer exists - ################################################################## -diff --git a/src/sqlite/Makefile.am b/src/sqlite/Makefile.am -index 8b0ac18..354f054 100644 ---- a/src/sqlite/Makefile.am -+++ b/src/sqlite/Makefile.am -@@ -3,7 +3,8 @@ AM_CPPFLAGS = \ - -I$(top_srcdir)/src \ - -DSQLITE_THREADSAFE=1 \ - -DSQLITE_ENABLE_FTS4 \ -- -DSQLITE_ENABLE_FTS3_TOKENIZER -+ -DSQLITE_ENABLE_FTS3_TOKENIZER \ -+ -pthread - - noinst_LTLIBRARIES = libtracker-sqlite.la - -@@ -12,5 +13,9 @@ libtracker_sqlite_la_SOURCES = \ - sqlite3.h \ - sqlite3ext.h - -+libtracker_sqlite_la_LDFLAGS = \ -+ -pthread -+ - libtracker_sqlite_la_LIBADD = \ -- $(BUILD_LIBS) -+ $(BUILD_LIBS) \ -+ $(LIBDL) --- -2.8.2 - diff --git a/app-misc/tracker/tracker-1.6.2.ebuild b/app-misc/tracker/tracker-1.6.2.ebuild deleted file mode 100644 index 4ade202..00000000 --- a/app-misc/tracker/tracker-1.6.2.ebuild +++ /dev/null @@ -1,266 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="5" -GCONF_DEBUG="no" -GNOME2_LA_PUNT="yes" -PYTHON_COMPAT=( python2_7 ) - -inherit autotools bash-completion-r1 eutils gnome2 linux-info multilib python-any-r1 vala versionator virtualx - -DESCRIPTION="A tagging metadata database, search tool and indexer" -HOMEPAGE="https://wiki.gnome.org/Projects/Tracker"; - -LICENSE="GPL-2+ LGPL-2.1+" -SLOT="0/100" -IUSE="cue eds elibc_glibc exif ffmpeg firefox-bookmarks flac gif gsf -gstreamer gtk iptc +iso +jpeg libav +miner-fs mp3 nautilus networkmanager -pdf playlist rss stemmer test thunderbird +tiff upnp-av upower +vorbis +xml xmp xps" - -KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86" - -REQUIRED_USE=" - ?? ( gstreamer ffmpeg ) - cue? ( gstreamer ) - upnp-av? ( gstreamer ) - !miner-fs? ( !cue !exif !flac !gif !gsf !iptc !iso !jpeg !mp3 !pdf !playlist !tiff !vorbis !xml !xmp !xps ) -" - -# According to NEWS, introspection is non-optional -# glibc-2.12 needed for SCHED_IDLE (see bug #385003) -RDEPEND=" - >=app-i18n/enca-1.9 - >=dev-libs/glib-2.40:2 - >=dev-libs/gobject-introspection-0.9.5:= - >=dev-libs/icu-4.8.1.1:= - || ( - >=media-gfx/imagemagick-5.2.1[png,jpeg?] - media-gfx/graphicsmagick[imagemagick,png,jpeg?] ) - >=media-libs/libpng-1.2:0= - >=media-libs/libmediaart-1.9:2.0 - >=x11-libs/pango-1:= - sys-apps/util-linux - - cue? ( media-libs/libcue ) - eds? ( - >=mail-client/evolution-3.3.5:= - >=gnome-extra/evolution-data-server-3.3.5:= - <mail-client/evolution-3.5.3 - <gnome-extra/evolution-data-server-3.5.3 ) - elibc_glibc? ( >=sys-libs/glibc-2.12 ) - exif? ( >=media-libs/libexif-0.6 ) - ffmpeg? ( - libav? ( media-video/libav:= ) - !libav? ( media-video/ffmpeg:0= ) - ) - firefox-bookmarks? ( || ( - >=www-client/firefox-4.0 - >=www-client/firefox-bin-4.0 ) ) - flac? ( >=media-libs/flac-1.2.1 ) - gif? ( media-libs/giflib:= ) - gsf? ( >=gnome-extra/libgsf-1.14.24 ) - gstreamer? ( - media-libs/gstreamer:1.0 - media-libs/gst-plugins-base:1.0 ) - gtk? ( - >=dev-libs/libgee-0.3:0.8 - >=x11-libs/gtk+-3:3 ) - iptc? ( media-libs/libiptcdata ) - iso? ( >=sys-libs/libosinfo-0.2.9:= ) - jpeg? ( virtual/jpeg:0 ) - upower? ( || ( >=sys-power/upower-0.9 sys-power/upower-pm-utils ) ) - mp3? ( >=media-libs/taglib-1.6 ) - networkmanager? ( >=net-misc/networkmanager-0.8 ) - pdf? ( - >=x11-libs/cairo-1:= - >=app-text/poppler-0.16:=[cairo,utils] - >=x11-libs/gtk+-2.12:2 ) - playlist? ( >=dev-libs/totem-pl-parser-3 ) - rss? ( >=net-libs/libgrss-0.7:0 ) - stemmer? ( dev-libs/snowball-stemmer ) - thunderbird? ( || ( - >=mail-client/thunderbird-5.0 - >=mail-client/thunderbird-bin-5.0 ) ) - tiff? ( media-libs/tiff:0 ) - upnp-av? ( >=media-libs/gupnp-dlna-0.9.4:2.0 ) - vorbis? ( >=media-libs/libvorbis-0.22 ) - xml? ( >=dev-libs/libxml2-2.6 ) - xmp? ( >=media-libs/exempi-2.1 ) - xps? ( app-text/libgxps ) - !gstreamer? ( !ffmpeg? ( || ( media-video/totem media-video/mplayer ) ) ) -" -DEPEND="${RDEPEND} - ${PYTHON_DEPS} - $(vala_depend) - dev-util/gdbus-codegen - >=dev-libs/libxslt-1 - >=dev-util/gtk-doc-am-1.8 - >=dev-util/intltool-0.40.0 - >=sys-devel/gettext-0.17 - virtual/pkgconfig - gtk? ( >=dev-libs/libgee-0.3:0.8 ) - test? ( - >=dev-libs/dbus-glib-0.82-r1 - >=sys-apps/dbus-1.3.1[X] ) -" -PDEPEND="nautilus? ( ~gnome-extra/nautilus-tracker-tags-${PV} )" - -function inotify_enabled() { - if linux_config_exists; then - if ! linux_chkconfig_present INOTIFY_USER; then - ewarn "You should enable the INOTIFY support in your kernel." - ewarn "Check the 'Inotify support for userland' under the 'File systems'" - ewarn "option. It is marked as CONFIG_INOTIFY_USER in the config" - die 'missing CONFIG_INOTIFY' - fi - else - einfo "Could not check for INOTIFY support in your kernel." - fi -} - -pkg_setup() { - linux-info_pkg_setup - inotify_enabled - - python-any-r1_pkg_setup -} - -src_prepare() { - # Don't run 'firefox --version' or 'thunderbird --version'; it results in - # access violations on some setups (bug #385347, #385495). - create_version_script "www-client/firefox" "Mozilla Firefox" firefox-version.sh - create_version_script "mail-client/thunderbird" "Mozilla Thunderbird" thunderbird-version.sh - - # Looks like sorting got fixed but not test reference files - sort "${S}"/tests/libtracker-data/functions/functions-tracker-1.out \ - -o "${S}"/tests/libtracker-data/functions/functions-tracker-1.out || die - sort "${S}"/tests/libtracker-data/functions/functions-tracker-2.out \ - -o "${S}"/tests/libtracker-data/functions/functions-tracker-2.out || die - - # Ensure embedded sqlite.h is in the include path (from 1.6 branch) - epatch "${FILESDIR}"/${P}-include-path.patch - - # embedded sqlite underlinking, https://bugzilla.gnome.org/show_bug.cgi?id=766487 - epatch "${FILESDIR}"/${P}-sqlite-underlinking.patch - - eautoreconf # See bug #367975 - gnome2_src_prepare - vala_src_prepare -} - -src_configure() { - local myconf="" - - if use gstreamer ; then - myconf="${myconf} --enable-generic-media-extractor=gstreamer" - if use upnp-av; then - myconf="${myconf} --with-gstreamer-backend=gupnp-dlna" - else - myconf="${myconf} --with-gstreamer-backend=discoverer" - fi - elif use ffmpeg ; then - myconf="${myconf} --enable-generic-media-extractor=libav" - else - myconf="${myconf} --enable-generic-media-extractor=external" - fi - - # unicode-support: libunistring, libicu or glib ? - # According to NEWS, introspection is required - # is not being generated - # nautilus extension is in a separate package, nautilus-tracker-tags - gnome2_src_configure \ - --disable-hal \ - --disable-nautilus-extension \ - --disable-static \ - --enable-abiword \ - --enable-artwork \ - --enable-cfg-man-pages \ - --enable-dvi \ - --enable-enca \ - --enable-guarantee-metadata \ - --enable-icon \ - --enable-introspection \ - --enable-libmediaart \ - --enable-libpng \ - --enable-miner-apps \ - --enable-miner-user-guides \ - --enable-ps \ - --enable-text \ - --enable-tracker-writeback \ - --with-unicode-support=libicu \ - --with-bash-completion-dir="$(get_bashcompdir)" \ - $(use_enable cue libcue) \ - $(use_enable eds miner-evolution) \ - $(use_enable exif libexif) \ - $(use_enable firefox-bookmarks miner-firefox) \ - $(use_with firefox-bookmarks firefox-plugin-dir "${EPREFIX}"/usr/$(get_libdir)/firefox/extensions) \ - FIREFOX="${S}"/firefox-version.sh \ - $(use_enable flac libflac) \ - $(use_enable gif libgif) \ - $(use_enable gsf libgsf) \ - $(use_enable gtk tracker-needle) \ - $(use_enable gtk tracker-preferences) \ - $(use_enable iptc libiptcdata) \ - $(use_enable iso libosinfo) \ - $(use_enable jpeg libjpeg) \ - $(use_enable upower upower) \ - $(use_enable miner-fs) \ - $(use_enable mp3 taglib) \ - $(use_enable mp3) \ - $(use_enable networkmanager network-manager) \ - $(use_enable pdf poppler) \ - $(use_enable playlist) \ - $(use_enable rss miner-rss) \ - $(use_enable stemmer libstemmer) \ - $(use_enable test functional-tests) \ - $(use_enable test unit-tests) \ - $(use_enable thunderbird miner-thunderbird) \ - $(use_with thunderbird thunderbird-plugin-dir "${EPREFIX}"/usr/$(get_libdir)/thunderbird/extensions) \ - THUNDERBIRD="${S}"/thunderbird-version.sh \ - $(use_enable tiff libtiff) \ - $(use_enable vorbis libvorbis) \ - $(use_enable xml libxml2) \ - $(use_enable xmp exempi) \ - $(use_enable xps libgxps) \ - ${myconf} -} - -src_test() { - # G_MESSAGES_DEBUG, upstream bug #699401#c1 - Xemake check TESTS_ENVIRONMENT="dbus-run-session" G_MESSAGES_DEBUG="all" -} - -src_install() { - gnome2_src_install - - # Manually symlink extensions for {firefox,thunderbird}-bin - if use firefox-bookmarks; then - dosym /usr/share/xul-ext/trackerfox \ - /usr/$(get_libdir)/firefox-bin/extensions/[email protected] - fi - - if use thunderbird; then - dosym /usr/share/xul-ext/trackerbird \ - /usr/$(get_libdir)/thunderbird-bin/extensions/[email protected] - fi -} - -create_version_script() { - # Create script $3 that prints "$2 MAX(VERSION($1), VERSION($1-bin))" - - local v=$(best_version ${1}) - v=${v#${1}-} - local vbin=$(best_version ${1}-bin) - vbin=${vbin#${1}-bin-} - - if [[ -z ${v} ]]; then - v=${vbin} - else - version_compare ${v} ${vbin} - [[ $? -eq 1 ]] && v=${vbin} - fi - - echo -e "#!/bin/sh\necho $2 $v" > "$3" || die - chmod +x "$3" || die -}
