Use gnome2.eclass to ensure glib schemas get compiled correctly (bug #437750, thanks to Nikoli). Add missing gtk-doc-am and pkgconfig dependencies. Drop useless USE=doc flag for regenerating documentation. Update license. Drop old.

(Portage version: 2.2.0_alpha134/cvs/Linux x86_64)

4 files changed, 45 insertions, 108 deletions

diff --git a/net-im/telepathy-logger/ChangeLog b/net-im/telepathy-logger/ChangeLog
index 8f728054cfa8..174d1ee14e59 100644
--- a/net-im/telepathy-logger/ChangeLog
+++ b/net-im/telepathy-logger/ChangeLog
@@ -1,6 +1,13 @@
 # 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.41 2012/10/04 14:58:13 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/telepathy-logger/ChangeLog,v 1.42 2012/10/09 23:30:05 tetromino Exp $
+
+  09 Oct 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+  -telepathy-logger-0.2.12.ebuild, telepathy-logger-0.2.12-r1.ebuild,
+  telepathy-logger-0.4.0.ebuild:
+  Use gnome2.eclass to ensure glib schemas get compiled correctly (bug #437750,
+  thanks to Nikoli). Add missing gtk-doc-am and pkgconfig dependencies. Drop
+  useless USE=doc flag for regenerating documentation. Update license. Drop old.
 
   04 Oct 2012; Agostino Sarubbo <ago@gentoo.org> telepathy-logger-0.4.0.ebuild:
   Stable for amd64, wrt bug #427544
diff --git a/net-im/telepathy-logger/telepathy-logger-0.2.12-r1.ebuild b/net-im/telepathy-logger/telepathy-logger-0.2.12-r1.ebuild
index c1c962421365..35323e726c15 100644
--- a/net-im/telepathy-logger/telepathy-logger-0.2.12-r1.ebuild
+++ b/net-im/telepathy-logger/telepathy-logger-0.2.12-r1.ebuild
@@ -1,20 +1,22 @@
 # 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.7 2012/07/15 18:09:22 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/telepathy-logger/telepathy-logger-0.2.12-r1.ebuild,v 1.8 2012/10/09 23:30:05 tetromino Exp $
 
 EAPI="4"
 PYTHON_DEPEND="2:2.5"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
 
-inherit gnome2-utils python virtualx
+inherit gnome2 python 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"
+LICENSE="LGPL-2.1+"
 SLOT="0"
 KEYWORDS="alpha amd64 ia64 ppc sparc x86 ~x86-linux"
-IUSE="doc +introspection"
+IUSE="+introspection"
 
 RDEPEND=">=dev-libs/glib-2.25.11:2
 	>=sys-apps/dbus-1.1
@@ -26,39 +28,32 @@ RDEPEND=">=dev-libs/glib-2.25.11:2
 	introspection? ( >=dev-libs/gobject-introspection-0.9.6 )
 "
 DEPEND="${RDEPEND}
+	dev-util/gtk-doc-am
 	>=dev-util/intltool-0.35
-	doc? ( >=dev-util/gtk-doc-1.10 )
+	virtual/pkgconfig
 "
 
-DOCS=(AUTHORS ChangeLog NEWS README)
-
 pkg_setup() {
+	DOCS="AUTHORS ChangeLog NEWS README"
+	G2CONF="${G2CONF}
+		$(use_enable introspection)
+		--enable-call
+		--enable-debug
+		--enable-public-extensions
+		--disable-coding-style-checks
+		--disable-Werror
+		--disable-static"
+
 	python_set_active_version 2
 	python_pkg_setup
 }
 
 src_prepare() {
 	python_convert_shebangs -r 2 .
-}
-
-src_configure() {
-	econf \
-		$(use_enable doc gtk-doc) \
-		$(use_enable introspection) \
-		--enable-call \
-		--enable-debug \
-		--enable-public-extensions \
-		--disable-coding-style-checks \
-		--disable-Werror \
-		--disable-static
+	gnome2_src_prepare
 }
 
 src_test() {
 	gnome2_environment_reset
 	Xemake check || die "make check failed"
 }
-
-src_install() {
-	default
-	find "${D}" -name "*.la" -delete || die "la files removal failed"
-}
diff --git a/net-im/telepathy-logger/telepathy-logger-0.2.12.ebuild b/net-im/telepathy-logger/telepathy-logger-0.2.12.ebuild
deleted file mode 100644
index 25bfb23b0732..000000000000
--- a/net-im/telepathy-logger/telepathy-logger-0.2.12.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# 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.ebuild,v 1.8 2012/03/25 17:04:13 armin76 Exp $
-
-EAPI="4"
-PYTHON_DEPEND="2:2.5"
-
-inherit gnome2-utils python 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"
-IUSE="doc +introspection"
-
-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?]
-	dev-libs/libxml2
-	dev-libs/libxslt
-	dev-db/sqlite:3
-	introspection? ( >=dev-libs/gobject-introspection-0.9.6 )
-"
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.35
-	doc? ( >=dev-util/gtk-doc-1.10 )
-"
-
-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 doc gtk-doc) \
-		--enable-debug \
-		--enable-public-extensions \
-		--disable-coding-style-checks \
-		--disable-Werror \
-		--disable-static
-}
-
-src_test() {
-	gnome2_environment_reset
-	Xemake check || die "make check failed"
-}
-
-src_install() {
-	default
-	find "${D}" -name "*.la" -delete || die "la files removal failed"
-}
diff --git a/net-im/telepathy-logger/telepathy-logger-0.4.0.ebuild b/net-im/telepathy-logger/telepathy-logger-0.4.0.ebuild
index aa2c2bbe10b6..498aa207a24e 100644
--- a/net-im/telepathy-logger/telepathy-logger-0.4.0.ebuild
+++ b/net-im/telepathy-logger/telepathy-logger-0.4.0.ebuild
@@ -1,20 +1,22 @@
 # 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.4.0.ebuild,v 1.4 2012/10/04 14:58:13 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/telepathy-logger/telepathy-logger-0.4.0.ebuild,v 1.5 2012/10/09 23:30:05 tetromino Exp $
 
 EAPI="4"
 PYTHON_DEPEND="2:2.5"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
 
-inherit gnome2-utils python virtualx
+inherit gnome2 python 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"
+LICENSE="LGPL-2.1+"
 SLOT="0"
 KEYWORDS="~alpha amd64 ~ia64 ~ppc ~sparc x86 ~x86-linux"
-IUSE="doc +introspection"
+IUSE="+introspection"
 
 RDEPEND=">=dev-libs/glib-2.25.11:2
 	>=sys-apps/dbus-1.1
@@ -25,35 +27,30 @@ RDEPEND=">=dev-libs/glib-2.25.11:2
 	dev-db/sqlite:3
 	introspection? ( >=dev-libs/gobject-introspection-0.9.6 )"
 DEPEND="${RDEPEND}
+	dev-util/gtk-doc-am
 	>=dev-util/intltool-0.35
-	doc? ( >=dev-util/gtk-doc-1.10 )"
+	virtual/pkgconfig"
 
 pkg_setup() {
+	DOCS="AUTHORS ChangeLog NEWS README"
+	G2CONF="${G2CONF}
+		$(use_enable introspection)
+		--enable-debug
+		--enable-public-extensions
+		--disable-coding-style-checks
+		--disable-Werror
+		--disable-static"
+
 	python_set_active_version 2
 	python_pkg_setup
 }
 
 src_prepare() {
 	python_convert_shebangs -r 2 .
-}
-
-src_configure() {
-	econf \
-		$(use_enable doc gtk-doc) \
-		$(use_enable introspection) \
-		--enable-debug \
-		--enable-public-extensions \
-		--disable-coding-style-checks \
-		--disable-Werror \
-		--disable-static
+	gnome2_src_prepare
 }
 
 src_test() {
 	gnome2_environment_reset
 	Xemake check || die "make check failed"
 }
-
-src_install() {
-	default
-	find "${D}" -name "*.la" -delete || die "la files removal failed"
-}