* [gentoo-commits] gentoo-x86 commit in app-misc/tracker: tracker-0.14.2.ebuild tracker-9999.ebuild tracker-0.12.10.ebuild tracker-0.10.35.ebuild ChangeLog tracker-0.12.10-r1.ebuild tracker-0.14.2-r1.ebuild tracker-0.10.27.ebuild tracker-0.14.1.ebuild
@ 2012-09-28 4:27 Alexandre Rostovtsev (tetromino)
0 siblings, 0 replies; only message in thread
From: Alexandre Rostovtsev (tetromino) @ 2012-09-28 4:27 UTC (permalink / raw
To: gentoo-commits
tetromino 12/09/28 04:27:43
Modified: tracker-0.14.2.ebuild tracker-9999.ebuild
tracker-0.12.10.ebuild tracker-0.10.35.ebuild
ChangeLog tracker-0.12.10-r1.ebuild
tracker-0.14.2-r1.ebuild
Removed: tracker-0.10.27.ebuild tracker-0.14.1.ebuild
Log:
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.
(Portage version: 2.2.0_alpha132/cvs/Linux x86_64)
Revision Changes Path
1.2 app-misc/tracker/tracker-0.14.2.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/tracker/tracker-0.14.2.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/tracker/tracker-0.14.2.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/tracker/tracker-0.14.2.ebuild?r1=1.1&r2=1.2
Index: tracker-0.14.2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-misc/tracker/tracker-0.14.2.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- tracker-0.14.2.ebuild 5 Jul 2012 23:35:08 -0000 1.1
+++ tracker-0.14.2.ebuild 28 Sep 2012 04:27:43 -0000 1.2
@@ -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 @@
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 @@
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? ( || (
1.52 app-misc/tracker/tracker-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/tracker/tracker-9999.ebuild?rev=1.52&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/tracker/tracker-9999.ebuild?rev=1.52&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/tracker/tracker-9999.ebuild?r1=1.51&r2=1.52
Index: tracker-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-misc/tracker/tracker-9999.ebuild,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- tracker-9999.ebuild 7 May 2012 07:42:32 -0000 1.51
+++ tracker-9999.ebuild 28 Sep 2012 04:27:43 -0000 1.52
@@ -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 @@
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 @@
>=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 @@
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 @@
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 @@
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
}
1.4 app-misc/tracker/tracker-0.12.10.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/tracker/tracker-0.12.10.ebuild?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/tracker/tracker-0.12.10.ebuild?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/tracker/tracker-0.12.10.ebuild?r1=1.3&r2=1.4
Index: tracker-0.12.10.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-misc/tracker/tracker-0.12.10.ebuild,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- tracker-0.12.10.ebuild 3 May 2012 19:41:31 -0000 1.3
+++ tracker-0.12.10.ebuild 28 Sep 2012 04:27:43 -0000 1.4
@@ -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 @@
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 @@
>=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? ( || (
1.4 app-misc/tracker/tracker-0.10.35.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/tracker/tracker-0.10.35.ebuild?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/tracker/tracker-0.10.35.ebuild?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/tracker/tracker-0.10.35.ebuild?r1=1.3&r2=1.4
Index: tracker-0.10.35.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-misc/tracker/tracker-0.10.35.ebuild,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- tracker-0.10.35.ebuild 3 May 2012 19:41:31 -0000 1.3
+++ tracker-0.10.35.ebuild 28 Sep 2012 04:27:43 -0000 1.4
@@ -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 @@
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 @@
>=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 )
1.132 app-misc/tracker/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/tracker/ChangeLog?rev=1.132&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/tracker/ChangeLog?rev=1.132&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/tracker/ChangeLog?r1=1.131&r2=1.132
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-misc/tracker/ChangeLog,v
retrieving revision 1.131
retrieving revision 1.132
diff -u -r1.131 -r1.132
--- ChangeLog 8 Sep 2012 02:07:53 -0000 1.131
+++ ChangeLog 28 Sep 2012 04:27:43 -0000 1.132
@@ -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
1.2 app-misc/tracker/tracker-0.12.10-r1.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/tracker/tracker-0.12.10-r1.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/tracker/tracker-0.12.10-r1.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/tracker/tracker-0.12.10-r1.ebuild?r1=1.1&r2=1.2
Index: tracker-0.12.10-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-misc/tracker/tracker-0.12.10-r1.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- tracker-0.12.10-r1.ebuild 20 Jul 2012 15:47:53 -0000 1.1
+++ tracker-0.12.10-r1.ebuild 28 Sep 2012 04:27:43 -0000 1.2
@@ -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 @@
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 @@
>=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? ( || (
1.3 app-misc/tracker/tracker-0.14.2-r1.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/tracker/tracker-0.14.2-r1.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/tracker/tracker-0.14.2-r1.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/tracker/tracker-0.14.2-r1.ebuild?r1=1.2&r2=1.3
Index: tracker-0.14.2-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-misc/tracker/tracker-0.14.2-r1.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- tracker-0.14.2-r1.ebuild 8 Sep 2012 02:07:53 -0000 1.2
+++ tracker-0.14.2-r1.ebuild 28 Sep 2012 04:27:43 -0000 1.3
@@ -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 @@
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 @@
!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 @@
>=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 @@
>=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 @@
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 @@
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 @@
-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
}
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2012-09-28 4:27 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-09-28 4:27 [gentoo-commits] gentoo-x86 commit in app-misc/tracker: tracker-0.14.2.ebuild tracker-9999.ebuild tracker-0.12.10.ebuild tracker-0.10.35.ebuild ChangeLog tracker-0.12.10-r1.ebuild tracker-0.14.2-r1.ebuild tracker-0.10.27.ebuild tracker-0.14.1.ebuild Alexandre Rostovtsev (tetromino)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox