[gentoo-commits] repo/gentoo:master commit in: gnome-extra/zeitgeist/, gnome-extra/zeitgeist/files/

[gentoo-commits] repo/gentoo:master commit in: gnome-extra/zeitgeist/, gnome-extra/zeitgeist/files/

[Justin Lecher]

commit:     68891e7bc8ff3a23d725232b89e4c1e1f5807d76
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 20 10:15:44 2015 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Sun Sep 20 10:15:44 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=68891e7b

gnome-extra/zeitgeist: Clean old

obsoletes
Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=530870

Package-Manager: portage-2.2.20.1
Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>

 gnome-extra/zeitgeist/Manifest                     |   1 -
 .../files/zeitgeist-0.9.14-gio-backport.patch      |  18 ----
 ...geist-0.9.15-fix-array-length-string-join.patch |  29 ------
 gnome-extra/zeitgeist/zeitgeist-0.9.15.ebuild      | 104 ---------------------
 4 files changed, 152 deletions(-)

diff --git a/gnome-extra/zeitgeist/Manifest b/gnome-extra/zeitgeist/Manifest
index 133dde3..181d801 100644
--- a/gnome-extra/zeitgeist/Manifest
+++ b/gnome-extra/zeitgeist/Manifest
@@ -1,2 +1 @@
-DIST zeitgeist-0.9.15.tar.xz 812972 SHA256 f3092aed4b2d28a8e55c93116ba1926f86b397aecbea499c7849bd4b30d97ebe SHA512 bec7e206d982b7d6a055600cd9acb84811c8f717b6328032a7179e984fd0e5fa691c2272a21c4442fac0a471f615ed4d1fde6d5d6e1ba3e106cae2b2bdf26025 WHIRLPOOL f72fb0823476b5b74ca5e8b3b44f010843d2af21cbb0882c8d3d1bbbd1f4f4b81777d191dcfd1243a69d5ae2508c391aa4a6bb260a6f549d340a2d4b7b94026b
 DIST zeitgeist-0.9.16.tar.xz 807092 SHA256 6ed3e60d0cd82ea58ee134c19beccafac10eb0f71977f3848755dacbf0927d3a SHA512 eb28215c937b71c8cec12f55236db4281ad529b2854ecb3c093477d45cd8348c6ea764e2cf00a99d41645b27b685a5325f0631b318409735b578a5871087b0f1 WHIRLPOOL 7ad3f528ffa938d14e9fbfe3f4e94ac5ad06bc48b13e261a0e8f43b88a9750a41d5e9212da7cc492f7c0197a4b12391d58e3f51a2a18a85b2663414332434c9b

diff --git a/gnome-extra/zeitgeist/files/zeitgeist-0.9.14-gio-backport.patch b/gnome-extra/zeitgeist/files/zeitgeist-0.9.14-gio-backport.patch
deleted file mode 100644
index 178215d..0000000
--- a/gnome-extra/zeitgeist/files/zeitgeist-0.9.14-gio-backport.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-From b1e82de434a7b63fe1290d0051de58350b069991 Mon Sep 17 00:00:00 2001
-From: Philip Withnall <philip@tecnocode.co.uk>
-Date: Sun, 16 Feb 2014 15:08:49 +0000
-Subject: libzeitgeist: Add a missing dependency on gio-2.0
-
-This actually makes the zeitgeist vapi file usable.
-
-Signed-off-by: Seif Lotfy <seif@lotfy.com>
----
-diff --git a/libzeitgeist/zeitgeist-2.0.deps b/libzeitgeist/zeitgeist-2.0.deps
-index ff8d39b..59eec5d 100644
---- a/libzeitgeist/zeitgeist-2.0.deps
-+++ b/libzeitgeist/zeitgeist-2.0.deps
-@@ -1 +1,2 @@
- zeitgeist-datamodel-2.0
-+gio-2.0
---
-cgit v0.9.0.2-2-gbebe

diff --git a/gnome-extra/zeitgeist/files/zeitgeist-0.9.15-fix-array-length-string-join.patch b/gnome-extra/zeitgeist/files/zeitgeist-0.9.15-fix-array-length-string-join.patch
deleted file mode 100644
index 857df8a..0000000
--- a/gnome-extra/zeitgeist/files/zeitgeist-0.9.15-fix-array-length-string-join.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 201bd67de450320520a12e2b0c465c8eb6818bd2 Mon Sep 17 00:00:00 2001
-From: Rico Tzschichholz <ricotz@ubuntu.com>
-Date: Mon, 17 Mar 2014 20:57:49 +0100
-Subject: [PATCH] WhereClause: Fix array-length to work with string.joinv of
- vala-0.24
-
----
- libzeitgeist/where-clause.vala | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/libzeitgeist/where-clause.vala b/libzeitgeist/where-clause.vala
-index a830599..d981914 100644
---- a/libzeitgeist/where-clause.vala
-+++ b/libzeitgeist/where-clause.vala
-@@ -211,7 +211,11 @@ namespace Zeitgeist
-          */
-         private T[] generic_array_to_unowned_array<T> (GenericArray<T> gptrarr)
-         {
-+#if VALA_0_24
-+            long[] pointers = new long[gptrarr.length];
-+#else
-             long[] pointers = new long[gptrarr.length + 1];
-+#endif
-             Memory.copy(pointers, ((PtrArray *) gptrarr)->pdata,
-                 (gptrarr.length) * sizeof (void *));
-             return (T[]) pointers;
--- 
-2.3.0
-

diff --git a/gnome-extra/zeitgeist/zeitgeist-0.9.15.ebuild b/gnome-extra/zeitgeist/zeitgeist-0.9.15.ebuild
deleted file mode 100644
index dea118c..0000000
--- a/gnome-extra/zeitgeist/zeitgeist-0.9.15.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-AUTOTOOLS_AUTORECONF=true
-PYTHON_COMPAT=( python2_7 )
-VALA_MIN_API_VERSION=0.22
-
-inherit autotools-utils bash-completion-r1 eutils python-r1 vala versionator
-
-DIR_PV=$(get_version_component_range 1-2)
-
-DESCRIPTION="Service to log activities and present to other apps"
-HOMEPAGE="https://launchpad.net/zeitgeist/"
-SRC_URI="https://launchpad.net/zeitgeist/${DIR_PV}/${PV}/+download/${P}.tar.xz
-	https://dev.gentoo.org/~eva/distfiles/${PN}/${P}.tar.xz"
-
-LICENSE="LGPL-2+ LGPL-3+ GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
-IUSE="+datahub downloads-monitor extensions +fts icu introspection nls plugins sql-debug telepathy"
-
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	downloads-monitor? ( datahub )"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	!gnome-extra/zeitgeist-datahub
-	dev-libs/json-glib
-	dev-python/dbus-python[${PYTHON_USEDEP}]
-	dev-python/pygobject:2[${PYTHON_USEDEP}]
-	dev-python/pyxdg[${PYTHON_USEDEP}]
-	dev-python/rdflib[${PYTHON_USEDEP}]
-	media-libs/raptor:2
-	>=dev-libs/glib-2.26.0:2
-	>=dev-db/sqlite-3.7.11:3
-	sys-apps/dbus
-	datahub? ( x11-libs/gtk+:3 )
-	extensions? ( gnome-extra/zeitgeist-extensions  )
-	fts? ( dev-libs/xapian[inmemory] )
-	icu? ( dev-libs/dee[icu?,${PYTHON_USEDEP}] )
-	introspection? ( dev-libs/gobject-introspection )
-	plugins? ( gnome-extra/zeitgeist-datasources )
-	telepathy? ( net-libs/telepathy-glib )
-"
-DEPEND="${RDEPEND}
-	$(vala_depend)
-	>=dev-util/intltool-0.35
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	# pure-python module is better managed manually, see src_install
-	sed -e 's:python::g' \
-		-i Makefile.am || die
-
-	# Fix direct invocation of python in configure
-	epatch "${FILESDIR}"/${PN}-0.9.15-python-detection.patch
-
-	# Fix vapi dependencies
-	epatch "${FILESDIR}"/${PN}-0.9.14-gio-backport.patch
-
-	# Fix query generation, from master
-	epatch "${FILESDIR}"/${PN}-0.9.15-fix-array-length-string-join.patch
-
-	autotools-utils_src_prepare
-	vala_src_prepare
-}
-
-src_configure() {
-	local myeconfargs=(
-		--docdir="${EPREFIX}/usr/share/doc/${PF}"
-		--with-session-bus-services-dir="${EPREFIX}/usr/share/dbus-1/services"
-		$(use_enable sql-debug explain-queries)
-		$(use_enable datahub)
-		$(use_enable downloads-monitor)
-		$(use_enable telepathy)
-		$(use_enable introspection)
-		$(use_with icu dee-icu)
-	)
-
-	use nls || myeconfargs+=( --disable-nls )
-	use fts && myeconfargs+=( --enable-fts )
-
-	python_setup
-	autotools-utils_src_configure
-}
-
-src_test() {
-	autotools-utils_src_test TESTS_ENVIRONMENT="dbus-run-session"
-}
-
-src_install() {
-	dobashcomp data/completions/zeitgeist-daemon
-	autotools-utils_src_install
-	cd python || die
-	python_moduleinto ${PN}
-	python_foreach_impl python_domodule *py
-
-	# Redundant NEWS/AUTHOR installation
-	rm -r "${D}"/usr/share/zeitgeist/doc/ || die
-}