Fix bug 383769 with python 3

Package-Manager: portage-2.1.10.41/cvs/Linux x86_64

3 files changed, 54 insertions, 12 deletions

diff --git a/gnome-extra/zeitgeist/ChangeLog b/gnome-extra/zeitgeist/ChangeLog
index 5393c6cb02fc..0e36860cd1fd 100644
--- a/gnome-extra/zeitgeist/ChangeLog
+++ b/gnome-extra/zeitgeist/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for gnome-extra/zeitgeist
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/zeitgeist/ChangeLog,v 1.5 2011/12/15 22:53:21 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/zeitgeist/ChangeLog,v 1.6 2011/12/21 11:43:41 maksbotan Exp $
+
+*zeitgeist-0.7.1-r2 (21 Dec 2011)
+
+  21 Dec 2011; Maxim Koltsov <maksbotan@gentoo.org> +zeitgeist-0.7.1-r2.ebuild:
+  Fix bug 383769 with python 3
 
   15 Dec 2011; Pacho Ramos <pacho@gentoo.org> metadata.xml:
   Drop maintainer due retirement, bug #353461
diff --git a/gnome-extra/zeitgeist/Manifest b/gnome-extra/zeitgeist/Manifest
index f34b27b3639e..7bd11347d248 100644
--- a/gnome-extra/zeitgeist/Manifest
+++ b/gnome-extra/zeitgeist/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX zeitgeist-0.7-no-rdfpipe.patch 472 RMD160 0a8b47f562427671a0d3fc028e1018b339e35a27 SHA1 9959bfc03d6e16a700bc9f37f423d40fed2d7376 SHA256 4c340380c7cf8446583e4ff47d4c128394ede35abd570a2965cf963a859cc139
 AUX zeitgeist-0.7.1-no-rdfpipe.patch 458 RMD160 7738c462c8df2a8d4c82c015628a04dd83314d80 SHA1 2cfd1ea45bd3d17d71bb72b2edcd13bdc47f27fd SHA256 791e2b845559761657764f15ee989360677aaa258517039c36d908ec3becedd7
 DIST zeitgeist-0.7.1.tar.gz 336349 RMD160 64ebbeddf26fee33e1b12baa1ac5b7c1095050f5 SHA1 04609887358906112ab5eb8e5770209b724ebcd1 SHA256 3bd454d950bf5a174b2f67d9425aa5e781e9fed759c4ea2a9a94e07ce11859a8
@@ -8,14 +5,8 @@ DIST zeitgeist-0.7.tar.gz 337909 RMD160 bbdee7ff27520af88c465b54050dd809d39f3ce0
 DIST zeitgeist-extensions-0.0.6.tar.gz 27628 RMD160 9c624094f274765ba95c1bc715d7f79a1c86adff SHA1 f39d17c848d0aa12e2ab1ea920e78a33b629f54e SHA256 6b9a2414daa27114f4bff29d54685c49cb49cb46feac50af1f8f4d0598968bd5
 DIST zeitgeist-extensions-0.0.7.tar.gz 28273 RMD160 5522894a3afc49261818bd8ee0bf0fc9311ee538 SHA1 57c2282315c6ed20b8a4fbc4aef3ebc549493c6c SHA256 097c62331822950818241cfd7a5ae4aa2c9f5ce51874f38cd16c8f06b1198fad
 EBUILD zeitgeist-0.7.1-r1.ebuild 1210 RMD160 8846e637282179a1b8ae2a325fc1bab7d2957db7 SHA1 eb86e5239f71e06d636992cfd79d6f4574fd9bea SHA256 a6a214d7632cdcea2c999f68d238bf4358ef1840a47cbf158bd1650a130d54c1
+EBUILD zeitgeist-0.7.1-r2.ebuild 1250 RMD160 4cba659199c70be6f7045b0e3319bab33baeca34 SHA1 4910b9794c961fba2b3cb59c2677931502f6d14c SHA256 f060a81e660439a6c7ef7d529666670ad89f8d3cff365a8ef3d75e663102cab2
 EBUILD zeitgeist-0.7.1.ebuild 1207 RMD160 78316f089dc9d31f2c3b8b000e0f87bc9b17f11d SHA1 974d31995ee7af8b84c15f2aea8efbbc18d1b1bb SHA256 b90c565b0ebfa014e04dc676301972ce7ecc5d9f1719e5ab2ea297b02f53d564
 EBUILD zeitgeist-0.7.ebuild 1146 RMD160 7136532c6ed7ed4330c54e8847b5e4a929cafbbc SHA1 195d3918d4d6b1a576eebf2cad55484f1631e0be SHA256 e586ee7fa2fedf93b04ca1cfc259b5b44809a759759c0f1a342c6e48c8829278
-MISC ChangeLog 981 RMD160 19e1bd46be64f0681718446f4da637c225ec12dc SHA1 2c80ef6fa8f849d30d9153d6bf70c41f441c8368 SHA256 184df9d6a22f8de421df838a4f7a1552367f199643ca9e43ecb85c432fad506a
+MISC ChangeLog 1132 RMD160 c236825dd97dc27b36fba711457701472e72cc0c SHA1 bda41c877fce94a86641255062d9f9e63c6c339a SHA256 f335785ff369e1a1a51c1587c1cacfdc8a33b12a712a46d0afce05fc8d49d533
 MISC metadata.xml 250 RMD160 72ae56e24dadd973421df6a252901e6b66b20313 SHA1 f3f1e5cc8f00f31ab3cee5205edee027b2e5f114 SHA256 08ff89cf8ec1b7de283bf2c7be0c0cb5d28b2aa636dcab3144c4b2d178495409
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iEYEARECAAYFAk7qemcACgkQCaWpQKGI+9RJxwCgg7JGJtua5DQE819cGzZQdUcN
-NbgAn1+DiUWOYu4k/gQWFkhZCNkVHS2z
-=M7B4
------END PGP SIGNATURE-----
diff --git a/gnome-extra/zeitgeist/zeitgeist-0.7.1-r2.ebuild b/gnome-extra/zeitgeist/zeitgeist-0.7.1-r2.ebuild
new file mode 100644
index 000000000000..e80bbf2a983e
--- /dev/null
+++ b/gnome-extra/zeitgeist/zeitgeist-0.7.1-r2.ebuild
@@ -0,0 +1,46 @@
+# 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-r2.ebuild,v 1.1 2011/12/21 11:43:41 maksbotan Exp $
+
+EAPI=3
+PYTHON_DEPEND="2"
+inherit autotools eutils python versionator
+
+DIR_PV=$(get_version_component_range 1-2)
+EXT_VER=0.0.7
+
+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/${EXT_VER}/+download/zeitgeist-extensions-${EXT_VER}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="fts"
+
+RDEPEND="media-libs/raptor:2
+	dev-python/rdflib
+	dev-python/dbus-python
+	dev-python/pyxdg
+	fts? ( dev-libs/xapian-bindings[python] )"
+DEPEND="${RDEPEND}"
+
+pkg_setup() {
+	python_set_active_version 2
+	python_pkg_setup
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-no-rdfpipe.patch
+	eautoreconf
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	insinto /usr/share/zeitgeist/_zeitgeist/engine/extensions
+	if use fts; then
+		doins "${WORKDIR}"/zeitgeist-extensions-${EXT_VER}/fts/fts.py
+	fi
+	python_convert_shebangs -r 2 "${ED}"
+}