Add gobject patches created by eva

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

4 files changed, 128 insertions, 4 deletions

diff --git a/gnome-extra/zeitgeist/ChangeLog b/gnome-extra/zeitgeist/ChangeLog
index d74388915a71..1ae517d0a77c 100644
--- a/gnome-extra/zeitgeist/ChangeLog
+++ b/gnome-extra/zeitgeist/ChangeLog
@@ -1,6 +1,12 @@
 # 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.8 2012/02/15 18:51:50 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/zeitgeist/ChangeLog,v 1.9 2012/02/16 19:49:01 jlec Exp $
+
+*zeitgeist-0.8.2-r1 (16 Feb 2012)
+
+  16 Feb 2012; Justin Lecher <jlec@gentoo.org> zeitgeist-0.8.2.ebuild,
+  +zeitgeist-0.8.2-r1.ebuild, +files/zeitgeist-0.8.2-gobject.patch:
+  Add gobject patches created by eva
 
   15 Feb 2012; Justin Lecher <jlec@gentoo.org> zeitgeist-0.8.2.ebuild,
   metadata.xml:
diff --git a/gnome-extra/zeitgeist/files/zeitgeist-0.8.2-gobject.patch b/gnome-extra/zeitgeist/files/zeitgeist-0.8.2-gobject.patch
new file mode 100644
index 000000000000..ce9e576cf01d
--- /dev/null
+++ b/gnome-extra/zeitgeist/files/zeitgeist-0.8.2-gobject.patch
@@ -0,0 +1,62 @@
+ .../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/zeitgeist-0.8.2-r1.ebuild b/gnome-extra/zeitgeist/zeitgeist-0.8.2-r1.ebuild
new file mode 100644
index 000000000000..b3df0be407ca
--- /dev/null
+++ b/gnome-extra/zeitgeist/zeitgeist-0.8.2-r1.ebuild
@@ -0,0 +1,58 @@
+# 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.1 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}"
+
+PATCHES=( "${FILESDIR}"/${P}-gobject.patch )
+
+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.8.2.ebuild b/gnome-extra/zeitgeist/zeitgeist-0.8.2.ebuild
index 7a0817afa801..fa3c3f2206a6 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.2 2012/02/15 18:51:50 jlec Exp $
+# $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
 
@@ -35,8 +35,6 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}"
 
-PATCHES=( )
-
 pkg_setup() {
 	python_set_active_version 2
 	python_pkg_setup