Fix libpng dependencies in 0.14.x, alphabetize a few things in 0.16.0, and update live ebuild.

Package-Manager: portage-2.2.0_alpha171/cvs/Linux x86_64
Manifest-Sign-Key: 0xCF0ADD61

6 files changed, 38 insertions, 38 deletions

diff --git a/app-misc/tracker/ChangeLog b/app-misc/tracker/ChangeLog
index 17e8afb4dfc9..487607ec6876 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.151 2013/04/05 21:19:10 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/tracker/ChangeLog,v 1.152 2013/04/06 03:06:30 tetromino Exp $
+
+  06 Apr 2013; Alexandre Rostovtsev <tetromino@gentoo.org>
+  tracker-0.14.4.ebuild, tracker-0.14.5.ebuild, tracker-0.16.0.ebuild,
+  tracker-9999.ebuild:
+  Fix libpng dependencies in 0.14.x, alphabetize a few things in 0.16.0, and
+  update live ebuild.
 
   05 Apr 2013; Pacho Ramos <pacho@gentoo.org> tracker-0.16.0.ebuild:
   Fix subslot dep on libpng
diff --git a/app-misc/tracker/Manifest b/app-misc/tracker/Manifest
index 87ff0e1ab8ad..12cd646b40f2 100644
--- a/app-misc/tracker/Manifest
+++ b/app-misc/tracker/Manifest
@@ -4,16 +4,20 @@ Hash: SHA256
 DIST tracker-0.14.4.tar.xz 5946796 SHA256 b818ee42b9007a94b2f8046edc4706bb2036187d5fd304e7ae23e5d2fcf85918 SHA512 e9d6d28276dc7f9930f0e8801fa3b3ea2a30ced0979309418ff5a36d7417ab85fb4d2c246032cad88ea63a4716b301db95a0046bd17eb1849e8a9a7edc464103 WHIRLPOOL 82aebbd0596c931867c65612672af52a510da202c881b2e1fdaa9a07136f8bef2840c2d0a6546ba0e6a53c9e61c973925dbc917ba5d8ec3b385f0656a34b926a
 DIST tracker-0.14.5.tar.xz 6065728 SHA256 cabef75eb18ad35208000dc472bdc20a74269799414527ee6e1c1c1cfb28eec8 SHA512 ab65d5618ef51d23b65e3d6972834e573415dba52e7bb9f20f8f9d4d4aab467b667301e6540083401d91c9e36cb63fdb2259f6dd9e975e9ff60bf1f83245b777 WHIRLPOOL 4c2c5ad9ff0d7a35c5e9c6bc42b354b9967a436cb1a8b2b640ca09e102a428e268bd011e0405a2b331f80df5a69dcd7e0afc693ae4969604ee41088e5da0c25b
 DIST tracker-0.16.0.tar.xz 5921104 SHA256 299c6a180370522d1d794c184aaef8d8222d3f737d564b8e5ca25b8751470c4f SHA512 621b0ab202bfbe6f29d8d75333a8f051b677c14c9c352d09afef92aca7f908b82307ceea4e1e55f14fc0666d8256019ff7e2664737eb34b6ab8c22a742696a40 WHIRLPOOL 245a64d577bccd65798ad90459a027d5f5b9cc344fcff298ed8912562a7391b982b2fb5ba12aa81b9208fab35f6cb769ff27c3b694e1f0d709696f473ee329db
-EBUILD tracker-0.14.4.ebuild 8928 SHA256 49f56f21606c1d33207b83c437e830617e2c8d93c654be5afece6828eb38ac3c SHA512 3343f7ca3a05e9da5bbc936713a7018e91acbcaab050270699997c3c8241cf8e02ce61bbd1ec6b9d62568f1b7136447dff8f9de77dfb57435a054400f13331bd WHIRLPOOL 1510f1106adf1d9a3116a5d3f2508e7b408236da8fb5221de39a03f3d7522fc8de09e5340cb332c4a335f2309c9bec20a2c4d338438b24594ef514041931aa55
-EBUILD tracker-0.14.5.ebuild 9554 SHA256 11eace2161f748d118bfea5abdffb594f4e273a0b28a1c9ae3b7db18811a1aba SHA512 cfa5803c2bbd99d91e202bba57d88f485243a8bf7a4eab0be4e2f7cd61850ea800bb90531be0b84b05263bc10108b85f0e7cf4041bb1397fa148adcbacbd526a WHIRLPOOL 2bfec7850088050750f3e95d9dbdddd3497bf8400b54652a2d83e70a3f78d55303a7716c703b79d808cbfa17669948d19babcd3536ce9b680bfe3628dcd211d1
-EBUILD tracker-0.16.0.ebuild 9034 SHA256 5351a32f1233d967ba49537fb4e7baf04d176ea0da22e857bbe383bd24cc1b96 SHA512 1c8c4b4895aef51332cc750dbe174554d1f8466a0ef03f035b7ef7bba5315fcb26ed1718acdd7d073de0b564c2c722f359ed948602a4b67b9314ac8335ae329a WHIRLPOOL 4847bb1acc440cdd488a8fe7b6f5ef24d9ac773abdd14fd8737d51680dce9d4352006774393a8f61a2de8203b9021a6af764d8b95e0f8b24c62f2f7ac9616a7d
-EBUILD tracker-9999.ebuild 8480 SHA256 437083742147017e6c5c8d39c199cb74dfdf755520b07dbf9f108a8489f57992 SHA512 d7adda4de9db8f1f6e8c36cb34fe99ba7e598d6f1de4eb1b654864e3d01432ff1a586991e4fcd6efe2b659938132c3b963e344c718f224567ecaa735b5d524b6 WHIRLPOOL b0061c94e39a13362f002ee0ab9beee8bd786fd1fd0219f475753a1fd840d9923784a7d512393d8bc8dadeb8e6439da4ba1683a6ad130c7d80f893f91489837a
-MISC ChangeLog 28645 SHA256 92663a99b003d19a3018c2a0bb8ab12b7fc467a50f917bee684e788b20c089ef SHA512 f40f1d994ed28cedcfa081ba462f1de5a95f0e7bf007b5d850e2d4acd53154dc36bd3e284a295a3395f20a54bc61bae309f36c911cb205fae81c5890d176b06b WHIRLPOOL b49169448c2bdff993e84b6e5f33d971849489bdeefc60099f99ddf4934a3aa9a3528b6ca062402e619a8b048a3675b3b57c1e1f2161eab6c5c600d23fc9e8fd
+EBUILD tracker-0.14.4.ebuild 8935 SHA256 90d15d2fce78420979ea36de4573edcfa186f9070edf1164e47e30a0c782f857 SHA512 95daf34a45677245173bb20114cb32d4c4ffece023f8fefdfa83dfa9cee2e988127ae0e250e61d2b7a526fa9c557eccc9d2f6cd728a8976bee1f2128016a0ccf WHIRLPOOL 6ebba10fe8be5f410782e383e3bff9a9115060852c8ea15fac483d6a2e1497257bfaf57a7d0c47d19645f59b009317c659c38b38ad3a67b7ab807f2931306a62
+EBUILD tracker-0.14.5.ebuild 9561 SHA256 dcb1b4ac0a0d57c9361088096325ada8aa15ef9b56226d309e7318375e0aff07 SHA512 305f8c6c1b943dc95410f4cc00b65ef64f91bb55cc874467d48a497110048970a26dd6f2c4ef1ee1ed29aa44292079d8201c7885b327ad0a6042ebce4cf0c8a1 WHIRLPOOL 52463e6690dcfdc5bb209cb5ecf7270a6fa17728ded907b80ed2b855a7c8a3e6556905cc5499f1e4e45271d356ba9757f45c4f699a471677a5a6e4d41abf0dcd
+EBUILD tracker-0.16.0.ebuild 9038 SHA256 1e77cdbdb680ef97d4918e4812f37f879fdd7b45e289ae693b84222c7fd0839b SHA512 e713a7866b4ed7c508379169a099570ff924790753d03bcc147a77904c31616006652c8bd519cfd9fdd8dea4120def5dd654165ae17af487ae9e35fd48bce31a WHIRLPOOL 324479c343be65bb168a7f47c27f6804912e57f698163dc2ef408c82e94949ba0ae03acbe09e5e69a4dddbba2ff9b4e455ac95dde752fb9e58710f65df7d70d8
+EBUILD tracker-9999.ebuild 8191 SHA256 3a24b893a0d4b3da579d0736cc515af75155e92b1d4c302b9207298ba1b0d91c SHA512 8c42bb7dfa776e56b74e4eacf62dac9f0f47a12cae2710e97724f0543d17366c670ee12a590333dff99c961c2054a608629062eaebfb0308fea732b3ad3fd31f WHIRLPOOL b4c782f75cfa580b4c8405215c9c8488067ac79af10d29e6f55594d392a9d4481815da15ef33f10c8922c97a4e92a7cc713d739467397db7c248531f44e97708
+MISC ChangeLog 28902 SHA256 b98e5001986a242c02da4adb1fa4d62db48430d0e1afc5f1be0d799a5f6fca5d SHA512 d32d291be4065ed1dbe614e02574ee2e547c4776072e88dbbeb17784e0057547e650005320614904eca827efbcc3ba05df02e136cc7c76962b960bf806371ee3 WHIRLPOOL 46b4b02e40ef4044c624c05dbe0f8c92dbbe54856e432d19b2a1737532f8199a2ca791fcedc3b00bfdc218510b3fcc6380cb7804ba3e809fcbd16c3a707df645
 MISC metadata.xml 1601 SHA256 b7d9768eb7b4d1c588947299912d742751c1279f2cc1bd88a437b48eb3824554 SHA512 bc9ec7bfed8d73e1dfcadf6c2b2239595c6d06ad6d4f1657b4e405f8ff1e87af82fb122e267426fbed53fd7011699fa551bc66503d9cb58bf96ac1d6da1e9e61 WHIRLPOOL 27982acb9fbb780837c7a598bdffe0e4283bcb30ce72c3fcce069b933955cb5b7f485a75b7f54dbc66e851b4d9843959efcc0555435e27dc4bec7154112eaf56
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlFfP88ACgkQCaWpQKGI+9QOlQCfZnqEJMVBdRYQj48+i9NL9XwE
-e1EAn2/F85M/n3MBfo89R09NEUMjBcpi
-=QZor
+iQEcBAEBCAAGBQJRX5E4AAoJEJ0WA1zPCt1hZXoH/jW5YJdQmODCOXG/JAry/sCy
+RpHv2wSsjb0HcUO3EaveWne1i1lSVkSLyloa4pbxFD+vWDscZPBAxrpQvr9e78bj
+0zBX05jEL/8Soh9jqC5t26ULuEBf+fnNMrOXwICebnBgxKwCEq5TZ8Wvrt1/iVDi
+a3nP7rgtnkWp7mbnqFWHT1Xo9S02eGIPmdnlmkMgU4Ebq+8VD/jYn0sM3t9ook8O
+Ky0e89jqQ4u3la7rPbyLVez/qnc9Ffx26g56v02+Xea8qYJMi/kIosK12tbPPIum
+WmfzsUdqpaU2qTuZ+ArR2apm++uBmDRYUZgPiN9e1Dn3Rx0xdts/tPKEg358bTc=
+=+Ve+
 -----END PGP SIGNATURE-----
diff --git a/app-misc/tracker/tracker-0.14.4.ebuild b/app-misc/tracker/tracker-0.14.4.ebuild
index fd038a4da02d..c82da4c8b117 100644
--- a/app-misc/tracker/tracker-0.14.4.ebuild
+++ b/app-misc/tracker/tracker-0.14.4.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-0.14.4.ebuild,v 1.12 2013/03/30 22:46:31 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/tracker/tracker-0.14.4.ebuild,v 1.13 2013/04/06 03:06:30 tetromino Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
@@ -51,7 +51,7 @@ RDEPEND="
 	|| (
 		>=media-gfx/imagemagick-5.2.1[png,jpeg=]
 		media-gfx/graphicsmagick[imagemagick,png,jpeg=] )
-	>=media-libs/libpng-1.2:=
+	>=media-libs/libpng-1.2:0=
 	>=x11-libs/pango-1:=
 	sys-apps/util-linux
 
diff --git a/app-misc/tracker/tracker-0.14.5.ebuild b/app-misc/tracker/tracker-0.14.5.ebuild
index ce97f100d9ce..7fb1b6e20416 100644
--- a/app-misc/tracker/tracker-0.14.5.ebuild
+++ b/app-misc/tracker/tracker-0.14.5.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-0.14.5.ebuild,v 1.4 2013/03/30 22:46:31 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/tracker/tracker-0.14.5.ebuild,v 1.5 2013/04/06 03:06:30 tetromino Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
@@ -47,7 +47,7 @@ RDEPEND="
 	|| (
 		>=media-gfx/imagemagick-5.2.1[png,jpeg=]
 		media-gfx/graphicsmagick[imagemagick,png,jpeg=] )
-	>=media-libs/libpng-1.2:=
+	>=media-libs/libpng-1.2:0=
 	>=x11-libs/pango-1:=
 	sys-apps/util-linux
 
diff --git a/app-misc/tracker/tracker-0.16.0.ebuild b/app-misc/tracker/tracker-0.16.0.ebuild
index fc93bba3afca..6bf9c3afbf32 100644
--- a/app-misc/tracker/tracker-0.16.0.ebuild
+++ b/app-misc/tracker/tracker-0.16.0.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-0.16.0.ebuild,v 1.3 2013/04/05 21:19:10 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/tracker/tracker-0.16.0.ebuild,v 1.4 2013/04/06 03:06:30 tetromino Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
@@ -15,8 +15,7 @@ HOMEPAGE="http://projects.gnome.org/tracker/"
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="0/16"
-IUSE="cue doc eds elibc_glibc exif firefox-bookmarks flac gif
-libsecret gsf gstreamer gtk iptc +iso +jpeg laptop +miner-fs mp3 networkmanager pdf playlist rss test thunderbird +tiff upnp-av +vorbis xine +xml xmp xps" # qt4 strigi
+IUSE="cue doc 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
 KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="${IUSE} nautilus"
 
@@ -55,7 +54,6 @@ RDEPEND="
 		>=www-client/firefox-bin-4.0 ) )
 	flac? ( >=media-libs/flac-1.2.1 )
 	gif? ( media-libs/giflib )
-	libsecret? ( >=app-crypt/libsecret-0.5 )
 	gsf? ( >=gnome-extra/libgsf-1.13 )
 	gstreamer? (
 		media-libs/gstreamer:1.0
@@ -67,6 +65,7 @@ RDEPEND="
 	iso? ( >=sys-libs/libosinfo-0.0.2:= )
 	jpeg? ( virtual/jpeg:0 )
 	laptop? ( >=sys-power/upower-0.9 )
+	libsecret? ( >=app-crypt/libsecret-0.5 )
 	mp3? (
 		>=media-libs/taglib-1.6
 		gtk? ( x11-libs/gdk-pixbuf:2 ) )
@@ -218,7 +217,6 @@ 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 libsecret) \
 		$(use_enable gsf libgsf) \
 		$(use_enable gtk tracker-needle) \
 		$(use_enable gtk tracker-preferences) \
@@ -226,6 +224,7 @@ src_configure() {
 		$(use_enable iso libosinfo) \
 		$(use_enable jpeg libjpeg) \
 		$(use_enable laptop upower) \
+		$(use_enable libsecret) \
 		$(use_enable miner-fs) \
 		$(use_enable mp3 taglib) \
 		$(use_enable networkmanager network-manager) \
diff --git a/app-misc/tracker/tracker-9999.ebuild b/app-misc/tracker/tracker-9999.ebuild
index 3829baa8f2c4..3deb48bb9df6 100644
--- a/app-misc/tracker/tracker-9999.ebuild
+++ b/app-misc/tracker/tracker-9999.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.60 2013/03/30 22:46:31 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/tracker/tracker-9999.ebuild,v 1.61 2013/04/06 03:06:30 tetromino Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
@@ -18,9 +18,8 @@ EGIT_REPO_URI="git://git.gnome.org/${PN}
 [[ ${PV} = 9999 ]] && SRC_URI=""
 
 LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="0/14"
-IUSE="applet cue doc eds elibc_glibc exif firefox-bookmarks flac flickr gif
-gnome-keyring gsf gstreamer gtk iptc +iso +jpeg laptop +miner-fs mp3 networkmanager pdf playlist rss test thunderbird +tiff upnp-av +vorbis xine +xml xmp xps" # qt4 strigi
+SLOT="0/16"
+IUSE="cue doc 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"
@@ -41,20 +40,16 @@ REQUIRED_USE="
 RDEPEND="
 	>=app-i18n/enca-1.9
 	>=dev-db/sqlite-3.7.14:=[threadsafe(+)]
-	>=dev-libs/glib-2.28:2
+	>=dev-libs/glib-2.35.1: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:=
+	>=media-libs/libpng-1.2:0=
 	>=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:3 )
 	cue? ( media-libs/libcue )
 	eds? (
 		>=mail-client/evolution-3.3.5:=
@@ -67,13 +62,11 @@ RDEPEND="
 		>=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
-		>=media-libs/gst-plugins-base-0.10.31:0.10 )
+		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 )
@@ -81,6 +74,7 @@ RDEPEND="
 	iso? ( >=sys-libs/libosinfo-0.0.2:= )
 	jpeg? ( virtual/jpeg:0 )
 	laptop? ( >=sys-power/upower-0.9 )
+	libsecret? ( >=app-crypt/libsecret-0.5 )
 	mp3? (
 		>=media-libs/taglib-1.6
 		gtk? ( x11-libs/gdk-pixbuf:2 ) )
@@ -90,12 +84,12 @@ RDEPEND="
 		>=app-text/poppler-0.16:=[cairo,utils]
 		>=x11-libs/gtk+-2.12:2 )
 	playlist? ( dev-libs/totem-pl-parser )
-	rss? ( net-libs/libgrss )
+	rss? ( >=net-libs/libgrss-0.5 )
 	thunderbird? ( || (
 		>=mail-client/thunderbird-5.0
 		>=mail-client/thunderbird-bin-5.0 ) )
 	tiff? ( media-libs/tiff )
-	upnp-av? ( >=media-libs/gupnp-dlna-0.5:1.0 )
+	upnp-av? ( >=media-libs/gupnp-dlna-0.9.4:2.0 )
 	vorbis? ( >=media-libs/libvorbis-0.22 )
 	xine? ( >=media-libs/xine-lib-1 )
 	xml? ( >=dev-libs/libxml2-2.6 )
@@ -206,7 +200,6 @@ src_configure() {
 		--enable-tracker-fts \
 		--with-enca \
 		--with-unicode-support=libicu \
-		$(use_enable applet tracker-search-bar) \
 		$(use_enable cue libcue) \
 		$(use_enable eds miner-evolution) \
 		$(use_enable exif libexif) \
@@ -214,16 +207,14 @@ 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 flickr miner-flickr) \
-		$(use_enable gnome-keyring) \
 		$(use_enable gsf libgsf) \
-		$(use_enable gtk tracker-explorer) \
 		$(use_enable gtk tracker-needle) \
 		$(use_enable gtk tracker-preferences) \
 		$(use_enable iptc libiptcdata) \
 		$(use_enable iso libosinfo) \
 		$(use_enable jpeg libjpeg) \
 		$(use_enable laptop upower) \
+		$(use_enable libsecret) \
 		$(use_enable miner-fs) \
 		$(use_enable mp3 taglib) \
 		$(use_enable networkmanager network-manager) \