Version bump for Gnome 3.16.

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0xC6085806

5 files changed, 317 insertions, 6 deletions

diff --git a/app-misc/tracker/ChangeLog b/app-misc/tracker/ChangeLog
index b572b41e366f..c7028634d6c1 100644
--- a/app-misc/tracker/ChangeLog
+++ b/app-misc/tracker/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-misc/tracker
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/tracker/ChangeLog,v 1.186 2015/05/02 13:23:05 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/tracker/ChangeLog,v 1.187 2015/06/09 10:41:22 eva Exp $
+
+*tracker-1.4.0 (09 Jun 2015)
+
+  09 Jun 2015; Gilles Dartiguelongue <eva@gentoo.org> +tracker-1.4.0.ebuild,
+  +files/tracker-1.4.0-have-gstreamer-fix.patch, metadata.xml:
+  Version bump for Gnome 3.16.
 
   02 May 2015; Gilles Dartiguelongue <eva@gentoo.org> tracker-1.2.5.ebuild,
   tracker-1.2.6.ebuild:
diff --git a/app-misc/tracker/Manifest b/app-misc/tracker/Manifest
index d980ae68b8cf..ea2cc52f8c8d 100644
--- a/app-misc/tracker/Manifest
+++ b/app-misc/tracker/Manifest
@@ -1,16 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX tracker-1.4.0-have-gstreamer-fix.patch 1342 SHA256 b695bdc7b51ab79980302e2afa1975817fa643a0327251cf319fa2b3a4cc18a4 SHA512 f268d87c2ebfbf1cb26aa64914cadca0701a770604a25c3347ba11cf4beab3e2392fa026689ce2c0d52d5c06cf8a549c18b4e3bf6e8cf76823546f0ab2ef77b1 WHIRLPOOL 0b5fb9e01b753d98aff5bf3a059de7095fdc92b184a36345d740672ce6d720b0de7d2b55968b4abc6c612515a0da2a062edeb0297e3af8e21b4feddc5cc7f886
 DIST tracker-1.2.5.tar.xz 6033708 SHA256 1e614bc33f93d5820f3c90510e11210bf34d02dba6ccbd3dc30097758a6d31aa SHA512 8b2027e4350286d1d9c8274aa7addf0653f116389584b2cea35dc9d68563135340ac89873027d531beea2cce44b20d4a9718d6986fb486a2ef77f9cab8189699 WHIRLPOOL 4e1e923106a4b732029db9e12d8e4576aa71db64a803b8afc91f0d41793a6d22f8eb7654d0b3ac71af21ab5061432ddae1db0b3afc97d019c246c4eabf1f14d3
 DIST tracker-1.2.6.tar.xz 6049860 SHA256 09851691d527b505ed96987c08142f4dbe4f511ea155b66e99b83f73da7c93c4 SHA512 b812d8dba3225f30fa0f091617acd294d1ead23a67ebfe12ced08c24ae7fcef017b602241d4205a696adb51c0bfcaebdd0a40317c95177ba934eeae99f46165f WHIRLPOOL d4be5d8d63ca9268bd8be4eee4096e344fb17ac1d36e559ba5548b1dab099d9169f9973fee9d80bec8afa1286306d71596a9f2c3031333ab08c46e2dda59cdda
+DIST tracker-1.4.0.tar.xz 5940004 SHA256 c87c35b55ab3a201f6bf306b812532de2bd35f3946a7fe966963c5d3e3d251eb SHA512 1c2fd8d877297cbe30dfe933b05a5fcf46a1a9b96b76f09dc56e888223e7828ee75008e79505d86f4f824f449ac5f984cc7bebcdf23fe42924d7de98afc90626 WHIRLPOOL 69d72e138d9f63376591087b1d5d7e2335cde72bce5a9fd031fa5d4bbaf2b9d7d917871f0ea5df82e4790c043220a8afe21be74ac1ac1601a20d846ac04e2c1c
 EBUILD tracker-1.2.5.ebuild 7994 SHA256 ff4b95fe2f491f7efc86ed70c1aaadb53ddd1b8cf055fa34076e3bf84a2ccffd SHA512 2a1e5344fee5db984866196398653b8bc9a54806ee96b79b15e46fd8ad376b7d67dedf6cf2c7801f0cc50269d07fa44bab7bbade5cb9ee2e0be87b6acdb63acb WHIRLPOOL efd6ce1797aaaaf6bfb419c5244a72d5538e54c5e5c469360a993479ee296a5e694cadd9a58f25e5236190a40ba58e3a242aeec4295a993caa99fe491d616029
 EBUILD tracker-1.2.6.ebuild 8350 SHA256 63df73cd656470dbc34614d92fc5a74e22c21e0ce5d3f6f5237cb58bb9b9eaa6 SHA512 670ed5431590323b7808eace0d195fce63f5b452ea218b9ab1a94a56142e736035a390bfe47896db07398717aef4fd808ee65a58e4e81d7714ff48744f82df27 WHIRLPOOL 57fe85501308601f7116c8fefbb7a932fdb28b2f21a4a7420cbf9526896ac48fe43c2123d7d0a2e943532f3d166ead163d3a918053ea2ff6a8b3edf03735e050
-MISC ChangeLog 33823 SHA256 3983920feb5aea5a6261d55ffccb96ea76fd879da65761883156cd7024c2e27f SHA512 75bca0f3515868e92ba58afee0316ed71a40543f95a1a2009ba628e7bdfa5d41e58817bbbcd876a9608334306e28b35b063c1afa5775e05bda97aae72c1b1207 WHIRLPOOL c0a72b5cf2c8db1845053e44c13faf9bad5ad8edcac21379acbe821a14b3e06bddce556175e06e148efed4044117c9779afacbf1ee2cc6872fee35a66dfc8b73
-MISC metadata.xml 1333 SHA256 acf42f9c9d3cfacc4452d151b085f86f915a2d8b8a3dfd1af3681c2348d8751b SHA512 3363fec17041064d9886c9f2862ab6ca987430c9c757ec2fe91146c082d3d3307b21ef0ebc70bf100944bbc43ea5becd2f16f3102f2e5f49ad97a9ce24c875f1 WHIRLPOOL 45fb5512999350e923ad8faf31f71f75aacfd52e22a046065efe860e9a50013ecf1b6f3100f490e2c28f8b82094a0c8c1506518a6d4dda4070a4f7fd4e7bdf34
+EBUILD tracker-1.4.0.ebuild 8227 SHA256 d45c9c9a2145e566afab460448f3b269f75d07a7ec4ad70b11ff707803835225 SHA512 4b2964cb2ad77a373b096590681dc156e3341bf73c482af27fa1f9604084fc612d766d82419b81cff4122b3adf26b4f7d6b7505a420ba63f120acd85fd96f9d8 WHIRLPOOL 6b141084e8b7fe2de47e94ad428575e691380f723c619664343d8ad932cbab82e8c30780bd2cff886368d2f80a73801839f07e8301d3f3a21d51cba86041669c
+MISC ChangeLog 34025 SHA256 153691ee7be21fab295eacc371ea7c633933bf97f7b81d3089241eed5f436ccd SHA512 f87026f4c8e9b2744265eb2ec43ff4d8f17398ddec86eb29fb0e128694ebbdd94bc56c109e40bab0675e3bfcb4168a61ff1973a2569d9ed9bc972048c14782a5 WHIRLPOOL cab6df1e800391e9b49b274c394d36beb217ad289dab4f10850122c4c9cc354d6b7568aab2dd32d0afad7a84403c16274aa017d03e8ad7881baee71316f90db8
+MISC metadata.xml 1423 SHA256 5776f77b2d9958c1f5fe6b65a6f27222603c76846b521d7600b248610d30e8a8 SHA512 6d17b56f7af0efe79c22203ae94af0da10bc40f35f58c8f9f8272fbf8d1b0e392267e2a49c7700042fdd79d9382a0903b964913a720bf5b733ace71ac0230aa9 WHIRLPOOL 763cfbfb0f011d612f8ca7ae2c41ff4c126534e1c1299a7341835193f16803de0ee7295a70240a3deb29f44ca5c27b744ca87f7bc0f5e0f7d51c2d1a3708761d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlVEz7oACgkQ1fmVwcYIWAb3IQCfdvs+OL7p6ZnaeXy8AstDMYBA
-6fAAoNfD+UZcDQ0qDClN5+hRisN9DHy+
-=gZjh
+iEYEAREIAAYFAlV2wtMACgkQ1fmVwcYIWAbr4QCfa164e8lHjhhFkHsIrcT/kgmL
+HyIAnjByy+arHZd+tQGZGoVj8Oih6/w2
+=/uhs
 -----END PGP SIGNATURE-----
diff --git a/app-misc/tracker/files/tracker-1.4.0-have-gstreamer-fix.patch b/app-misc/tracker/files/tracker-1.4.0-have-gstreamer-fix.patch
new file mode 100644
index 000000000000..de2b774d9417
--- /dev/null
+++ b/app-misc/tracker/files/tracker-1.4.0-have-gstreamer-fix.patch
@@ -0,0 +1,35 @@
+From 32333d707ca2a4a33bbefd051c70f037d81207eb Mon Sep 17 00:00:00 2001
+From: Gilles Dartiguelongue <eva@gentoo.org>
+Date: Wed, 3 Jun 2015 23:42:56 +0200
+Subject: [PATCH] Fix AM_CONDITIONAL position HAVE_{GSTREAMER,LIBAV} definition
+
+---
+ configure.ac | 9 ++++-----
+ 1 file changed, 4 insertions(+), 5 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index b2e3ae8..6ed8801 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1884,14 +1884,13 @@ fi
+ 
+ if test "$have_generic_media_handler_app" = "GStreamer"; then
+    AC_DEFINE(HAVE_GSTREAMER, [], [Define if we have GStreamer])
+-   AM_CONDITIONAL(HAVE_GSTREAMER, true)
+-   AM_CONDITIONAL(HAVE_LIBAV, false)
+ elif test "$have_generic_media_handler_app" = "libav"; then
+-    AC_DEFINE(HAVE_GSTREAMER, [], [Define if we have libav])
+-    AM_CONDITIONAL(HAVE_LIBAV, true)
+-    AM_CONDITIONAL(HAVE_GSTREAMER, false)
++   AC_DEFINE(HAVE_LIBAV, [], [Define if we have libav])
+ fi
+ 
++AM_CONDITIONAL(HAVE_GSTREAMER, [test "$have_generic_media_handler_app" = "GStreamer"])
++AM_CONDITIONAL(HAVE_LIBAV,     [test "$have_generic_media_handler_app" = "libav"])
++
+ ###########################################################################
+ # Check for gstreamer backend: tagreadbin/decodebin2/discoverer/gupnp-dlna
+ ###########################################################################
+-- 
+2.4.1
+
diff --git a/app-misc/tracker/metadata.xml b/app-misc/tracker/metadata.xml
index 61312d495a40..0cebc0bb8a66 100644
--- a/app-misc/tracker/metadata.xml
+++ b/app-misc/tracker/metadata.xml
@@ -18,6 +18,7 @@
     <pkg>gnome-base/nautilus</pkg> by providing entries in its context menu
   </flag>
   <flag name="playlist">Add support for playlists</flag>
+  <flag name="stemmer">Add word stemming via <pkg>dev-libs/snowball-stemmer</pkg>.</flag>
   <flag name="thunderbird">Install email data miner plugin for
     <pkg>mail-client/thunderbird</pkg> and
 	<pkg>mail-client/thunderbird-bin</pkg></flag>
diff --git a/app-misc/tracker/tracker-1.4.0.ebuild b/app-misc/tracker/tracker-1.4.0.ebuild
new file mode 100644
index 000000000000..194360ebb5dd
--- /dev/null
+++ b/app-misc/tracker/tracker-1.4.0.ebuild
@@ -0,0 +1,266 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/tracker/tracker-1.4.0.ebuild,v 1.1 2015/06/09 10:41:22 eva Exp $
+
+EAPI="5"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+PYTHON_COMPAT=( python2_7 )
+VALA_MIN_API_VERSION="0.18"
+
+inherit autotools 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 +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)
+# sqlite-3.7.16 for FTS4 support
+RDEPEND="
+	>=app-i18n/enca-1.9
+	>=dev-db/sqlite-3.7.16:=
+	>=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? ( >=virtual/ffmpeg-9 )
+	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.5 )
+	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-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 )
+	test? (
+		>=dev-libs/dbus-glib-0.82-r1
+		>=sys-apps/dbus-1.3.1[X] )
+"
+PDEPEND="nautilus? ( ~gnome-extra/nautilus-tracker-tags-${PV} )"
+
+# configure mixes enable-compile-warnings and with-compile-warnings
+# See upstream bug #705315
+QA_CONFIGURE_OPTIONS="--enable-compile-warnings"
+
+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() {
+	# Fix position of AM_CONDITIONAL, bug #550910, upstream bug #750368
+	epatch "${FILESDIR}"/${PN}-1.4.0-have-gstreamer-fix.patch
+
+	# 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
+
+	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-fts \
+		--enable-tracker-writeback \
+		--with-unicode-support=libicu \
+		$(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/trackerfox@bustany.org
+	fi
+
+	if use thunderbird; then
+		dosym /usr/share/xul-ext/trackerbird \
+			/usr/$(get_libdir)/thunderbird-bin/extensions/trackerbird@bustany.org
+	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
+}