gnome-extra/zeitgeist: Make all ebuilds use vala.eclass, #463720; use new python eclass

Package-Manager: portage-2.2.0_alpha171/cvs/Linux x86_64
Manifest-Sign-Key: 0x8009D6F070EB7916

4 files changed, 97 insertions, 24 deletions

diff --git a/gnome-extra/zeitgeist/ChangeLog b/gnome-extra/zeitgeist/ChangeLog
index 7a1a5d87228b..6bc9ce79c64e 100644
--- a/gnome-extra/zeitgeist/ChangeLog
+++ b/gnome-extra/zeitgeist/ChangeLog
@@ -1,6 +1,12 @@
 # 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.25 2013/02/02 22:42:20 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/zeitgeist/ChangeLog,v 1.26 2013/04/07 16:14:52 jlec Exp $
+
+*zeitgeist-0.9.5-r1 (07 Apr 2013)
+
+  07 Apr 2013; Justin Lecher <jlec@gentoo.org> zeitgeist-0.9.5.ebuild,
+  +zeitgeist-0.9.5-r1.ebuild:
+  Make all ebuilds use vala.eclass, #463720; use new python eclass
 
   02 Feb 2013; Agostino Sarubbo <ago@gentoo.org> zeitgeist-0.9.5.ebuild:
   Add ~arm, wrt bug #449220
diff --git a/gnome-extra/zeitgeist/Manifest b/gnome-extra/zeitgeist/Manifest
index ef76f2c69200..f5d451a2bee2 100644
--- a/gnome-extra/zeitgeist/Manifest
+++ b/gnome-extra/zeitgeist/Manifest
@@ -1,9 +1,20 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
 AUX zeitgeist-0.7-no-rdfpipe.patch 472 SHA256 4c340380c7cf8446583e4ff47d4c128394ede35abd570a2965cf963a859cc139 SHA512 d9502d03ae1c6d882f7be19cfdf738fc95f50ea0a438185aa14c701bcd85256af9433a4d2f6f38744063927171ad24c16f4c74871baa7810398e3e2e82dbb869 WHIRLPOOL 61aea508ef94eeb2e1e41ff3e5eb27d166cee6343d8ce76ebae25d7ca08e24ba57466641c3161df957bbf52fe8e0a4582af81b08fcd8800555a82fd025884828
 AUX zeitgeist-0.7.1-no-rdfpipe.patch 458 SHA256 791e2b845559761657764f15ee989360677aaa258517039c36d908ec3becedd7 SHA512 0877a10ea905ea70cbf1b0db2218006f1a6b5e63e88292c527a96544a7bb720ffcc046f3011b6fad228dd4a7bbd01a93fc18dae0f62c8ac0d3c7e2c100ba0c75 WHIRLPOOL ba490d09437617269aa830aa591a6a44a68ad971b990e9ea571c6c19785b9d4305f1bd018c174e97690bbc604a297029a1b7e2dbc05580ee04e4bb4fb74cbd13
 AUX zeitgeist-0.8.2-gobject.patch 1939 SHA256 149c58ed0b08ea024c005ccc5ec1430c6fddbd97110b5c5dccf3c1ebbea94b38 SHA512 bd7822e4ef40ed527c7dfdc837828b004ac0cc17a70a944c7e0df8e7e7e1fe1629c5a40bf5487cce209371ceaf18417b96b4df07e962105a870098b7c9da3e9c WHIRLPOOL 4a500d4ad196085593303370c3d36d32470a5378c2b604bc10feebde923fec87c1622e571210f3b5d3bec4aa17b46bfb4d272052e518b4d9c434f41963dbd43b
 AUX zeitgeist-0.9.0-doc.patch 345 SHA256 5658e76e9219c41d74b3dcf68dcad6b7eb4b5629a37ef1690fc10fe208796fb5 SHA512 3d24a3b53d4bb91bc4ee7cbbeede1de0814cc7ea5841db509c3af30ebd3952631e0b450b3e93d8fcf4272a64f91df24459e14e66fce27b4e19dccaf4b882ca58 WHIRLPOOL b13ef59620dfbce1bb25b66998304e7aa37f2e9095ec64046f3a8273b1a4e3e5ea5832bd19bda83209598f40b0ab43705023172af825f581b695a47ddd071ac1
 AUX zeitgeist-0.9.0-gobject.patch 528 SHA256 5f55bdc51f465c00753773a70ef95afcef81750f5af6c4e5291fa523a281d7ab SHA512 2ba93c23ceb54a3cbd05428affcb766620b7edbc38a0fc0dda501c91354c2f36116a5ca62698deb2da4ec090705de61810d27f940412a91b104b42d4010646d6 WHIRLPOOL b2786011d3081048fbbc3c624dd019ff92cde5c9d88462731651a37c4f3df2b4e7ed6b6eeb0c0c98f29241c8a93b1c85b7fb6f3e7947e53bbd45d6e6af4a0be4
 DIST zeitgeist-0.9.5.tar.bz2 856757 SHA256 e5ccb75ff705bfb382750c520c29653b6e0f40aeacd30adf233162132114be55 SHA512 26fc041721a9ba99875db7f5bd3cdf91555a3006d0f82186a95b269462334e53f58284d988f0fb9ae39b11679ba08a2992625d3646f697762005803069f1b7ab WHIRLPOOL a5d28119e88eb4d7b93eeb6cf7232c5dc1402560702016d45d3b4587d8224b0bc21e767d89ea2ed6847c0971c97a6db29d20afe640be50d1407fcce8ad3e5568
-EBUILD zeitgeist-0.9.5.ebuild 1852 SHA256 95054c21326d09a650cf816a704f83730b178d28b7d599ffe675305affbd531c SHA512 17fd14f9e37d8f85a01a2ff53c68d9cb9c97fc5ce3d63426834065b67506cc297ed716c30fa462eec67bc4b49bfcdd40930ade49496a6ba3438d4127f342ee56 WHIRLPOOL 8945289584a4ae9fdb6f32645858d8a6721066bf77955cbedd6282921132faaa9bd055b43fb5a219437dcbb5667c7861f10b3488d6b8e676344a791461bf376f
-MISC ChangeLog 4015 SHA256 162f2a8302392154e3e6d0cbd366351625e4971de524076fce971ad1103ad078 SHA512 38a7693e801926517cbdc3437d8d2b124eb012f224161c30b583aecee3335c364bb2d3b68ab02cae39c2a83237f0438ca8cf9092c702fea72798ac66a774f490 WHIRLPOOL 9f2d2c0e47efc9940646185821092b1eecf4811a49404c8560c0ade933b6df56cb684d396fe4f11f1a84926f90faf6f531754789f3310a209e4dc397a93b96b4
+EBUILD zeitgeist-0.9.5-r1.ebuild 1877 SHA256 1a5e5a022ada0aac4448fa1bd049e35385824a69f9e83e1efb7d0cbd4bafc07a SHA512 f0d3e067e7776e07a6221b155fdaf28551d3281d9ef95b2ab569bdc57fc56f27c9e95c616b91157641787bf86c8e6a9011488553752d4b1b4cfc4c153734ef41 WHIRLPOOL ba684984c5f7ae3aea9c82bb6d5d5734de6946fee1a75b98166b98e9b1033c8389cf9fb7a60f9370462a860c2f70d88025fc3c62d88121191d66736acb0256d4
+EBUILD zeitgeist-0.9.5.ebuild 1712 SHA256 2406a107ec87fcb5fcd5d7d4a86ccb674e8f4df9ea839860dbfca75ba8a6352d SHA512 080cf54f8604b42cfa336b7446eb0badc00eb08e10bb43e5dd7a640f82d2526b0831f0a7be1145ecd5292006d0a604a607381e97c3bc7e972c7d0711d3739b08 WHIRLPOOL cc6de89112cb5acda8150235b8f55f639be9dcbc9cd4481419ebc0e7907259e78aa6e86b62762131d7b918bd2efb050d4e73e9416434d50bdb1a3ebbf9e7836b
+MISC ChangeLog 4220 SHA256 0dfb51ccc257b38ee1d30d8947c1358eb12220a49c17b3d677bcd680b6763f7d SHA512 9aed05484679ae1d04fd0ca7d647fd3f38866396f97c6e746acf4d38c0d2dc53fd5e53b3c052de1aa7c55ca13879b8425af818bf1bf0ab333fd9b7a0ed1a038d WHIRLPOOL 37b99f9b5838869584c7637f834204100ba0cdabececea6431d14002154f4b5aa6a1152a11cb584b7ce2fa8f71793065f70c56f7174de712e71a189b8d14bab4
 MISC metadata.xml 943 SHA256 f72da4205201e12adad015dc10fbd0fb0a5cca8dd4157491f61c747e57757a16 SHA512 cd14a960f432fec6f7e7bef44801a25015665db8de5ddd5f46bc767a06b02454ee0754ef6543f6e8aa198f98625fd64bf59e42efd8f35b1da0a155f622fd8b08 WHIRLPOOL 19d3e54d9337c351a7053521ce67169a3c3a26ec072e4d0950a2c13f7ecf00dd4c8187ad9b6d2c52a07aeb82ec423f067d01b28271efc060dab24617ce18a5bb
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iEYEAREKAAYFAlFhm4kACgkQgAnW8HDreRbNIQCeJX4xEsvnOjUKnsZdRwVOL3iS
++7oAn3+S4BVBIXgv5ZBIsa1PbjmaeUe3
+=11Jf
+-----END PGP SIGNATURE-----
diff --git a/gnome-extra/zeitgeist/zeitgeist-0.9.5-r1.ebuild b/gnome-extra/zeitgeist/zeitgeist-0.9.5-r1.ebuild
new file mode 100644
index 000000000000..7786e0be2700
--- /dev/null
+++ b/gnome-extra/zeitgeist/zeitgeist-0.9.5-r1.ebuild
@@ -0,0 +1,70 @@
+# 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.1 2013/04/07 16:14:52 jlec Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_6,2_7} )
+
+AUTOTOOLS_AUTORECONF=true
+VALA_MIN_API_VERSION=0.16
+
+inherit autotools-utils eutils python-r1 versionator vala
+
+DIR_PV=$(get_version_component_range 1-2)
+EXT_VER=0.0.13
+
+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.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="+dbus extensions +fts icu nls passiv plugins sql-debug"
+
+RDEPEND="
+	dev-libs/xapian[inmemory]
+	dev-python/dbus-python[${PYTHON_USEDEP}]
+	dev-python/pygobject:2[${PYTHON_USEDEP}]
+	dev-python/pyxdg[${PYTHON_USEDEP}]
+	dev-python/rdflib
+	media-libs/raptor:2
+	dev-libs/glib:2
+	dev-db/sqlite:3
+	extensions? ( gnome-extra/zeitgeist-extensions  )
+	icu? ( dev-libs/dee[icu?] )
+	passiv? ( gnome-extra/zeitgeist-datahub )
+	plugins? ( gnome-extra/zeitgeist-datasources )"
+DEPEND="${RDEPEND}
+	${vala_depend}
+	virtual/pkgconfig"
+
+PATCHES=( "${FILESDIR}"/${PN}-0.9.0-doc.patch )
+
+src_prepare() {
+	sed \
+		-e 's:python::g' \
+		-i Makefile.am || die
+	vala_src_prepare
+	autotools-utils_src_prepare
+}
+
+src_configure() {
+	local myeconfargs=(
+		--docdir="${EPREFIX}/usr/share/doc/${PF}"
+		$(use_enable sql-debug explain-queries)
+		$(use_with icu dee-icu)
+		$(use_with dbus session-bus-services-dir /usr/share/dbus-1/services)
+	)
+	use nls || myeconfargs+=(--disable-nls)
+	use fts || myeconfargs+=(--disable-fts)
+	autotools-utils_src_configure
+}
+
+src_install() {
+	autotools-utils_src_install
+	cd python || die
+	python_moduleinto ${PN}
+	python_foreach_impl python_domodule *py
+}
diff --git a/gnome-extra/zeitgeist/zeitgeist-0.9.5.ebuild b/gnome-extra/zeitgeist/zeitgeist-0.9.5.ebuild
index f87cb92cba21..62aa6010063f 100644
--- a/gnome-extra/zeitgeist/zeitgeist-0.9.5.ebuild
+++ b/gnome-extra/zeitgeist/zeitgeist-0.9.5.ebuild
@@ -1,14 +1,15 @@
 # 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.ebuild,v 1.8 2013/02/02 22:42:20 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/zeitgeist/zeitgeist-0.9.5.ebuild,v 1.9 2013/04/07 16:14:52 jlec Exp $
 
 EAPI=4
 
 PYTHON_DEPEND="2"
 
 AUTOTOOLS_AUTORECONF=true
+VALA_MIN_API_VERSION=0.16
 
-inherit autotools-utils eutils python versionator
+inherit autotools-utils eutils python versionator vala
 
 DIR_PV=$(get_version_component_range 1-2)
 EXT_VER=0.0.13
@@ -30,19 +31,16 @@ RDEPEND="
 	dev-python/rdflib
 	media-libs/raptor:2
 	dev-libs/glib:2
-	dev-lang/vala:0.16
 	dev-db/sqlite:3
 	extensions? ( gnome-extra/zeitgeist-extensions  )
 	icu? ( dev-libs/dee[icu?] )
 	passiv? ( gnome-extra/zeitgeist-datahub )
-	plugins? ( gnome-extra/zeitgeist-datasources )
-"
+	plugins? ( gnome-extra/zeitgeist-datasources )"
 DEPEND="${RDEPEND}
+	${vala_depend}
 	virtual/pkgconfig"
 
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.9.0-doc.patch
-	)
+PATCHES=( "${FILESDIR}"/${PN}-0.9.0-doc.patch )
 
 pkg_setup() {
 	python_set_active_version 2
@@ -50,7 +48,7 @@ pkg_setup() {
 }
 
 src_prepare() {
-	export VALAC=$(type -p valac-0.16)
+	vala_src_prepare
 	python_clean_py-compile_files
 	autotools-utils_src_prepare
 }
@@ -66,15 +64,3 @@ src_configure() {
 	use fts || myeconfargs+=(--disable-fts)
 	autotools-utils_src_configure
 }
-
-src_install() {
-	autotools-utils_src_install
-}
-
-pkg_postinst() {
-	python_mod_optimize zeitgeist
-}
-
-pkg_postrm() {
-	python_mod_cleanup zeitgeist
-}