gnome-extra/zeitgeist: Correctly fix python dep on rdflib, #469958

(Portage version: 2.2.0_alpha174/cvs/Linux x86_64, signed Manifest commit with key 8009D6F070EB7916)

4 files changed, 17 insertions, 7 deletions

diff --git a/gnome-extra/zeitgeist/ChangeLog b/gnome-extra/zeitgeist/ChangeLog
index 446b143f709a..5a5ab98bdd43 100644
--- a/gnome-extra/zeitgeist/ChangeLog
+++ b/gnome-extra/zeitgeist/ChangeLog
@@ -1,6 +1,10 @@
 # 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.34 2013/05/12 18:04:10 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/zeitgeist/ChangeLog,v 1.35 2013/05/15 13:49:58 jlec Exp $
+
+  15 May 2013; Justin Lecher <jlec@gentoo.org> zeitgeist-0.9.5-r1.ebuild,
+  zeitgeist-0.9.12.ebuild, zeitgeist-0.9.12-r1.ebuild:
+  Correctly fix python dep on rdflib, #469958
 
   12 May 2013; Justin Lecher <jlec@gentoo.org> zeitgeist-0.9.12-r1.ebuild:
   Fix python_usedep for rdflib, #469290
@@ -41,7 +45,7 @@
   +zeitgeist-0.9.12.ebuild, -files/zeitgeist-0.7.1-no-rdfpipe.patch,
   -files/zeitgeist-0.7-no-rdfpipe.patch, -files/zeitgeist-0.8.2-gobject.patch,
   -files/zeitgeist-0.9.0-gobject.patch, metadata.xml:
-  Version
+  Version Bump
 
 *zeitgeist-0.9.5-r1 (07 Apr 2013)
 
diff --git a/gnome-extra/zeitgeist/zeitgeist-0.9.12-r1.ebuild b/gnome-extra/zeitgeist/zeitgeist-0.9.12-r1.ebuild
index 5d59f52b702e..416d3e0215f5 100644
--- a/gnome-extra/zeitgeist/zeitgeist-0.9.12-r1.ebuild
+++ b/gnome-extra/zeitgeist/zeitgeist-0.9.12-r1.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.12-r1.ebuild,v 1.4 2013/05/12 18:04:10 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/zeitgeist/zeitgeist-0.9.12-r1.ebuild,v 1.5 2013/05/15 13:49:58 jlec Exp $
 
 EAPI=5
 
@@ -49,6 +49,9 @@ DEPEND="${RDEPEND}
 PATCHES=( "${FILESDIR}"/${P}-download_monitor.patch )
 
 src_prepare() {
+	sed \
+		-e 's:python::g' \
+		-i Makefile.am || die
 	vala_src_prepare
 
 	sed \
diff --git a/gnome-extra/zeitgeist/zeitgeist-0.9.12.ebuild b/gnome-extra/zeitgeist/zeitgeist-0.9.12.ebuild
index 5e7ae5dd213e..d87939e95cdd 100644
--- a/gnome-extra/zeitgeist/zeitgeist-0.9.12.ebuild
+++ b/gnome-extra/zeitgeist/zeitgeist-0.9.12.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.12.ebuild,v 1.6 2013/05/04 07:42:38 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/zeitgeist/zeitgeist-0.9.12.ebuild,v 1.7 2013/05/15 13:49:58 jlec Exp $
 
 EAPI=5
 
@@ -30,7 +30,7 @@ RDEPEND="
 	dev-python/dbus-python[${PYTHON_USEDEP}]
 	dev-python/pygobject:2[${PYTHON_USEDEP}]
 	dev-python/pyxdg[${PYTHON_USEDEP}]
-	dev-python/rdflib
+	dev-python/rdflib[${PYTHON_USEDEP}]
 	media-libs/raptor:2
 	>=dev-libs/glib-2.26.0:2
 	>=dev-db/sqlite-3.7.11:3
@@ -49,6 +49,9 @@ DEPEND="${RDEPEND}
 PATCHES=( "${FILESDIR}"/${P}-download_monitor.patch )
 
 src_prepare() {
+	sed \
+		-e 's:python::g' \
+		-i Makefile.am || die
 	vala_src_prepare
 	autotools-utils_src_prepare
 }
diff --git a/gnome-extra/zeitgeist/zeitgeist-0.9.5-r1.ebuild b/gnome-extra/zeitgeist/zeitgeist-0.9.5-r1.ebuild
index 2ddd15ed3810..af1cb96caf57 100644
--- a/gnome-extra/zeitgeist/zeitgeist-0.9.5-r1.ebuild
+++ b/gnome-extra/zeitgeist/zeitgeist-0.9.5-r1.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-r1.ebuild,v 1.2 2013/04/24 06:47:12 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/zeitgeist/zeitgeist-0.9.5-r1.ebuild,v 1.3 2013/05/15 13:49:58 jlec Exp $
 
 EAPI=5
 
@@ -28,7 +28,7 @@ RDEPEND="
 	dev-python/dbus-python[${PYTHON_USEDEP}]
 	dev-python/pygobject:2[${PYTHON_USEDEP}]
 	dev-python/pyxdg[${PYTHON_USEDEP}]
-	dev-python/rdflib
+	dev-python/rdflib[${PYTHON_USEDEP}]
 	media-libs/raptor:2
 	dev-libs/glib:2
 	dev-db/sqlite:3