gnome-extra/zeitgeist-datasources: Drop old, fix dep for telepathy python support, #489554

(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key B9D4F231BD1558AB!)

4 files changed, 9 insertions, 128 deletions

diff --git a/gnome-extra/zeitgeist-datasources/ChangeLog b/gnome-extra/zeitgeist-datasources/ChangeLog
index 9fb8e57124ee..b6f80f617baa 100644
--- a/gnome-extra/zeitgeist-datasources/ChangeLog
+++ b/gnome-extra/zeitgeist-datasources/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for gnome-extra/zeitgeist-datasources
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/zeitgeist-datasources/ChangeLog,v 1.17 2013/09/08 14:25:09 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/zeitgeist-datasources/ChangeLog,v 1.18 2013/10/27 17:27:56 jlec Exp $
+
+  27 Oct 2013; Justin Lecher <jlec@gentoo.org>
+  -zeitgeist-datasources-0.8.0.1.ebuild, zeitgeist-datasources-0.8.1.ebuild,
+  metadata.xml:
+  Drop old, fix dep for telepathy python support, #489554
 
   08 Sep 2013; Pacho Ramos <pacho@gentoo.org>
   zeitgeist-datasources-0.8.1.ebuild:
diff --git a/gnome-extra/zeitgeist-datasources/metadata.xml b/gnome-extra/zeitgeist-datasources/metadata.xml
index 2b8e13c104c0..bb6799917a12 100644
--- a/gnome-extra/zeitgeist-datasources/metadata.xml
+++ b/gnome-extra/zeitgeist-datasources/metadata.xml
@@ -13,18 +13,13 @@ datahub does not track events like opening websites etc.
 </longdescription>
   <use>
     <flag name="bzr">Zeitgeist plugin for <pkg>dev-vcs/bzr</pkg> as data source</flag>
-    <flag name="chromium">Zeitgeist plugin for <pkg>www-client/chromium</pkg> as data source</flag>
-    <flag name="eog">Zeitgeist plugin for <pkg>media-gfx/eog</pkg> as data source</flag>
     <flag name="geany">Zeitgeist plugin for <pkg>dev-util/geany</pkg> as data source</flag>
-    <flag name="gedit">Zeitgeist plugin for <pkg>app-editors/gedit</pkg> as data source</flag>
     <flag name="vim">Zeitgeist plugin for vim as data source</flag>
     <flag name="emacs">Zeitgeist plugin for emacs as data source</flag>
     <flag name="tomboy">Zeitgeist plugin for <pkg>app-misc/tomboy</pkg> as data source</flag>
     <flag name="telepathy">Zeitgeist plugin for telepathy framework as data source</flag>
     <flag name="xchat">Zeitgeist plugin for <pkg>net-irc/xchat-gnome</pkg> as data source</flag>
-    <flag name="rhythmbox">Zeitgeist plugin for <pkg>media-sound/rhythmbox</pkg> as data source</flag>
     <flag name="firefox">Zeitgeist plugin for <pkg>www-client/firefox</pkg> as data source</flag>
     <flag name="thunderbird">Zeitgeist plugin for <pkg>mail-client/thunderbird</pkg> as data source</flag>
-    <flag name="totem">Zeitgeist plugin for <pkg>media-video/totem</pkg> as data source</flag>
   </use>
 </pkgmetadata>
diff --git a/gnome-extra/zeitgeist-datasources/zeitgeist-datasources-0.8.0.1.ebuild b/gnome-extra/zeitgeist-datasources/zeitgeist-datasources-0.8.0.1.ebuild
deleted file mode 100644
index 75da55f6b94b..000000000000
--- a/gnome-extra/zeitgeist-datasources/zeitgeist-datasources-0.8.0.1.ebuild
+++ /dev/null
@@ -1,119 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/zeitgeist-datasources/zeitgeist-datasources-0.8.0.1.ebuild,v 1.14 2013/04/30 16:41:26 jlec Exp $
-
-EAPI=4
-
-AUTOTOOLS_AUTORECONF=true
-VALA_MIN_API_VERSION=0.14
-
-inherit autotools-utils eutils mono multilib python versionator vala
-
-DIR_PV=$(get_version_component_range 1-2)
-DIR_PV2=$(get_version_component_range 1-3)
-
-DESCRIPTION="Plugins whose work is to push activities as events into Zeitgeist daemon"
-HOMEPAGE="https://launchpad.net/zeitgeist-datasources/ http://zeitgeist-project.com/"
-SRC_URI="http://launchpad.net/zeitgeist-datasources/${DIR_PV}/${DIR_PV2}/+download/${P}.tar.gz"
-
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-LICENSE="GPL-3"
-#PLUGINS_IUSE="bzr chromium eog geany gedit vim emacs tomboy telepathy xchat rhythmbox firefox totem"
-PLUGINS_IUSE="bzr chromium eog geany gedit vim emacs tomboy telepathy xchat rhythmbox totem"
-IUSE="${PLUGINS_IUSE} static-libs"
-
-RDEPEND="
-	dev-libs/libzeitgeist
-	x11-libs/gtk+:2
-	chromium? ( www-client/chromium )
-	eog? ( media-gfx/eog[python] )
-	geany? ( dev-util/geany )
-	gedit? ( app-editors/gedit[zeitgeist] )
-	vim? ( app-editors/vim[python] )
-	emacs? ( virtual/emacs )
-	tomboy? (
-		app-misc/tomboy
-		dev-dotnet/gtk-sharp
-		dev-dotnet/mono-addins
-		dev-dotnet/zeitgeist-sharp
-		dev-python/dbus-python )
-	telepathy? (
-		dev-python/telepathy-python
-		dev-python/dbus-python
-		dev-python/pygobject )
-	xchat? ( net-irc/xchat-gnome )
-	rhythmbox? ( media-sound/rhythmbox[zeitgeist] )
-	totem? ( media-video/totem[zeitgeist] )"
-#	firefox? (
-#		|| ( >=www-client/firefox-4.0 >=www-client/firefox-bin-4.0 )
-#		net-libs/xulrunner )
-DEPEND="${RDEPEND}
-	$(vala_depend)"
-PDEPEND="gnome-extra/zeitgeist"
-
-PLUGINS="bzr chrome eog geany vim emacs tomboy telepathy xchat firefox-40-libzg"
-
-src_prepare() {
-	rm bzr/bzr-icon-64.png || die
-	sed \
-		-e '/bzr-icon-64.png/d' \
-		-i bzr/Makefile.am || die
-	sed \
-		-e '/^allowed_plugin/s:^:#:g' \
-		-i configure.ac || die
-
-	SEARCH='$(datadir)/opt/google/chrome/resources'
-	REPLACE="/usr/$(get_libdir)/chromium-browser/resources"
-	sed \
-		-e "s:${SEARCH}:${REPLACE}:" \
-		-i chrome/Makefile.* || die
-	sed \
-		-e 's:vim72:vimfiles:' \
-		-i vim/Makefile.* || die
-	sed \
-		-e "s:/xchat/:/xchat-gnome/:g" \
-		-i xchat/Makefile.* || die
-	vala_src_prepare
-	autotools-utils_src_prepare
-}
-
-src_configure() {
-	local i myplugins
-
-	for i in ${PLUGINS}; do
-		case ${i} in
-			chrome )
-				use chromium && myplugins+=( ${i} )
-				;;
-			firefox-40-libzg )
-				use firefox && myplugins+=( ${i} )
-				;;
-			totem-libzg )
-				use totem && myplugins+=( ${i} )
-				;;
-			* )
-				use ${i} && myplugins+=( ${i} )
-				;;
-		esac
-	done
-
-	local myeconfargs=(
-		allowed_plugins="${myplugins[@]}"
-		)
-	autotools-utils_src_configure
-}
-
-pkg_postinst() {
-	if use chromium; then
-		elog "to use the chromium plugin you must open chromium"
-		elog "then click the wrench -> tools -> extensions"
-		elog "expand the \"Developer mode\" section"
-		elog "and click the \"Load unpacked extension...\" button"
-		elog "then browse to..."
-		elog "\t/usr/$(get_libdir)/chromium-browser/resources/zeitgeist_plugin/"
-		elog ""
-		elog "More info available here"
-		elog "http://code.google.com/chrome/extensions/packaging.html"
-	fi
-}
diff --git a/gnome-extra/zeitgeist-datasources/zeitgeist-datasources-0.8.1.ebuild b/gnome-extra/zeitgeist-datasources/zeitgeist-datasources-0.8.1.ebuild
index ad6e5b912b36..077b059edff4 100644
--- a/gnome-extra/zeitgeist-datasources/zeitgeist-datasources-0.8.1.ebuild
+++ b/gnome-extra/zeitgeist-datasources/zeitgeist-datasources-0.8.1.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-datasources/zeitgeist-datasources-0.8.1.ebuild,v 1.3 2013/09/08 14:25:09 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/zeitgeist-datasources/zeitgeist-datasources-0.8.1.ebuild,v 1.4 2013/10/27 17:27:56 jlec Exp $
 
 EAPI=5
 
@@ -8,7 +8,7 @@ AUTOTOOLS_AUTORECONF=true
 VALA_MIN_API_VERSION=0.14
 PYTHON_COMPAT=( python{2_6,2_7}  )
 
-inherit autotools-utils eutils mono multilib python-single-r1 versionator vala
+inherit autotools-utils eutils mono-env multilib python-single-r1 versionator vala
 
 DIR_PV=$(get_version_component_range 1-2)
 DIR_PV2=$(get_version_component_range 1-3)
@@ -35,7 +35,7 @@ RDEPEND="
 	geany? ( dev-util/geany )
 	mono? ( dev-util/monodevelop )
 	telepathy? (
-		dev-python/telepathy-python[${PYTHON_USEDEP}]
+		net-libs/telepathy-glib[${PYTHON_USEDEP}]
 		dev-python/dbus-python[${PYTHON_USEDEP}]
 		dev-python/pygobject[${PYTHON_USEDEP}]
 		)