Sync live ebuild with 0.12 series ebuild.

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

diff --git a/app-misc/tracker/ChangeLog b/app-misc/tracker/ChangeLog
index a16730aa9673d998b9a464563405374bcfc18c4d..bcb7e779fad0e4d9b4fc2aa1d6d9f5e9ca41859e 100644 (file)
--- a/app-misc/tracker/ChangeLog
+++ b/app-misc/tracker/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-misc/tracker
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/tracker/ChangeLog,v 1.117 2011/11/08 21:45:34 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/tracker/ChangeLog,v 1.118 2011/11/08 22:25:58 eva Exp $
+
+  08 Nov 2011; Gilles Dartiguelongue <eva@gentoo.org> tracker-0.12.7.ebuild,
+  tracker-9999.ebuild:
+  Sync live ebuild with 0.12 series ebuild.
 
 *tracker-0.10.35 (08 Nov 2011)
 

diff --git a/app-misc/tracker/Manifest b/app-misc/tracker/Manifest
index a901d5efe7a6d3c6b0099573b291493504e7a051..905fe7bff70f68ab0d1c5b81574642f39623c652 100644 (file)
--- a/app-misc/tracker/Manifest
+++ b/app-misc/tracker/Manifest
@@ -12,14 +12,14 @@ DIST tracker-0.10.35.tar.xz 5754872 RMD160 6919a7623bf3f041b617d7c2a2b55856863b5
 DIST tracker-0.12.7.tar.xz 5969180 RMD160 e31b85538145404640c303968ecbbb8f729d2564 SHA1 188c9aaa5478302be818e36c3ef126267971289d SHA256 e7a4d016326bc0a1b6aea07e48c3de73ffc29119812149e2dee5eac35104f1b4
 EBUILD tracker-0.10.27.ebuild 6070 RMD160 1b551075534798b0e4a70cde2b99ea28bbaf16c0 SHA1 1a4fa27525df3114dc7d9348d40c9a9b927fc969 SHA256 cf380edbe80f5da7f7643167a4e275e8b70a1b1aae861b4fefbd1463fd0bd2bc
 EBUILD tracker-0.10.35.ebuild 6070 RMD160 ec058f97ccc92537c39121d363a4ca00b8b0afc0 SHA1 41954ff9631eb25fa957aaaa61ab09cd679ae47d SHA256 8aab9dca68b1742e410805453c21beb5907dda8d44ca3ea742d89b0aeab55d43
-EBUILD tracker-0.12.7.ebuild 8174 RMD160 d7181c04626cf37f38d2e380892c5a1059bbe270 SHA1 d2b9c0210fadedab96c09fa56f4ac063a332d9de SHA256 c149b4c7920e242743e8c01f6a0bb63fce293c54b351435ed6acfbb067ce3b20
-EBUILD tracker-9999.ebuild 5868 RMD160 666e3ba395ea347322ef76a9f9a7f11c62358955 SHA1 3e5e76375f4fb82eb2be0388e508d314d7a6d71f SHA256 e9a6b3fb26ac27beb909afdbf98c6eb448ec97e15b2d55b41f5a46e2d9663f31
-MISC ChangeLog 21824 RMD160 cd688a2b1eb220e4c9209dee235a3c0daabcd741 SHA1 36eca6d2691c8b0a8ef461d9492f1b3ec741595d SHA256 8d1afd599a2764b0abfd1dae8cfae0152544cbe4f5530e421cb90b13543bb122
+EBUILD tracker-0.12.7.ebuild 8187 RMD160 d0fb114422d8b95cbf64386075a85c1b88982570 SHA1 4f5932f6578a09a6ddbb537964a5359061a6d5b6 SHA256 550f6e81a6e7031e247d97832f91e7cc9da4fc3c064e5bf881d49ea77f294cac
+EBUILD tracker-9999.ebuild 8057 RMD160 b7a474f317dc513b14b67b2f104364e25887c2c8 SHA1 ce178ba141214db723e15ad29bbc82b9060dad68 SHA256 e6ae652a7f28d3df682078bb3d06dfe4b2baa21fc66839e0af25da9492657898
+MISC ChangeLog 21969 RMD160 86550b379ceb92c8a3a61a2108db9a8b298db333 SHA1 10805be676fe699a4f3978518f4682e90430e8d0 SHA256 92cd4aa3fb8c65b2bc5ad4abd4a52351db478ff57798fad6948b0e2821ea6160
 MISC metadata.xml 1493 RMD160 7c1571bebea478fa6ecbdbf94aad99745da96d50 SHA1 70c721ac6e96538e2978dd4d361682af516dd1a6 SHA256 7d6953b715e4656de079be4a23c5be6acd1695a5b3a50f5ab8f1ddc437104e3a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk65owMACgkQ1fmVwcYIWAaNrQCcDgUXz4LO5OOLjz7c6itsQgdG
-dDgAoITLILvfQyKU7xXyBDrBhg/alx8H
-=2hG+
+iEYEARECAAYFAk65rHsACgkQ1fmVwcYIWAa8NQCdGjlqDSYwCk9OM4M8UQXgbmW4
+PLcAoLahjWYotdtGE7HOOwfy5oLoaGA8
+=prUE
 -----END PGP SIGNATURE-----

diff --git a/app-misc/tracker/tracker-0.12.7.ebuild b/app-misc/tracker/tracker-0.12.7.ebuild
index 4e74783bdfc2a910de428c13405e4bcd59a0fc69..2b511b90c7b927dd0cc9bd916f56f877ce698246 100644 (file)
--- a/app-misc/tracker/tracker-0.12.7.ebuild
+++ b/app-misc/tracker/tracker-0.12.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/tracker/tracker-0.12.7.ebuild,v 1.1 2011/11/02 16:23:58 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/tracker/tracker-0.12.7.ebuild,v 1.2 2011/11/08 22:25:58 eva Exp $
 
 EAPI="3"
 GCONF_DEBUG="no"
@@ -158,6 +158,7 @@ pkg_setup() {
        # nautilus extension is in a separate package, nautilus-tracker-tags
        G2CONF="${G2CONF}
                --disable-hal
+               --disable-libcue
                --enable-tracker-fts
                --with-enca
                --with-unicode-support=libicu

diff --git a/app-misc/tracker/tracker-9999.ebuild b/app-misc/tracker/tracker-9999.ebuild
index 8805adf53f1f5003bf3291ea32ad63b4accd4ce1..fd892a566516511a9be570b282e78b1c2c01b940 100644 (file)
--- a/app-misc/tracker/tracker-9999.ebuild
+++ b/app-misc/tracker/tracker-9999.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2011 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.46 2011/09/20 22:44:51 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/tracker/tracker-9999.ebuild,v 1.47 2011/11/08 22:25:58 eva Exp $
 
 EAPI="3"
 GCONF_DEBUG="no"
 GNOME2_LA_PUNT="yes"
 PYTHON_DEPEND="2:2.6"
 
-inherit autotools git-2 gnome2 linux-info python virtualx
+inherit autotools git-2 gnome2 linux-info multilib python versionator virtualx
 
 DESCRIPTION="A tagging metadata database, search tool and indexer"
 HOMEPAGE="http://www.tracker-project.org/"
@@ -19,14 +19,20 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS=""
 # 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"
+IUSE="applet doc eds elibc_glibc exif firefox-bookmarks flac flickr gif gnome-keyring gsf gstreamer gtk iptc +jpeg laptop mp3 networkmanager pdf playlist rss test thunderbird +tiff upnp +vorbis xine +xml xmp" # nautilus qt4 strigi
+
+# 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/dbus-glib-0.82-r1
-       >=dev-libs/glib-2.26:2
+       >=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=]
@@ -36,12 +42,17 @@ RDEPEND="
        sys-apps/util-linux
 
        applet? (
-               >=gnome-base/gnome-panel-2.91
+               >=gnome-base/gnome-panel-2.91.6
+               >=x11-libs/gdk-pixbuf-2.12:2
                >=x11-libs/gtk+-3:3 )
        eds? (
-               >=mail-client/evolution-2.32
-               >=gnome-extra/evolution-data-server-2.32 )
+               >=mail-client/evolution-2.91.90
+               >=gnome-extra/evolution-data-server-2.91.90 )
+       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 )
@@ -51,23 +62,18 @@ RDEPEND="
                >=gnome-extra/libgsf-1.13 )
        gstreamer? (
                >=media-libs/gstreamer-0.10.31:0.10
-               upnp? ( >=media-libs/gupnp-dlna-0.5 ) )
+               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+-2.18:2 )
-       introspection? ( >=dev-libs/gobject-introspection-0.9.5 )
+               >=x11-libs/gtk+-3:3 )
        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 )
+               gtk? ( x11-libs/gdk-pixbuf:2 ) )
        networkmanager? ( >=net-misc/networkmanager-0.8 )
        pdf? (
                >=x11-libs/cairo-1
@@ -75,12 +81,16 @@ RDEPEND="
                >=x11-libs/gtk+-2.12:2 )
        playlist? ( dev-libs/totem-pl-parser )
        rss? ( net-libs/libgrss )
-       strigi? ( >=app-misc/strigi-0.7 )
+       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
@@ -98,6 +108,8 @@ DEPEND="${RDEPEND}
                >=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} )"
 
 function inotify_enabled() {
        if linux_config_exists; then
@@ -122,7 +134,7 @@ pkg_setup() {
                if use upnp; then
                        G2CONF="${G2CONF} --with-gstreamer-backend=gupnp-dlna"
                else
-                       G2CONF="${G2CONF} --with-gstreamer-backend=discover"
+                       G2CONF="${G2CONF} --with-gstreamer-backend=discoverer"
                fi
        elif use xine ; then
                G2CONF="${G2CONF} --enable-generic-media-extractor=xine"
@@ -130,24 +142,40 @@ 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.12)"
        fi
 
-       if use mp3 && (use gtk || use qt4); then
-               G2CONF="${G2CONF} $(use_enable !qt4 gdkpixbuf) $(use_enable qt4 qt)"
+       # 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
+               --disable-libcue
                --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 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)
@@ -155,23 +183,24 @@ pkg_setup() {
                $(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 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"
 
@@ -183,22 +212,57 @@ src_unpack() {
 }
 
 src_prepare() {
-       gnome2_src_prepare
-
        # 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
+       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
 
        gtkdocize || die "gtkdocize failed"
        intltoolize --force --copy --automake || die "intltoolize failed"
        eautoreconf
+
+       gnome2_src_prepare
 }
 
 src_test() {
        unset DBUS_SESSION_BUS_ADDRESS
        Xemake check XDG_DATA_HOME="${T}" XDG_CONFIG_HOME="${T}" || die "tests failed"
 }
+
+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 || die
+       fi
+
+       if use thunderbird; then
+               dosym /usr/share/xul-ext/trackerbird \
+                       /usr/$(get_libdir)/thunderbird-bin/extensions/trackerbird@bustany.org || die
+       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
+}