* [gentoo-commits] dev/eva:master commit in: gnome-extra/zeitgeist/, gnome-extra/zeitgeist/files/
@ 2011-12-18 16:32 Gilles Dartiguelongue
0 siblings, 0 replies; 2+ messages in thread
From: Gilles Dartiguelongue @ 2011-12-18 16:32 UTC (permalink / raw
To: gentoo-commits
commit: 8315613d6fcbd790a76d54c8261b7527e354c4b7
Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 18 16:32:16 2011 +0000
Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Sun Dec 18 16:32:22 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/eva.git;a=commit;h=8315613d
gnome-extra/zeitgeist: 0.7-r1 → 0.8.2
---
| 12 +++
.../files/zeitgeist-0.8.2-gobject-extensions.patch | 53 +++++++++++++
.../zeitgeist/files/zeitgeist-0.8.2-gobject.patch | 42 ++++++++++
| 13 +++
| 81 ++++++++++++++++++++
5 files changed, 201 insertions(+), 0 deletions(-)
--git a/gnome-extra/zeitgeist/Manifest b/gnome-extra/zeitgeist/Manifest
new file mode 100644
index 0000000..97017fd
--- /dev/null
+++ b/gnome-extra/zeitgeist/Manifest
@@ -0,0 +1,12 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+DIST zeitgeist-0.8.2.tar.gz 358781 RMD160 2277456ecb9c6947772064abf872de6c1e428c1f SHA1 bfeff11029673d235e4f6e2e9be00dff8f434a50 SHA256 6155611ee182f642cc1fe9f8aadc25c7e2942fdef2565b1f29e8388bc4643703
+DIST zeitgeist-extensions-0.0.13.tar.gz 30700 RMD160 d6b03b7a8fc9cae81831b3e4c2e4b21d45dbcbcf SHA1 01cb6a4b0b3e46cbd8630ec340ce35bd605dac3c SHA256 c8a93b419c7f81fad2dcda2aa40ae4a610432b971d7deca20bcd1451bd841d65
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.18 (GNU/Linux)
+
+iEYEARECAAYFAk7uFZAACgkQ1fmVwcYIWAbvTwCeP6jyz42PRxivwhVqn7wR0v6t
+L+IAoOQKAqG/T6v2MUGs8RtgMEcFpzMi
+=sAkb
+-----END PGP SIGNATURE-----
diff --git a/gnome-extra/zeitgeist/files/zeitgeist-0.8.2-gobject-extensions.patch b/gnome-extra/zeitgeist/files/zeitgeist-0.8.2-gobject-extensions.patch
new file mode 100644
index 0000000..00d03f2
--- /dev/null
+++ b/gnome-extra/zeitgeist/files/zeitgeist-0.8.2-gobject-extensions.patch
@@ -0,0 +1,53 @@
+diff -Nur a/extensions/tracker/tracker.py b/extensions/tracker/tracker.py
+--- a/extensions/tracker/tracker.py 2011-12-18 16:42:33.000000000 +0100
++++ b/extensions/tracker/tracker.py 2011-12-18 16:55:08.000000000 +0100
+@@ -26,9 +26,7 @@
+ import logging
+
+ import gi
+-from gi.repository import Tracker
+-
+-import gobject
++from gi.repository import Tracker, GObject
+
+ from _zeitgeist.engine.extension import Extension
+ from _zeitgeist.engine import constants
+@@ -52,7 +50,7 @@
+ self._engine = engine
+ self.cursor = get_default_cursor()
+ if not (os.path.exists(INDEX_FILE)):
+- gobject.idle_add (self._reindex)
++ GObject.idle_add (self._reindex)
+
+ def _reindex(self):
+ log.info("Empty index detected. Doing full rebuild")
+diff -Nur a/extensions/fts/fts.py b/extensions/fts/fts.py
+--- a/extensions/fts/fts.py 2011-12-18 17:21:37.000000000 +0100
++++ b/extensions/fts/fts.py 2011-12-18 17:22:09.000000000 +0100
+@@ -49,7 +49,7 @@
+ from Queue import Queue, Empty
+ import threading
+ from urllib import quote as url_escape, unquote as url_unescape
+-import gobject, gio
++from gi.repository import GObject
+ from cStringIO import StringIO
+
+ from zeitgeist.datamodel import Symbol, StorageState, ResultType, TimeRange, NULL_EVENT, NEGATION_OPERATOR
+@@ -294,7 +294,7 @@
+ # Cache of parsed DesktopEntrys
+ self._desktops = {}
+
+- gobject.threads_init()
++ GObject.threads_init()
+ self._may_run = True
+ self._queue = Queue(0)
+ self._worker = threading.Thread(target=self._worker_thread,
+@@ -304,7 +304,7 @@
+ # We need to defer the index checking until after ZG has completed
+ # full setup. Hence the idle handler.
+ # We also don't start the worker until after we've checked the index
+- gobject.idle_add (self._check_index_and_start_worker)
++ GObject.idle_add (self._check_index_and_start_worker)
+
+ @synchronized (INDEX_LOCK)
+ def _check_index_and_start_worker (self):
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 0000000..9970eb3
--- /dev/null
+++ b/gnome-extra/zeitgeist/files/zeitgeist-0.8.2-gobject.patch
@@ -0,0 +1,42 @@
+diff -Nur a/_zeitgeist/engine/extensions/datasource_registry.py b/_zeitgeist/engine/extensions/datasource_registry.py
+--- a/_zeitgeist/engine/extensions/datasource_registry.py 2011-12-18 16:42:33.000000000 +0100
++++ b/_zeitgeist/engine/extensions/datasource_registry.py 2011-12-18 16:54:04.000000000 +0100
+@@ -23,7 +23,7 @@
+ 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 @@
+ )
+
+ 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 -Nur a/zeitgeist-daemon.py b/zeitgeist-daemon.py
+--- a/zeitgeist-daemon.py 2011-12-18 16:42:33.000000000 +0100
++++ b/zeitgeist-daemon.py 2011-12-18 16:53:41.000000000 +0100
+@@ -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 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():
--git a/gnome-extra/zeitgeist/metadata.xml b/gnome-extra/zeitgeist/metadata.xml
new file mode 100644
index 0000000..9488a0c
--- /dev/null
+++ b/gnome-extra/zeitgeist/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>desktop-misc</herd>
+<maintainer>
+ <email>eva@gentoo.org</email>
+ <name>Gilles Dartiguelongue</name>
+</maintainer>
+<use>
+ <flag name="geoloc">Enable geolocation support through app-misc/geoclue</flag>
+</use>
+</pkgmetadata>
+
--git a/gnome-extra/zeitgeist/zeitgeist-0.8.2.ebuild b/gnome-extra/zeitgeist/zeitgeist-0.8.2.ebuild
new file mode 100644
index 0000000..4174f32
--- /dev/null
+++ b/gnome-extra/zeitgeist/zeitgeist-0.8.2.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/zeitgeist/zeitgeist-0.7.1-r1.ebuild,v 1.1 2011/05/06 16:09:58 signals Exp $
+
+EAPI="4"
+PYTHON_DEPEND="2"
+# Needed for geoloc
+PYTHON_USE_WITH="sqlite"
+
+inherit 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
+ http://launchpad.net/zeitgeist-extensions/trunk/fts-${EXT_VER}/+download/zeitgeist-extensions-${EXT_VER}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+# XXX: geoloc needs python module
+IUSE="fts tracker"
+
+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] )
+ tracker? ( >=app-misc/tracker-0.10.30 )
+"
+# geoloc? ( app-misc/geoclue )
+DEPEND="${RDEPEND}
+ >=dev-util/intltool-0.35.5
+"
+# Needs gnome-common for autoreconf
+
+pkg_setup() {
+ python_set_active_version 2
+ python_pkg_setup
+}
+
+src_prepare() {
+ # Disable py-compile
+ ln -sf $(type -P true) "${S}"/py-compile
+
+ # Fix gobject import mixup with introspection
+ ln -sf "${WORKDIR}/${PN}-extensions-${EXT_VER}" "${S}"/extensions
+ epatch "${FILESDIR}/${P}-gobject.patch"
+ epatch "${FILESDIR}/${P}-gobject-extensions.patch"
+}
+
+src_install() {
+ default
+ python_convert_shebangs -r 2 "${D}"
+ python_clean_installation_image -q
+
+ insinto /usr/share/zeitgeist/_zeitgeist/engine/extensions
+ if use fts; then
+ doins "${WORKDIR}"/zeitgeist-extensions-${EXT_VER}/fts/fts.py
+ fi
+ #if use geoloc; then
+ # doins "${WORKDIR}"/zeitgeist-extensions-${EXT_VER}/geolocation/geolocation.py
+ #fi
+ if use tracker; then
+ doins "${WORKDIR}"/zeitgeist-extensions-${EXT_VER}/tracker/tracker.py
+ fi
+}
+
+pkg_postinst() {
+ python_mod_optimize zeitgeist
+ python_mod_optimize /usr/share/zeitgeist/
+}
+
+pkg_postrm() {
+ python_mod_cleanup zeitgeist
+ python_mod_cleanup /usr/share/zeitgeist/
+}
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] dev/eva:master commit in: gnome-extra/zeitgeist/, gnome-extra/zeitgeist/files/
@ 2012-03-25 15:28 Gilles Dartiguelongue
0 siblings, 0 replies; 2+ messages in thread
From: Gilles Dartiguelongue @ 2012-03-25 15:28 UTC (permalink / raw
To: gentoo-commits
commit: 25600c3e2f93d4c77915edf67b5f7ef9c3a4cfb7
Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 25 15:28:23 2012 +0000
Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Sun Mar 25 15:28:23 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/eva.git;a=commit;h=25600c3e
gnome-extra/zeitgeist: moved to gentoo-x86
---
| 12 ---
.../files/zeitgeist-0.8.2-gobject-extensions.patch | 53 -------------
.../zeitgeist/files/zeitgeist-0.8.2-gobject.patch | 42 ----------
| 13 ---
| 81 --------------------
5 files changed, 0 insertions(+), 201 deletions(-)
diff --git a/gnome-extra/zeitgeist/Manifest b/gnome-extra/zeitgeist/Manifest
deleted file mode 100644
index 97017fd..0000000
--- a/gnome-extra/zeitgeist/Manifest
+++ /dev/null
@@ -1,12 +0,0 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-DIST zeitgeist-0.8.2.tar.gz 358781 RMD160 2277456ecb9c6947772064abf872de6c1e428c1f SHA1 bfeff11029673d235e4f6e2e9be00dff8f434a50 SHA256 6155611ee182f642cc1fe9f8aadc25c7e2942fdef2565b1f29e8388bc4643703
-DIST zeitgeist-extensions-0.0.13.tar.gz 30700 RMD160 d6b03b7a8fc9cae81831b3e4c2e4b21d45dbcbcf SHA1 01cb6a4b0b3e46cbd8630ec340ce35bd605dac3c SHA256 c8a93b419c7f81fad2dcda2aa40ae4a610432b971d7deca20bcd1451bd841d65
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
-
-iEYEARECAAYFAk7uFZAACgkQ1fmVwcYIWAbvTwCeP6jyz42PRxivwhVqn7wR0v6t
-L+IAoOQKAqG/T6v2MUGs8RtgMEcFpzMi
-=sAkb
------END PGP SIGNATURE-----
diff --git a/gnome-extra/zeitgeist/files/zeitgeist-0.8.2-gobject-extensions.patch b/gnome-extra/zeitgeist/files/zeitgeist-0.8.2-gobject-extensions.patch
deleted file mode 100644
index 00d03f2..0000000
--- a/gnome-extra/zeitgeist/files/zeitgeist-0.8.2-gobject-extensions.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-diff -Nur a/extensions/tracker/tracker.py b/extensions/tracker/tracker.py
---- a/extensions/tracker/tracker.py 2011-12-18 16:42:33.000000000 +0100
-+++ b/extensions/tracker/tracker.py 2011-12-18 16:55:08.000000000 +0100
-@@ -26,9 +26,7 @@
- import logging
-
- import gi
--from gi.repository import Tracker
--
--import gobject
-+from gi.repository import Tracker, GObject
-
- from _zeitgeist.engine.extension import Extension
- from _zeitgeist.engine import constants
-@@ -52,7 +50,7 @@
- self._engine = engine
- self.cursor = get_default_cursor()
- if not (os.path.exists(INDEX_FILE)):
-- gobject.idle_add (self._reindex)
-+ GObject.idle_add (self._reindex)
-
- def _reindex(self):
- log.info("Empty index detected. Doing full rebuild")
-diff -Nur a/extensions/fts/fts.py b/extensions/fts/fts.py
---- a/extensions/fts/fts.py 2011-12-18 17:21:37.000000000 +0100
-+++ b/extensions/fts/fts.py 2011-12-18 17:22:09.000000000 +0100
-@@ -49,7 +49,7 @@
- from Queue import Queue, Empty
- import threading
- from urllib import quote as url_escape, unquote as url_unescape
--import gobject, gio
-+from gi.repository import GObject
- from cStringIO import StringIO
-
- from zeitgeist.datamodel import Symbol, StorageState, ResultType, TimeRange, NULL_EVENT, NEGATION_OPERATOR
-@@ -294,7 +294,7 @@
- # Cache of parsed DesktopEntrys
- self._desktops = {}
-
-- gobject.threads_init()
-+ GObject.threads_init()
- self._may_run = True
- self._queue = Queue(0)
- self._worker = threading.Thread(target=self._worker_thread,
-@@ -304,7 +304,7 @@
- # We need to defer the index checking until after ZG has completed
- # full setup. Hence the idle handler.
- # We also don't start the worker until after we've checked the index
-- gobject.idle_add (self._check_index_and_start_worker)
-+ GObject.idle_add (self._check_index_and_start_worker)
-
- @synchronized (INDEX_LOCK)
- def _check_index_and_start_worker (self):
diff --git a/gnome-extra/zeitgeist/files/zeitgeist-0.8.2-gobject.patch b/gnome-extra/zeitgeist/files/zeitgeist-0.8.2-gobject.patch
deleted file mode 100644
index 9970eb3..0000000
--- a/gnome-extra/zeitgeist/files/zeitgeist-0.8.2-gobject.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-diff -Nur a/_zeitgeist/engine/extensions/datasource_registry.py b/_zeitgeist/engine/extensions/datasource_registry.py
---- a/_zeitgeist/engine/extensions/datasource_registry.py 2011-12-18 16:42:33.000000000 +0100
-+++ b/_zeitgeist/engine/extensions/datasource_registry.py 2011-12-18 16:54:04.000000000 +0100
-@@ -23,7 +23,7 @@
- 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 @@
- )
-
- 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 -Nur a/zeitgeist-daemon.py b/zeitgeist-daemon.py
---- a/zeitgeist-daemon.py 2011-12-18 16:42:33.000000000 +0100
-+++ b/zeitgeist-daemon.py 2011-12-18 16:53:41.000000000 +0100
-@@ -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 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/metadata.xml b/gnome-extra/zeitgeist/metadata.xml
deleted file mode 100644
index 9488a0c..0000000
--- a/gnome-extra/zeitgeist/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>desktop-misc</herd>
-<maintainer>
- <email>eva@gentoo.org</email>
- <name>Gilles Dartiguelongue</name>
-</maintainer>
-<use>
- <flag name="geoloc">Enable geolocation support through app-misc/geoclue</flag>
-</use>
-</pkgmetadata>
-
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 4174f32..0000000
--- a/gnome-extra/zeitgeist/zeitgeist-0.8.2.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/zeitgeist/zeitgeist-0.7.1-r1.ebuild,v 1.1 2011/05/06 16:09:58 signals Exp $
-
-EAPI="4"
-PYTHON_DEPEND="2"
-# Needed for geoloc
-PYTHON_USE_WITH="sqlite"
-
-inherit 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
- http://launchpad.net/zeitgeist-extensions/trunk/fts-${EXT_VER}/+download/zeitgeist-extensions-${EXT_VER}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-# XXX: geoloc needs python module
-IUSE="fts tracker"
-
-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] )
- tracker? ( >=app-misc/tracker-0.10.30 )
-"
-# geoloc? ( app-misc/geoclue )
-DEPEND="${RDEPEND}
- >=dev-util/intltool-0.35.5
-"
-# Needs gnome-common for autoreconf
-
-pkg_setup() {
- python_set_active_version 2
- python_pkg_setup
-}
-
-src_prepare() {
- # Disable py-compile
- ln -sf $(type -P true) "${S}"/py-compile
-
- # Fix gobject import mixup with introspection
- ln -sf "${WORKDIR}/${PN}-extensions-${EXT_VER}" "${S}"/extensions
- epatch "${FILESDIR}/${P}-gobject.patch"
- epatch "${FILESDIR}/${P}-gobject-extensions.patch"
-}
-
-src_install() {
- default
- python_convert_shebangs -r 2 "${D}"
- python_clean_installation_image -q
-
- insinto /usr/share/zeitgeist/_zeitgeist/engine/extensions
- if use fts; then
- doins "${WORKDIR}"/zeitgeist-extensions-${EXT_VER}/fts/fts.py
- fi
- #if use geoloc; then
- # doins "${WORKDIR}"/zeitgeist-extensions-${EXT_VER}/geolocation/geolocation.py
- #fi
- if use tracker; then
- doins "${WORKDIR}"/zeitgeist-extensions-${EXT_VER}/tracker/tracker.py
- fi
-}
-
-pkg_postinst() {
- python_mod_optimize zeitgeist
- python_mod_optimize /usr/share/zeitgeist/
-}
-
-pkg_postrm() {
- python_mod_cleanup zeitgeist
- python_mod_cleanup /usr/share/zeitgeist/
-}
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2012-03-25 15:28 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-03-25 15:28 [gentoo-commits] dev/eva:master commit in: gnome-extra/zeitgeist/, gnome-extra/zeitgeist/files/ Gilles Dartiguelongue
-- strict thread matches above, loose matches on Subject: below --
2011-12-18 16:32 Gilles Dartiguelongue
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox