4 files changed, 50 insertions, 135 deletions

diff --git a/sysutils/zeitgeist/Makefile b/sysutils/zeitgeist/Makefile
index 139ff2ee07ea..cc71283805c1 100644
--- a/sysutils/zeitgeist/Makefile
+++ b/sysutils/zeitgeist/Makefile
@@ -1,31 +1,46 @@
 # Created by: Koop Mast <kwm@FreeBSD.org>
 # $FreeBSD$
+# NOTE: please keep zeitgeist in sysutils/qzeitgeist in sync
 
 PORTNAME=	zeitgeist
-PORTVERSION=	0.8.2
-PORTREVISION=	1
+PORTVERSION=	0.9.16
 CATEGORIES=	sysutils
-MASTER_SITES=	http://launchpad.net/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}/${PORTVERSION}/+download/
+MASTER_SITES=	https://launchpad.net/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}/${PORTVERSION}/+download/
 
 MAINTAINER=	kwm@FreeBSD.org
-COMMENT=	Event logging framework - engine
+COMMENT=	Event logging framework
 
-BUILD_DEPENDS=	python:${PORTSDIR}/lang/python \
+LICENSE=	GPLv2 LGPL21
+LICENSE_COMB=	multi
+
+BUILD_DEPENDS=	valac:${PORTSDIR}/lang/vala \
+		dee-tool:${PORTSDIR}/devel/dee \
 		rapper:${PORTSDIR}/textproc/raptor2 \
-		${PYTHON_SITELIBDIR}/rdflib/__init__.py:${PORTSDIR}/textproc/py-rdflib
-RUN_DEPENDS=	python:${PORTSDIR}/lang/python \
-		${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3 \
-		${PYTHON_SITELIBDIR}/xdg/__init__.py:${PORTSDIR}/devel/py-xdg \
+		${PYTHON_PKGNAMEPREFIX}rdflib>=4.1.1:${PORTSDIR}/textproc/py-rdflib
+RUN_DEPENDS=	${PYTHON_SITELIBDIR}/xdg/__init__.py:${PORTSDIR}/devel/py-xdg \
 		${PYTHON_SITELIBDIR}/dbus/__init__.py:${PORTSDIR}/devel/py-dbus
 
-USE_GNOME=	intlhack pygobject
+USE_GNOME=	intlhack glib20 introspection:build
 GNU_CONFIGURE=	yes
-USES=		gmake gettext pathfix python
+USES=		gmake gettext pathfix python:2 pkgconfig libtool tar:xz
+USE_SQLITE=	3
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
+INSTALL_TARGET=	install-strip
+
+CONFIGURE_ARGS=	--disable-fts --disable-telepathy \
+		--disable-downloads-monitor
+
+OPTIONS_SUB=	yes
+OPTIONS_DEFINE=	DATAHUB
+OPTIONS_DEFAULT=DATAHUB
+DATAHUB_LIB_DEPENDS=	libjson-glib-1.0.so:${PORTSDIR}/devel/json-glib
+DATAHUB_USE=	gnome=gtk30
+DATAHUB_CONFIGURE_ENABLE=	datahub
+DATAHUB_DESC=	Passive loggers for Zeitgeist
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|/usr/bin/python|${PYTHON_CMD}|g' \
-		${WRKSRC}/extra/rdfxml2py
+	@${REINPLACE_CMD} -e 's|python -|${PYTHON_CMD} -|g' \
+		${WRKSRC}/configure
 
 .include <bsd.port.mk>
diff --git a/sysutils/zeitgeist/distinfo b/sysutils/zeitgeist/distinfo
index d1137bb3691f..21e840bcd54f 100644
--- a/sysutils/zeitgeist/distinfo
+++ b/sysutils/zeitgeist/distinfo
@@ -1,2 +1,2 @@
-SHA256 (zeitgeist-0.8.2.tar.gz) = 6155611ee182f642cc1fe9f8aadc25c7e2942fdef2565b1f29e8388bc4643703
-SIZE (zeitgeist-0.8.2.tar.gz) = 358781
+SHA256 (zeitgeist-0.9.16.tar.xz) = 6ed3e60d0cd82ea58ee134c19beccafac10eb0f71977f3848755dacbf0927d3a
+SIZE (zeitgeist-0.9.16.tar.xz) = 807092
diff --git a/sysutils/zeitgeist/files/patch-extra__PythonSerializer.py b/sysutils/zeitgeist/files/patch-extra__PythonSerializer.py
deleted file mode 100644
index d7f9ef494b48..000000000000
--- a/sysutils/zeitgeist/files/patch-extra__PythonSerializer.py
+++ /dev/null
@@ -1,13 +0,0 @@
---- extra/PythonSerializer.py.orig	2011-09-21 13:57:53.000000000 -0400
-+++ extra/PythonSerializer.py	2012-04-07 05:36:04.507729012 -0400
-@@ -85,8 +85,8 @@
- 		assert root_type
- 		#TODO: displayname, how are translation handled? on trig level or on python level?
- 		stream.write(
--			"Symbol('%s', parent=%r, uri='%s', display_name='%s', doc='%s', auto_resolve=False)\n" %(name, 
--				root_type, symbol, display_name, doc)
-+			str("Symbol('%s', parent=%r, uri='%s', display_name='%s', doc='%s', auto_resolve=False)\n" %(name, 
-+				root_type, symbol, display_name, doc))
- 		)
- 		
- 
diff --git a/sysutils/zeitgeist/pkg-plist b/sysutils/zeitgeist/pkg-plist
index 9b7c0401b683..e27c3abe9f7e 100644
--- a/sysutils/zeitgeist/pkg-plist
+++ b/sysutils/zeitgeist/pkg-plist
@@ -1,10 +1,18 @@
 bin/zeitgeist-daemon
+%%DATAHUB%%bin/zeitgeist-datahub
+%%DATAHUB%%etc/xdg/autostart/zeitgeist-datahub.desktop
+include/zeitgeist-2.0/zeitgeist-datamodel.h
+include/zeitgeist-2.0/zeitgeist.h
+lib/girepository-1.0/Zeitgeist-2.0.typelib
+lib/libzeitgeist-2.0.so
+lib/libzeitgeist-2.0.so.0
+lib/libzeitgeist-2.0.so.0.0.0
 %%PYTHON_SITELIBDIR%%/zeitgeist/__init__.py
 %%PYTHON_SITELIBDIR%%/zeitgeist/__init__.pyc
 %%PYTHON_SITELIBDIR%%/zeitgeist/__init__.pyo
-%%PYTHON_SITELIBDIR%%/zeitgeist/_config.py
-%%PYTHON_SITELIBDIR%%/zeitgeist/_config.pyc
-%%PYTHON_SITELIBDIR%%/zeitgeist/_config.pyo
+%%PYTHON_SITELIBDIR%%/zeitgeist/_ontology.py
+%%PYTHON_SITELIBDIR%%/zeitgeist/_ontology.pyc
+%%PYTHON_SITELIBDIR%%/zeitgeist/_ontology.pyo
 %%PYTHON_SITELIBDIR%%/zeitgeist/client.py
 %%PYTHON_SITELIBDIR%%/zeitgeist/client.pyc
 %%PYTHON_SITELIBDIR%%/zeitgeist/client.pyo
@@ -14,117 +22,22 @@ bin/zeitgeist-daemon
 %%PYTHON_SITELIBDIR%%/zeitgeist/mimetypes.py
 %%PYTHON_SITELIBDIR%%/zeitgeist/mimetypes.pyc
 %%PYTHON_SITELIBDIR%%/zeitgeist/mimetypes.pyo
-libdata/pkgconfig/zeitgeist-daemon.pc
+libdata/pkgconfig/zeitgeist-2.0.pc
 man/man1/zeitgeist-daemon.1.gz
+%%DATAHUB%%man/man1/zeitgeist-datahub.1.gz
+share/bash-completion/completions/zeitgeist-daemon
 share/dbus-1/services/org.gnome.zeitgeist.service
-share/locale/bg/LC_MESSAGES/zeitgeist.mo
-share/locale/ca/LC_MESSAGES/zeitgeist.mo
-share/locale/cs/LC_MESSAGES/zeitgeist.mo
-share/locale/da/LC_MESSAGES/zeitgeist.mo
-share/locale/de/LC_MESSAGES/zeitgeist.mo
-share/locale/el/LC_MESSAGES/zeitgeist.mo
-share/locale/en_AU/LC_MESSAGES/zeitgeist.mo
-share/locale/en_CA/LC_MESSAGES/zeitgeist.mo
-share/locale/en_GB/LC_MESSAGES/zeitgeist.mo
-share/locale/eo/LC_MESSAGES/zeitgeist.mo
-share/locale/es/LC_MESSAGES/zeitgeist.mo
-share/locale/eu/LC_MESSAGES/zeitgeist.mo
-share/locale/fi/LC_MESSAGES/zeitgeist.mo
-share/locale/fr/LC_MESSAGES/zeitgeist.mo
-share/locale/gl/LC_MESSAGES/zeitgeist.mo
-share/locale/hu/LC_MESSAGES/zeitgeist.mo
-share/locale/id/LC_MESSAGES/zeitgeist.mo
-share/locale/it/LC_MESSAGES/zeitgeist.mo
-share/locale/ja/LC_MESSAGES/zeitgeist.mo
-share/locale/lt/LC_MESSAGES/zeitgeist.mo
-share/locale/mk/LC_MESSAGES/zeitgeist.mo
-share/locale/ml/LC_MESSAGES/zeitgeist.mo
-share/locale/nb/LC_MESSAGES/zeitgeist.mo
-share/locale/nl/LC_MESSAGES/zeitgeist.mo
-share/locale/nn/LC_MESSAGES/zeitgeist.mo
-share/locale/oc/LC_MESSAGES/zeitgeist.mo
-share/locale/pl/LC_MESSAGES/zeitgeist.mo
-share/locale/pt/LC_MESSAGES/zeitgeist.mo
-share/locale/pt_BR/LC_MESSAGES/zeitgeist.mo
-share/locale/ro/LC_MESSAGES/zeitgeist.mo
-share/locale/ru/LC_MESSAGES/zeitgeist.mo
-share/locale/sv/LC_MESSAGES/zeitgeist.mo
-share/locale/te/LC_MESSAGES/zeitgeist.mo
-share/locale/tr/LC_MESSAGES/zeitgeist.mo
-share/locale/uk/LC_MESSAGES/zeitgeist.mo
-share/locale/ur/LC_MESSAGES/zeitgeist.mo
-share/locale/zh_CN/LC_MESSAGES/zeitgeist.mo
-%%DATADIR%%/_zeitgeist/__init__.py
-%%DATADIR%%/_zeitgeist/__init__.pyc
-%%DATADIR%%/_zeitgeist/__init__.pyo
-%%DATADIR%%/_zeitgeist/engine/__init__.py
-%%DATADIR%%/_zeitgeist/engine/__init__.pyc
-%%DATADIR%%/_zeitgeist/engine/__init__.pyo
-%%DATADIR%%/_zeitgeist/engine/datamodel.py
-%%DATADIR%%/_zeitgeist/engine/datamodel.pyc
-%%DATADIR%%/_zeitgeist/engine/datamodel.pyo
-%%DATADIR%%/_zeitgeist/engine/extension.py
-%%DATADIR%%/_zeitgeist/engine/extension.pyc
-%%DATADIR%%/_zeitgeist/engine/extension.pyo
-%%DATADIR%%/_zeitgeist/engine/extensions/__init__.py
-%%DATADIR%%/_zeitgeist/engine/extensions/__init__.pyc
-%%DATADIR%%/_zeitgeist/engine/extensions/__init__.pyo
-%%DATADIR%%/_zeitgeist/engine/extensions/blacklist.py
-%%DATADIR%%/_zeitgeist/engine/extensions/blacklist.pyc
-%%DATADIR%%/_zeitgeist/engine/extensions/blacklist.pyo
-%%DATADIR%%/_zeitgeist/engine/extensions/datasource_registry.py
-%%DATADIR%%/_zeitgeist/engine/extensions/datasource_registry.pyc
-%%DATADIR%%/_zeitgeist/engine/extensions/datasource_registry.pyo
-%%DATADIR%%/_zeitgeist/engine/extensions/storagemonitor.py
-%%DATADIR%%/_zeitgeist/engine/extensions/storagemonitor.pyc
-%%DATADIR%%/_zeitgeist/engine/extensions/storagemonitor.pyo
-%%DATADIR%%/_zeitgeist/engine/main.py
-%%DATADIR%%/_zeitgeist/engine/main.pyc
-%%DATADIR%%/_zeitgeist/engine/main.pyo
-%%DATADIR%%/_zeitgeist/engine/notify.py
-%%DATADIR%%/_zeitgeist/engine/notify.pyc
-%%DATADIR%%/_zeitgeist/engine/notify.pyo
-%%DATADIR%%/_zeitgeist/engine/remote.py
-%%DATADIR%%/_zeitgeist/engine/remote.pyc
-%%DATADIR%%/_zeitgeist/engine/remote.pyo
-%%DATADIR%%/_zeitgeist/engine/sql.py
-%%DATADIR%%/_zeitgeist/engine/sql.pyc
-%%DATADIR%%/_zeitgeist/engine/sql.pyo
-%%DATADIR%%/_zeitgeist/engine/upgrades/__init__.py
-%%DATADIR%%/_zeitgeist/engine/upgrades/__init__.pyc
-%%DATADIR%%/_zeitgeist/engine/upgrades/__init__.pyo
-%%DATADIR%%/_zeitgeist/engine/upgrades/core_0_1.py
-%%DATADIR%%/_zeitgeist/engine/upgrades/core_0_1.pyc
-%%DATADIR%%/_zeitgeist/engine/upgrades/core_0_1.pyo
-%%DATADIR%%/_zeitgeist/engine/upgrades/core_1_2.py
-%%DATADIR%%/_zeitgeist/engine/upgrades/core_1_2.pyc
-%%DATADIR%%/_zeitgeist/engine/upgrades/core_1_2.pyo
-%%DATADIR%%/_zeitgeist/engine/upgrades/core_2_3.py
-%%DATADIR%%/_zeitgeist/engine/upgrades/core_2_3.pyc
-%%DATADIR%%/_zeitgeist/engine/upgrades/core_2_3.pyo
-%%DATADIR%%/_zeitgeist/engine/upgrades/core_3_4.py
-%%DATADIR%%/_zeitgeist/engine/upgrades/core_3_4.pyc
-%%DATADIR%%/_zeitgeist/engine/upgrades/core_3_4.pyo
-%%DATADIR%%/_zeitgeist/lrucache.py
-%%DATADIR%%/_zeitgeist/lrucache.pyc
-%%DATADIR%%/_zeitgeist/lrucache.pyo
-%%DATADIR%%/_zeitgeist/singleton.py
-%%DATADIR%%/_zeitgeist/singleton.pyc
-%%DATADIR%%/_zeitgeist/singleton.pyo
-%%DATADIR%%/ontology/nao.py
+share/gir-1.0/Zeitgeist-2.0.gir
+share/vala/vapi/zeitgeist-2.0.deps
+share/vala/vapi/zeitgeist-2.0.vapi
+share/vala/vapi/zeitgeist-datamodel-2.0.vapi
+%%DATADIR%%/doc/AUTHORS
+%%DATADIR%%/doc/NEWS
 %%DATADIR%%/ontology/nao.trig
-%%DATADIR%%/ontology/ncal.py
 %%DATADIR%%/ontology/ncal.trig
-%%DATADIR%%/ontology/nco.py
 %%DATADIR%%/ontology/nco.trig
-%%DATADIR%%/ontology/nfo.py
 %%DATADIR%%/ontology/nfo.trig
-%%DATADIR%%/ontology/nie.py
 %%DATADIR%%/ontology/nie.trig
-%%DATADIR%%/ontology/nmm.py
 %%DATADIR%%/ontology/nmm.trig
-%%DATADIR%%/ontology/nmo.py
 %%DATADIR%%/ontology/nmo.trig
-%%DATADIR%%/ontology/zeitgeist.py
-%%DATADIR%%/ontology/zg.py
 %%DATADIR%%/ontology/zg.trig