Revert change to postinst behavior in existing ebuild versions. The schema compile fix is now only in 0.4.0-r1.

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

5 files changed, 113 insertions, 40 deletions

diff --git a/net-im/telepathy-logger/ChangeLog b/net-im/telepathy-logger/ChangeLog
index 174d1ee14e59..42bbc2b1cd90 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.42 2012/10/09 23:30:05 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/telepathy-logger/ChangeLog,v 1.43 2012/10/09 23:45:42 tetromino Exp $
+
+*telepathy-logger-0.4.0-r1 (09 Oct 2012)
+
+  09 Oct 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+  telepathy-logger-0.2.12-r1.ebuild, telepathy-logger-0.4.0.ebuild,
+  +telepathy-logger-0.4.0-r1.ebuild:
+  Revert change to postinst behavior in existing ebuild versions. The schema
+  compile fix is now only in 0.4.0-r1.
 
   09 Oct 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
   -telepathy-logger-0.2.12.ebuild, telepathy-logger-0.2.12-r1.ebuild,
diff --git a/net-im/telepathy-logger/Manifest b/net-im/telepathy-logger/Manifest
index b5bc8a6ef5e5..a87094a8010a 100644
--- a/net-im/telepathy-logger/Manifest
+++ b/net-im/telepathy-logger/Manifest
@@ -3,18 +3,19 @@ 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 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
+EBUILD telepathy-logger-0.2.12-r1.ebuild 1525 SHA256 103b19daa962f83f12eba5a189638751b0fb76bfdc81139733b2c33c5356c530 SHA512 d2ba81de0a9a83552b9d1452b035d91d9b87e9d402957e53ad9676e2b87521e2d6d89dbf6f4880ea3340a848f3960b0f8849b45cc6d8077f7629c2d662564887 WHIRLPOOL 72adaf357530cd6bbd07530e2883ec60343b4b03fce48fc846fa363f90c865feacccfd5a857155f63823df367ec43deea27d1451ad5497b565786efa00decb77
+EBUILD telepathy-logger-0.4.0-r1.ebuild 1448 SHA256 7d57e15cc5a6b80f1a35fa9989908909de5342d7e91f9b19e92ac7af2c78a830 SHA512 bd898fae1a37b185add1b6f95e379ae5d8e8610f1f4d5810cef5d8e664a7b9f846fee52f7bd851e7debbb2c945f25f092e7e93014bf8e4d0da6c361b39a24fff WHIRLPOOL 0a2893a30fc59f7690ca2ef2c615f0004a31786e587b19d8d97c12224f07b802657316b1a0edc45c3a4ca81e8dad68adf2836b8cc2929e45de12ab6a18ad08cb
+EBUILD telepathy-logger-0.4.0.ebuild 1467 SHA256 d94b20ec446ad0420e8d0734642b5b69743accc69ed2118011f31083ae3ecaad SHA512 03b390a5db912be43c6b15b2b96acf361fd60ce2f36d21c965b214e68de81f1b665a94b07dbbdc8d0a102fde06f4aee8a4bdd66725f0834b7ea4cff1a03d241f WHIRLPOOL 863fcc790ae16a445f502ee179995bce722ef4af4721bc7ae953d59a47d738decc9ee25c64177db26e6e9b538f512bf4f0d804714f4ee6d2a5e37fcaec738f8d
+MISC ChangeLog 6738 SHA256 b982c149b71aed5fda887829ab97a5031441269b3769f0aa75646fc36fb7b7d9 SHA512 d94c3869a6af20928d057d498ff0513950f33a1d0add374e56d411b264cfaf64963e2b2f29be8d7651e449f331c83e9a704e56c9a07c1fa17a0d31e972e4a976 WHIRLPOOL 7f1287340f3033018bde4434cffae0d7c9d851d92f0a8f820a8bc2d52a6ba028cb7bc85601b016f7e291bf32c1a59028116e4cbcf0b19c7a8d7e4923baed9da1
 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
+iQEcBAEBCAAGBQJQdLcoAAoJEJ0WA1zPCt1hXDcH/0T6/5HrWWv8SFjkKh69vA9h
+nNv4cJs8NKBcbe+6hWtm/eP3e9mTwG77RQbGODmQlkzg6RpsAIZ1iSgs7XX7tSYO
+gAeJG+WFJFfr/jfPwIm717mBUvNuCFNKAyu0d+aMgQOLNPiahxAZc0MwseG9OCtw
+uRy+LvazzHw71sYiuRRiu2jReappKB27PWrpPJ0iBcK0a0+nsgyaFb2NfB+s/RNK
+mttQY/lN6AOGQnp0E3m22WT5cEYx2LeES5FRPnobcdIH6SkokOAFpwOY2sPaAHZ9
+uLpUtrAx0WBqf+87th4N3P0COOc8A1fS+pOVhgr2DKrpYB6P6MBrmh0OT6ND7wc=
+=7xBp
 -----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 35323e726c15..48e698c3e426 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,13 +1,11 @@
 # 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.8 2012/10/09 23:30:05 tetromino Exp $
+# $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 $
 
 EAPI="4"
 PYTHON_DEPEND="2:2.5"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
 
-inherit gnome2 python virtualx
+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"
@@ -33,27 +31,34 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig
 "
 
-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"
+DOCS=(AUTHORS ChangeLog NEWS README)
 
+pkg_setup() {
 	python_set_active_version 2
 	python_pkg_setup
 }
 
 src_prepare() {
 	python_convert_shebangs -r 2 .
-	gnome2_src_prepare
+}
+
+src_configure() {
+	econf \
+		$(use_enable introspection) \
+		--enable-call \
+		--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-r1.ebuild b/net-im/telepathy-logger/telepathy-logger-0.4.0-r1.ebuild
new file mode 100644
index 000000000000..5fdc8185f54e
--- /dev/null
+++ b/net-im/telepathy-logger/telepathy-logger-0.4.0-r1.ebuild
@@ -0,0 +1,56 @@
+# 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-r1.ebuild,v 1.1 2012/10/09 23:45:43 tetromino Exp $
+
+EAPI="4"
+PYTHON_DEPEND="2:2.5"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+
+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+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86 ~x86-linux"
+IUSE="+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.18.0[introspection?]
+	dev-libs/libxml2
+	dev-libs/libxslt
+	dev-db/sqlite:3
+	introspection? ( >=dev-libs/gobject-introspection-0.9.6 )"
+DEPEND="${RDEPEND}
+	dev-util/gtk-doc-am
+	>=dev-util/intltool-0.35
+	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 .
+	gnome2_src_prepare
+}
+
+src_test() {
+	gnome2_environment_reset
+	Xemake check || die "make check 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 498aa207a24e..dc3e149691b2 100644
--- a/net-im/telepathy-logger/telepathy-logger-0.4.0.ebuild
+++ b/net-im/telepathy-logger/telepathy-logger-0.4.0.ebuild
@@ -1,13 +1,11 @@
 # 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.5 2012/10/09 23:30:05 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/telepathy-logger/telepathy-logger-0.4.0.ebuild,v 1.6 2012/10/09 23:45:42 tetromino Exp $
 
 EAPI="4"
 PYTHON_DEPEND="2:2.5"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
 
-inherit gnome2 python virtualx
+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"
@@ -32,25 +30,30 @@ DEPEND="${RDEPEND}
 	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 .
-	gnome2_src_prepare
+}
+
+src_configure() {
+	econf \
+		$(use_enable introspection) \
+		--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"
+}