Unbundle the extensions, add long description, make it more to behave as a meta package

(Portage version: 2.2.0_alpha86/cvs/Linux x86_64)

3 files changed, 34 insertions, 13 deletions

diff --git a/gnome-extra/zeitgeist/ChangeLog b/gnome-extra/zeitgeist/ChangeLog
index 2fd8531218ee..d74388915a71 100644
--- a/gnome-extra/zeitgeist/ChangeLog
+++ b/gnome-extra/zeitgeist/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for gnome-extra/zeitgeist
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/zeitgeist/ChangeLog,v 1.7 2012/01/31 17:00:00 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/zeitgeist/ChangeLog,v 1.8 2012/02/15 18:51:50 jlec Exp $
+
+  15 Feb 2012; Justin Lecher <jlec@gentoo.org> zeitgeist-0.8.2.ebuild,
+  metadata.xml:
+  Unbundle the extensions, add long description, make it more to behave as a
+  meta package
 
 *zeitgeist-0.8.2 (31 Jan 2012)
 
diff --git a/gnome-extra/zeitgeist/metadata.xml b/gnome-extra/zeitgeist/metadata.xml
index 9fab56e866e6..ed2df5276b23 100644
--- a/gnome-extra/zeitgeist/metadata.xml
+++ b/gnome-extra/zeitgeist/metadata.xml
@@ -5,7 +5,15 @@
 	<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="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.ebuild b/gnome-extra/zeitgeist/zeitgeist-0.8.2.ebuild
index 1eb956aa17c4..7a0817afa801 100644
--- a/gnome-extra/zeitgeist/zeitgeist-0.8.2.ebuild
+++ b/gnome-extra/zeitgeist/zeitgeist-0.8.2.ebuild
@@ -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/gnome-extra/zeitgeist/zeitgeist-0.8.2.ebuild,v 1.1 2012/01/31 17:00:00 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/zeitgeist/zeitgeist-0.8.2.ebuild,v 1.2 2012/02/15 18:51:50 jlec Exp $
 
 EAPI=4
 
@@ -15,25 +15,27 @@ 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
-	http://launchpad.net/zeitgeist-extensions/trunk/fts-${EXT_VER}/+download/zeitgeist-extensions-${EXT_VER}.tar.gz"
+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="fts"
+IUSE="extensions passiv plugins"
 
 RDEPEND="
 	dev-python/dbus-python
+	dev-python/pygobject:2
 	dev-python/pyxdg
 	dev-python/rdflib
 	media-libs/raptor:2
-	fts? ( dev-libs/xapian-bindings[python] )"
+	extensions? ( gnome-extra/zeitgeist-extensions  )
+	passiv? ( gnome-extra/zeitgeist-datahub )
+	plugins? ( gnome-extra/zeitgeist-datasources )
+"
 DEPEND="${RDEPEND}"
 
-PATCHES=( "${FILESDIR}"/${PN}-0.7.1-no-rdfpipe.patch )
+PATCHES=( )
 
 pkg_setup() {
 	python_set_active_version 2
@@ -42,9 +44,15 @@ pkg_setup() {
 
 src_install() {
 	autotools-utils_src_install
-	if use fts; then
-		insinto /usr/share/zeitgeist/_zeitgeist/engine/extensions
-		doins "${WORKDIR}"/zeitgeist-extensions-${EXT_VER}/fts/fts.py
-	fi
 	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/
+}