gnome-extra/zeitgeist: Drop old; backport patch for missing gio in vala bindings

Package-Manager: portage-2.2.10/cvs/Linux x86_64
RepoMan-Options: --force
Manifest-Sign-Key: 0xB9D4F231BD1558AB!

8 files changed, 60 insertions, 209 deletions

diff --git a/gnome-extra/zeitgeist/ChangeLog b/gnome-extra/zeitgeist/ChangeLog
index 161f46ef7bf0..d3d672db241d 100644
--- a/gnome-extra/zeitgeist/ChangeLog
+++ b/gnome-extra/zeitgeist/ChangeLog
@@ -1,6 +1,15 @@
 # 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.41 2013/12/08 19:59:31 pacho Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/zeitgeist/ChangeLog,v 1.42 2014/07/01 06:46:16 jlec Exp $
+
+*zeitgeist-0.9.14-r1 (01 Jul 2014)
+
+  01 Jul 2014; Justin Lecher <jlec@gentoo.org> -zeitgeist-0.9.5-r1.ebuild,
+  -zeitgeist-0.9.12.ebuild, -zeitgeist-0.9.12-r1.ebuild,
+  +zeitgeist-0.9.14-r1.ebuild, -files/zeitgeist-0.9.0-doc.patch,
+  -files/zeitgeist-0.9.12-download_monitor.patch,
+  +files/zeitgeist-0.9.14-gio-backport.patch:
+  Drop old; backport patch for missing gio in vala bindings
 
   08 Dec 2013; Pacho Ramos <pacho@gentoo.org> zeitgeist-0.9.14.ebuild:
   x86 stable, bug #478252
diff --git a/gnome-extra/zeitgeist/Manifest b/gnome-extra/zeitgeist/Manifest
index 853c3b67e59e..f687c1d9658e 100644
--- a/gnome-extra/zeitgeist/Manifest
+++ b/gnome-extra/zeitgeist/Manifest
@@ -1,21 +1,28 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
-AUX zeitgeist-0.9.0-doc.patch 345 SHA256 5658e76e9219c41d74b3dcf68dcad6b7eb4b5629a37ef1690fc10fe208796fb5 SHA512 3d24a3b53d4bb91bc4ee7cbbeede1de0814cc7ea5841db509c3af30ebd3952631e0b450b3e93d8fcf4272a64f91df24459e14e66fce27b4e19dccaf4b882ca58 WHIRLPOOL b13ef59620dfbce1bb25b66998304e7aa37f2e9095ec64046f3a8273b1a4e3e5ea5832bd19bda83209598f40b0ab43705023172af825f581b695a47ddd071ac1
-AUX zeitgeist-0.9.12-download_monitor.patch 588 SHA256 a594bc4ff7714c951d05d9cfadb6e0dc553f64460ff0e9d6172c0362f0e2488b SHA512 ff2dc1c7938b09156a763d453f60b4dba0b571982b4233ca56dabbdddb68b004eacb3ff7e071aeb5f868e45de51011ff35970a9550a701d4572b47c9af997b4f WHIRLPOOL f8d2f0ac7411f6b824e20264d5136de2c17f581e2c4070201287585009a843dd79794ff984fb291df04ae167ccb02ede707eed59adcd8c472865890e2ac95b52
-DIST zeitgeist-0.9.12.tar.xz 780456 SHA256 f9b1b656dcd4da57438289316d44f8960ce0ee4773ea2fbab4bce165330f41cd SHA512 cb68a1e9bf87ea84b90e8a4593e054c977d138ead796b4e8f1801a14efbe499e0e6bc3fea841c35630961194c2db71b89271ab4807da26296dcff612a78151e4 WHIRLPOOL bb9484393766ece5bbf42e8c1a9ad52b78a7084c791dd6b219c52ae7e824518ab987a9e47450f6d3ec41ee57b86ae04826b8465bd459dc26d6eef8c8fc4c682d
+AUX zeitgeist-0.9.14-gio-backport.patch 574 SHA256 581e017a59adad92978cf492d640ca1c925831bef82579e715d0ef3957385fc7 SHA512 fc8234d887c7d2c2cfef4381d4845c64d9f7d671f5f03b218b9a5efdda6e6e637b032db2cdf5cbb586283ec76710b85d9f0f60f6a23f11565a4778921a5bcaa5 WHIRLPOOL 99d50964767b2a749228f5218f46a46ca0117154d45227f60a518ff8e357d05bb9aa1e7322534037bb09ababe45b64caa119f8d24d0bdf5ef666175084d0e860
 DIST zeitgeist-0.9.14.tar.xz 780324 SHA256 769b5abfe67ef632414efa1d35a1462c5cd86c8792bb4635b4c3d93a5f15f061 SHA512 9886396ea153fc12de81fdee2acf645b33a2af0c0fa3533c18f6c80c68c506ee9f790f37f99677ce6c3546a0f9ef5e5c251bc9411e0d882df796479edd9e817c WHIRLPOOL 3b71715390a1a30d417d19777e8bce56abf8105c201a53e61443a1783150a3fe43f1e5dbd0a5d2d9438998a50d9aeb12cf333e02f05d04ab4f04e3e94db6f0bb
-DIST zeitgeist-0.9.5.tar.bz2 856757 SHA256 e5ccb75ff705bfb382750c520c29653b6e0f40aeacd30adf233162132114be55 SHA512 26fc041721a9ba99875db7f5bd3cdf91555a3006d0f82186a95b269462334e53f58284d988f0fb9ae39b11679ba08a2992625d3646f697762005803069f1b7ab WHIRLPOOL a5d28119e88eb4d7b93eeb6cf7232c5dc1402560702016d45d3b4587d8224b0bc21e767d89ea2ed6847c0971c97a6db29d20afe640be50d1407fcce8ad3e5568
-EBUILD zeitgeist-0.9.12-r1.ebuild 2518 SHA256 2363415fcdfec8bdc6fe1a15a4fe7f991f7c359bb90d2932505b86ea86ae9f5e SHA512 85211b9bb82124a7b9426e3ac668620fcbb259510772a761b51c37f06744d906eefefb66032eac98999b0e7f56c84382181d65b47abed29cce3d6f5c5d4642bd WHIRLPOOL 2e7ce601ede781f33726f508ca1e95e7a80893c7813943c3a3da005e03036cec85b2d6439b0f18bbf586b9f4757c04ac273d88ac9b238b88be1fb7a72916330e
-EBUILD zeitgeist-0.9.12.ebuild 2323 SHA256 88740f243a191c95281731b6b892cfe0d1e3cc1fec4630512ccf5d8ff43b9ff4 SHA512 0e1af628d26476f925cb7fa8b55d5370cddb92059c26bdd4b4d43cb5bc76dca3c1b348de1b06d6ccc20c53ead370f520d064fce108abb07f78bce862e01fdc64 WHIRLPOOL 54f421e77e879ad2df62d5f667716ef0a7e5bb5a765ae5741557d5ed84483553d6ad8598a326cda7387b0fa1a2cc8cadcb6f5135e51861cc3829280a18504fea
+EBUILD zeitgeist-0.9.14-r1.ebuild 2505 SHA256 640e423286fcb7b737fa61b5205375a48818162db6e41be4af822f4a217243df SHA512 7ca606ebe0a9a62aa252f278a72c2e4d0e7f388bd8cd37a2414503d3565aae0bc0d4b0f58db35ba53db4f48b0dc5f3b31fb10e957520f354962ada9c511aca67 WHIRLPOOL 30cf4fe8fe42b04ecd4558ab2ad6bf6d80549800ca4b39ce2c5d043017274b87e668feb9950f05652e57b2c281e113ee1ae11036f08b8614fa0e3cedeff2b29a
 EBUILD zeitgeist-0.9.14.ebuild 2456 SHA256 2a2182978d80f21feff53f9403e6808e24d49fdfb615f008aa225d4c81147d7a SHA512 93ff33fed0e86b6c3e08db7434d9968f3ef186580c532eee1ae33033142b6518bf158ee81081d6783810b5078ee54b21f18a65802d2f6fa1a7a6181b09027bda WHIRLPOOL 4327868b5cdd1ea6ff115e2f7fb318f9c099d85b1d35700bb213528ce89344c55e4c79f962def5b723dfbc178077904adad72757f2839f8bcb0b466d09a6be02
-EBUILD zeitgeist-0.9.5-r1.ebuild 1950 SHA256 1f20bdc17005c7e1c38811c1e98f65b6656bace31de7981b90ba5a185e9a1fa1 SHA512 eb0811a866649257f89a153312b56fc9d2a17512aa8928fc0e255631ace854c6a3697f0b907341ce58e13a711e049edff9625bd7f336701725e4b1f3f8ebf612 WHIRLPOOL 5d7bcd9a623577119a3ad76c876ff540d368d136f45a50de77a6e30d1f006186123b5d6dd2d5afda50bcc833c8d692b87b98191c9e4c5b9ead43ef9525105820
-MISC ChangeLog 6708 SHA256 17f2da9948eb636339a4b534790654595b88d14b691e01355273ca74bce4b877 SHA512 4ea17c5d62bb7b6f98fa261ccd15fc865d608dfda2ee755fa45a31765d453d25125cb5c80e6a1ccc8c936a2fa0862030071ac0e4b2929bb7db2da3efdaa35d63 WHIRLPOOL d26492044b3a4dd25c89ae45712e7dc27d654d5795d6478fcb85c0396d133fca1bb19e09788a0fe497aeedf60a739c83b6dea55f3009cc464c95f8c27e8510c0
+MISC ChangeLog 7097 SHA256 f5553cbd14ddb432a0c2fb8cc10f9eff4dd24dc10129a79d78209de4262a12eb SHA512 72c0890aaf97203941b46ac47387ed4b0b189e8992a63d51059f6aec055227e7d86c4c91587be6cfaf4bee97c76f0468ec0409adf1044d1c1ea47afbbb6c781e WHIRLPOOL 32add7fa7dca3827deb86be15705095410273f48022859e98f45ed0947ae8a48724a58dff5323d8a7d9fb1f71e917b9e7b2f775b037d82e11e8362b39841e7e5
 MISC metadata.xml 1174 SHA256 6af9e5c28e714e9a190a5f9ee2d23a1f8c8b4c41ef478e87e9628b05ff9870f9 SHA512 71e83f27c95d09e0e19417197af76e4a3eccf8fec318bfc85e98ecdc4ca07ec657fc63e9f64bae87cdcb3627644aaf261a0bda5bacc789a518ee6ba13f333fae WHIRLPOOL 61bf7888dacffdaf68064b57f045dfe11934a8461a989c05d3e03629256a21299d14bb782aa1fca460f3618dbfac041fc283e5894071ca5198424ef1785eeb92
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlKkz6QACgkQCaWpQKGI+9R6mACeNLgOq/UXaKy5yMB7vGUk4FyI
-fJgAnigJGeF54TSZhBQUOw0x+FniaI5w
-=CYKK
+iQJ8BAEBCgBmBQJTslk5XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
+OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirADUP/1QcFjc2F/KnDPcFd5ZCBkrO
+9g2M5ei8IdaxhkbBQlaaTp5WIJBtLanoUmaXHtnLqT/TmdypxBOvIA0V2s46PzCN
+2e/4w/jIbuW4+nYSOtWc0IRWVW1D30Yu1v6GGs/EJbnk2VrqxWn/wI7cVyuXQbNU
+vPYdKScs6goCixBZc1dosTGUcFuHqXtkm4L0blRlFi3SvMRQ9oG5IuLn+QPS8Loo
+cNlNKtVpTCGFjr/ed/ZB1RwaT7/XLoHdXNLDUAqM1SG04qqx5hpVmhfg3auGkwMI
+DuLfHoO0w8tntAlMReGNeWJFBl3hiK9fA3b4YsAHYMcQNSZuWja90+K8c0RUBzNd
+yLHQ+JRw2ReZWjvyz7bbAZCDPYXLguD6CEDyBQh6n359GYEfhmj1IhjudXi6lXYu
+5vHqQMtJljhk7GgVwRE99XFnzVuKLi3R5wr24/EX7EG+bF1/FizgqPQichK+39J3
+J7/W6rOzo5/uIfnQFsf4QVpMrDL8mAg0DErVWM80dS9WHT0BA8ujvvDscK7Asqx4
+hhijA1/37oJeGI5jdkp7Ejf5koNxyzXkc036wGmO+armR4lqbx12xAm6p/3ohUsU
+p929/3d9BRu9gNSOtMZJZdocDdbzbD4kZvCCT8dluZdBTfnK9h/ROsOzsmTVG8nS
+ocE/G2moL4k7TpLekxJ9
+=HAfJ
 -----END PGP SIGNATURE-----
diff --git a/gnome-extra/zeitgeist/files/zeitgeist-0.9.0-doc.patch b/gnome-extra/zeitgeist/files/zeitgeist-0.9.0-doc.patch
deleted file mode 100644
index 016336becdaf..000000000000
--- a/gnome-extra/zeitgeist/files/zeitgeist-0.9.0-doc.patch
+++ /dev/null
@@ -1,16 +0,0 @@
- Makefile.am |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/Makefile.am b/Makefile.am
-index 824aa91..c991754 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -10,7 +10,7 @@ SUBDIRS = \
- 	doc \
- 	$(NULL)
- 
--zeitgeistdocdir = ${prefix}/doc/zeitgeist
-+zeitgeistdocdir = ${docdir}
- zeitgeistdoc_DATA = \
- 	AUTHORS \
- 	NEWS \
diff --git a/gnome-extra/zeitgeist/files/zeitgeist-0.9.12-download_monitor.patch b/gnome-extra/zeitgeist/files/zeitgeist-0.9.12-download_monitor.patch
deleted file mode 100644
index 6eea705c1414..000000000000
--- a/gnome-extra/zeitgeist/files/zeitgeist-0.9.12-download_monitor.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- zeitgeist-0.9.12/configure.ac	2013-04-13 10:09:15.000000000 +0200
-+++ zeitgeist-0.9.12_mod/configure.ac	2013-04-22 21:14:47.604406313 +0200
-@@ -189,6 +189,8 @@
- 
- if test "x$enable_downloads_monitor" = "xyes" -a "x$enable_datahub" = "xyes"; then
-     AC_DEFINE([DOWNLOADS_MONITOR_ENABLED], [1], [Is the XDG_DOWNLOAD_DIRECTORY file monitor enabled?])
-+else
-+    AC_DEFINE([DOWNLOADS_MONITOR_ENABLED], [0], [Is the XDG_DOWNLOAD_DIRECTORY file monitor enabled?])
- fi
- AM_CONDITIONAL(DOWNLOADS_MONITOR_ENABLED, test "x$enable_downloads_monitor" = "xyes" -a "x$enable_datahub" = "xyes")
- 
diff --git a/gnome-extra/zeitgeist/files/zeitgeist-0.9.14-gio-backport.patch b/gnome-extra/zeitgeist/files/zeitgeist-0.9.14-gio-backport.patch
new file mode 100644
index 000000000000..178215ddbf13
--- /dev/null
+++ b/gnome-extra/zeitgeist/files/zeitgeist-0.9.14-gio-backport.patch
@@ -0,0 +1,18 @@
+From b1e82de434a7b63fe1290d0051de58350b069991 Mon Sep 17 00:00:00 2001
+From: Philip Withnall <philip@tecnocode.co.uk>
+Date: Sun, 16 Feb 2014 15:08:49 +0000
+Subject: libzeitgeist: Add a missing dependency on gio-2.0
+
+This actually makes the zeitgeist vapi file usable.
+
+Signed-off-by: Seif Lotfy <seif@lotfy.com>
+---
+diff --git a/libzeitgeist/zeitgeist-2.0.deps b/libzeitgeist/zeitgeist-2.0.deps
+index ff8d39b..59eec5d 100644
+--- a/libzeitgeist/zeitgeist-2.0.deps
++++ b/libzeitgeist/zeitgeist-2.0.deps
+@@ -1 +1,2 @@
+ zeitgeist-datamodel-2.0
++gio-2.0
+--
+cgit v0.9.0.2-2-gbebe
diff --git a/gnome-extra/zeitgeist/zeitgeist-0.9.12.ebuild b/gnome-extra/zeitgeist/zeitgeist-0.9.12.ebuild
deleted file mode 100644
index 95fdb147a6d3..000000000000
--- a/gnome-extra/zeitgeist/zeitgeist-0.9.12.ebuild
+++ /dev/null
@@ -1,84 +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.12.ebuild,v 1.8 2013/05/29 15:39:03 jlec Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_6,2_7} )
-
-AUTOTOOLS_AUTORECONF=true
-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"
-
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	downloads-monitor? ( datahub )"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	!gnome-extra/zeitgeist-datahub
-	dev-libs/json-glib
-	dev-python/dbus-python[${PYTHON_USEDEP}]
-	dev-python/pygobject:2[${PYTHON_USEDEP}]
-	dev-python/pyxdg[${PYTHON_USEDEP}]
-	dev-python/rdflib[${PYTHON_USEDEP}]
-	media-libs/raptor:2
-	>=dev-libs/glib-2.26.0:2
-	>=dev-db/sqlite-3.7.11:3
-	datahub? ( x11-libs/gtk+: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"
-
-PATCHES=( "${FILESDIR}"/${P}-download_monitor.patch )
-
-src_prepare() {
-	sed \
-		-e 's:python::g' \
-		-i Makefile.am || die
-	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.12-r1.ebuild b/gnome-extra/zeitgeist/zeitgeist-0.9.14-r1.ebuild
index 19d63119a5d0..6b1bd482e387 100644
--- a/gnome-extra/zeitgeist/zeitgeist-0.9.12-r1.ebuild
+++ b/gnome-extra/zeitgeist/zeitgeist-0.9.14-r1.ebuild
@@ -1,18 +1,17 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 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-r1.ebuild,v 1.7 2013/05/29 15:39:03 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/zeitgeist/zeitgeist-0.9.14-r1.ebuild,v 1.1 2014/07/01 06:46:16 jlec Exp $
 
 EAPI=5
 
+AUTOTOOLS_AUTORECONF=true
 PYTHON_COMPAT=( python{2_6,2_7} )
 
-AUTOTOOLS_AUTORECONF=true
-VALA_MIN_API_VERSION=0.18
+VALA_MIN_API_VERSION=0.20
 
 inherit autotools-utils bash-completion-r1 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/"
@@ -20,8 +19,8 @@ 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"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
+IUSE="+datahub downloads-monitor extensions +fts icu introspection nls plugins sql-debug telepathy"
 
 REQUIRED_USE="
 	${PYTHON_REQUIRED_USE}
@@ -38,6 +37,7 @@ RDEPEND="
 	media-libs/raptor:2
 	>=dev-libs/glib-2.26.0:2
 	>=dev-db/sqlite-3.7.11:3
+	sys-apps/dbus
 	datahub? ( x11-libs/gtk+:3 )
 	extensions? ( gnome-extra/zeitgeist-extensions  )
 	fts? ( dev-libs/xapian[inmemory] )
@@ -50,8 +50,6 @@ DEPEND="${RDEPEND}
 	$(vala_depend)
 	virtual/pkgconfig"
 
-PATCHES=( "${FILESDIR}"/${P}-download_monitor.patch )
-
 src_prepare() {
 	local PYTHON
 	python_export_best
@@ -64,20 +62,23 @@ src_prepare() {
 		-e "/import/s: python : ${PYTHON} :g" \
 		-i configure.ac || die
 
+	epatch "${FILESDIR}"/${P}-gio-backport.patch
+
 	autotools-utils_src_prepare
 }
 
 src_configure() {
 	local myeconfargs=(
 		--docdir="${EPREFIX}/usr/share/doc/${PF}"
+		--with-session-bus-services-dir="${EPREFIX}/usr/share/dbus-1/services"
 		$(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
diff --git a/gnome-extra/zeitgeist/zeitgeist-0.9.5-r1.ebuild b/gnome-extra/zeitgeist/zeitgeist-0.9.5-r1.ebuild
deleted file mode 100644
index 6770f9d4dca7..000000000000
--- a/gnome-extra/zeitgeist/zeitgeist-0.9.5-r1.ebuild
+++ /dev/null
@@ -1,73 +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-r1.ebuild,v 1.4 2013/05/29 15:39:03 jlec Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_6,2_7} )
-
-AUTOTOOLS_AUTORECONF=true
-VALA_MIN_API_VERSION=0.16
-
-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.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"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	dev-libs/xapian[inmemory]
-	dev-python/dbus-python[${PYTHON_USEDEP}]
-	dev-python/pygobject:2[${PYTHON_USEDEP}]
-	dev-python/pyxdg[${PYTHON_USEDEP}]
-	dev-python/rdflib[${PYTHON_USEDEP}]
-	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 )
-
-src_prepare() {
-	sed \
-		-e 's:python::g' \
-		-i Makefile.am || die
-	vala_src_prepare
-	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
-}
-
-src_install() {
-	autotools-utils_src_install
-	cd python || die
-	python_moduleinto ${PN}
-	python_foreach_impl python_domodule *py
-}