Version bump. Switch to EAPI=5 and python-any-r1. USE=introspection is now global. Drop old revision.

(Portage version: 2.2.0_alpha149/cvs/Linux x86_64, signed Manifest commit with key C6085806)

3 files changed, 29 insertions, 36 deletions

diff --git a/net-im/telepathy-logger/ChangeLog b/net-im/telepathy-logger/ChangeLog
index 4e684704f712..274e7c6742fe 100644
--- a/net-im/telepathy-logger/ChangeLog
+++ b/net-im/telepathy-logger/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-im/telepathy-logger
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/telepathy-logger/ChangeLog,v 1.46 2012/10/28 16:31:29 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/telepathy-logger/ChangeLog,v 1.47 2012/12/21 22:03:03 eva Exp $
+
+*telepathy-logger-0.6.0 (21 Dec 2012)
+
+  21 Dec 2012; Gilles Dartiguelongue <eva@gentoo.org>
+  -telepathy-logger-0.2.12-r1.ebuild, +telepathy-logger-0.6.0.ebuild,
+  metadata.xml:
+  Version bump. Switch to EAPI=5 and python-any-r1. USE=introspection is now
+  global. Drop old revision.
 
   28 Oct 2012; Raúl Porcel <armin76@gentoo.org> telepathy-logger-0.4.0.ebuild:
   ia64/sparc stable wrt #427544
diff --git a/net-im/telepathy-logger/metadata.xml b/net-im/telepathy-logger/metadata.xml
index d6acf46776c7..da6fd63d0085 100644
--- a/net-im/telepathy-logger/metadata.xml
+++ b/net-im/telepathy-logger/metadata.xml
@@ -2,7 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>gnome</herd>
-<use>
-  <flag name='introspection'>Use <pkg>dev-libs/gobject-introspection</pkg> for introspection</flag>
-</use>
 </pkgmetadata>
diff --git a/net-im/telepathy-logger/telepathy-logger-0.2.12-r1.ebuild b/net-im/telepathy-logger/telepathy-logger-0.6.0.ebuild
index 48e698c3e426..c3be2f4a3810 100644
--- a/net-im/telepathy-logger/telepathy-logger-0.2.12-r1.ebuild
+++ b/net-im/telepathy-logger/telepathy-logger-0.6.0.ebuild
@@ -1,64 +1,52 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/telepathy-logger/telepathy-logger-0.2.12-r1.ebuild,v 1.9 2012/10/09 23:45:43 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/telepathy-logger/telepathy-logger-0.6.0.ebuild,v 1.1 2012/12/21 22:03:03 eva Exp $
 
-EAPI="4"
-PYTHON_DEPEND="2:2.5"
+EAPI="5"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+PYTHON_COMPAT=( python2_{5,6,7} )
 
-inherit gnome2-utils python virtualx
+inherit gnome2 python-any-r1 virtualx
 
 DESCRIPTION="Telepathy Logger is a session daemon that should be activated whenever telepathy is being used."
 HOMEPAGE="http://telepathy.freedesktop.org/wiki/Logger"
 SRC_URI="http://telepathy.freedesktop.org/releases/${PN}/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="alpha amd64 ia64 ppc sparc x86 ~x86-linux"
+SLOT="0/3"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86 ~x86-linux"
 IUSE="+introspection"
 
-RDEPEND=">=dev-libs/glib-2.25.11:2
+RDEPEND="
+	>=dev-libs/glib-2.25.11:2
 	>=sys-apps/dbus-1.1
 	>=dev-libs/dbus-glib-0.82
-	>=net-libs/telepathy-glib-0.15.6[introspection?]
+	>=net-libs/telepathy-glib-0.19.2[introspection?]
 	dev-libs/libxml2
 	dev-libs/libxslt
 	dev-db/sqlite:3
 	introspection? ( >=dev-libs/gobject-introspection-0.9.6 )
 "
 DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
 	dev-util/gtk-doc-am
 	>=dev-util/intltool-0.35
 	virtual/pkgconfig
 "
 
-DOCS=(AUTHORS ChangeLog NEWS README)
-
-pkg_setup() {
-	python_set_active_version 2
-	python_pkg_setup
-}
-
-src_prepare() {
-	python_convert_shebangs -r 2 .
-}
-
 src_configure() {
-	econf \
-		$(use_enable introspection) \
-		--enable-call \
-		--enable-debug \
-		--enable-public-extensions \
-		--disable-coding-style-checks \
-		--disable-Werror \
-		--disable-static
+	G2CONF="${G2CONF}
+		$(use_enable introspection)
+		--enable-debug
+		--enable-public-extensions
+		--disable-coding-style-checks
+		--disable-Werror
+		--disable-static"
+	gnome2_src_configure
 }
 
 src_test() {
 	gnome2_environment_reset
 	Xemake check || die "make check failed"
 }
-
-src_install() {
-	default
-	find "${D}" -name "*.la" -delete || die "la files removal failed"
-}