gnome-extra/zeitgeist: Drop old; add USE restraint to inmemory to dev-libs/xapian, #449114

Package-Manager: portage-2.2.0_alpha149/cvs/Linux x86_64
Manifest-Sign-Key: 0x70EB7916

8 files changed, 33 insertions, 305 deletions

diff --git a/gnome-extra/zeitgeist/ChangeLog b/gnome-extra/zeitgeist/ChangeLog
index e925f825cda3..fab97ee241dc 100644
--- a/gnome-extra/zeitgeist/ChangeLog
+++ b/gnome-extra/zeitgeist/ChangeLog
@@ -1,6 +1,11 @@
 # 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.23 2013/01/06 09:42:54 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/zeitgeist/ChangeLog,v 1.24 2013/01/10 16:23:51 jlec Exp $
+
+  10 Jan 2013; Justin Lecher <jlec@gentoo.org> -zeitgeist-0.8.2.ebuild,
+  -zeitgeist-0.8.2-r1.ebuild, -zeitgeist-0.9.0-r1.ebuild,
+  -zeitgeist-0.9.0.1.ebuild, zeitgeist-0.9.5.ebuild, metadata.xml:
+  Drop old; add USE restraint to inmemory to dev-libs/xapian, #449114
 
   06 Jan 2013; Agostino Sarubbo <ago@gentoo.org> zeitgeist-0.9.5.ebuild:
   Add ~sparc, wrt bug #449220
diff --git a/gnome-extra/zeitgeist/Manifest b/gnome-extra/zeitgeist/Manifest
index 8827e495f845..f029dc56dcc7 100644
--- a/gnome-extra/zeitgeist/Manifest
+++ b/gnome-extra/zeitgeist/Manifest
@@ -1,16 +1,19 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX zeitgeist-0.7-no-rdfpipe.patch 472 SHA256 4c340380c7cf8446583e4ff47d4c128394ede35abd570a2965cf963a859cc139 SHA512 d9502d03ae1c6d882f7be19cfdf738fc95f50ea0a438185aa14c701bcd85256af9433a4d2f6f38744063927171ad24c16f4c74871baa7810398e3e2e82dbb869 WHIRLPOOL 61aea508ef94eeb2e1e41ff3e5eb27d166cee6343d8ce76ebae25d7ca08e24ba57466641c3161df957bbf52fe8e0a4582af81b08fcd8800555a82fd025884828
 AUX zeitgeist-0.7.1-no-rdfpipe.patch 458 SHA256 791e2b845559761657764f15ee989360677aaa258517039c36d908ec3becedd7 SHA512 0877a10ea905ea70cbf1b0db2218006f1a6b5e63e88292c527a96544a7bb720ffcc046f3011b6fad228dd4a7bbd01a93fc18dae0f62c8ac0d3c7e2c100ba0c75 WHIRLPOOL ba490d09437617269aa830aa591a6a44a68ad971b990e9ea571c6c19785b9d4305f1bd018c174e97690bbc604a297029a1b7e2dbc05580ee04e4bb4fb74cbd13
 AUX zeitgeist-0.8.2-gobject.patch 1939 SHA256 149c58ed0b08ea024c005ccc5ec1430c6fddbd97110b5c5dccf3c1ebbea94b38 SHA512 bd7822e4ef40ed527c7dfdc837828b004ac0cc17a70a944c7e0df8e7e7e1fe1629c5a40bf5487cce209371ceaf18417b96b4df07e962105a870098b7c9da3e9c WHIRLPOOL 4a500d4ad196085593303370c3d36d32470a5378c2b604bc10feebde923fec87c1622e571210f3b5d3bec4aa17b46bfb4d272052e518b4d9c434f41963dbd43b
 AUX zeitgeist-0.9.0-doc.patch 345 SHA256 5658e76e9219c41d74b3dcf68dcad6b7eb4b5629a37ef1690fc10fe208796fb5 SHA512 3d24a3b53d4bb91bc4ee7cbbeede1de0814cc7ea5841db509c3af30ebd3952631e0b450b3e93d8fcf4272a64f91df24459e14e66fce27b4e19dccaf4b882ca58 WHIRLPOOL b13ef59620dfbce1bb25b66998304e7aa37f2e9095ec64046f3a8273b1a4e3e5ea5832bd19bda83209598f40b0ab43705023172af825f581b695a47ddd071ac1
 AUX zeitgeist-0.9.0-gobject.patch 528 SHA256 5f55bdc51f465c00753773a70ef95afcef81750f5af6c4e5291fa523a281d7ab SHA512 2ba93c23ceb54a3cbd05428affcb766620b7edbc38a0fc0dda501c91354c2f36116a5ca62698deb2da4ec090705de61810d27f940412a91b104b42d4010646d6 WHIRLPOOL b2786011d3081048fbbc3c624dd019ff92cde5c9d88462731651a37c4f3df2b4e7ed6b6eeb0c0c98f29241c8a93b1c85b7fb6f3e7947e53bbd45d6e6af4a0be4
-DIST zeitgeist-0.8.2.tar.gz 358781 SHA256 6155611ee182f642cc1fe9f8aadc25c7e2942fdef2565b1f29e8388bc4643703
-DIST zeitgeist-0.9.0.1.tar.bz2 827258 SHA256 5d52c34e7a655d152f991f7461ecf0dac274d9f67bfb021f815d7044a4b5ba1e SHA512 54f04cfaf542dbac17c8efa2a7d85a336d1eab1654fb140d3cf2a4e61215edf7699bcb297b3cb55db077561fbc58949d461ffb236f7b9ebfa6830ea836df986a WHIRLPOOL 96a7c85bf88c07a3c1c7da6de71979e92bb817f6c4c4664488c3cec69a72ebaa1fcb9579c01495781a3cc431748bc615e86247fe0a57e92e445e602eb2f71b1a
-DIST zeitgeist-0.9.0.tar.bz2 827040 SHA256 9ea34194fefaebdb35042a501189fe4c8252c5a011e59680a4edb60b11501009
 DIST zeitgeist-0.9.5.tar.bz2 856757 SHA256 e5ccb75ff705bfb382750c520c29653b6e0f40aeacd30adf233162132114be55 SHA512 26fc041721a9ba99875db7f5bd3cdf91555a3006d0f82186a95b269462334e53f58284d988f0fb9ae39b11679ba08a2992625d3646f697762005803069f1b7ab WHIRLPOOL a5d28119e88eb4d7b93eeb6cf7232c5dc1402560702016d45d3b4587d8224b0bc21e767d89ea2ed6847c0971c97a6db29d20afe640be50d1407fcce8ad3e5568
-EBUILD zeitgeist-0.8.2-r1.ebuild 1425 SHA256 f5736041e2d80d367a85512d8fdc3423ff98bd423d3622d4d0798b135e9a77ad SHA512 fa4396cd77759bc7c46db3c35bc1ea733fff664e3f26a5e35d07c9eaf1454d8609fa67396dda80d2b2887e13eea93bf7232353a6afaa297fc767ee1f0e505117 WHIRLPOOL 75235bf4d774e0b1852c835d4440a87df2268bffa171194b5dd726a5e26a513f6b70ba3fce129a879fd57b15165d18b71c6d368a1f23914dc81eaa89410e5185
-EBUILD zeitgeist-0.8.2.ebuild 1298 SHA256 ac7ce418cb6c41b6c06aa696c6b58797aee72bbc83331481ce4c7c1c2c314ca9 SHA512 11474173f4cb29346976f68291a626e63239e89e0a54145e654ecdeb28b597deb9a9eb6af3a55790065bfabfc00526d1a52f7ec48892dd40b49bb0abacb8d932 WHIRLPOOL 500748d790a0a37312be38e714b46492351615b7dcd073e792891164d844aa53dab13b8d1fb3340d23459a8dd33384304bfc5c3cdeef186e9706921063a1df0a
-EBUILD zeitgeist-0.9.0-r1.ebuild 1774 SHA256 8d15efa940fef65d485ed5f37347586c45aff711cdbf8df145efec37256d5024 SHA512 e0efa28e53d8c8f34075fddfe2dbbe0a706e4f697045e629645e8a9dd62657c2d01310b9b66cce9cfd1c792f8b2873ce3f294e6807180609b4c8d2d96cf2a985 WHIRLPOOL b3369f2d9519779a308cde0d20c7605d749868a5d4602764439f5c6b970935fcc90e25b6a5c82034950d2551605ccc346c13e4b59df66e4814fa229599f80440
-EBUILD zeitgeist-0.9.0.1.ebuild 1837 SHA256 5b9f434acab6f235cc0fc7fb8618e4821e76a94854cef0fc6c0416d17b01c8a4 SHA512 f8fa3c8492181a212e93d864450e095dcf24ad32672c6a565e4f085fe905178095a1f69c46aadb592a2e4f8273fb34149cd218ea47795a56ec2157202736caf7 WHIRLPOOL e39cccc138548539d9d53bffcda03bebf4506a591dcde2b88a7df95a09155fb1cbe92ef8bc5bd04134c30f9dfdbe26ceab29aca2114fc09214691a2f45e7ee2e
-EBUILD zeitgeist-0.9.5.ebuild 1837 SHA256 62ae900969922012c108d81b90ad23d6295893f606a7ec729caefe639389923b SHA512 9822f89b5aec2fc0f318d48832af514537db0c7c8d651feee9f11dcc47f98cb7c6d3a0b586593de7fa2e922b375c36536e24ca6abed1b1ab9eaab994f7babbf5 WHIRLPOOL d487f366bd13bc0ed3fca2d269a1aa1b247fc1fa8c03bcd03f20ae1b9e64b0256e8f9677fdb498710c545285ba9629f409e7e7483f292a85b982c350224e3ca1
-MISC ChangeLog 3645 SHA256 3e883df6a3bee1aaf7f04400a44b3f82eb6e3080f20c7c16b6603aeacd6b5019 SHA512 1d2f459cfe1415082f5ffb8ddb7f823552bef8fe879d12944629dee9d005da8bc990481335231b15178e066d74d59ad54f2ccda319655c030e69636a0550f701 WHIRLPOOL 1ad9a96b7d5f54fdccd4ff87a644c14a473d009a4778a151749c27ee3a968a0c3ec44a50b202fb78c0e365c292952eb0790500046ef00c0ceafb9c573f5f152d
-MISC metadata.xml 925 SHA256 5cf58a8845e50c0dace47533ea836fb6433762b00621eea0a7f57eaa7fecc9ef SHA512 4706cd73be10f73433ab2c8ec3fbc7fa09a00b1478ad73d903b94973aaff9af29ca4df6ad223713e9b612c64a62b7a391768f50104a63f76675d6c57e194558f WHIRLPOOL dd7d74360cae2f349e8775e997cd34bb38a1475eb26ff5b2f99d12cb72817baaec162aaeee8226ec4dfb97739439a984f5b45691f5ad6f344c02ac60f10a379f
+EBUILD zeitgeist-0.9.5.ebuild 1848 SHA256 11b62b1b339b9ae689999877308a3a866c43166aae2637430a6acc4bdd9830b8 SHA512 8c61debbded2a57dc654af4113efbd7ed37674ae586eb87bec7627307ac730cf94aaa108091a875256d372bf8074f5b378548a74ff6df9b78f3d3d21d84605f9 WHIRLPOOL cba251c527641c8c54f390d3992cba75f47159caad186d7ad5092c1b9a807ac20e84829b1ec79699bf9a9ac2e5144d01ed4f949668721d59baf7f6fd00a1e7cc
+MISC ChangeLog 3914 SHA256 fb4f1184383b2da87679f61a2a62afc1cdba6161c82e3dc8bdbcbf7afe009bc1 SHA512 4e5ea5f814395b6b06c0a29df323f52f0d4f49e35572fc06a8b16bfb1117c11ef257d8303548d672fdedf83f70171da8a668abe4b709b04800c88dd58d4c8cad WHIRLPOOL edd145134e9c36df5d19091d167a2aa0b009fe33d7d3bf2bf2d259822ff054f8e4e083929b4154d61176fa21b3c189a7cba7298b0a564395ae726d97862982bd
+MISC metadata.xml 943 SHA256 f72da4205201e12adad015dc10fbd0fb0a5cca8dd4157491f61c747e57757a16 SHA512 cd14a960f432fec6f7e7bef44801a25015665db8de5ddd5f46bc767a06b02454ee0754ef6543f6e8aa198f98625fd64bf59e42efd8f35b1da0a155f622fd8b08 WHIRLPOOL 19d3e54d9337c351a7053521ce67169a3c3a26ec072e4d0950a2c13f7ecf00dd4c8187ad9b6d2c52a07aeb82ec423f067d01b28271efc060dab24617ce18a5bb
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iEYEAREIAAYFAlDu6xgACgkQgAnW8HDreRZzzQCdFy8QGfR+Yr8pICwKLTliJJ+B
+4MEAn2r+pn+OUxAvHiIjTf/3Y1SfI8yt
+=fqvG
+-----END PGP SIGNATURE-----
diff --git a/gnome-extra/zeitgeist/metadata.xml b/gnome-extra/zeitgeist/metadata.xml
index e35eaf56343d..d5e5ac15c77b 100644
--- a/gnome-extra/zeitgeist/metadata.xml
+++ b/gnome-extra/zeitgeist/metadata.xml
@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>desktop-misc</herd>
-	<maintainer>
-		<email>jlec@gentoo.org</email>
-	</maintainer>
-	<longdescription>
+  <herd>desktop-misc</herd>
+  <maintainer>
+    <email>jlec@gentoo.org</email>
+  </maintainer>
+  <longdescription>
 The engine is the main module that accepts all incoming events and allows 
 applications to fetch as well as subscribe to be notified when events 
 are logged. It is the heart of Zeitgeist.
 </longdescription>
-	<use>
-		<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="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>
-	</use>
+  <use>
+    <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="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>
+  </use>
 </pkgmetadata>
diff --git a/gnome-extra/zeitgeist/zeitgeist-0.8.2-r1.ebuild b/gnome-extra/zeitgeist/zeitgeist-0.8.2-r1.ebuild
deleted file mode 100644
index 3e7dbe0fa4ca..000000000000
--- a/gnome-extra/zeitgeist/zeitgeist-0.8.2-r1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/zeitgeist/zeitgeist-0.8.2-r1.ebuild,v 1.2 2012/03/25 15:25:41 eva Exp $
-
-EAPI=4
-
-PYTHON_DEPEND="2"
-PYTHON_USE_WITH="sqlite"
-
-AUTOTOOLS_AUTORECONF=true
-
-inherit autotools-utils eutils python versionator
-
-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.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="extensions passiv plugins"
-
-RDEPEND="
-	dev-python/dbus-python
-	dev-python/pygobject:2
-	dev-python/pyxdg
-	dev-python/rdflib
-	media-libs/raptor:2
-	extensions? ( gnome-extra/zeitgeist-extensions  )
-	passiv? ( gnome-extra/zeitgeist-datahub )
-	plugins? ( gnome-extra/zeitgeist-datasources )
-"
-DEPEND="${RDEPEND}"
-
-PATCHES=( "${FILESDIR}"/${P}-gobject.patch )
-
-pkg_setup() {
-	python_set_active_version 2
-	python_pkg_setup
-}
-
-src_prepare() {
-	python_clean_py-compile_files
-	autotools-utils_src_prepare
-}
-
-src_install() {
-	autotools-utils_src_install
-	python_convert_shebangs -r 2 "${ED}"
-}
-
-pkg_postinst() {
-	python_mod_optimize zeitgeist
-	python_mod_optimize /usr/share/zeitgeist/
-}
-
-pkg_postrm() {
-	python_mod_cleanup zeitgeist
-	python_mod_cleanup /usr/share/zeitgeist/
-}
diff --git a/gnome-extra/zeitgeist/zeitgeist-0.8.2.ebuild b/gnome-extra/zeitgeist/zeitgeist-0.8.2.ebuild
deleted file mode 100644
index fa3c3f2206a6..000000000000
--- a/gnome-extra/zeitgeist/zeitgeist-0.8.2.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/zeitgeist/zeitgeist-0.8.2.ebuild,v 1.3 2012/02/16 19:49:01 jlec Exp $
-
-EAPI=4
-
-PYTHON_DEPEND="2"
-PYTHON_USE_WITH="sqlite"
-
-AUTOTOOLS_AUTORECONF=true
-
-inherit autotools-utils eutils python versionator
-
-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.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="extensions passiv plugins"
-
-RDEPEND="
-	dev-python/dbus-python
-	dev-python/pygobject:2
-	dev-python/pyxdg
-	dev-python/rdflib
-	media-libs/raptor:2
-	extensions? ( gnome-extra/zeitgeist-extensions  )
-	passiv? ( gnome-extra/zeitgeist-datahub )
-	plugins? ( gnome-extra/zeitgeist-datasources )
-"
-DEPEND="${RDEPEND}"
-
-pkg_setup() {
-	python_set_active_version 2
-	python_pkg_setup
-}
-
-src_install() {
-	autotools-utils_src_install
-	python_convert_shebangs -r 2 "${ED}"
-}
-
-pkg_postinst() {
-	python_mod_optimize zeitgeist
-	python_mod_optimize /usr/share/zeitgeist/
-}
-
-pkg_postrm() {
-	python_mod_cleanup zeitgeist
-	python_mod_cleanup /usr/share/zeitgeist/
-}
diff --git a/gnome-extra/zeitgeist/zeitgeist-0.9.0-r1.ebuild b/gnome-extra/zeitgeist/zeitgeist-0.9.0-r1.ebuild
deleted file mode 100644
index 0b98554bab2c..000000000000
--- a/gnome-extra/zeitgeist/zeitgeist-0.9.0-r1.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/zeitgeist/zeitgeist-0.9.0-r1.ebuild,v 1.2 2012/05/05 06:25:21 jdhore Exp $
-
-EAPI=4
-
-PYTHON_DEPEND="2"
-
-AUTOTOOLS_AUTORECONF=true
-
-inherit autotools-utils eutils python versionator
-
-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="~amd64 ~x86"
-IUSE="+dbus extensions +fts icu nls passiv plugins"
-
-RDEPEND="
-	dev-libs/xapian
-	dev-python/dbus-python
-	dev-python/pygobject:2
-	dev-python/pyxdg
-	dev-python/rdflib
-	media-libs/raptor:2
-	dev-libs/glib:2
-	dev-lang/vala:0.14
-	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}
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-gobject.patch
-	"${FILESDIR}"/${P}-doc.patch
-	)
-
-pkg_setup() {
-	python_set_active_version 2
-	python_pkg_setup
-	export VALAC=$(type -p valac-0.14)
-}
-
-src_prepare() {
-	python_clean_py-compile_files
-	autotools-utils_src_prepare
-}
-
-src_configure() {
-	local myeconfargs=(
-		--docdir=/usr/share/doc/${PF}
-		$(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
-}
-
-pkg_postinst() {
-	python_mod_optimize zeitgeist
-}
-
-pkg_postrm() {
-	python_mod_cleanup zeitgeist
-}
diff --git a/gnome-extra/zeitgeist/zeitgeist-0.9.0.1.ebuild b/gnome-extra/zeitgeist/zeitgeist-0.9.0.1.ebuild
deleted file mode 100644
index c132a376755a..000000000000
--- a/gnome-extra/zeitgeist/zeitgeist-0.9.0.1.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/zeitgeist/zeitgeist-0.9.0.1.ebuild,v 1.1 2012/06/29 09:00:12 jlec Exp $
-
-EAPI=4
-
-PYTHON_DEPEND="2"
-
-AUTOTOOLS_AUTORECONF=true
-
-inherit autotools-utils eutils python versionator
-
-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="~amd64 ~x86"
-IUSE="+dbus extensions +fts icu nls passiv plugins sql-debug"
-
-RDEPEND="
-	dev-libs/xapian
-	dev-python/dbus-python
-	dev-python/pygobject:2
-	dev-python/pyxdg
-	dev-python/rdflib
-	media-libs/raptor:2
-	dev-libs/glib:2
-	dev-lang/vala:0.14
-	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}
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.9.0-gobject.patch
-	"${FILESDIR}"/${PN}-0.9.0-doc.patch
-	)
-
-pkg_setup() {
-	python_set_active_version 2
-	python_pkg_setup
-}
-
-src_prepare() {
-	export VALAC=$(type -p valac-0.14)
-	python_clean_py-compile_files
-	autotools-utils_src_prepare
-}
-
-src_configure() {
-	local myeconfargs=(
-		--docdir=/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
-}
-
-pkg_postinst() {
-	python_mod_optimize zeitgeist
-}
-
-pkg_postrm() {
-	python_mod_cleanup zeitgeist
-}
diff --git a/gnome-extra/zeitgeist/zeitgeist-0.9.5.ebuild b/gnome-extra/zeitgeist/zeitgeist-0.9.5.ebuild
index 5c0ed4c7e9c0..fa982056dd8f 100644
--- a/gnome-extra/zeitgeist/zeitgeist-0.9.5.ebuild
+++ b/gnome-extra/zeitgeist/zeitgeist-0.9.5.ebuild
@@ -1,6 +1,6 @@
 # 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.6 2013/01/06 09:42:54 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/zeitgeist/zeitgeist-0.9.5.ebuild,v 1.7 2013/01/10 16:23:51 jlec Exp $
 
 EAPI=4
 
@@ -23,7 +23,7 @@ KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="+dbus extensions +fts icu nls passiv plugins sql-debug"
 
 RDEPEND="
-	dev-libs/xapian
+	dev-libs/xapian[inmemory]
 	dev-python/dbus-python
 	dev-python/pygobject:2
 	dev-python/pyxdg