gnome-extra/zeitgeist: Version

(Portage version: 2.2.0_alpha173/cvs/Linux x86_64, signed Manifest commit with key 8009D6F070EB7916)

8 files changed, 87 insertions, 179 deletions

diff --git a/gnome-extra/zeitgeist/ChangeLog b/gnome-extra/zeitgeist/ChangeLog
index 6bc9ce79c64e..b49b38e2c948 100644
--- a/gnome-extra/zeitgeist/ChangeLog
+++ b/gnome-extra/zeitgeist/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for gnome-extra/zeitgeist
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/zeitgeist/ChangeLog,v 1.26 2013/04/07 16:14:52 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/zeitgeist/ChangeLog,v 1.27 2013/04/21 14:11:40 jlec Exp $
+
+*zeitgeist-0.9.12 (21 Apr 2013)
+
+  21 Apr 2013; Justin Lecher <jlec@gentoo.org> -zeitgeist-0.9.5.ebuild,
+  +zeitgeist-0.9.12.ebuild, -files/zeitgeist-0.7.1-no-rdfpipe.patch,
+  -files/zeitgeist-0.7-no-rdfpipe.patch, -files/zeitgeist-0.8.2-gobject.patch,
+  -files/zeitgeist-0.9.0-gobject.patch, metadata.xml:
+  Version
 
 *zeitgeist-0.9.5-r1 (07 Apr 2013)
 
diff --git a/gnome-extra/zeitgeist/files/zeitgeist-0.7-no-rdfpipe.patch b/gnome-extra/zeitgeist/files/zeitgeist-0.7-no-rdfpipe.patch
deleted file mode 100644
index 0a91fda3df69..000000000000
--- a/gnome-extra/zeitgeist/files/zeitgeist-0.7-no-rdfpipe.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Remove dep on rdfpipe (from OpenSUSE)
-
---- configure.ac
-+++ configure.ac
-@@ -37,10 +37,4 @@ if test "x$HAVE_RAPPER" = "xno"; then
-   AC_MSG_ERROR(You need the tool `rapper' from the `raptor-utils' package in order to compile Zeitgeist)
- fi
- 
--# check for rdflib
--AC_CHECK_PROG(HAVE_RDFLIB, rdfpipe, yes, no)
--if test "x$HAVE_RDFLIB" = "xno"; then
--  AC_MSG_ERROR(You need the tool `rdfpipe' from the `python-rdflib' package in order to compile Zeitgeist)
--fi
--
- AC_OUTPUT
diff --git a/gnome-extra/zeitgeist/files/zeitgeist-0.7.1-no-rdfpipe.patch b/gnome-extra/zeitgeist/files/zeitgeist-0.7.1-no-rdfpipe.patch
deleted file mode 100644
index 1cb5050d0c8e..000000000000
--- a/gnome-extra/zeitgeist/files/zeitgeist-0.7.1-no-rdfpipe.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Remove dep on rdfpipe (from OpenSUSE)
-
---- configure.ac
-+++ configure.ac
-@@ -37,13 +37,4 @@
-   AC_MSG_ERROR(You need the tool `rapper' from the `raptor-utils' package in order to compile Zeitgeist)
- fi
- 
--# check for python-rdflib
--AC_MSG_CHECKING([for python-rdflib])
--echo "import rdflib" | python - 2>/dev/null
--if test $? -ne 0 ; then
--  AC_MSG_FAILURE([failed.  Please install the python-rdflib package.])
--else
--  AC_MSG_RESULT([yes])
--fi
--
- AC_OUTPUT
diff --git a/gnome-extra/zeitgeist/files/zeitgeist-0.8.2-gobject.patch b/gnome-extra/zeitgeist/files/zeitgeist-0.8.2-gobject.patch
deleted file mode 100644
index ce9e576cf01d..000000000000
--- a/gnome-extra/zeitgeist/files/zeitgeist-0.8.2-gobject.patch
+++ /dev/null
@@ -1,62 +0,0 @@
- .../engine/extensions/datasource_registry.py       |    4 ++--
- zeitgeist-daemon                                   |    2 +-
- zeitgeist-daemon.py                                |    4 ++--
- 3 files changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/_zeitgeist/engine/extensions/datasource_registry.py b/_zeitgeist/engine/extensions/datasource_registry.py
-index 17d357f..fea7d85 100644
---- a/_zeitgeist/engine/extensions/datasource_registry.py
-+++ b/_zeitgeist/engine/extensions/datasource_registry.py
-@@ -23,7 +23,7 @@ import os
- import cPickle as pickle
- import dbus
- import dbus.service
--import gobject
-+from gi.repository import GObject
- import logging
- 
- from zeitgeist.datamodel import get_timestamp_for_now
-@@ -96,7 +96,7 @@ class DataSourceRegistry(Extension, dbus.service.Object):
- 		)
- 		
- 		self._dirty = True
--		gobject.timeout_add(DISK_WRITE_TIMEOUT, self._write_to_disk)
-+		GObject.timeout_add(DISK_WRITE_TIMEOUT, self._write_to_disk)
- 		
- 	def _write_to_disk(self):
- 		data = [DataSource.get_plain(datasource) for datasource in
-diff --git a/zeitgeist-daemon b/zeitgeist-daemon
-index 3f5ae91..c845d10 100755
---- a/zeitgeist-daemon
-+++ b/zeitgeist-daemon
-@@ -21,7 +21,7 @@
- 
- import sys
- import os
--import gobject
-+from gi.repository import GObject
- import glib
- import dbus.mainloop.glib
- import gettext
-diff --git a/zeitgeist-daemon.py b/zeitgeist-daemon.py
-index 1afe89b..dad24fc 100755
---- a/zeitgeist-daemon.py
-+++ b/zeitgeist-daemon.py
-@@ -21,7 +21,7 @@
- 
- import sys
- import os
--import gobject
-+from gi.repository import GObject
- import glib
- import dbus.mainloop.glib
- import gettext
-@@ -99,7 +99,7 @@ def do_shell_completion(parser):
- def setup_interface():
- 	from _zeitgeist.engine.remote import RemoteInterface
- 	dbus.mainloop.glib.DBusGMainLoop(set_as_default=True)
--	mainloop = gobject.MainLoop()
-+	mainloop = GObject.MainLoop()
- 	return mainloop, RemoteInterface(mainloop = mainloop)
- 
- def start_datahub():
diff --git a/gnome-extra/zeitgeist/files/zeitgeist-0.9.0-gobject.patch b/gnome-extra/zeitgeist/files/zeitgeist-0.9.0-gobject.patch
deleted file mode 100644
index 1099c22b3bca..000000000000
--- a/gnome-extra/zeitgeist/files/zeitgeist-0.9.0-gobject.patch
+++ /dev/null
@@ -1,15 +0,0 @@
- configure.ac |    1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index fc0b202..6db8686 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -33,6 +33,7 @@ SQLITE_REQUIRED=3.7
- ZEITGEIST_REQUIRED="glib-2.0 >= $GLIB_REQUIRED
-                     gobject-2.0 >= $GLIB_REQUIRED
-                     gio-unix-2.0 >= $GLIB_REQUIRED
-+                    gmodule-2.0 >= $GLIB_REQUIRED
-                     sqlite3 >= $SQLITE_REQUIRED"
- 
- PKG_CHECK_MODULES(ZEITGEIST, [$ZEITGEIST_REQUIRED])
diff --git a/gnome-extra/zeitgeist/metadata.xml b/gnome-extra/zeitgeist/metadata.xml
index d5e5ac15c77b..f107682d9cb3 100644
--- a/gnome-extra/zeitgeist/metadata.xml
+++ b/gnome-extra/zeitgeist/metadata.xml
@@ -11,10 +11,13 @@ applications to fetch as well as subscribe to be notified when events
 are logged. It is the heart of Zeitgeist.
 </longdescription>
   <use>
+    <flag name="datahub">Use build datahub for passive event injection</flag>
     <flag name="extensions">Use <pkg>gnome-extra/zeitgeist-extentions</pkg> to enhance the internal routines</flag>
-    <flag name="sql-debug">Enable SQL debugging</flag>
+    <flag name="downloads-monitor">Monitor the XDG_DOWNLOAD_DIRECTORY</flag>
+    <flag name="fts">Enable the full text search extension</flag>
     <flag name="passiv">Use <pkg>gnome-extra/zeitgeist-datahub</pkg> to passively inject events</flag>
     <flag name="plugins">Use <pkg>gnome-extra/zeitgeist-datasources</pkg> to enable numerous packages to inject events</flag>
-    <flag name="fts">Enable the full text search extension</flag>
+    <flag name="sql-debug">Enable SQL debugging</flag>
+    <flag name="telepathy">Enable telepathy framework as data source</flag>
   </use>
 </pkgmetadata>
diff --git a/gnome-extra/zeitgeist/zeitgeist-0.9.12.ebuild b/gnome-extra/zeitgeist/zeitgeist-0.9.12.ebuild
new file mode 100644
index 000000000000..f2b91b2bfe89
--- /dev/null
+++ b/gnome-extra/zeitgeist/zeitgeist-0.9.12.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/zeitgeist/zeitgeist-0.9.12.ebuild,v 1.1 2013/04/21 14:11:40 jlec Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_6,2_7} )
+
+VALA_MIN_API_VERSION=0.18
+
+inherit autotools-utils eutils python-r1 versionator vala
+
+DIR_PV=$(get_version_component_range 1-2)
+EXT_VER=0.0.13
+
+DESCRIPTION="Service to log activities and present to other apps"
+HOMEPAGE="http://launchpad.net/zeitgeist/"
+SRC_URI="http://launchpad.net/zeitgeist/${DIR_PV}/${PV}/+download/${P}.tar.xz"
+
+LICENSE="LGPL-2+ LGPL-3+ GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="+datahub +dbus downloads-monitor extensions +fts icu introspection nls plugins sql-debug telepathy"
+
+REQUIERED_USE="datahub? ( downloads-monitor )"
+
+RDEPEND="
+	!gnome-extra/zeitgeist-datahub
+	dev-python/dbus-python[${PYTHON_USEDEP}]
+	dev-python/pygobject:2[${PYTHON_USEDEP}]
+	dev-python/pyxdg[${PYTHON_USEDEP}]
+	dev-python/rdflib
+	media-libs/raptor:2
+	>=dev-libs/glib-2.26.0:2
+	>=dev-db/sqlite-3.7.11:3
+	extensions? ( gnome-extra/zeitgeist-extensions  )
+	fts? ( dev-libs/xapian[inmemory] )
+	icu? ( dev-libs/dee[icu?] )
+	introspection? ( dev-libs/gobject-introspection )
+	plugins? ( gnome-extra/zeitgeist-datasources )
+	telepathy? ( net-libs/telepathy-glib )
+"
+DEPEND="${RDEPEND}
+	${vala_depend}
+	virtual/pkgconfig"
+
+src_prepare() {
+	vala_src_prepare
+	autotools-utils_src_prepare
+}
+
+src_configure() {
+	local myeconfargs=(
+		--docdir="${EPREFIX}/usr/share/doc/${PF}"
+		$(use_enable sql-debug explain-queries)
+		$(use_enable datahub)
+		$(use_enable downloads-monitor)
+		$(use_enable telepathy)
+		$(use_enable introspection)
+		$(use_with icu dee-icu)
+		$(use_with dbus session-bus-services-dir /usr/share/dbus-1/services)
+	)
+	use nls || myeconfargs+=( --disable-nls )
+	use fts && myeconfargs+=( --enable-fts )
+	autotools-utils_src_configure
+}
+
+src_install() {
+	autotools-utils_src_install
+	cd python || die
+	python_moduleinto ${PN}
+	python_foreach_impl python_domodule *py
+}
diff --git a/gnome-extra/zeitgeist/zeitgeist-0.9.5.ebuild b/gnome-extra/zeitgeist/zeitgeist-0.9.5.ebuild
deleted file mode 100644
index 62aa6010063f..000000000000
--- a/gnome-extra/zeitgeist/zeitgeist-0.9.5.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/zeitgeist/zeitgeist-0.9.5.ebuild,v 1.9 2013/04/07 16:14:52 jlec Exp $
-
-EAPI=4
-
-PYTHON_DEPEND="2"
-
-AUTOTOOLS_AUTORECONF=true
-VALA_MIN_API_VERSION=0.16
-
-inherit autotools-utils eutils python versionator vala
-
-DIR_PV=$(get_version_component_range 1-2)
-EXT_VER=0.0.13
-
-DESCRIPTION="Service to log activities and present to other apps"
-HOMEPAGE="http://launchpad.net/zeitgeist/"
-SRC_URI="http://launchpad.net/zeitgeist/${DIR_PV}/${PV}/+download/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="+dbus extensions +fts icu nls passiv plugins sql-debug"
-
-RDEPEND="
-	dev-libs/xapian[inmemory]
-	dev-python/dbus-python
-	dev-python/pygobject:2
-	dev-python/pyxdg
-	dev-python/rdflib
-	media-libs/raptor:2
-	dev-libs/glib:2
-	dev-db/sqlite:3
-	extensions? ( gnome-extra/zeitgeist-extensions  )
-	icu? ( dev-libs/dee[icu?] )
-	passiv? ( gnome-extra/zeitgeist-datahub )
-	plugins? ( gnome-extra/zeitgeist-datasources )"
-DEPEND="${RDEPEND}
-	${vala_depend}
-	virtual/pkgconfig"
-
-PATCHES=( "${FILESDIR}"/${PN}-0.9.0-doc.patch )
-
-pkg_setup() {
-	python_set_active_version 2
-	python_pkg_setup
-}
-
-src_prepare() {
-	vala_src_prepare
-	python_clean_py-compile_files
-	autotools-utils_src_prepare
-}
-
-src_configure() {
-	local myeconfargs=(
-		--docdir="${EPREFIX}/usr/share/doc/${PF}"
-		$(use_enable sql-debug explain-queries)
-		$(use_with icu dee-icu)
-		$(use_with dbus session-bus-services-dir /usr/share/dbus-1/services)
-	)
-	use nls || myeconfargs+=(--disable-nls)
-	use fts || myeconfargs+=(--disable-fts)
-	autotools-utils_src_configure
-}