Evolution plugin fundamentally incompatible with evolution-3.6, see bug #436460. Update license. Unify tracker-0.14.2-r1 and -9999 ebuilds as much as possible for ease of maintenance. Update icu patch to upstreamed version. Vala is not needed for 0.14.2 tarball release. Drop old versions.

Package-Manager: portage-2.2.0_alpha132/cvs/Linux x86_64

11 files changed, 132 insertions, 574 deletions

diff --git a/app-misc/tracker/ChangeLog b/app-misc/tracker/ChangeLog
index 4d9667ad3dda..752ea32aa6e9 100644
--- a/app-misc/tracker/ChangeLog
+++ b/app-misc/tracker/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for app-misc/tracker
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/tracker/ChangeLog,v 1.131 2012/09/08 02:07:53 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/tracker/ChangeLog,v 1.132 2012/09/28 04:27:43 tetromino Exp $
+
+  28 Sep 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+  -tracker-0.10.27.ebuild, tracker-0.10.35.ebuild, tracker-0.12.10.ebuild,
+  tracker-0.12.10-r1.ebuild, -tracker-0.14.1.ebuild, tracker-0.14.2.ebuild,
+  tracker-0.14.2-r1.ebuild, files/tracker-0.14.2-icu-no-LC_ALL.patch,
+  tracker-9999.ebuild:
+  Evolution plugin fundamentally incompatible with evolution-3.6, see bug
+  #436460. Update license. Unify tracker-0.14.2-r1 and -9999 ebuilds as much as
+  possible for ease of maintenance. Update icu patch to upstreamed version.
+  Vala is not needed for 0.14.2 tarball release. Drop old versions.
 
   08 Sep 2012; Nirbheek Chauhan <nirbheek@gentoo.org> tracker-0.14.2-r1.ebuild:
   Use either vala-0.14, or vala-0.18
diff --git a/app-misc/tracker/Manifest b/app-misc/tracker/Manifest
index 639975b46fcc..a8ad1d6a5e17 100644
--- a/app-misc/tracker/Manifest
+++ b/app-misc/tracker/Manifest
@@ -2,41 +2,31 @@
 Hash: SHA256
 
 AUX tracker-0.12.3-strigi.patch 1166 SHA256 01078f04c1f5c37e767d0bc4ea13f8dc2d478ed95498cb350d915768f71aa8f0 SHA512 48c9ff62888e8c1bf9c4fec4b11f61f3e9ae51e4ac894c639f6479afbfc928964e35e7d37bda99c7d0e505b5c2e6a7964eb16587d5365c1acd009c51f94ef4d4 WHIRLPOOL 83db8c654f11ff9c0b9500a04c28cc499915fc0ba3517e1b572c3f7d2d38a96a625061de7a70bd3112e908ee7f2bd1f8ddc730370b42385b23a756277dda4b94
-AUX tracker-0.14.2-icu-no-LC_ALL.patch 1473 SHA256 addd3cddb5c4effb5d0620715fad791aeea5f09fbcb9ba3591f2d9a6848e80ed SHA512 6359701b2029fd87e49aa2ceabf5f1066f9726bbf5f286e34c323a0098277032182955a372dab95a2e7ec4b0b9b0bf8cfbe683550ddd679202e5343fac848069 WHIRLPOOL deb12c201992ccce05cdf43e3633f731e28d5aef9fd4cdb00908d169948b08441b9ec74e6f8ea93049b94d8b60c440b8d1596dcc0d933c4cce12ab8f481ef852
+AUX tracker-0.14.2-icu-no-LC_ALL.patch 1266 SHA256 e42770fe57d01e54811584546ee657b110ad83bbe9c9fdd1c8b017777749cc74 SHA512 7de8927c4825f09e6d419e136be5c729b2f98caa374710887b958edd17865e4fba7518596d18cb81e5ced32977593fbc4cc9bf86d0156f13386f2752ab1200b0 WHIRLPOOL 58481556fde3b3410554b8a0882e924373caf3f941fb37fe75c497d12c6edce8b97daefb671c69a37375b19d961e4c8f6fd18ba6e0bf4c59374a982ef326e0ec
 AUX tracker-0.8.0-strigi.patch 1385 SHA256 7ae959cd52ac96f6427646089b554e0572727f27d5d4aab1913f795e270a4ccb SHA512 f61eab32f6db4b7bb44353a3d0ed10de6e06def73150d40381b8dc15145f54c474c66325641f8d82668fcca04f6a3c5771475fa98d12ba53a7084fb5eab1ca95 WHIRLPOOL ea7de30b3f87f97597b4bb9fd2601c592e319ce4562747a6b39958e3ead495a0a7486295e6ce89133fca00fb5f1a64680e45d6c57d18088f54223a355a4b65fc
 AUX tracker-0.8.17-build-with-eds232.patch 807 SHA256 bced568783664b0128903094db05a1f881519754d6fa1588f1050620fb73f989 SHA512 fb658501e9d5dfd614ad02d5e18778a8a393fe702ed163b1044f48264b023b63b20bd4c04e3ae7dab688c31bea381b7d53b1f2420edaf12c45755adf14b0c637 WHIRLPOOL 7bc32543f2e936c018ea6384bbfa23b5d3c84615497c76df04d31e68be5cc49b427eed389273fb6196e1acae8a91e56310d89bf30d8a055dce91a113fdac7706
 AUX tracker-0.8.17-poppler-0.16.patch 1209 SHA256 8d1ed288fc14655e36ddda9af6d30b5b00572feca08b643951c1b5ac2d4eba1c SHA512 6e3dc71154ff54cf7f5b431649433ae6ca732dc8f8022f991b371b8581f11668e8a8c02dc981a98463914065304ea26387d9113a64fb6debbca2c1692d0876c9 WHIRLPOOL a684fb49bdb82db0e359f609c884440bc3cb879c1378ead6d17671c15afdd469179e8b87653a5bf64e04389be7772f63e88d163f05c03b214f96e7427b00de8a
 AUX tracker-0.8.17-tests-fixes.patch 2499 SHA256 3c00640648e56c722fcca4b6c1016082df992def8d7a95c5a1618453463d4048 SHA512 c830d59e724dbcfccae535a78dbfb2e9f84044d1ad9cb4b0791f0ae5b6586533b92eb06935a758bc72d45c7da9e5b855161c136c09169cfc500e4dff90efd396 WHIRLPOOL 1d81bb6df1469f648ff56cfbc0ef2f3492e2a5ad403683bb8e199787e5eaa341f084e966c36da791260ee50c4c30fcf6b8f20fed80a1069cc4e0fe70cc5e40cd
 AUX tracker-0.8.17-use-upower.patch 16884 SHA256 542432544663f0c1a9c43c08e816f42a95fa31f828e33f6d470cafc60a33a7a1 SHA512 e5e6ab059c962507eb71804ef2a191bb2522b00cf578784c454007565a546a6f67a7403bed99eba7d3bc5d312542db5faaed50221d31788fd65d7e0f2f919dea WHIRLPOOL 212c84e17a14c3ddf98a9aaced0764ff70505fdb1074249611ed5903a840cf8a2c6603061c721feb8b09cd72bb5d0a16a54ea41cfabbac252769fa66cd385715
-DIST tracker-0.10.27.tar.xz 5721444 SHA256 30ca97cc8a1c82cb0e09a921c0ebe8acbfe7be6908b2303266f447477465444f SHA512 c3760f1b0b6a1239b905f3caf4fa5196c91fabbc90eefe0682a7b060c7c6c68556c90b3004e7d1da92c72188d9844d9fa489a81524cb52c900fff3ac08855beb WHIRLPOOL 15904334e113470804dee1aa3b3780ea94e5f09a4eb1cd738c02b96bd4ad1e97c6eed909140047bbdd7f6483b2b01f3ba087a38e6ac6beb64cc901eafe174219
 DIST tracker-0.10.35.tar.xz 5754872 SHA256 5f6a32d0b2b0036f4aec74a6d36d889e33ea038a1530161ca4eb9a549cc87fe3 SHA512 9645c6ff6686a94f7ce9a0e7b29b5b8d5300ba1a1706e41ab3ca97bba891855bba9ce3213435373c52fb6821dc21be0816608c0f6796cb984f090c2b35e0b59c WHIRLPOOL 9cfd6d8446c7880499948cd663017161b879b0accd3de31dd3aecf87394315af4cd28d74865dafa67674ffa07cccb7fc1fe95350a36612560f8ef5e7214415dc
 DIST tracker-0.12.10.tar.xz 6220648 SHA256 42722831fdde63cfa07e4f0bb75805425c09b1f1801d3d5280de8be37a357b69 SHA512 53b50847229190e9510e4fc37deadf94f6a478c32b7548a457fe6597433bf7ac9f5bc2470641fe4b665b92c989b1d5b6e9917f7e1903b93c32830f0b2efa8f6f WHIRLPOOL 707b290232a9c3b0b7825628c32130b77afd24915bc18eb77c517b6775d58379f94f4f8efb52bd53637fb66374f426f7a01c47986e951123ff0ff8af874fd870
-DIST tracker-0.14.1.tar.xz 6041840 SHA256 17ac4125d02c5f820eae9a785ac1c90b0e93682730a3950f82fd4a3dff238a43 SHA512 44e166d58e38f28a742f895548a4928347cffc2936ad0784ac847c38d7bd19013401aa88124a12174d00378b9ac7d004721e57cee5f896d8f9c99a472d65b5ba WHIRLPOOL b9f3cfbc7b792f10cd0e2f7c2865bd598bd209cdc3df8b3bfd05a9d109ab60ce74d707a0770047943e46328916cf2644c2bfaa4c0d66e1aa929ca47ae0c52688
 DIST tracker-0.14.2.tar.xz 5985464 SHA256 9b59330aa2e9e09feee587ded895e9247f71fc25f46b023d616d9969314bc7f1 SHA512 204749a915e6e9af7057a0de7f8b5c317a56899dd5a9ca05c029ab1a3b47c42e54b3a86eb53c31fa21ad50abebed2b3a4e99008aac6cc23cb3bc9f7faa6504ff WHIRLPOOL 431a2b06e6906269795fd05e10bac912ffcc8d1ee0e5c394e178c5c12197ed6a05ec6ba939cf21946be0a17b84717405ad8b8be3d052b3f82c4d58999308cb07
-EBUILD tracker-0.10.27.ebuild 6068 SHA256 561c6880323dc025baa485a9f2be780e5127590796114d943b0a220da0a79b65 SHA512 80294c8c998578aa095ac74975dfd2faed5b40f3c29ebf47f34b118d15c964f08fa64f06dd3baa1637325e9ea826ef52b53dece8821684812530dc513305e2cb WHIRLPOOL df10b9b635867e76515752714afea29be8eeb9d9c4c87c1c1dcef1cf3877509b886f0a4ca1efd9e95bd73b6c13c7fd611ca1ce4628b6fb4771e783b68da645b3
-EBUILD tracker-0.10.35.ebuild 6068 SHA256 8cf4701b96cac0c4444584e4aac0bfb81c0efe9c4fb4955aac1251faf6167c56 SHA512 4548f17c504bd3f72bebf260d288e01e9033b43d165b0881ce65259bd92bbbebcf17b2836ea0f04d50d632adea4f85c46d7b56020266a95653bfdbbbe0090784 WHIRLPOOL 87cb99ae2307f979b5d8ab517e7e9a74a4d68a9810ba91c5941308cd6cc2b5ed7363cf306e916eaab10a26d9fe0b85a571dc769ba6dd0a91e52d642259bda8f2
-EBUILD tracker-0.12.10-r1.ebuild 8250 SHA256 1236ba2678a6a8f2ad9b0680b2410f9c3bea901d058874c99105437f287ce3d5 SHA512 006b673302cb9d41b20c7334bb888b0b4c5d8f6db68eaaf9a3376fb71979401c83941a6fd1add73b1776c2a9c5b1d32cc9c92eeddb4c6969d193a400838bfc56 WHIRLPOOL d545fa7eac5bbe3ccf7039ecd7f2e1237894c1d321c86ba6c62a89ed30d292415488e09887ab81cdfa733f7fd39f358a538ff01b63a99086647eca0f44a8533e
-EBUILD tracker-0.12.10.ebuild 8122 SHA256 73ea41e86bd5a5dfed075fa5f9f1559eda15de3fb06331bb0b7bf5e09257fd1f SHA512 14af2e4f356731709d330092571e403622bb099b8206a6e9ca5a2ee617505dd4355d3ac70624cfd9ec08ffaa670691908125cc08ae1fa90d96ac9ebbd3e2275d WHIRLPOOL c0799c8bcd9c68cb1084f7c162314551e29d1e60a3c61bb541594612de09f2a7769ec7724c1419de470a56b257109840621c6c8faa10bb2d7da8b73ba6a9235f
-EBUILD tracker-0.14.1.ebuild 8183 SHA256 9beb6eac92f5dddae4d4567c5af9478fdc2cace0fef70023e9ab9061a28dc7bc SHA512 1e2e14b0fd0f86c2236d71a941995cf98214aa02e4ef2990308095d17954716577617444986cd796c0ce5668b29e4dabbad772a5d7e2b91d50825c35c86e62c3 WHIRLPOOL 0786362b89fdda56ec5f8ea6001eca0d5ea4a3f24bf548ba05ccdbe7f9ed9319e3b8089cc490d0207b842502b659b699f705ded35a2e125166632fc85f274624
-EBUILD tracker-0.14.2-r1.ebuild 8433 SHA256 6bffbe3b4ae89d832d0d9202cec45a56df99659b1683d020c1e94e15f95a3cd7 SHA512 f478782cce6a1f75f93d97648db58c98fe9f2c31d11bf1388e3b96e172f8b911cb62c88df02a8fc7141bed6f9fc3a9736a7c5e5457ada29c1617f355030455fc WHIRLPOOL cf481ffdf8ebc8a4dfb66d91f9ec27f83d050a629b30d31e1f3d8056627ad897dab58650948c7666efaa8333a3721bf88c0c59369b7c02dda75cc0ddbdd7ac56
-EBUILD tracker-0.14.2.ebuild 8183 SHA256 5aef2588152aee37e184056e1becc63dd1014c04c9fb25561e2e88df4a46ab67 SHA512 6c8f19d6ff20034d96106806155423558aec2a56e47a72c5270ede0287efff44f4aee87b637e81c940ad016fda8b557e3717ff0ca745508f4824cb50510f68df WHIRLPOOL c0c4fba62c9e758beb6c84194008860894fa982c70f38922cd5dc00acc0b0d25243b5f128c32fa81671416f3ef097cd1044b117383923c2b44e4cc87a2c04320
-EBUILD tracker-9999.ebuild 8147 SHA256 b3caeae5a9cdba20adcc11ffa6b680ddb20d7b134085839ff04c1df8ebf66c25 SHA512 da50d475ebdfcd3cd21e1aac59f4f2e24fd131b6edf2513f0b1bb12393de31d82d1fc94174ad22637f24c6ac6321aea96322968ef70ac80642c5c253d900e4ac WHIRLPOOL b297f3832cf8781d014ce73822e225014015b268aeda9af0b4b4384f510289a97b405a55087934d62d7739ca1fd68fcd6cb9055f415fa77ec554e4f17bb1f422
-MISC ChangeLog 24545 SHA256 76681d78708464d9ec0307b1007e38d1fd3635ea41c9e5bd27b9c196bfbf820f SHA512 9c836138519f0f73630929dabc9b982884482887edd616a75ab7d86b3326b66c7819c2ba5305a4ab8dca48c2e01b5adf413fb6ac94fcb75d1c19dbe86eb5a93f WHIRLPOOL aeef6b85f55c2994088ea7ed917d9d8d34989fe7200d9f40723f6c98d299e95a58f83ef701f86a71e22deabfe5ecc3274e91ef75bd08ee7a323b82e92384c86b
+EBUILD tracker-0.10.35.ebuild 6148 SHA256 9e2988b14246d27fda9f9e5a75fda42bbc0cdfee20712e972d777e2f8d29a033 SHA512 2cb8a77c9377cafc32b40ce1c95b95a60dfe92b69ab905234d205888575c0be40b4dfcf4c36ce37debf2618b4a294d40ede4487f0491d27148ee7964fbba5e77 WHIRLPOOL c59dc43ff738ab94e79110b388cbfa740cdba0ccef4994ebce39ce855d8484de8eb7844eda449fbc3da3573d8c3622900acf5787b3173f8ff4239e91a82cbac5
+EBUILD tracker-0.12.10-r1.ebuild 8335 SHA256 8d1019da2f9f43236b2ed704b906504acfaf70ec81e548236e81d2e985d3b910 SHA512 302d745d91c12b0585dc49268594153e5ee1b75785ff651fb6dd00ed99df03a431b88560dc6185ca089f3bb4e69841d5a1e1b216c436b2c1f186a07ad65a8991 WHIRLPOOL eacc99b6f659f99a218bcf8af8502b3bdc8c0d24488f35c5e94496c0235502d33eb945a02800a49865dadf3814c6fee15e6b13fbe721f3e4de9bfc0fb96d4d35
+EBUILD tracker-0.12.10.ebuild 8210 SHA256 6b58e40c9d57a28b0bbf0505ddb25859c2bb0256eae19f9b924298c398121b9f SHA512 faffe84091b0117ee1abe1867c5c5bbbea5e70f7afcbb15e5f90eff2a7c81bb3f6beedeaf048a584013f13e2bba12dc0b82201bcc9fe22845ea775e36a7fefae WHIRLPOOL 397fc4ef5abb4fd891324c68c17226070446a59cc420e5f4f665cd556ab7c3607d85733f2a3fbd9fee079e581b10ed8cd2503f4a5c6a89044c651db5e6ae0f07
+EBUILD tracker-0.14.2-r1.ebuild 8654 SHA256 11620fb7b4882e3fc8655cc54e2ceb0d2632eb271a03592881c8007ff560ce42 SHA512 ab37df9f3be919337bdc1f4070d729c2b25c3a8ccc33d09c35c4c3b769313ab95a50f57f10a476278a10decbe490a6e5f36a97190854352e4a334303ca7de5da WHIRLPOOL ad6241c3bb9794da29c7148a6dadb54e15d4b166ff4702f4457408dc2b02eab62fca03655207daca0bbd74acbbcd3caf00259f23f67ffa5c03b88d286daa402a
+EBUILD tracker-0.14.2.ebuild 8268 SHA256 4f2e20a8903d38176d243ae014bbcc9b9a4555feaa5c1757f6f280dd549fec01 SHA512 15b642a0f7163929869585d27cdeb56a828e92f47e6e5058d4c6f8ec501188f01a2ea6bf1e49ece0c728ebb8b7a5ab4ebc55517bef10ebea88a9efd58d794367 WHIRLPOOL 853e0b72421956f1eb8e646195cc6ab5e535f7dd2bd27634ada4de8150ddd1b0a348a381c53393c14273c569376470abf82a13206688472d33113b01c2acf5bf
+EBUILD tracker-9999.ebuild 8244 SHA256 b807792911d8c0f35bd99441a267b6e8593b6715a28cbe0269871e56fed7f2b4 SHA512 f5bbb889b9df5d99e01d9d1adefc13f8d9024df87f04b6adca62bf2b69568b8c43bf3cd57c0dcd766e7d4b4cb729f2ab570a60ab88f5a5113b244fd9807390bf WHIRLPOOL f8575123f565a04e6382e2cf0a9f821d24d0e9b6caa9d346728840522ec5b7b5b69f93d1dbbfdffbc6c6825a08fa42b770fb736c11a8cd2c82135cb33458f8d3
+MISC ChangeLog 25148 SHA256 5fff00b0c0626d3f0dca07f8ba408b61680ab9315e449d9af46f6ca216a9c680 SHA512 237aee8df7e80200d7379eee556ef290c1927b7d9daaa3fa2636ad1e8a82e2486fe670f57ca43000d9c866837acbc740a1bf7d0b58b161bdccea388216561ec6 WHIRLPOOL 0ac676dd059f48b3dbc7158ce4772540f01671bbcf7b28d7c94c4eba23d20e250a56c40496462c4bc878bfcc55e90d67a5810ff59ec8db5d0705fa565994f789
 MISC metadata.xml 1621 SHA256 a01929993109e8e5b6c5e3ba8433a99ba4417f41328455823907a860dcb4311e SHA512 26808b5c3decabbbc166a67ee7d3b5f2ea68899684f79a092a74f8b712be1806560db3659671df3ba7ccc490a57bfae728b6e7ac9cfb92765d35bdbb7028b439 WHIRLPOOL bb4df83f2e873334dcf1ce20cce359738291ee102b759863bd770b63fd3ca8cce653700e9a84ec83f18672939a12ba9089d01637fc32edd3799b6f962651dd4c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJQSqh5AAoJEO/kOhxWD91kjawP/RVOuDG4HxSUuHquhDRrX/9p
-LClxiwaD0g4ysfPhjsfgvLjZO79hC9XHHGEeqE9+ihBDx6q4Zw4hgHFYQvBKnzYV
-sADYKaBVaKBxy4KPsgyXu+njYuYLsP19twlCM0S59jL13I1c3ESFeoZxdApaVoFq
-jVsVP3bgMTtaGs34/KnrjSm1ROickbSt3LH0835PURYOHk/1i4aB9E1ObRcMo6TB
-Ez5WHrJ92k0lMwCOSdqKCYZOcmu+IWLPNQsBipQxrMEiK8/AYbIoetH+tNbLgnPV
-5YziJhQzZTmD5M+sXhzDgCZssI76as/W9W8XwbyT9oOue+FvvzAdfYtoUXsFXjJL
-ybQo5sGzIxYFHTyrEpqHcrT+gBRpaI4gdWaTv4x+zr7XDbpjmmZEF8sVnQv6yrlK
-btK37n6p57xehhzOhIY9V64e1y9cj4Iq8Mz4eibvpq7193jSDSkxMMzXaYvo99Gi
-BGyRhtSflntusSL/EI9Mdxf253TD2YvPDjOyIiGd1cunnURjhhvnLEvQ+iGe79bm
-qx4FJKmbI3Ph5yew5y5nirgQaefRhnyn9FIg+V9vaPlBUInQNg+t66sor3JgJ0cd
-OrAqYhC49//AwI/QJ+AO/OoUMxuyJe/h1nvG3v+/7TqWfju/G3uaxKC/98/r5xMK
-crNBqAvQWzApn3iTzlI5
-=cFqP
+iQEcBAEBCAAGBQJQZSdGAAoJEJ0WA1zPCt1ha8YH/inG9aX5LfSSm1k2hejf8+mU
+Ocmq/+mDSEoNF2oyDhRQ0+K4oGoKb9BgeTrqO1wyTFZKZq51911NmN57oQEdOd9v
+qve9LVsbzpQPmjOfW1uDXVNqU55PjwxOfOcIanJp1xqmnZxP8n83Es996zUhYoWi
+rRH5e0ZEpD4qlk/idZKz4JxbRmCjkpqSv+FOpwpkxZDHCYE/WRWZRIV84lUA5YE5
+im5n5HqeKqUvKfgXo+WvU8ZGRncEWHacJtssXnUbrps5D7yc7uBLJLWL0+MQphVs
+OE5GpqviiAGuWfGcw7+Sc3zRuhDt7pNjFUoFgto71owBhDVtlo94e68epWEf+hk=
+=vKjR
 -----END PGP SIGNATURE-----
diff --git a/app-misc/tracker/files/tracker-0.14.2-icu-no-LC_ALL.patch b/app-misc/tracker/files/tracker-0.14.2-icu-no-LC_ALL.patch
index 7ecac00c478c..b0615fbc772d 100644
--- a/app-misc/tracker/files/tracker-0.14.2-icu-no-LC_ALL.patch
+++ b/app-misc/tracker/files/tracker-0.14.2-icu-no-LC_ALL.patch
@@ -1,23 +1,20 @@
-From c0f298d3db5202d1e6de7e093923f396116eefc6 Mon Sep 17 00:00:00 2001
+From 48713ba26af38a15a97fc7ebb0828cd287ef2447 Mon Sep 17 00:00:00 2001
 From: Alexandre Rostovtsev <tetromino@gentoo.org>
 Date: Fri, 20 Jul 2012 10:46:33 -0400
-Subject: [PATCH] FTS parser: ICU cannot handle locale descriptions of > 157
- characters
+Subject: [PATCH] libtracker-fts: ICU cannot handle complex locale
+ descriptions
 
-ICU's unicode/uloc.h #defines ULOC_FULLNAME_CAPACITY as 157. If a locale
-description cannot fit in a buffer of size ULOC_FULLNAME_CAPACITY,
-ubrk_open(UBRK_WORD, locale, ...) will fail when attempring to
-canonicalize the locale string.
+ubrk_open expects the name of just a single locale (e.g. "en_US.UTF-8"),
+not the full definition of your various locale variables and their
+values as returned by glibc's setlocale(LC_ALL, NULL).
 
-To avoid this, we must not pass setlocale(LC_ALL, NULL) to ICU since that
-can easily be >200 chars for common locales. Instead, limit ourselves to
-LC_CTYPE, since after all, that's all we need to determine word
-boundaries.
+Instead, limit ourselves to LC_CTYPE, since after all, that's all we
+need to determine word boundaries.
 
-https://bugzilla.gnome.org/show_bug.cgi?id=675660
+Fixes GB#675660.
 ---
- src/libtracker-fts/tracker-parser-libicu.c |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ src/libtracker-fts/tracker-parser-libicu.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/src/libtracker-fts/tracker-parser-libicu.c b/src/libtracker-fts/tracker-parser-libicu.c
 index 7388f69..69f75ed 100644
@@ -33,5 +30,5 @@ index 7388f69..69f75ed 100644
  		                       parser->utxt_size,
  		                       &error);
 -- 
-1.7.8.6
+1.7.12
 
diff --git a/app-misc/tracker/tracker-0.10.27.ebuild b/app-misc/tracker/tracker-0.10.27.ebuild
deleted file mode 100644
index f580b359722f..000000000000
--- a/app-misc/tracker/tracker-0.10.27.ebuild
+++ /dev/null
@@ -1,203 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/tracker/tracker-0.10.27.ebuild,v 1.3 2012/05/03 19:41:31 jdhore Exp $
-
-EAPI="3"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-GNOME_TARBALL_SUFFIX="xz"
-PYTHON_DEPEND="2:2.6"
-
-inherit eutils gnome2 linux-info python virtualx
-
-DESCRIPTION="A tagging metadata database, search tool and indexer"
-HOMEPAGE="http://projects.gnome.org/tracker/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-# USE="doc" is managed by eclass.
-IUSE="applet doc eds exif flac flickr gif gnome-keyring gsf gstreamer gtk +introspection iptc +jpeg laptop mp3 nautilus networkmanager pdf playlist qt4 rss strigi test +tiff upnp +vorbis xine +xml xmp"
-
-# Test suite highly disfunctional, loops forever
-# putting aside for now
-RESTRICT="test"
-
-# vala is built with debug by default (see VALAFLAGS)
-RDEPEND="
-	>=app-i18n/enca-1.9
-	>=dev-db/sqlite-3.7[threadsafe]
-	>=dev-libs/dbus-glib-0.82-r1
-	>=dev-libs/glib-2.28:2
-	>=dev-libs/icu-4
-	|| (
-		>=media-gfx/imagemagick-5.2.1[png,jpeg=]
-		media-gfx/graphicsmagick[imagemagick,png,jpeg=] )
-	>=media-libs/libpng-1.2
-	>=x11-libs/pango-1
-	sys-apps/util-linux
-
-	applet? (
-		>=gnome-base/gnome-panel-2.91
-		>=x11-libs/gtk+-3:3 )
-	eds? (
-		>=mail-client/evolution-2.32
-		>=gnome-extra/evolution-data-server-2.32 )
-	exif? ( >=media-libs/libexif-0.6 )
-	flac? ( >=media-libs/flac-1.2.1 )
-	flickr? ( net-libs/rest:0.7 )
-	gif? ( media-libs/giflib )
-	gnome-keyring? ( >=gnome-base/gnome-keyring-2.26 )
-	gsf? (
-		app-text/odt2txt
-		>=gnome-extra/libgsf-1.13 )
-	gstreamer? (
-		>=media-libs/gstreamer-0.10.31:0.10
-		upnp? ( >=media-libs/gupnp-dlna-0.5 ) )
-	!gstreamer? ( !xine? ( || ( media-video/totem media-video/mplayer ) ) )
-	gtk? (
-		>=dev-libs/libgee-0.3:0
-		>=x11-libs/gtk+-2.18:2 )
-	introspection? ( >=dev-libs/gobject-introspection-0.9.5 )
-	iptc? ( media-libs/libiptcdata )
-	jpeg? ( virtual/jpeg:0 )
-	laptop? ( >=sys-power/upower-0.9 )
-	mp3? (
-		>=media-libs/taglib-1.6
-		gtk? ( x11-libs/gdk-pixbuf:2 )
-		qt4? ( >=x11-libs/qt-gui-4.7.1:4 ) )
-	nautilus? (
-		>=gnome-base/nautilus-2
-		<gnome-base/nautilus-2.90
-		>=x11-libs/gtk+-2.18:2 )
-	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 )
-	rss? ( net-libs/libgrss )
-	strigi? ( >=app-misc/strigi-0.7 )
-	tiff? ( media-libs/tiff )
-	vorbis? ( >=media-libs/libvorbis-0.22 )
-	xine? ( >=media-libs/xine-lib-1 )
-	xml? ( >=dev-libs/libxml2-2.6 )
-	xmp? ( >=media-libs/exempi-2.1 )"
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.40
-	>=sys-devel/gettext-0.17
-	virtual/pkgconfig
-	applet? ( >=dev-lang/vala-0.12:0.12 )
-	gtk? (
-		app-office/dia
-		>=dev-lang/vala-0.12:0.12
-		>=dev-libs/libgee-0.3 )
-	doc? (
-		>=dev-util/gtk-doc-1.8
-		media-gfx/graphviz )
-	test? (
-		>=dev-libs/dbus-glib-0.82-r1
-		>=sys-apps/dbus-1.3.1[X] )
-"
-
-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
-
-	if use gstreamer ; then
-		G2CONF="${G2CONF} --enable-generic-media-extractor=gstreamer"
-		if use upnp; then
-			G2CONF="${G2CONF} --with-gstreamer-backend=gupnp-dlna"
-		else
-			G2CONF="${G2CONF} --with-gstreamer-backend=discoverer"
-		fi
-	elif use xine ; then
-		G2CONF="${G2CONF} --enable-generic-media-extractor=xine"
-	else
-		G2CONF="${G2CONF} --enable-generic-media-extractor=external"
-	fi
-
-	if use applet || use gtk; then
-		G2CONF="${G2CONF} VALAC=$(type -P valac-0.12)"
-	fi
-
-	if use mp3 && (use gtk || use qt4); then
-		G2CONF="${G2CONF} $(use_enable !qt4 gdkpixbuf) $(use_enable qt4 qt)"
-	fi
-
-	# unicode-support: libunistring, libicu or glib ?
-	G2CONF="${G2CONF}
-		--disable-hal
-		--enable-tracker-fts
-		--with-enca
-		--with-unicode-support=libicu
-		--enable-guarantee-metadata
-		$(use_enable applet tracker-search-bar)
-		$(use_enable eds miner-evolution)
-		$(use_enable exif libexif)
-		$(use_enable flac libflac)
-		$(use_enable flickr miner-flickr)
-		$(use_enable gnome-keyring)
-		$(use_enable gsf libgsf)
-		$(use_enable gtk tracker-explorer)
-		$(use_enable gtk tracker-preferences)
-		$(use_enable gtk tracker-needle)
-		$(use_enable introspection)
-		$(use_enable iptc libiptcdata)
-		$(use_enable jpeg libjpeg)
-		$(use_enable laptop upower)
-		$(use_enable mp3 taglib)
-		$(use_enable nautilus nautilus-extension)
-		$(use_enable networkmanager network-manager)
-		$(use_enable pdf poppler)
-		$(use_enable playlist)
-		$(use_enable rss miner-rss)
-		$(use_enable strigi libstreamanalyzer)
-		$(use_enable test functional-tests)
-		$(use_enable test unit-tests)
-		$(use_enable tiff libtiff)
-		$(use_enable vorbis libvorbis)
-		$(use_enable xml libxml2)
-		$(use_enable xmp exempi)"
-
-	DOCS="AUTHORS ChangeLog NEWS README"
-
-	python_set_active_version 2
-}
-
-src_prepare() {
-	# Fix build failures with USE=strigi
-	epatch "${FILESDIR}/${PN}-0.8.0-strigi.patch"
-
-	# Fix functional tests scripts
-	find "${S}" -name "*.pyc" -delete
-	python_convert_shebangs 2 "${S}"/tests/tracker-writeback/*.py
-	python_convert_shebangs 2 "${S}"/tests/functional-tests/*.py
-	python_convert_shebangs 2 "${S}"/utils/data-generators/cc/{*.py,generate}
-	python_convert_shebangs 2 "${S}"/utils/gtk-sparql/*.py
-	python_convert_shebangs 2 "${S}"/examples/rss-reader/*.py
-
-	# FIXME: report broken tests
-	sed -e '/\/libtracker-miner\/tracker-password-provider\/setting/,+1 s:^\(.*\)$:/*\1*/:' \
-		-e '/\/libtracker-miner\/tracker-password-provider\/getting/,+1 s:^\(.*\)$:/*\1*/:' \
-		-i tests/libtracker-miner/tracker-password-provider-test.c || die
-}
-
-src_test() {
-	unset DBUS_SESSION_BUS_ADDRESS
-	Xemake check XDG_DATA_HOME="${T}" XDG_CONFIG_HOME="${T}" || die "tests failed"
-}
diff --git a/app-misc/tracker/tracker-0.10.35.ebuild b/app-misc/tracker/tracker-0.10.35.ebuild
index d3e8f0cced20..aef1e5b21a9d 100644
--- a/app-misc/tracker/tracker-0.10.35.ebuild
+++ b/app-misc/tracker/tracker-0.10.35.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/tracker/tracker-0.10.35.ebuild,v 1.3 2012/05/03 19:41:31 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/tracker/tracker-0.10.35.ebuild,v 1.4 2012/09/28 04:27:43 tetromino Exp $
 
 EAPI="3"
 GCONF_DEBUG="no"
@@ -13,7 +13,7 @@ inherit eutils gnome2 linux-info python virtualx
 DESCRIPTION="A tagging metadata database, search tool and indexer"
 HOMEPAGE="http://projects.gnome.org/tracker/"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 # USE="doc" is managed by eclass.
@@ -42,7 +42,9 @@ RDEPEND="
 		>=x11-libs/gtk+-3:3 )
 	eds? (
 		>=mail-client/evolution-2.32
-		>=gnome-extra/evolution-data-server-2.32 )
+		>=gnome-extra/evolution-data-server-2.32
+		<mail-client/evolution-3
+		<gnome-extra/evolution-data-server-3 )
 	exif? ( >=media-libs/libexif-0.6 )
 	flac? ( >=media-libs/flac-1.2.1 )
 	flickr? ( net-libs/rest:0.7 )
diff --git a/app-misc/tracker/tracker-0.12.10-r1.ebuild b/app-misc/tracker/tracker-0.12.10-r1.ebuild
index a0f4baa4d80b..768b80b385cf 100644
--- a/app-misc/tracker/tracker-0.12.10-r1.ebuild
+++ b/app-misc/tracker/tracker-0.12.10-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/tracker/tracker-0.12.10-r1.ebuild,v 1.1 2012/07/20 15:47:53 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/tracker/tracker-0.12.10-r1.ebuild,v 1.2 2012/09/28 04:27:43 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="no"
@@ -12,7 +12,7 @@ inherit eutils gnome2 linux-info multilib python versionator
 DESCRIPTION="A tagging metadata database, search tool and indexer"
 HOMEPAGE="http://projects.gnome.org/tracker/"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 # USE="doc" is managed by eclass.
@@ -44,7 +44,9 @@ RDEPEND="
 		>=x11-libs/gtk+-3.0:3 )
 	eds? (
 		>=mail-client/evolution-2.91.90
-		>=gnome-extra/evolution-data-server-2.91.90 )
+		>=gnome-extra/evolution-data-server-2.91.90
+		<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 )
 	firefox-bookmarks? ( || (
diff --git a/app-misc/tracker/tracker-0.12.10.ebuild b/app-misc/tracker/tracker-0.12.10.ebuild
index f49839313175..e2b4110b32ec 100644
--- a/app-misc/tracker/tracker-0.12.10.ebuild
+++ b/app-misc/tracker/tracker-0.12.10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/tracker/tracker-0.12.10.ebuild,v 1.3 2012/05/03 19:41:31 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/tracker/tracker-0.12.10.ebuild,v 1.4 2012/09/28 04:27:43 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="no"
@@ -12,7 +12,7 @@ inherit eutils gnome2 linux-info multilib python versionator
 DESCRIPTION="A tagging metadata database, search tool and indexer"
 HOMEPAGE="http://projects.gnome.org/tracker/"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 # USE="doc" is managed by eclass.
@@ -44,7 +44,9 @@ RDEPEND="
 		>=x11-libs/gtk+-3.0:3 )
 	eds? (
 		>=mail-client/evolution-2.91.90
-		>=gnome-extra/evolution-data-server-2.91.90 )
+		>=gnome-extra/evolution-data-server-2.91.90
+		<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 )
 	firefox-bookmarks? ( || (
diff --git a/app-misc/tracker/tracker-0.14.1.ebuild b/app-misc/tracker/tracker-0.14.1.ebuild
deleted file mode 100644
index f9acd5f2d804..000000000000
--- a/app-misc/tracker/tracker-0.14.1.ebuild
+++ /dev/null
@@ -1,264 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/tracker/tracker-0.14.1.ebuild,v 1.1 2012/05/07 07:42:32 tetromino Exp $
-
-EAPI="4"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-PYTHON_DEPEND="2:2.6"
-
-inherit eutils gnome2 linux-info multilib python versionator
-
-DESCRIPTION="A tagging metadata database, search tool and indexer"
-HOMEPAGE="http://projects.gnome.org/tracker/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-# USE="doc" is managed by eclass.
-IUSE="applet cue doc eds elibc_glibc exif firefox-bookmarks flac flickr gif gnome-keyring gsf gstreamer gtk iptc +iso +jpeg laptop mp3 nautilus networkmanager pdf playlist rss test thunderbird +tiff upnp +vorbis xine +xml xmp" # qt4 strigi
-REQUIRED_USE="cue? ( gstreamer )"
-
-# Test suite highly disfunctional, loops forever
-# putting aside for now
-RESTRICT="test"
-
-# vala is built with debug by default (see VALAFLAGS)
-# According to NEWS, introspection is non-optional
-# glibc-2.12 needed for SCHED_IDLE (see bug #385003)
-RDEPEND="
-	>=app-i18n/enca-1.9
-	>=dev-db/sqlite-3.7[threadsafe]
-	>=dev-libs/glib-2.28:2
-	>=dev-libs/gobject-introspection-0.9.5
-	>=dev-libs/icu-4
-	|| (
-		>=media-gfx/imagemagick-5.2.1[png,jpeg=]
-		media-gfx/graphicsmagick[imagemagick,png,jpeg=] )
-	>=media-libs/libpng-1.2
-	>=x11-libs/pango-1
-	sys-apps/util-linux
-
-	applet? (
-		>=gnome-base/gnome-panel-2.91.6
-		>=x11-libs/gdk-pixbuf-2.12:2
-		>=x11-libs/gtk+-3.0:3 )
-	cue? ( media-libs/libcue )
-	eds? (
-		>=mail-client/evolution-3.3.5
-		>=gnome-extra/evolution-data-server-3.3.5 )
-	elibc_glibc? ( >=sys-libs/glibc-2.12 )
-	exif? ( >=media-libs/libexif-0.6 )
-	firefox-bookmarks? ( || (
-		>=www-client/firefox-4.0
-		>=www-client/firefox-bin-4.0 ) )
-	flac? ( >=media-libs/flac-1.2.1 )
-	flickr? ( net-libs/rest:0.7 )
-	gif? ( media-libs/giflib )
-	gnome-keyring? ( >=gnome-base/gnome-keyring-2.26 )
-	gsf? ( >=gnome-extra/libgsf-1.13 )
-	gstreamer? (
-		>=media-libs/gstreamer-0.10.31:0.10
-		upnp? ( >=media-libs/gupnp-dlna-0.5 )
-		!upnp? ( >=media-libs/gst-plugins-base-0.10.31 ) )
-	!gstreamer? ( !xine? ( || ( media-video/totem media-video/mplayer ) ) )
-	gtk? (
-		>=dev-libs/libgee-0.3:0
-		>=x11-libs/gtk+-3.0.0:3 )
-	iptc? ( media-libs/libiptcdata )
-	iso? ( >=sys-libs/libosinfo-0.0.2 )
-	jpeg? ( virtual/jpeg:0 )
-	laptop? ( >=sys-power/upower-0.9 )
-	mp3? (
-		>=media-libs/taglib-1.6
-		gtk? ( x11-libs/gdk-pixbuf:2 ) )
-	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 )
-	rss? ( net-libs/libgrss )
-	thunderbird? ( || (
-		>=mail-client/thunderbird-5.0
-		>=mail-client/thunderbird-bin-5.0 ) )
-	tiff? ( media-libs/tiff )
-	vorbis? ( >=media-libs/libvorbis-0.22 )
-	xine? ( >=media-libs/xine-lib-1 )
-	xml? ( >=dev-libs/libxml2-2.6 )
-	xmp? ( >=media-libs/exempi-2.1 )"
-#	strigi? ( >=app-misc/strigi-0.7 )
-#	mp3? ( qt4? (  >=x11-libs/qt-gui-4.7.1:4 ) )
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.40
-	>=sys-devel/gettext-0.17
-	virtual/pkgconfig
-	applet? ( >=dev-lang/vala-0.13.4:0.14 )
-	gtk? (
-		>=dev-lang/vala-0.13.4:0.14
-		>=dev-libs/libgee-0.3 )
-	doc? (
-		app-office/dia
-		>=dev-util/gtk-doc-1.8
-		media-gfx/graphviz )
-	test? (
-		>=dev-libs/dbus-glib-0.82-r1
-		>=sys-apps/dbus-1.3.1[X] )
-"
-#	strigi? ( >=dev-lang/vala-0.13.4:0.14 )
-PDEPEND="nautilus? ( >=gnome-extra/nautilus-tracker-tags-0.14 )"
-
-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
-
-	if use gstreamer ; then
-		G2CONF="${G2CONF} --enable-generic-media-extractor=gstreamer"
-		if use upnp; then
-			G2CONF="${G2CONF} --with-gstreamer-backend=gupnp-dlna"
-		else
-			G2CONF="${G2CONF} --with-gstreamer-backend=discoverer"
-		fi
-	elif use xine ; then
-		G2CONF="${G2CONF} --enable-generic-media-extractor=xine"
-	else
-		G2CONF="${G2CONF} --enable-generic-media-extractor=external"
-	fi
-
-	# if use applet || use gtk || use strigi; then
-	if use applet || use gtk; then
-		G2CONF="${G2CONF} VALAC=$(type -P valac-0.14)"
-	fi
-
-	# if use mp3 && (use gtk || use qt4); then
-	if use mp3 && use gtk; then
-		#G2CONF="${G2CONF} $(use_enable !qt4 gdkpixbuf) $(use_enable qt4 qt)"
-		G2CONF="${G2CONF} --enable-gdkpixbuf"
-	fi
-
-	# unicode-support: libunistring, libicu or glib ?
-	# According to NEWS, introspection is required
-	# FIXME: disabling streamanalyzer for now since tracker-sparql-builder.h
-	# is not being generated
-	# XXX: disabling qt since tracker-albumart-qt is unstable; bug #385345
-	# nautilus extension is in a separate package, nautilus-tracker-tags
-	G2CONF="${G2CONF}
-		--disable-hal
-		--enable-tracker-fts
-		--with-enca
-		--with-unicode-support=libicu
-		--enable-guarantee-metadata
-		--enable-introspection
-		--disable-libstreamanalyzer
-		--disable-qt
-		--disable-nautilus-extension
-		$(use_enable applet tracker-search-bar)
-		$(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 flickr miner-flickr)
-		$(use_enable gnome-keyring)
-		$(use_enable gsf libgsf)
-		$(use_enable gtk tracker-explorer)
-		$(use_enable gtk tracker-preferences)
-		$(use_enable gtk tracker-needle)
-		$(use_enable iptc libiptcdata)
-		$(use_enable iso libosinfo)
-		$(use_enable jpeg libjpeg)
-		$(use_enable laptop upower)
-		$(use_enable mp3 taglib)
-		$(use_enable networkmanager network-manager)
-		$(use_enable pdf poppler)
-		$(use_enable playlist)
-		$(use_enable rss miner-rss)
-		$(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 strigi libstreamanalyzer)
-
-	DOCS="AUTHORS ChangeLog NEWS README"
-
-	python_set_active_version 2
-	python_pkg_setup
-}
-
-src_prepare() {
-	# Fix functional tests scripts
-	find "${S}" -name "*.pyc" -delete
-	python_convert_shebangs -r 2 tests utils examples
-
-	# 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
-
-	# FIXME: report broken tests
-	sed -e '/\/libtracker-miner\/tracker-password-provider\/setting/,+1 s:^\(.*\)$:/*\1*/:' \
-		-e '/\/libtracker-miner\/tracker-password-provider\/getting/,+1 s:^\(.*\)$:/*\1*/:' \
-		-i tests/libtracker-miner/tracker-password-provider-test.c || die
-
-	gnome2_src_prepare
-}
-
-src_test() {
-	unset DBUS_SESSION_BUS_ADDRESS
-	Xemake check XDG_DATA_HOME="${T}" XDG_CONFIG_HOME="${T}"
-}
-
-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
-}
diff --git a/app-misc/tracker/tracker-0.14.2-r1.ebuild b/app-misc/tracker/tracker-0.14.2-r1.ebuild
index 59b4f08b771e..838c436ea601 100644
--- a/app-misc/tracker/tracker-0.14.2-r1.ebuild
+++ b/app-misc/tracker/tracker-0.14.2-r1.ebuild
@@ -1,34 +1,40 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/tracker/tracker-0.14.2-r1.ebuild,v 1.2 2012/09/08 02:07:53 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/tracker/tracker-0.14.2-r1.ebuild,v 1.3 2012/09/28 04:27:43 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="no"
 GNOME2_LA_PUNT="yes"
 PYTHON_DEPEND="2:2.6"
+VALA_MIN_API_VERSION="0.14"
 
-inherit eutils gnome2 linux-info multilib python versionator
+[[ ${PV} = 9999 ]] && inherit autotools git-2
+inherit eutils gnome2 linux-info multilib python 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"
+LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+if [[ ${PV} = 9999 ]]; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
 # USE="doc" is managed by eclass.
-IUSE="applet cue doc eds elibc_glibc exif firefox-bookmarks flac flickr gif gnome-keyring gsf gstreamer gtk iptc +iso +jpeg laptop mp3 nautilus networkmanager pdf playlist rss test thunderbird +tiff upnp +vorbis xine +xml xmp" # qt4 strigi
+IUSE="applet cue doc eds elibc_glibc exif firefox-bookmarks flac flickr gif gnome-keyring gsf gstreamer gtk iptc +iso +jpeg laptop mp3 networkmanager pdf playlist rss test thunderbird +tiff upnp +vorbis xine +xml xmp" # qt4 strigi
+[[ ${PV} = 9999 ]] || IUSE="${IUSE} nautilus"
 REQUIRED_USE="cue? ( gstreamer )"
 
 # Test suite highly disfunctional, loops forever
 # putting aside for now
 RESTRICT="test"
 
-# vala is built with debug by default (see VALAFLAGS)
 # According to NEWS, introspection is non-optional
 # glibc-2.12 needed for SCHED_IDLE (see bug #385003)
-VALA_DEP="|| (
-	dev-lang/vala:0.18
-	>=dev-lang/vala-0.13.4:0.14 )"
 RDEPEND="
 	>=app-i18n/enca-1.9
 	>=dev-db/sqlite-3.7[threadsafe]
@@ -45,11 +51,13 @@ RDEPEND="
 	applet? (
 		>=gnome-base/gnome-panel-2.91.6
 		>=x11-libs/gdk-pixbuf-2.12:2
-		>=x11-libs/gtk+-3.0:3 )
+		>=x11-libs/gtk+-3:3 )
 	cue? ( media-libs/libcue )
 	eds? (
 		>=mail-client/evolution-3.3.5
-		>=gnome-extra/evolution-data-server-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 )
 	firefox-bookmarks? ( || (
@@ -67,7 +75,7 @@ RDEPEND="
 	!gstreamer? ( !xine? ( || ( media-video/totem media-video/mplayer ) ) )
 	gtk? (
 		>=dev-libs/libgee-0.3:0
-		>=x11-libs/gtk+-3.0.0:3 )
+		>=x11-libs/gtk+-3:3 )
 	iptc? ( media-libs/libiptcdata )
 	iso? ( >=sys-libs/libosinfo-0.0.2 )
 	jpeg? ( virtual/jpeg:0 )
@@ -96,10 +104,7 @@ DEPEND="${RDEPEND}
 	>=dev-util/intltool-0.40
 	>=sys-devel/gettext-0.17
 	virtual/pkgconfig
-	applet? ( ${VALA_DEP} )
-	gtk? (
-		${VALA_DEP}
-		>=dev-libs/libgee-0.3 )
+	gtk? ( >=dev-libs/libgee-0.3 )
 	doc? (
 		app-office/dia
 		>=dev-util/gtk-doc-1.8
@@ -108,8 +113,12 @@ DEPEND="${RDEPEND}
 		>=dev-libs/dbus-glib-0.82-r1
 		>=sys-apps/dbus-1.3.1[X] )
 "
-#	strigi? ( ${VALA_DEP} )
-PDEPEND="nautilus? ( >=gnome-extra/nautilus-tracker-tags-0.14 )"
+[[ ${PV} = 9999 ]] && DEPEND="${DEPEND}
+	dev-util/gtk-doc-am
+	>=dev-util/gtk-doc-1.8
+	$(vala_depend)
+"
+[[ ${PV} = 9999 ]] || PDEPEND="nautilus? ( >=gnome-extra/nautilus-tracker-tags-0.14 )"
 
 function inotify_enabled() {
 	if linux_config_exists; then
@@ -142,15 +151,6 @@ pkg_setup() {
 		G2CONF="${G2CONF} --enable-generic-media-extractor=external"
 	fi
 
-	# if use applet || use gtk || use strigi; then
-	if use applet || use gtk; then
-		if has_version "dev-lang/vala:0.18"; then
-			G2CONF="${G2CONF} VALAC=$(type -P valac-0.18)"
-		else
-			G2CONF="${G2CONF} VALAC=$(type -P valac-0.14)"
-		fi
-	fi
-
 	# if use mp3 && (use gtk || use qt4); then
 	if use mp3 && use gtk; then
 		#G2CONF="${G2CONF} $(use_enable !qt4 gdkpixbuf) $(use_enable qt4 qt)"
@@ -213,6 +213,14 @@ pkg_setup() {
 	python_pkg_setup
 }
 
+src_unpack() {
+	if [[ ${PV} = 9999 ]]; then
+		git_src_unpack
+	else
+		gnome2_src_unpack
+	fi
+}
+
 src_prepare() {
 	# bug #426276, https://bugzilla.gnome.org/show_bug.cgi?id=675660
 	epatch "${FILESDIR}/${PN}-0.14.2-icu-no-LC_ALL.patch"
@@ -231,6 +239,10 @@ src_prepare() {
 		-e '/\/libtracker-miner\/tracker-password-provider\/getting/,+1 s:^\(.*\)$:/*\1*/:' \
 		-i tests/libtracker-miner/tracker-password-provider-test.c || die
 
+	if [[ ${PV} = 9999 ]]; then
+		eautoreconf
+		vala_src_prepare
+	fi
 	gnome2_src_prepare
 }
 
diff --git a/app-misc/tracker/tracker-0.14.2.ebuild b/app-misc/tracker/tracker-0.14.2.ebuild
index ca57bdb48ea6..e7c1743364cc 100644
--- a/app-misc/tracker/tracker-0.14.2.ebuild
+++ b/app-misc/tracker/tracker-0.14.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/tracker/tracker-0.14.2.ebuild,v 1.1 2012/07/05 23:35:08 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/tracker/tracker-0.14.2.ebuild,v 1.2 2012/09/28 04:27:43 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="no"
@@ -12,7 +12,7 @@ inherit eutils gnome2 linux-info multilib python versionator
 DESCRIPTION="A tagging metadata database, search tool and indexer"
 HOMEPAGE="http://projects.gnome.org/tracker/"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 # USE="doc" is managed by eclass.
@@ -46,7 +46,9 @@ RDEPEND="
 	cue? ( media-libs/libcue )
 	eds? (
 		>=mail-client/evolution-3.3.5
-		>=gnome-extra/evolution-data-server-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 )
 	firefox-bookmarks? ( || (
diff --git a/app-misc/tracker/tracker-9999.ebuild b/app-misc/tracker/tracker-9999.ebuild
index d263b38a0831..cd8a726685a2 100644
--- a/app-misc/tracker/tracker-9999.ebuild
+++ b/app-misc/tracker/tracker-9999.ebuild
@@ -1,32 +1,38 @@
 # Copyright 1999-2012 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.51 2012/05/07 07:42:32 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/tracker/tracker-9999.ebuild,v 1.52 2012/09/28 04:27:43 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="no"
 GNOME2_LA_PUNT="yes"
 PYTHON_DEPEND="2:2.6"
+VALA_MIN_API_VERSION="0.14"
 
-inherit autotools git-2 gnome2 linux-info multilib python versionator virtualx
+[[ ${PV} = 9999 ]] && inherit autotools git-2
+inherit gnome2 linux-info multilib python 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}"
-SRC_URI=""
+[[ ${PV} = 9999 ]] && SRC_URI=""
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="0"
-KEYWORDS=""
+if [[ ${PV} = 9999 ]]; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
 # USE="doc" is managed by eclass.
-IUSE="applet cue doc eds elibc_glibc exif firefox-bookmarks flac flickr gif gnome-keyring gsf gstreamer gtk iptc +iso +jpeg laptop mp3 networkmanager pdf playlist rss test thunderbird +tiff upnp +vorbis xine +xml xmp" # nautilus qt4 strigi
+IUSE="applet cue doc eds elibc_glibc exif firefox-bookmarks flac flickr gif gnome-keyring gsf gstreamer gtk iptc +iso +jpeg laptop mp3 networkmanager pdf playlist rss test thunderbird +tiff upnp +vorbis xine +xml xmp" # qt4 strigi
+[[ ${PV} = 9999 ]] || IUSE="${IUSE} nautilus"
 REQUIRED_USE="cue? ( gstreamer )"
 
 # Test suite highly disfunctional, loops forever
 # putting aside for now
 RESTRICT="test"
 
-# vala is built with debug by default (see VALAFLAGS)
 # According to NEWS, introspection is non-optional
 # glibc-2.12 needed for SCHED_IDLE (see bug #385003)
 RDEPEND="
@@ -49,7 +55,9 @@ RDEPEND="
 	cue? ( media-libs/libcue )
 	eds? (
 		>=mail-client/evolution-3.3.5
-		>=gnome-extra/evolution-data-server-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 )
 	firefox-bookmarks? ( || (
@@ -96,21 +104,21 @@ DEPEND="${RDEPEND}
 	>=dev-util/intltool-0.40
 	>=sys-devel/gettext-0.17
 	virtual/pkgconfig
-	dev-util/gtk-doc-am
-	>=dev-util/gtk-doc-1.8
-	applet? ( >=dev-lang/vala-0.13.4:0.14 )
-	gtk? (
-		app-office/dia
-		>=dev-lang/vala-0.13.4:0.14
-		>=dev-libs/libgee-0.3 )
+	gtk? ( >=dev-libs/libgee-0.3 )
 	doc? (
+		app-office/dia
+		>=dev-util/gtk-doc-1.8
 		media-gfx/graphviz )
 	test? (
 		>=dev-libs/dbus-glib-0.82-r1
 		>=sys-apps/dbus-1.3.1[X] )
 "
-#	strigi? ( >=dev-lang/vala-0.12:0.12 )
-#PDEPEND="nautilus? ( >=gnome-extra/nautilus-tracker-tags-${PV} )"
+[[ ${PV} = 9999 ]] && DEPEND="${DEPEND}
+	dev-util/gtk-doc-am
+	>=dev-util/gtk-doc-1.8
+	$(vala_depend)
+"
+[[ ${PV} = 9999 ]] || PDEPEND="nautilus? ( >=gnome-extra/nautilus-tracker-tags-${PV} )"
 
 function inotify_enabled() {
 	if linux_config_exists; then
@@ -143,11 +151,6 @@ pkg_setup() {
 		G2CONF="${G2CONF} --enable-generic-media-extractor=external"
 	fi
 
-	# if use applet || use gtk || use strigi; then
-	if use applet || use gtk; then
-		G2CONF="${G2CONF} VALAC=$(type -P valac-0.14)"
-	fi
-
 	# if use mp3 && (use gtk || use qt4); then
 	if use mp3 && use gtk; then
 		#G2CONF="${G2CONF} $(use_enable !qt4 gdkpixbuf) $(use_enable qt4 qt)"
@@ -207,10 +210,15 @@ pkg_setup() {
 	DOCS="AUTHORS ChangeLog NEWS README"
 
 	python_set_active_version 2
+	python_pkg_setup
 }
 
 src_unpack() {
-	git_src_unpack
+	if [[ ${PV} = 9999 ]]; then
+		git_src_unpack
+	else
+		gnome2_src_unpack
+	fi
 }
 
 src_prepare() {
@@ -223,10 +231,10 @@ src_prepare() {
 	create_version_script "www-client/firefox" "Mozilla Firefox" firefox-version.sh
 	create_version_script "mail-client/thunderbird" "Mozilla Thunderbird" thunderbird-version.sh
 
-	gtkdocize || die "gtkdocize failed"
-	intltoolize --force --copy --automake || die "intltoolize failed"
-	eautoreconf
-
+	if [[ ${PV} = 9999 ]]; then
+		eautoreconf
+		vala_src_prepare
+	fi
 	gnome2_src_prepare
 }