Version bump, drop old

Package-Manager: portage-2.1.13.2/cvs/Linux x86_64
Manifest-Sign-Key: 0xA188FBD4

3 files changed, 55 insertions, 47 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/Manifest b/app-misc/tracker/Manifest
index a8bda1da4639..fe00ba4da4f9 100644
--- a/app-misc/tracker/Manifest
+++ b/app-misc/tracker/Manifest
@@ -3,15 +3,16 @@ Hash: SHA256
 
 DIST tracker-0.14.5.tar.xz 6065728 SHA256 cabef75eb18ad35208000dc472bdc20a74269799414527ee6e1c1c1cfb28eec8 SHA512 ab65d5618ef51d23b65e3d6972834e573415dba52e7bb9f20f8f9d4d4aab467b667301e6540083401d91c9e36cb63fdb2259f6dd9e975e9ff60bf1f83245b777 WHIRLPOOL 4c2c5ad9ff0d7a35c5e9c6bc42b354b9967a436cb1a8b2b640ca09e102a428e268bd011e0405a2b331f80df5a69dcd7e0afc693ae4969604ee41088e5da0c25b
 DIST tracker-0.16.1.tar.xz 5970452 SHA256 fbb94144826b00da0b427dc6f37d2679bd8dfec1dc992e857a47a0b453f0b771 SHA512 f980bf4558f3a69bc6044e6315c213e4413325364f3e2dcf11d92a9d7e11d61d179c6a4648769b8c5441869df242fd451d769672a6bfba79e2f311fb77e664e3 WHIRLPOOL 0a88138aa24aecd21329a35db611e9ccbea07c8e81f45c94511106232fa468ee9df75e7e20162a35b90ebae299e1a9ee7f6373420dfe6f58296416d98754f255
+DIST tracker-0.16.2.tar.xz 5984656 SHA256 033394636835628e01eb90efb55883fd88ec581910915b5948081f8f41df7409 SHA512 e43b219aa42a48f123d58dcbc4e4f54fa3e75ea17726337a7b380dfd048c4301a5ec12ad672c7a84f611206771b471337d9bb33c5bffa70c9b0d3303e3829dd4 WHIRLPOOL bd13451ebac1520a94ad22d3de0961c7c7795280f76efc4a26ae883c0dad49462fc1a7f3e207c514f2d302d6b0b511d85d3a02b6bc501cd5a80434a8649c9abf
 EBUILD tracker-0.14.5.ebuild 9035 SHA256 6fa3dc978b7874e47fa9b40aafbb78aae6e90f87b9dacca855a6e2cbd68aa793 SHA512 2ff0098826e159c57d7c180be28cd1485e4b6c577a1bd854e25ffe1463029e569f499a05dadb77ef3045b9418b086905d2da1d7a36d6f0d75daa985b26f8de2a WHIRLPOOL fb5a53b89621706cd16b811fbe000123af25adce66dc5db8c8052ec59440f469ef0fa6aa860fa8d1779d20aa48a0efaec91047622171182830e5d6ac22147192
 EBUILD tracker-0.16.1.ebuild 8815 SHA256 85b1f69e742cf769b92a583b7e893c1afcec74700c36c5162906be1594166415 SHA512 cbea866e2acae652c2a3c944d3674ae36f579b7f2ec1ccb1d099a9e8241860412d07f07a619ef672bf1a74f64c0da3662e6c970acf0e87ee7fd49f3b3e724832 WHIRLPOOL f3df38d8f43a62fb22d40d55b8edaf5ae50bd9d96d854094f1bc5ddeb81570837a4e7b5fd2701899bdf65465e9d02331b4dda527e72b22d6967e154b18bf86f0
-EBUILD tracker-9999.ebuild 8221 SHA256 49f1c3c69b4ac33522b5f8a54eb1dcf103f084847d98dabdb9e7d0cce65f4c6d SHA512 1176c893ac8d3abaaa3d711fd0fb5ce9cf1da56490537ae6a7136937a15fa0f60481a8e1694a124567cf5f1dcb7574c08c3ce131b70f15e2c2b8a5d4a9fec30a WHIRLPOOL f72b3074065993e01e314c63a3d4a9f42999a66b8d6b3a57f0d37d1c829eb322683b275b555e24c01b66b64a3dff57622dd5fc846d76089e403d50e1d1ae67c1
-MISC ChangeLog 30134 SHA256 f04b3b60572980c79df622eeb03334e76bdfd3b12b9f9d639ffebd8d707ee830 SHA512 be7ecf2db28a0f3535115d876e7de18395ba4e0d58e25c10436d5044ddab7ce79c297062c6a2b429d0e0a964138cc5a94bc1d7420c5d1928ef3538d982b12840 WHIRLPOOL 5fb57c186aa029bafd61b5c577f4cf781ce6eef317d31f5c668ed639f5cfe8a39b92597e529c5d2bd4c8ff82c55be62f8e1e475e3e70cf874263e96546c6ad1b
+EBUILD tracker-0.16.2.ebuild 9115 SHA256 24b35e62a7bfe6b9a477fd838676d06347d96711d33780f7741257e050600666 SHA512 7d34aff372b0c4b5ba2f027adfa7fd130df65b3afefe0907906a93ea99c3a660273f3eb54fdc069a90c2790dd45d700be5fbf31b65bc51f7f1674f4aee52433e WHIRLPOOL 9409eba30c659527e443422e3d49790a8cf878211f986e8d00e0f495331d56685fa39aa6ed900bfbdd078253eac681c2588d9b3aebb7f62722c274b238b64943
+MISC ChangeLog 30287 SHA256 18b356eaaed7da1018631e6d443d78c628cdf43f0f53b88593c78ac165de75e5 SHA512 4a113a5dbc6ed2becc120ef8f2beffe6a119ec92b23eddd7668d25885c701179915ce8bbf338a126b842121245a08869209b8acd3731099e82249c916740700a WHIRLPOOL 36690fded3806b5660cdabc3d94257e27d3a24803afb1c6ca377a12581b6fb9df583faccb540bef7e9d800ad55becd972f0b05bf8cc30447106fdb6fc0b52f90
 MISC metadata.xml 1601 SHA256 b7d9768eb7b4d1c588947299912d742751c1279f2cc1bd88a437b48eb3824554 SHA512 bc9ec7bfed8d73e1dfcadf6c2b2239595c6d06ad6d4f1657b4e405f8ff1e87af82fb122e267426fbed53fd7011699fa551bc66503d9cb58bf96ac1d6da1e9e61 WHIRLPOOL 27982acb9fbb780837c7a598bdffe0e4283bcb30ce72c3fcce069b933955cb5b7f485a75b7f54dbc66e851b4d9843959efcc0555435e27dc4bec7154112eaf56
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iEYEAREIAAYFAlGSrqcACgkQ1fmVwcYIWAbgOwCg4LZIhjucCLArBW3xjBrdsNLD
-YtQAn2bDTdOMDf6jpseTnJeF/iXfaUOn
-=NVjO
+iEYEAREIAAYFAlH6uk4ACgkQCaWpQKGI+9QCNACeJCRU0G7Q0HbKWpQXWAdmedJA
+FAkAn1g09Fo/q7gFDVE3DYsiEz4euC/M
+=uOu+
 -----END PGP SIGNATURE-----
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}"
 }