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.

Package-Manager: portage-2.2.0_alpha134/cvs/Linux x86_64

5 files changed, 62 insertions, 112 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/Manifest b/net-im/telepathy-logger/Manifest
index 06defa57b23c..b5bc8a6ef5e5 100644
--- a/net-im/telepathy-logger/Manifest
+++ b/net-im/telepathy-logger/Manifest
@@ -1,7 +1,20 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 DIST telepathy-logger-0.2.12.tar.bz2 465574 SHA256 43ce8c6d0309889b56116e9a6eb023e6698962fad72deb1202fee36d64a80199 SHA512 66d243e3d2f653c7a800dcd4f5c21a412c83bc95da40c9d913f3cc250dbf27a65864f8fd784359540288969cc7aeba3fcdc79538cad1aee99171e3be97aa0ebc WHIRLPOOL ce4426d70306c5f93f0fde02ac57f120892af889abdfd2e50904de2db8ca7f616b3b7ca0e10d638de42c6b32048fd4e228cf83ea73081772be3bd3c9e72afc45
 DIST telepathy-logger-0.4.0.tar.bz2 523642 SHA256 06b5ab0616afd7572a1bbda58e6a9487bb305f69358c85985a8999f26f4465e5 SHA512 bcd95b0f86a30c445764abd319fc368b500f394ff611312b9d0b871b8bed353cc991f34261fa64f73dca0bd3f69a259e9dab64242e208156ae917e66da6726f4 WHIRLPOOL 0eeff69445b738edc271e57c65556513e306dd544270555e530fec4903fa14d11e2e437b0a4aaff44e1cbffb3ad48a4df0d0b99512f10388d366f3b7013e6930
-EBUILD telepathy-logger-0.2.12-r1.ebuild 1550 SHA256 7a7a9c200c4a960d67f80850b15f18f89fc61dc554ec3cb023ea0592e767cadd SHA512 cf5212d94816753d9958d721084778014291a525b0cd06f970701045d21d304cb082dec50d0e027670b33568916d4fe90c727017905207119e670a8daa0a88e0 WHIRLPOOL 9b3f856cb72b7a952106689467eb32181afc2e9aa9cad64eda06c6d9e25b46c5400f4e7ebb0b0845462fe993969d1eefb71a402866162f91322c76d74826dd2d
-EBUILD telepathy-logger-0.2.12.ebuild 1497 SHA256 512569735b87abd0c665c048e9c2f2f059427eb63f3202b1e192018d197f1284 SHA512 2a7eb4011625bb424b3a7f2906dfa69d471ce18480c6ea460796fef2eeaa8321ae5040a0ec7218028fab4a69f6a2a9f0df7aee4be64e184868911850aea77979 WHIRLPOOL fb6093dde6a7d53806af1326a493ea414b0feeafce66af0c47e16a0f97d4e8d9b55b6e4dd1833132b7b015e5c4de028489ecb9d23128537a4a1edbc0bbc834f4
-EBUILD telepathy-logger-0.4.0.ebuild 1488 SHA256 b01223c6919a74e2de6788c8701669c5a1a7b2313a7ac0f741ca976916670a86 SHA512 a4e9bb076e48e7b7a9f0811c2cf298f8fe087b0b9c5753df78412c41951ed87c4b501022ab26d31b4bbe6f0756bd9dae66a4d7b37ded32dc998dfddc2f9b7c87 WHIRLPOOL e670c5a999cf4935b816ae0edc44cdcb35598d76772cf4d6248bbf7b7ec2b464d1147b6f23567243fcc1d2afce3b565c071aa6446c40052d6a0bcfd9825187b0
-MISC ChangeLog 6008 SHA256 5e767ebb73ee866ef5343df87a93bd4a2025895e381151bf329eb9872c0d2582 SHA512 67ebf9b151a36ec799c17366247abdeed6f1a725ab030e1bb7dc8adf2740ca80850f4f58826bad8cfd76db62cd0d5280ebd2020470483f9a3604e253a60e6598 WHIRLPOOL de48aed94b0c3b857a2dfb4f7709eacb8692c9ac1ef75279a9a4fac40939d85362b5d73e4b97ff39f5a52e8140205d74541224633884978cddb95cb499d1804b
+EBUILD telepathy-logger-0.2.12-r1.ebuild 1461 SHA256 e118c37af4a1e8c8cf4eab5c127db303d08ba62d804296eaceb6832b72c86bc7 SHA512 cbc1a45e91b348f01e17e9916f1b8c294fd67d6307a8eb577277a1e0c4c290b17a6a0968563f7e71e9d12754f3217b3f242dd8b0c160688f1e3da88d35d43cb8 WHIRLPOOL 6824fbf0c41063be73e90310bb651c367ca7b4f29599620dd5e78dfe7203010e642e018ff2eee0c128b6a41fba9fc1de451439998d28a871082d6a37320c6d0c
+EBUILD telepathy-logger-0.4.0.ebuild 1443 SHA256 ddcf6693948a72d81c597052b85e293e87770c36f3eb716fb95ea25c5095a081 SHA512 a4fe193f5041c9873ecde0bc22079ff910577e82c4828065b8efa782482afef28eab45efed50bece26cc25d839ab1e0e7b9447f5a46e61796d8902a616e0913b WHIRLPOOL fcf2d0afa26dd73c747d60bee33ee8511d1718163269665e2dee25f26a34a336b6a6c1fd08d3f4eecb68b256770a0f1c58076c8de1146b8301ccec1cebed4e48
+MISC ChangeLog 6415 SHA256 662674e025a2854af992c498459f1ab031be1a18e553d64f5c17938993b0169a SHA512 f5609ec78c105c9c97cdd47e5adb4abedadbbfb1973da63031781b1d92fd8f8721bc4aa63e0538d905236c340582e85df1e0b8df20045c36fa3dbd9b3a87fb86 WHIRLPOOL 27d4d40c9f89a74f6f623bdcea0008682c7aae90c95b9815b404f7751b8f4be0713904e1e62794a39972b3485cab74c5f8de14ab831131b2974b68c73be71cce
 MISC metadata.xml 271 SHA256 67647b0d11867e365da552164cf9abd70faf05b451f251e6292f5dc0d7fc6857 SHA512 9f7ceede83b20eac8c12833cf4f63b2348d02cc812dc095dbd313cdc7e167e1f5e598ec62c82f91f0a6ff8d32c36fe2bcd9ff4ecdd5ddfcda7cb3ac581733b59 WHIRLPOOL 05b6e163343eb2f087c77afde76e2418e72e22157cb248f053e3993130f2f303dced5eefbaa90a422694b98a4d24c96d491ebead0bea2ab5d4470e684eda8751
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQEcBAEBCAAGBQJQdLN+AAoJEJ0WA1zPCt1h7/oH/3omwoN3r+mQcXMz0y2O5BpT
+hW4uqfk0b9/kNT9IJbG/TMmIqd6bM7MlmkNNNJC7bxQ3Xs7JYsLJNlpVcMtsxWq9
+ANl5Bew1VN4f3BI8ZQCM1NEMh4QMG6/R7iX0eq/WcduU9x9eqQFH8TQ0JSWbl+4W
+R60g8qo0LbMo3mS3hq/MX+Z4VtK0l0hLfIJkzSLics645qRT6MawCh9TE8weFklL
+hFl7F673kZWTtKkxWZ7aXwMJqObxAImOEBESJFeqSWtWQXK+Suz/N9QwOZ4XA6DU
+1U+WUC4oE7zm6/HOI4dGp++lDKrqEJHWPsp6UEgG+OIuIzTVo0dahyv2tOA97YY=
+=jiwE
+-----END PGP SIGNATURE-----
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"
-}