Version bump, drop old

(Portage version: 2.1.13.2/cvs/Linux x86_64, signed Manifest commit with key A188FBD4)

2 files changed, 48 insertions, 41 deletions

diff --git a/app-misc/tracker/ChangeLog b/app-misc/tracker/ChangeLog
index 22183e67200d..821b3fa16894 100644
--- a/app-misc/tracker/ChangeLog
+++ b/app-misc/tracker/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-misc/tracker
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/tracker/ChangeLog,v 1.159 2013/05/14 21:37:42 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/tracker/ChangeLog,v 1.160 2013/08/01 19:43:09 pacho Exp $
+
+*tracker-0.16.2 (01 Aug 2013)
+
+  01 Aug 2013; Pacho Ramos <pacho@gentoo.org> +tracker-0.16.2.ebuild,
+  -tracker-9999.ebuild:
+  Version bump, drop old
 
   14 May 2013; Gilles Dartiguelongue <eva@gentoo.org> tracker-0.14.5.ebuild,
   -tracker-0.16.0.ebuild, tracker-0.16.1.ebuild:
diff --git a/app-misc/tracker/tracker-9999.ebuild b/app-misc/tracker/tracker-0.16.2.ebuild
index a96be957eb25..2a2da7195532 100644
--- a/app-misc/tracker/tracker-9999.ebuild
+++ b/app-misc/tracker/tracker-0.16.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/tracker/tracker-9999.ebuild,v 1.62 2013/04/09 21:26:48 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/tracker/tracker-0.16.2.ebuild,v 1.1 2013/08/01 19:43:09 pacho Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
@@ -8,25 +8,15 @@ GNOME2_LA_PUNT="yes"
 PYTHON_COMPAT=( python2_{6,7} )
 VALA_MIN_API_VERSION="0.14"
 
-[[ ${PV} = 9999 ]] && inherit autotools git-2
-inherit gnome2 linux-info multilib python-any-r1 vala versionator virtualx
+inherit autotools gnome2 linux-info multilib python-any-r1 vala versionator virtualx
 
 DESCRIPTION="A tagging metadata database, search tool and indexer"
 HOMEPAGE="http://projects.gnome.org/tracker/"
-EGIT_REPO_URI="git://git.gnome.org/${PN}
-	http://git.gnome.org/browse/${PN}"
-[[ ${PV} = 9999 ]] && SRC_URI=""
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="0/16"
-IUSE="cue eds elibc_glibc exif firefox-bookmarks flac gif gsf gstreamer gtk iptc +iso +jpeg laptop libsecret +miner-fs mp3 networkmanager pdf playlist rss test thunderbird +tiff upnp-av +vorbis xine +xml xmp xps" # qt4 strigi
-if [[ ${PV} = 9999 ]]; then
-	KEYWORDS=""
-	IUSE="${IUSE} doc"
-else
-	KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-	IUSE="${IUSE} nautilus"
-fi
+IUSE="cue eds elibc_glibc exif firefox-bookmarks flac gif gsf gstreamer gtk iptc +iso +jpeg laptop libsecret +miner-fs mp3 nautilus networkmanager pdf playlist rss test thunderbird +tiff upnp-av +vorbis xine +xml xmp xps" # qt4 strigi
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 
 REQUIRED_USE="
 	^^ ( gstreamer xine )
@@ -102,6 +92,7 @@ RDEPEND="
 #	mp3? ( qt4? (  >=dev-qt/qtgui-4.7.1:4 ) )
 DEPEND="${RDEPEND}
 	${PYTHON_DEPS}
+	$(vala_depend)
 	>=dev-util/gtk-doc-am-1.8
 	>=dev-util/intltool-0.40
 	>=sys-devel/gettext-0.17
@@ -111,17 +102,11 @@ DEPEND="${RDEPEND}
 		>=dev-libs/dbus-glib-0.82-r1
 		>=sys-apps/dbus-1.3.1[X] )
 "
+PDEPEND="nautilus? ( ~gnome-extra/nautilus-tracker-tags-${PV} )"
 
-if [[ ${PV} = 9999 ]]; then
-	DEPEND="${DEPEND}
-		doc? (
-			>=dev-util/gtk-doc-1.8
-			media-gfx/graphviz )
-		$(vala_depend)
-	"
-fi
-
-[[ ${PV} = 9999 ]] || 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
@@ -143,25 +128,35 @@ pkg_setup() {
 	python-any-r1_pkg_setup
 }
 
-src_unpack() {
-	if [[ ${PV} = 9999 ]]; then
-		git_src_unpack
-	else
-		gnome2_src_unpack
-	fi
-}
-
 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
 
-	if [[ ${PV} = 9999 ]]; then
-		eautoreconf
-		vala_src_prepare
-	fi
+	# Skip broken tests
+	# https://bugzilla.gnome.org/show_bug.cgi?id=699408
+	sed -e '\%/libtracker-common/file-utils/has_write_access_or_was_created%,+1 d' \
+		-i tests/libtracker-common/tracker-file-utils-test.c || die
+	# https://bugzilla.gnome.org/show_bug.cgi?id=699410
+	sed -e '\%/libtracker-miner/tracker-password-provider/setting%,+1 d' \
+		-e '\%/libtracker-miner/tracker-password-provider/getting%,+1 d' \
+		-i tests/libtracker-miner/tracker-password-provider-test.c || die
+	# https://bugzilla.gnome.org/show_bug.cgi?id=699412
+	sed -e '/#if HAVE_TRACKER_FTS/,/#endif/ d' \
+		-i tests/libtracker-sparql/tracker-test.c || die
+	# https://bugzilla.gnome.org/show_bug.cgi?id=699412
+	sed -e 's/\({ "本州最主流的风味",.*TRUE,  \) 8/\1 5/' \
+		-e 's/\({ "ホモ・サピエンス.*TRUE, \) 13/\1 10/' \
+		-i tests/libtracker-fts/tracker-parser-test.c || die
+	# Fails inside portage, not outside
+	# https://bugzilla.gnome.org/show_bug.cgi?id=699413
+	sed -e '\%/steroids/tracker/tracker_sparql_update_async%,+1 d' \
+		-i tests/tracker-steroids/tracker-test.c || die
+
+	eautoreconf # See bug #367975
 	gnome2_src_prepare
+	vala_src_prepare
 }
 
 src_configure() {
@@ -186,10 +181,6 @@ src_configure() {
 		myconf="${myconf} --enable-gdkpixbuf"
 	fi
 
-	if [[ ${PV} = 9999 ]]; then
-		myconf="${myconf} $(use_enable doc gtk-doc)"
-	fi
-
 	# unicode-support: libunistring, libicu or glib ?
 	# According to NEWS, introspection is required
 	# FIXME: disabling streamanalyzer for now since tracker-sparql-builder.h
@@ -201,8 +192,15 @@ src_configure() {
 		--disable-libstreamanalyzer \
 		--disable-nautilus-extension \
 		--disable-qt \
+		--enable-abiword \
+		--enable-artwork \
+		--enable-dvi \
+		--enable-icon \
+		--enable-ps \
+		--enable-text \
 		--enable-guarantee-metadata \
 		--enable-introspection \
+		--enable-libpng \
 		--enable-tracker-fts \
 		--with-enca \
 		--with-unicode-support=libicu \
@@ -213,6 +211,7 @@ src_configure() {
 		$(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) \
@@ -223,6 +222,7 @@ src_configure() {
 		$(use_enable libsecret) \
 		$(use_enable miner-fs) \
 		$(use_enable mp3 taglib) \
+		$(use_enable mp3) \
 		$(use_enable networkmanager network-manager) \
 		$(use_enable pdf poppler) \
 		$(use_enable playlist) \
@@ -242,6 +242,7 @@ src_configure() {
 }
 
 src_test() {
+	export G_MESSAGES_DEBUG=all # upstream bug #699401#c1
 	unset DBUS_SESSION_BUS_ADDRESS
 	Xemake check XDG_DATA_HOME="${T}" XDG_CONFIG_HOME="${T}"
 }