gnome-extra/zeitgeist-datahub: Drop old; make all ebuilds use vala.eclass, #463720

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

6 files changed, 20 insertions, 114 deletions

diff --git a/gnome-extra/zeitgeist-datahub/ChangeLog b/gnome-extra/zeitgeist-datahub/ChangeLog
index 22a2d952a087..ffb899b09344 100644
--- a/gnome-extra/zeitgeist-datahub/ChangeLog
+++ b/gnome-extra/zeitgeist-datahub/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for gnome-extra/zeitgeist-datahub
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/zeitgeist-datahub/ChangeLog,v 1.14 2013/02/02 22:42:40 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/zeitgeist-datahub/ChangeLog,v 1.15 2013/04/07 14:47:29 jlec Exp $
+
+  07 Apr 2013; Justin Lecher <jlec@gentoo.org> -zeitgeist-datahub-0.7.0.ebuild,
+  -zeitgeist-datahub-0.8.1.ebuild, -zeitgeist-datahub-0.8.2.ebuild,
+  zeitgeist-datahub-0.9.5.ebuild, metadata.xml:
+  Drop old; make all ebuilds use vala.eclass, #463720
 
   02 Feb 2013; Agostino Sarubbo <ago@gentoo.org> zeitgeist-datahub-0.9.5.ebuild:
   Add ~arm, wrt bug #449220
diff --git a/gnome-extra/zeitgeist-datahub/metadata.xml b/gnome-extra/zeitgeist-datahub/metadata.xml
index ab345584c433..6337d904adef 100644
--- a/gnome-extra/zeitgeist-datahub/metadata.xml
+++ b/gnome-extra/zeitgeist-datahub/metadata.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>desktop-misc</herd>
-	<maintainer>
-		<email>jlec@gentoo.org</email>
-	</maintainer>
-	<use>
-		<flag name="download">Monitor XDG download directory</flag>
-		<flag name="telepathy">
+  <herd>desktop-misc</herd>
+  <maintainer>
+    <email>jlec@gentoo.org</email>
+  </maintainer>
+  <use>
+    <flag name="download">Monitor XDG download directory</flag>
+    <flag name="telepathy">
 			Telepathy logging support for 1-to-1 chats, calls and file transfers
 		</flag>
-	</use>
+  </use>
 </pkgmetadata>
diff --git a/gnome-extra/zeitgeist-datahub/zeitgeist-datahub-0.7.0.ebuild b/gnome-extra/zeitgeist-datahub/zeitgeist-datahub-0.7.0.ebuild
deleted file mode 100644
index d8387eaf9765..000000000000
--- a/gnome-extra/zeitgeist-datahub/zeitgeist-datahub-0.7.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/zeitgeist-datahub/zeitgeist-datahub-0.7.0.ebuild,v 1.3 2012/05/05 06:25:19 jdhore Exp $
-
-EAPI=4
-inherit versionator
-
-MY_PV=$(get_version_component_range 1-2)
-DESCRIPTION="Provides passive plugins to insert events into zeitgeist"
-HOMEPAGE="http://launchpad.net/zeitgeist-datahub"
-SRC_URI="http://launchpad.net/zeitgeist-datahub/${MY_PV}/${PV}/+download/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-CDEPEND="dev-libs/libzeitgeist
-	dev-libs/glib:2
-	x11-libs/gtk+:2
-	dev-lang/vala:0.12"
-RDEPEND="${CDEPEND}
-	gnome-extra/zeitgeist"
-DEPEND="${CDEPEND}
-	virtual/pkgconfig"
-
-src_configure() {
-	econf VALAC=$(type -P valac-0.12)
-}
diff --git a/gnome-extra/zeitgeist-datahub/zeitgeist-datahub-0.8.1.ebuild b/gnome-extra/zeitgeist-datahub/zeitgeist-datahub-0.8.1.ebuild
deleted file mode 100644
index 7823c138fb29..000000000000
--- a/gnome-extra/zeitgeist-datahub/zeitgeist-datahub-0.8.1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/zeitgeist-datahub/zeitgeist-datahub-0.8.1.ebuild,v 1.2 2012/05/05 06:25:19 jdhore Exp $
-
-EAPI=4
-
-inherit autotools-utils versionator
-
-MY_PV=$(get_version_component_range 1-2)
-DESCRIPTION="Provides passive plugins to insert events into zeitgeist"
-HOMEPAGE="http://launchpad.net/zeitgeist-datahub"
-SRC_URI="http://launchpad.net/zeitgeist-datahub/${MY_PV}/${PV}/+download/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="download"
-
-CDEPEND="
-	dev-libs/libzeitgeist
-	dev-libs/glib:2
-	x11-libs/gtk+:2
-	dev-lang/vala:0.12"
-RDEPEND="${CDEPEND}
-	gnome-extra/zeitgeist"
-DEPEND="${CDEPEND}
-	virtual/pkgconfig"
-
-src_configure() {
-	local myeconfargs=(
-		$(use_enable download downloads-monitor)
-		VALAC=$(type -P valac-0.12)
-	)
-	autotools-utils_src_configure
-}
diff --git a/gnome-extra/zeitgeist-datahub/zeitgeist-datahub-0.8.2.ebuild b/gnome-extra/zeitgeist-datahub/zeitgeist-datahub-0.8.2.ebuild
deleted file mode 100644
index 49ff49f33094..000000000000
--- a/gnome-extra/zeitgeist-datahub/zeitgeist-datahub-0.8.2.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/zeitgeist-datahub/zeitgeist-datahub-0.8.2.ebuild,v 1.3 2012/05/05 06:25:19 jdhore Exp $
-
-EAPI=4
-
-inherit autotools-utils versionator
-
-MY_PV=$(get_version_component_range 1-2)
-DESCRIPTION="Provides passive plugins to insert events into zeitgeist"
-HOMEPAGE="http://launchpad.net/zeitgeist-datahub"
-SRC_URI="http://launchpad.net/zeitgeist-datahub/${MY_PV}/${PV}/+download/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="download"
-
-CDEPEND="
-	dev-libs/libzeitgeist
-	dev-libs/glib:2
-	x11-libs/gtk+:2
-	dev-lang/vala:0.12"
-RDEPEND="${CDEPEND}"
-DEPEND="${CDEPEND}
-	virtual/pkgconfig"
-PDEPEND="gnome-extra/zeitgeist"
-
-src_configure() {
-	local myeconfargs=(
-		$(use_enable download downloads-monitor)
-		VALAC=$(type -P valac-0.12)
-	)
-	autotools-utils_src_configure
-}
diff --git a/gnome-extra/zeitgeist-datahub/zeitgeist-datahub-0.9.5.ebuild b/gnome-extra/zeitgeist-datahub/zeitgeist-datahub-0.9.5.ebuild
index f1e5121dda02..d253c887a7b0 100644
--- a/gnome-extra/zeitgeist-datahub/zeitgeist-datahub-0.9.5.ebuild
+++ b/gnome-extra/zeitgeist-datahub/zeitgeist-datahub-0.9.5.ebuild
@@ -1,10 +1,12 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/zeitgeist-datahub/zeitgeist-datahub-0.9.5.ebuild,v 1.7 2013/02/02 22:42:40 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/zeitgeist-datahub/zeitgeist-datahub-0.9.5.ebuild,v 1.8 2013/04/07 14:47:29 jlec Exp $
 
 EAPI=4
 
-inherit autotools-utils versionator
+VALA_MIN_API_VERSION=0.16
+
+inherit autotools-utils versionator vala
 
 MY_PV=$(get_version_component_range 1-2)
 
@@ -17,17 +19,15 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="download telepathy"
 
-VALA_VER="0.16"
-
 CDEPEND="
 	dev-libs/libzeitgeist
 	>=dev-libs/json-glib-0.14.0
 	dev-libs/glib:2
 	x11-libs/gtk+:2
-	dev-lang/vala:${VALA_VER}
 	telepathy? ( >=net-libs/telepathy-glib-0.18.0 )"
 RDEPEND="${CDEPEND}"
 DEPEND="${CDEPEND}
+	${vala_depend}
 	virtual/pkgconfig"
 PDEPEND="gnome-extra/zeitgeist"
 
@@ -36,6 +36,7 @@ src_prepare() {
 		-e '/Encoding/d' \
 		-i src/${PN}.desktop.in || die
 	rm -f src/zeitgeist-datahub.c || die
+	vala_src_prepare
 	autotools-utils_src_prepare
 }
 
@@ -44,7 +45,6 @@ src_configure() {
 		$(use_enable telepathy)
 		$(use_enable download downloads-monitor)
 		--disable-silent-rules
-		VALAC=$(type -P valac-${VALA_VER})
 	)
 	autotools-utils_src_configure
 }